Update .po files.

svn path=/trunk/; revision=17317

38 files changed, 185436 insertions, 138845 deletions

diff --git a/po/az.po b/po/az.po
index 0dd93c4fd3..55326f2989 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.99.2\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2001-12-19 19:21GMT+0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
@@ -35,7 +35,7 @@ msgstr "VCard fayllarını Evolution içinə gətirir."
 msgid "File As"
 msgstr "Fərqli Qeyd Et"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ad"
@@ -46,7 +46,7 @@ msgid "Email"
 msgstr "ePoçt"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "İlk"
 
@@ -56,7 +56,7 @@ msgstr "İlk"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Köməkçi"
@@ -64,8 +64,8 @@ msgstr "Köməkçi"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Məslək"
 
@@ -75,12 +75,12 @@ msgid "Bus"
 msgstr "Məs"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Geri axtarma"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Şirkət"
 
@@ -91,8 +91,8 @@ msgstr "Şir"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Ev"
 
@@ -107,18 +107,18 @@ msgstr "Qur"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Əl Telefonu"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Maşın"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "İş Faksı"
@@ -128,13 +128,13 @@ msgid "Bus Fax"
 msgstr "İş Faksı"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Ev Faksı"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "2-ci İş"
 
@@ -143,43 +143,43 @@ msgid "Bus 2"
 msgstr "İş 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "2-ci Ev"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Başqa"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Başqa faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Peycer"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Teleks"
@@ -191,14 +191,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "2-ci ePoçt ünvanı"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "3.ncü ePoçt ünvanı"
@@ -336,7 +336,7 @@ msgstr "%s üçün VCard"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -344,7 +344,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Bonoboyu başlada bilmədim"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Axtarılır..."
 
@@ -357,32 +357,32 @@ msgstr "Yüklənir ..."
 msgid "Error in search expression."
 msgstr "Axtarış ifadəsində xəta."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "LDAP vericiyə kart əlavə edilir..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "LDAP vericidən kart çıxardılır..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP vericidəki kart təkmilləşdirilir..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Axtarış yenidəm başladılır."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "LDAP axtarış nəticələri alınır..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Kart çıxartma xətası"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "URL `%s' alına bilmir"
@@ -430,104 +430,140 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Ünvan dəftəri göstərən nümunəvi Bonobo idarəsi."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "Ünvan Dəftəri Qaynağı"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Evolution ünvan dəftəri kiçik kartlarını göstərən idarə."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution Ünvan Dəftəri kiçik kart nümaiyişi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Əlaqələri idarə edici Evolution əlavəsi."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Evolutionun Ünvan Dəftəri Kiçik Kart emalatxanası"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Ünvan Dəftəriidə ünvan göstərici"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Ünvan Dəftərində ünvan göstərici emalatxanası"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Nümunəvi ünvan dəftəri idarəsi emalatxanası"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Əlaqələr"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Əlaqələr məlumatını daxil edən qovluq."
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP Vericisi"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "Əlaqələr məlumatını daxil edən LDAP verici."
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Yeni Əlaqə Siyahısı"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Əlaqə Siyahısı"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Yeni Əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Yeni Əlaqə Siyahısı"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "LDAP vericiyə bağlanma xətası."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "_Əlaqə Siyahısı"
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"IMAP vericisinə tanıdılma xətası.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Süzgəc məlumatını yükləmə xətası:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs-ni başlada bilmədim"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Digər Əlaqələr"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Ünvan dəftərini aça bilmədim"
@@ -551,8 +587,7 @@ msgstr ""
 "Evolution proqramının bu buraxılışı LDAP verici\n"
 "dəstəkli dərlənməmişdir. LDAP dəstəkli Evolution\n"
 "üçün aşağıdakı körpüdən alacağınız OpenLDAP yardımıyla\n"
-"endirib CVS üstündə proqramın mənbə kodunu yenidən "
-"dərləməlisiniz.\n"
+"endirib CVS üstündə proqramın mənbə kodunu yenidən dərləməlisiniz.\n"
 
 #: addressbook/gui/component/addressbook.c:538
 msgid ""
@@ -560,53 +595,61 @@ msgid ""
 "path exists and that you have permission to access it."
 msgstr ""
 "Bu ünvnan dəftərini aça bilmədik.  Xahiş edirik,\n"
-"cığırın mövcudiyyətini və üstündəki səlahiyyətlərinizi "
-"yoxlayın."
+"cığırın mövcudiyyətini və üstündəki səlahiyyətlərinizi yoxlayın."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s üçün parol girin (istifadəçi %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "sonlanır"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "2-ci ePoçt ünvanı"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kateqoriya"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Daxil edən hər hansı üzv"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Ətraflı..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Hər Hansı Kateqoriya"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "Qovluq Səyyahını göstərəcək olan URI"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(heç biri)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "İlk ePoçt ünvanı"
 
@@ -652,106 +695,59 @@ msgstr "Sorğuları Bağla"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Sorğuları Fəallaşdır (Təhlükəlidir!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "LDAP vericiyə bağlanma xətası."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"IMAP vericisinə tanıdılma xətası.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Hökmsüz mənasız iz məlumatı:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Qurtarma Vaxtı"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr " Dəstəklənən növləri _yoxla "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Seçənəklər"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr " _Sil"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr " _Sil"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Seçənəklər"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -760,8 +756,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Ünvan Dəftəri Qaynağı"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Alarm"
@@ -823,16 +819,12 @@ msgstr "Evolution Alarmı"
 #: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution bu Poçt ünvanından vericiyə tanıtmaq üçün istifadə "
-"edəcək"
+msgstr "Evolution bu Poçt ünvanından vericiyə tanıtmaq üçün istifadə edəcək"
 
 #: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolution bu Poçt ünvanından vericiyə tanıtmaq üçün istifadə "
-"edəcək"
+msgstr "Evolution bu Poçt ünvanından vericiyə tanıtmaq üçün istifadə edəcək"
 
 #: addressbook/gui/component/ldap-config.glade.h:32
 #, fuzzy
@@ -858,8 +850,8 @@ msgstr "Quraşdırma"
 msgid "Mappings"
 msgstr "Kənarlar"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_hər"
@@ -1040,14 +1032,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1064,14 +1056,12 @@ msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
-msgstr ""
-"Bu ad hesab adınızı müəyyəmləşdirər. Ancaq nümayiş məqsədi "
-"daşıyır."
+msgstr "Bu ad hesab adınızı müəyyəmləşdirər. Ancaq nümayiş məqsədi daşıyır."
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1103,7 +1093,7 @@ msgid "Using email address"
 msgstr "_Bu ePoçt ünvanıdır"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1111,7 +1101,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Əlavə Et"
 
@@ -1158,7 +1148,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1275,10 +1265,12 @@ msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü emalatxanası"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Sil"
 
@@ -1412,7 +1404,7 @@ msgstr "Iş birliği"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Əlaqə düzəldicisi"
 
@@ -1422,7 +1414,7 @@ msgid "D_epartment:"
 msgstr "_Bölmə :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Ətraflı"
 
@@ -1486,11 +1478,12 @@ msgstr "_HTML ePoçtlarını qəbul edir"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Sil"
 
@@ -1519,7 +1512,7 @@ msgid "_Web page address:"
 msgstr "_Veb səhifəsi ünvanı:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Birləşmiş Ştatlar"
 
@@ -2025,12 +2018,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Latviya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Livan"
 
@@ -2039,7 +2031,7 @@ msgid "Lesotho"
 msgstr "Lesoto"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberiya"
 
@@ -2048,12 +2040,12 @@ msgid "Liechtenstein"
 msgstr "Lixtenşteyn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litvaniya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Lüksemburq"
 
@@ -2086,7 +2078,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2111,7 +2103,7 @@ msgid "Mayotte"
 msgstr "Mayot"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Meksika"
 
@@ -2136,7 +2128,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Mərakeş"
 
@@ -2161,7 +2153,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Hollandiya"
 
@@ -2174,12 +2166,12 @@ msgid "New Caledonia"
 msgstr "Yeni Kaledoniya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Yeni Zellandiya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nikaraqua"
 
@@ -2196,7 +2188,7 @@ msgid "Niue"
 msgstr "Niu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolk Adaları"
 
@@ -2205,17 +2197,17 @@ msgid "Northern Mariana Islands"
 msgstr "Şimali Marian Adaları"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norveç"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2228,7 +2220,7 @@ msgid "Palestinian Territory"
 msgstr "Fələstin Bölgəsi"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2237,12 +2229,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Yeni Qvineya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraqvay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2255,22 +2247,22 @@ msgid "Pitcairn"
 msgstr "Pitkairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polşa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portuqaliya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Porto Riko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Katar"
 
@@ -2279,7 +2271,7 @@ msgid "Reunion"
 msgstr "Reyunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Ruminıya"
 
@@ -2316,7 +2308,7 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome Və Prinsip"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Səudiyyə Ərəbistan"
 
@@ -2333,17 +2325,17 @@ msgid "Sierra Leone"
 msgstr "Siera Lione"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Sinqapur"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovakiya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Sloveniya"
 
@@ -2356,7 +2348,7 @@ msgid "Somalia"
 msgstr "Somali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Cənubi Afrika"
 
@@ -2365,7 +2357,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Cənub Georgiya Və Cənub Sandviç Adaları"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "İspaniya"
 
@@ -2386,7 +2378,7 @@ msgid "Sudan"
 msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -2399,17 +2391,17 @@ msgid "Swaziland"
 msgstr "Svaziland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "İsveç"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "İsveçrə"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Tayvan"
 
@@ -2447,7 +2439,7 @@ msgid "Tunisia"
 msgstr "Tunis"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Türkiyə"
 
@@ -2468,7 +2460,7 @@ msgid "Uganda"
 msgstr "Uqanda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukrayna"
 
@@ -2477,7 +2469,7 @@ msgid "United Arab Emirates"
 msgstr "Birləşmiş Ərəb Əmirlikləri"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Birləşmiş Krallıq"
 
@@ -2486,7 +2478,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "Birləşmiş Ştatlar yanı Kiçik Adalar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruqvay"
 
@@ -2499,12 +2491,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vyetnam"
 
@@ -2527,12 +2519,12 @@ msgid "Western Sahara"
 msgstr "Qərbi Saxara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yəmən"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Yuqoslaviya"
 
@@ -2545,27 +2537,34 @@ msgid "Zimbabwe"
 msgstr "Zimbabve"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Əlaqəni Silimmi?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Kateqoriya editoru mövcud deyildir."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Bu üzv bu kateqoriyalara aitdir:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "VCard olaraq qeyd et"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Sahənin pəncərəciyi tapıla bilmir: `%s'"
@@ -2592,11 +2591,11 @@ msgstr "ePoçt"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "siyahı"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2716,8 +2715,7 @@ msgstr "Üzvlər"
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
-"Poçt ünvanını yazın ya da əlaqə məlumatını aşağıdakı siyahıya "
-"sürükləyin:"
+"Poçt ünvanını yazın ya da əlaqə məlumatını aşağıdakı siyahıya sürükləyin:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_Hide addresses when sending mail to this list"
@@ -2733,11 +2731,11 @@ msgid "contact-list-editor"
 msgstr "əlaqə-siyahısı-editoru"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Əlaqə Siyahısı Editoru"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "VCard olaraq qeyd et"
@@ -2816,21 +2814,21 @@ msgid "Error getting book view"
 msgstr "%s başladırkən xəta oldu"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Kard təkmilləşdirmə xətası"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Müvəffəqiyyət"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Naməlum xəta"
 
@@ -2839,7 +2837,7 @@ msgid "Repository offline"
 msgstr "Nüsxə xətdən deyil"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Qadağandır"
 
@@ -2857,55 +2855,70 @@ msgstr "Protokol dəstəklənmir"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Ləğv Edildi"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Tanıtma bacarılmadı."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Tanıtma lazımdır"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Başqa xəta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Dəyişiklikləri qeyd etmək istəyirsinizimi?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Siyahıya əlavə etmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Kart əlavə etmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Siyahı təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Siyahı çıxartma xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Kart çıxartma xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Ekran"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Ekran"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2913,22 +2926,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Kart yoxdur"
@@ -2993,102 +3006,108 @@ msgstr "Digər Telefonlar"
 msgid "Other Address"
 msgstr "BaşqaÜnvanlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Ünvan Dəftəri"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "VCard olaraq qeyd et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Yeni Əlaqə"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Yeni Əlaqə Siyahısı"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Qovluğa _Get ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_İdxal Et..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "Əlaqələri A_xtar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Ünvan Dəftəri Qaynağı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot Qurğuları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Əlaqəni Çatdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Əlaqəyə İsmarış Göndər"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Zərfi Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kəs"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Köçürt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Yapışdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Sil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3098,19 +3117,17 @@ msgstr "_Hazırkı Görünüş"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ""
-",123,a,b,c,ç,d,e,ə,f,g,ğ,h,i,j,k,,l,m,n,o,ö,p,q,r,s,ş,t,u,ü,v,w,x,y,z"
+msgstr ",123,a,b,c,ç,d,e,ə,f,g,ğ,h,i,j,k,,l,m,n,o,ö,p,q,r,s,ş,t,u,ü,v,w,x,y,z"
 
 #. Translators: put here a list of characters that correspond to buttons
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ""
-",0,a,b,c,ç,d,e,ə,f,g,ğ,h,i,j,k,,l,m,n,o,ö,p,q,r,s,ş,t,u,ü,v,w,x,y,z"
+msgstr ",0,a,b,c,ç,d,e,ə,f,g,ğ,h,i,j,k,,l,m,n,o,ö,p,q,r,s,ş,t,u,ü,v,w,x,y,z"
 
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
@@ -3260,7 +3277,7 @@ msgstr "Kənarlar"
 msgid "Number of columns:"
 msgstr "Sütunların miqdarı :"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Seçənəklər"
 
@@ -3270,7 +3287,7 @@ msgid "Orientation"
 msgstr "İstiqamət"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Səhifə"
 
@@ -3344,29 +3361,33 @@ msgstr "En :"
 msgid "_Font..."
 msgstr "_Yazı növü ..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Adsız görüş"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Yüksək"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Alçaq"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Təsvirsiz"
 
@@ -3409,42 +3430,34 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Evolutionun məktub yazıçısı emalatxanası."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Evolutionun İcracı mündəricat parçası."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution Təqvim iTip/iMip Nümayişçisi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Evolutionun Təqvim əlavəsi."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Təqvim Mündəricatı parçası emalatxanası."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Evolutionun Vəzifə parçası emalatxanası."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Təqvim iTip nümayiş idarəsi emalatxanası."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Nümunəvi Təqvim idarəsi emalaxanası"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Təqvim editor dialoqları mərkəzləşdirmə emalatxanası."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Evolutionun komponent editor parçasının emalatxanası."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3456,10 +3469,25 @@ msgstr "Alarm vermə xidməti"
 msgid "Factory for the alarm notification service"
 msgstr "Alarm vermə xidməti emalatxanası"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Qurğular"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "İndekslənir:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "səhv vaxt"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3499,7 +3527,7 @@ msgstr ""
 "xatırlatma ekranı göstərəcəkdir."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Xəbərdarlıq"
@@ -3526,15 +3554,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Mənə bir də soruşma."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "GNOME başladıla bilmədi"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "Alarm vermə xidməti yaradıla bilmir"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm vermə xidməti emalatxanası yaradıla bilmir"
 
@@ -3550,7 +3578,7 @@ msgstr "Daxil edən izah"
 msgid "Comment contains"
 msgstr "Daxil edən şərh"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Oxşar Olmayan"
 
@@ -3587,18 +3615,20 @@ msgstr "%d %B"
 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."
+"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:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Şəxsi"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Ümumi"
 
@@ -3619,27 +3649,32 @@ msgid "W"
 msgstr "Çərş."
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Boş"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Məşğul"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Başlamayıb"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "İşləyir"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Bitirmə Tarixi"
 
@@ -3654,11 +3689,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3673,12 +3709,14 @@ msgstr "Təkrarlayan"
 msgid "Assigned"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Bəli"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Xeyr"
 
@@ -3698,62 +3736,64 @@ msgstr "Həftəlik Nümayiş"
 msgid "Month View"
 msgstr "Aylıq Nümayiş"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Təqvim"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Görüş və hadisələri daxil edən qovluq"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Vəzifə"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Ediləcəkləri daxil edən qovluq"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "Xəbərlər Qurğuları"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "İclas"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "Yeni Vəzifə"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Vəzifə"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Yeni İclas"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Yeni _Görüş"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "Yeni İclas"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "İclas"
@@ -3816,9 +3856,8 @@ msgid ""
 "This is an email reminder, but Evolution does not yet support this kind of "
 "reminders.  You will not be able to edit the options for this reminder."
 msgstr ""
-"Bu məktub xatırladıcısıdır, amma Evolution bunu hələ ki "
-"dəstəkləmir. Bu xatırladıcı seçənəklərini işlədə "
-"bilməyəcəksiniz."
+"Bu məktub xatırladıcısıdır, amma Evolution bunu hələ ki dəstəkləmir. Bu "
+"xatırladıcı seçənəklərini işlədə bilməyəcəksiniz."
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
@@ -3964,7 +4003,7 @@ msgstr "Xatırladıcılar"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Mündəricat:"
 
@@ -3993,7 +4032,7 @@ msgstr "görüşün sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "dəqiqə"
 
@@ -4021,79 +4060,81 @@ msgstr "30 dəqiqə"
 msgid "60 minutes"
 msgstr "60 dəqiqə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alarm"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Təqvim və Vəzifə Qurğuları"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Gecikmiş vəzifə rəngi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Bugünkü vəzifə rəngi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Gün"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Cümə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Saat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Dəqiqə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Bazar ertəsi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "Ba_z"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Şənbə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Vaxt səyyahında həftə _sayısını göstər"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "Gününb _başlanğıcı:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "Ba_z"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Bazar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Bügunki və_zifələr:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "C_ax"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "Ça_x"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4122,83 +4163,96 @@ msgid "Tuesday"
 msgstr "Çərşənbə axşamı"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Çərşənbə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "İş  Həftəsi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 saat (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 saat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "Silinəcək üzvlər üçün təsdiqləmə _istə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "Aylıq nümayişlərdə həftə sonlarını _sıxışdır"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Vəzifə başlayır: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Ekran"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "Gün _sonu:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_Cüm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Ümumi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "Qurtarmış vəzifələri bundan sonra _gizlə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "B_e"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Ge_cikmiş işlər:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_Şn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
-msgstr ""
-"Həftəlik və aylıq nümayişlərdə görüşlərin _sonlanma tarixini "
-"göstər"
+msgstr "Həftəlik və aylıq nümayişlərdə görüşlərin _sonlanma tarixini göstər"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Vaxt dili_mləri:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "Ça_x"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_Çər"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "iclas başlamadan əvvəl"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4215,8 +4269,7 @@ msgstr "Bu vəzifəni həqiqətən də ləğv edib silmək istəyirsiniz?"
 
 #: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-"Bu jurnal girişini həqiqətən də ləğv edib silmək istəyirsiniz?"
+msgstr "Bu jurnal girişini həqiqətən də ləğv edib silmək istəyirsiniz?"
 
 #: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
@@ -4234,8 +4287,8 @@ msgstr "Bu jurnal girişi silindi."
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
-"%s  Siz dəyişikliklər apardınız. Bu dəyişiklikləri nəzərə "
-"almayıb editoru qapadaq?"
+"%s  Siz dəyişikliklər apardınız. Bu dəyişiklikləri nəzərə almayıb editoru "
+"qapadaq?"
 
 #: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
@@ -4258,8 +4311,8 @@ msgstr "Bu jurnal girişi dəyişdirildi."
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
-"%s  Siz dəyişikliklər apardınız. Bu dəyişiklikləri nəzərə "
-"almayıb editoru güncəlləyək?"
+"%s  Siz dəyişikliklər apardınız. Bu dəyişiklikləri nəzərə almayıb editoru "
+"güncəlləyək?"
 
 #: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
@@ -4286,40 +4339,61 @@ msgstr " (Ait "
 msgid "Due "
 msgstr "Aidiyyət"
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
 msgstr "Cism güncəllənə bilmədi!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Cism güncəllənə bilmədi!"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "İclası düzəlt"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "İclas - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Vəzifə - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Jurnal üzvü - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Fərqli qeyd et ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Hazırkı buraxılış öyrənilə bilmədi!"
 
@@ -4377,27 +4451,27 @@ msgstr "Nümayəndələşdir:"
 msgid "Enter Delegate"
 msgstr "Nümayəndəni Bildir"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "İclas"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Xatırladıcı"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Təkrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Vaxtlaşdırılır"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "İclas"
 
@@ -4447,7 +4521,7 @@ msgid "Pu_blic"
 msgstr "Üm_umi"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Vaxt Fərqli Göstər"
 
@@ -4469,19 +4543,19 @@ msgstr "_Sonlanma vaxtı:"
 msgid "_Start time:"
 msgstr "_Başlama vaxt:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Təşkilatçı lazımdır."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Ən az bir dinləyici lazımdır."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Bu şəxs onsuz da iclasın dinləyicisidir!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Təmsil Et..."
 
@@ -4492,49 +4566,56 @@ msgstr "Ziyarətçilər"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Ümumi Ad"
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Əlaqə əlavə etmək üçün buraya tıqlayın *"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Təmsil Etdiyi Yer"
+msgid "Common Name"
+msgstr "Ümumi Ad"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Təmsil Edir"
+msgid "Delegated From"
+msgstr "Təmsil Etdiyi Yer"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Dil"
+msgid "Delegated To"
+msgstr "Təmsil Edir"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Üzv"
+msgid "Language"
+msgstr "Dil"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Üzv"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolu"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Hal"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Növ"
@@ -4549,14 +4630,10 @@ msgid "_Change Organizer"
 msgstr "Təşkilatçını _Dəyişdir"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "Başqalarını _Dəvət Et ..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Başqa Təşkilatçı"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4715,24 +4792,20 @@ msgstr "il"
 #: calendar/gui/dialogs/send-comp.c:56
 #, fuzzy
 msgid "The meeting information has been created. Send it?"
-msgstr ""
-"İclas məlumatı dəyişdir. Güncəllənmiş buraxılışını yollayaq?"
+msgstr "İclas məlumatı dəyişdir. Güncəllənmiş buraxılışını yollayaq?"
 
 #: calendar/gui/dialogs/send-comp.c:59
 msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-"İclas məlumatı dəyişdir. Güncəllənmiş buraxılışını yollayaq?"
+msgstr "İclas məlumatı dəyişdir. Güncəllənmiş buraxılışını yollayaq?"
 
 #: calendar/gui/dialogs/send-comp.c:66
 #, fuzzy
 msgid "The task assignment information has been created. Send it?"
-msgstr ""
-"Vəzifə məlumatı dəyişdir. Güncəllənmiş buraxılışını yollayaq?"
+msgstr "Vəzifə məlumatı dəyişdir. Güncəllənmiş buraxılışını yollayaq?"
 
 #: calendar/gui/dialogs/send-comp.c:70
 msgid "The task information has changed. Send an updated version?"
-msgstr ""
-"Vəzifə məlumatı dəyişdir. Güncəllənmiş buraxılışını yollayaq?"
+msgstr "Vəzifə məlumatı dəyişdir. Güncəllənmiş buraxılışını yollayaq?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
@@ -4749,7 +4822,7 @@ msgid "Progress"
 msgstr "Gedişat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4761,19 +4834,19 @@ msgstr "_Üstünlük:"
 msgid "_Status:"
 msgstr "_Hal:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Əsas"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "İzah :"
 
@@ -4785,23 +4858,78 @@ msgstr "Başla_ma Tarixi:"
 msgid "_Due Date:"
 msgstr "_Bu tarixə qədər :"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, fuzzy, c-format
+msgid "100%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Seçili üzv silinir"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Aç"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Fərqli qeyd et ..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4809,20 +4937,20 @@ msgstr "Fərqli qeyd et ..."
 msgid "_Print..."
 msgstr "_Çap Et ..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kə_s"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Köçürt"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4830,35 +4958,36 @@ msgstr "_Köçürt"
 msgid "_Paste"
 msgstr "_Yapışdır"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Vəzifə Ver"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "v_Calendar şəklində çatdır"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "Qurtardı deyə _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Vəzifələri Qurtardı deyə _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "Seçili Vəzifələri _Sil"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Cismlər güncəllənir"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Vəzifə əlavə etmək üçün tıqla"
 
@@ -4866,47 +4995,48 @@ msgstr "Vəzifə əlavə etmək üçün tıqla"
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Qurtar"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Qurtarma Vaxtı"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Uyğun Tarix"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Son Tarix"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Çoğrafi Yerləşmə"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Üstünlük"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Başlama Tarixi"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Mündəricat"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Vəzifə nizamlanması"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4954,11 +5084,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -4998,7 +5130,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatını _Dərc Et"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Quraşdırma"
@@ -5009,7 +5141,7 @@ msgid "_Configure Pilot..."
 msgstr "Quraşdırma"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "Fərqli _Qeyd Et ..."
 
@@ -5036,76 +5168,392 @@ msgid "Delete _All Occurrences"
 msgstr "_Bütün Vaqeələri Sil"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vasitəlri deyəsən sistemə qurulu deyil."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "%s icra xətası."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "İclas başlayır: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "Vəzifə başlayır: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "Sərbəst/Məşğul infosu başlayır: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Başlayır: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "İclas sonlanır: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "Sərbəst/Məşğul infosu sonlanır: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "Sonlanır: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "Vəzifə Qurtardı: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "Vəzifə Vaxtı: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "iCalendar Məlumatı"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "iCalendar Xətası"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "Naməlum şəxs"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Xahiş edirik, aşağıdakı məlumatı gözdən keçirdin və aşağıdakı menüdən "
+"gediçi seçin."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Heç biri</i>"
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "_Hal:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Qəbul Edildi"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "Girişimli qəbul et"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Rədd Edildi"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Naməlum"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "Təqvim faylı güncəllənə bilmədi!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "Gediş seç:"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Güncəllə"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Oldu"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "Qəbul Et"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "Girişimli qəbul et"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "Rədd Et"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "Sərbəst/Məşğul Məlumatını Yolla"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "Cavablayıcı vəziyyətini güncəllə"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "Ən Son Məlumatı Yolla"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Ləğv Et"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> görüş məlumatını dərc edib."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Görüş Məlumatı"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> sizin görüşdə olmağınızı xahiş edir."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "Görüş Məqsədi"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> mövcud görüşə əlavə etmək istəyir."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "Görüş Güncəllənməsi"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> ən son görüş məlumatını almaq istəyir."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "Görüş Güncəllənmə İstəyi"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> görüş istəyini cavabladı."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "Görüş Cavabı"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> görüşü ləğv etdi."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "Görüş Ləğvi"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> pozğun ismarış yolladı."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Pis Görüş İsmarışı"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> vəzifə məlumatını dərc etdi."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Vəzifə Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> sizdən vəzifəni görməyinizi istədi."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Vəzifə Təklifi"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> mövcud vəzifəyə qoşulmaq istəyir."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Vəzifə Gencəllənməsi"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> ən son vəzifə məlumatını almaq istəyir."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Vəzifə Güncəllənmə İstəyi"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> vəzifə verilməsinə cavab verdi."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Vəzifə Cavabı"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> vəzifəni ləğv etdi."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Vəzifə Ləğvi"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Pis Vəzifə İsmarışı"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> sərbəst/məşğul məlumatını dərc etdi."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Sərbəst/Məşğul Məlumatı"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> sizin sərbəst/məşğul məlumatınızı istəyir."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Sərbəst/Məşğul İstəyi"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> sərbəst/məşğul istəyinə cavab verdi."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Sərbəst/Məşğul Cavabı"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Pis Sərbəst/Məşğul İsmarışı"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Qovluq geri dönülməz şəkildə xəsarət alıb."
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "Bu ismarış təkə dəstəklənməyən istəklər daxil edir."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "İlişgidəki hökmlü təqvim ismarışı daxil etmir"
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "İlişgidəki göstəriləbilən təqvim üzvləri daxil etmir"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Üzv göndərilə bilmədi!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Gübcəlləmə Qurtardı\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Təqvim faylı güncəllənə bilmədi!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
-"İştirakçı vəziyyəti üzvün artıq mövcud olmadığından ötrü "
-"güncəllənə bilmədi"
+"İştirakçı vəziyyəti üzvün artıq mövcud olmadığından ötrü güncəllənə bilmədi"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"İştirakçı vəziyyəti səhv haldan ötrü güncəllənə bilmədi!\n"
+msgstr "İştirakçı vəziyyəti səhv haldan ötrü güncəllənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-#, fuzzy
-msgid "Attendee status could not be updated!\n"
-msgstr "İştirakçı vəziyyəti güncəllən bilmədi!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "İştirakçı vəziyyəti güncəlləndi\n"
 
 #: calendar/gui/e-itip-control.c:1674
+#, fuzzy
+msgid "Attendee status could not be updated!\n"
+msgstr "İştirakçı vəziyyəti güncəllən bilmədi!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Çıxartma Qurtardı"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Üzv göndərildi!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Qovluq Seçin"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Qovluq Seçin"
@@ -5147,93 +5595,92 @@ msgstr "bitiş tarixi"
 msgid "date-start"
 msgstr "başlama tarixi"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Lazımi İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Ehtiyatdakı İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Qeyri-İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Şəxsi"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Qrup"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Mənbə"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Otaq"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Stul"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Lazımi İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Ehtiyatdakı İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Qeyri İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Hərəkət Lazımdır"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Qəbul Edildi"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Rədd Edildi"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Girişimli"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Temsil Edildi"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "İşləyir"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%a %B %d %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
@@ -5245,63 +5692,63 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "İş Yerində Deyil"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Məlumat Yoxdur"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Seçənəklər"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Sadəcə olaraq -İş Saatlarını Göstər"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "_Uzaqlaşdıraraq Göstər"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "Sərbəst/Məşğulları _Təzələ"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Avtomarik Olaraq Seç"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Bütün Adamlar və Qaynaqlar"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Bütün _adamlar və Bir Qaynaq"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "_Lazımi Adamlar"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Lazımi Adamlar və _Bir Qaynaq"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "İclas başlama saatı :"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "İclas sonlanma saatı :"
 
@@ -5320,17 +5767,22 @@ msgstr "`%s' dakı (dəki) vəzifələr yüklənə bilmədi"
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' i(ı) yükləməyə yarayan yol dəstəklənmir"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "`%s'da(də) qovluq yarada bilmədim"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Qurtarma Vaxtı"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Seçili üzv silinir"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "Qovluq açılır"
@@ -5343,17 +5795,17 @@ msgstr "Yeni _Görüş..."
 msgid "_Delete this Appointment"
 msgstr "Bu İclası _Sil"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, 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/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Təqvim %s vaxtı açılır"
@@ -5414,20 +5866,59 @@ msgstr "Oktyabr"
 msgid "September"
 msgstr "Sentyabr"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "Ən az bir dinləyici vacibdir"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Təşkilatçı bildirlməlidir."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "təqvim məlumatı"
+
+#: calendar/gui/itip-utils.c:356
+#, fuzzy
+msgid "Task information"
+msgstr "Vəzifə Məlumatı"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "Arzuya Bağlı Məlumatlar"
+
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "Sərbəst/Məşğul Məlumatı"
+
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "təqvim məlumatı"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Güncəllə"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Siyahını Yenilə"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Siz hadisənin istirakçısı olmalısınız."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "Komponent düzəltmə emalatxanası yaradıla bilmir"
 
@@ -5616,12 +6107,46 @@ msgstr "Seçili ay ( %b %Y )"
 msgid "Selected year (%Y)"
 msgstr "Seçili il ( %Y )"
 
+#: calendar/gui/print.c:2249
+#, fuzzy
+msgid "Task"
+msgstr "_Vəzifə"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Hal: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Üstünlük:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Qurtaran Nisbət: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Kateqoriyalar: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Əlaqələr:"
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Təqvimi çap et"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5639,8 +6164,7 @@ msgstr "Çap Qurğuları"
 msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr ""
-"Vəzifə görünüşü yaradıla bilmir. Lütfən ORBIT və OAF "
-"qurğularınızı yoxlayın."
+"Vəzifə görünüşü yaradıla bilmir. Lütfən ORBIT və OAF qurğularınızı yoxlayın."
 
 #: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
@@ -5654,14 +6178,13 @@ msgid ""
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Bu əməliyyat silinəcəklər deyə işarələnmiş bütün məktubları "
-"həmişəlik siləcəkdir. Davam etsəniz, bu ismarışları geri gətirə "
-"bilməyəcəksiniz.\n"
+"Bu əməliyyat silinəcəklər deyə işarələnmiş bütün məktubları həmişəlik "
+"siləcəkdir. Davam etsəniz, bu ismarışları geri gətirə bilməyəcəksiniz.\n"
 "\n"
 "İsmarışları həqiqətən də silək?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Mənə bir də soruşma."
 
@@ -5675,8 +6198,7 @@ msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
-"\"Evolution\" təqvim qovluğunda olan vəzifələri yeni qovluqlara "
-"daşıdı."
+"\"Evolution\" təqvim qovluğunda olan vəzifələri yeni qovluqlara daşıdı."
 
 #: calendar/gui/tasks-migrate.c:108
 msgid ""
@@ -5685,10 +6207,10 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"\"Evolution\" təqvim qovluğunda olan vəzifələri yeni qovluqlara "
-"daşımağa cəhd etdi.\n"
-"Bəzi vəzifələr daşına bilmədi. Ona görə də bu əməliyyat "
-"gələcəkdə də aparılmalıdır."
+"\"Evolution\" təqvim qovluğunda olan vəzifələri yeni qovluqlara daşımağa "
+"cəhd etdi.\n"
+"Bəzi vəzifələr daşına bilmədi. Ona görə də bu əməliyyat gələcəkdə də "
+"aparılmalıdır."
 
 #: calendar/gui/tasks-migrate.c:120
 #, c-format
@@ -5696,8 +6218,8 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"`%s' tapıla bilmədi; təqvim qovluğuna heç bir vəzifə vəzifələr "
-"qovluğuna daşına bilməyəcək."
+"`%s' tapıla bilmədi; təqvim qovluğuna heç bir vəzifə vəzifələr qovluğuna "
+"daşına bilməyəcək."
 
 #: calendar/gui/tasks-migrate.c:133
 #, c-format
@@ -5705,8 +6227,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 ""
-"`%s' yükləmək üçün işlədiləcən metod dəstəkləmir;  təqvim "
-"qovluğuna heç bir vəzifə vəzifələr qovluğuna daşına bilməyəcək."
+"`%s' yükləmək üçün işlədiləcən metod dəstəkləmir;  təqvim qovluğuna heç bir "
+"vəzifə vəzifələr qovluğuna daşına bilməyəcək."
 
 #: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
@@ -5727,6 +6249,11 @@ msgstr "VCard fayllarını Evolution içinə gətirir."
 msgid "Imports vCalendar files into Evolution"
 msgstr "VCard fayllarını Evolution içinə gətirir."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Xatırladıcı"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5768,14 +6295,11 @@ msgstr "vaxt-gün-əlavə-et 2 arqument gözləyir"
 
 #: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
-msgstr ""
-"vaxt-gün-əlavə-et gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
+msgstr "vaxt-gün-əlavə-et gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
 
 #: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
-msgstr ""
-"vaxt-gün-əlavə-et gözlədiyi 2 arqumentinin tam sayı olmağını "
-"gözləyir"
+msgstr "vaxt-gün-əlavə-et gözlədiyi 2 arqumentinin tam sayı olmağını gözləyir"
 
 #: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
@@ -5783,9 +6307,7 @@ msgstr "vaxt-gün-başlanğıcı 1 arqumentini gözləyir"
 
 #: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr ""
-"vaxt-gün-başlanğıcı gözlədiyi 1 arqumentinin vaxt_t olmağını "
-"gözləyir"
+msgstr "vaxt-gün-başlanğıcı gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
 
 #: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
@@ -5793,8 +6315,7 @@ msgstr "vaxt-gün-sonu 1 arqumentini gözləyir"
 
 #: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
-msgstr ""
-"vaxt-gün-sonu gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
+msgstr "vaxt-gün-sonu gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
 
 #: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
@@ -5826,8 +6347,8 @@ msgstr "contains? qatar olan arqument 2 gözləyir"
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 "contains? \"hər hansı\", \"icmal\", \"izahat\" olan arqument 1 gözləyir"
 
@@ -6829,668 +7350,683 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Köməkçi"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Katar"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr ""
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 #, fuzzy
 msgid "Asia/Muscat"
 msgstr "Köməkçi"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr ""
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 #, fuzzy
 msgid "Asia/Omsk"
 msgstr "Vəzifə Ver"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Vəzifə Ver"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 #, fuzzy
 msgid "Asia/Qatar"
 msgstr "Katar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr ""
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr ""
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr ""
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 #, fuzzy
 msgid "Asia/Singapore"
 msgstr "Sinqapur"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr ""
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr ""
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr ""
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 #, fuzzy
 msgid "Atlantic/Bermuda"
 msgstr "Bermuda"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 #, fuzzy
 msgid "Atlantic/Cape_Verde"
 msgstr "Keyp Verde"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 #, fuzzy
 msgid "Australia/Adelaide"
 msgstr "Avstraliya"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 #, fuzzy
 msgid "Australia/Brisbane"
 msgstr "Avstraliya"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 #, fuzzy
 msgid "Australia/Broken_Hill"
 msgstr "Avstraliya"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 #, fuzzy
 msgid "Australia/Darwin"
 msgstr "Avstraliya"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 #, fuzzy
 msgid "Australia/Hobart"
 msgstr "Avstraliya"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 #, fuzzy
 msgid "Australia/Lindeman"
 msgstr "Avstraliya"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 #, fuzzy
 msgid "Australia/Lord_Howe"
 msgstr "Avstraliya"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 #, fuzzy
 msgid "Australia/Melbourne"
 msgstr "Avstraliya"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 #, fuzzy
 msgid "Australia/Perth"
 msgstr "Avstraliya"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 #, fuzzy
 msgid "Australia/Sydney"
 msgstr "Avstraliya"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr ""
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 #, fuzzy
 msgid "Europe/Andorra"
 msgstr "Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 #, fuzzy
 msgid "Europe/Athens"
 msgstr "Seçənəklər"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr ""
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr ""
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr ""
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr ""
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr ""
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr ""
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr ""
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr ""
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 #, fuzzy
 msgid "Europe/Gibraltar"
 msgstr "Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr ""
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr ""
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr ""
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr ""
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr ""
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr ""
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 #, fuzzy
 msgid "Europe/Luxembourg"
 msgstr "Lüksemburq"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr ""
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr ""
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr ""
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 #, fuzzy
 msgid "Europe/Monaco"
 msgstr "Monako"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr ""
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr ""
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 #, fuzzy
 msgid "Europe/Paris"
 msgstr "Seçənəklər"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr ""
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr ""
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr ""
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr ""
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 #, fuzzy
 msgid "Europe/San_Marino"
 msgstr "San Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr ""
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr ""
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr ""
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr ""
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr ""
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr ""
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 #, fuzzy
 msgid "Indian/Comoro"
 msgstr "Komor"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 #, fuzzy
 msgid "Indian/Mahe"
 msgstr "Hindistan"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 #, fuzzy
 msgid "Indian/Maldives"
 msgstr "Maldiv"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 #, fuzzy
 msgid "Indian/Mauritius"
 msgstr "Maurit"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 #, fuzzy
 msgid "Indian/Mayotte"
 msgstr "Mayot"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 #, fuzzy
 msgid "Indian/Reunion"
 msgstr "Reyunion"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 #, fuzzy
 msgid "Pacific/Pitcairn"
 msgstr "Pitkairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Bu şifrləmə ilə imza dəstəklənmir"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Bu qeydlərdə müəyyənləşdirilən imzalama növü dəstəklənmir"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Bu qeydlərdə təsdiqləmə dəstəklənmir"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Bu qeydlərdə şifrləmə dəstəklənmir"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Bu qeydlərdə şifr açma dəstəklənmir"
 
@@ -7501,12 +8037,12 @@ msgstr ""
 "Nəticə faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ön yaddaş qovluğunu aça bilmədim: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7514,11 +8050,10 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 "Qeyd girişi yazıla bilmir: %s\n"
-"Bu vericidəki bütün əməliyyatlarınızın bağlanmadığınız "
-"müddətçə\n"
+"Bu vericidəki bütün əməliyyatlarınızın bağlanmadığınız müddətçə\n"
 "qəbul edilməyəcəkdir."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7527,14 +8062,18 @@ msgid ""
 msgstr ""
 "`%s' açıla bilmir:\n"
 "%s\n"
-"Bu qovluğa aparılmış dəyişikliklər yenidən "
-"sinxronlaşdırmayacaqlardır."
+"Bu qovluğa aparılmış dəyişikliklər yenidən sinxronlaşdırmayacaqlardır."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Verici ilə yenidən sinxronlaşdırılır"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "%s qovluğu saxlanılır"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Bui əməliyyatı bitirmək üçün xətdə olmalısınız"
 
@@ -7542,57 +8081,68 @@ msgstr "Bui əməliyyatı bitirmək üçün xətdə olmalısınız"
 msgid "Syncing folders"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Alıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "İşə salıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Növbə faylını aça bilmədim"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Növbə faylını işlədə bilmirəm"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) İsmarışı alınır"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "İsmarış açıla bilmir"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Bacarılmayan İsmarış %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d İsmarışın %d qədərə alınır"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d nin(nın) %d ismarışında iflas etdim"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "İsmarış kodu açıla bilmir."
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "İşə salıcı süzgəc axtarışı xətası: %s: %s"
@@ -7624,25 +8174,102 @@ msgstr "(hamısını yoxla) tək düzgün nəticə istəyir"
 msgid "Performing query on unknown header: %s"
 msgstr "Naməlum başlıqda sorǧu aparılır: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Dəstəklənməyən əməliyyat: ismarış əlavə et: %s üçün"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Dəstəklənməyən əməliyyat: ifadəyə görə axtar: %s üçün"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Dəstəklənməyən əməliyyat: uid-ə görə axtar: %s üçün"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "İsmarışlar daşınır"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "İsmarışlar \"%s\"a(ə) köçürülür"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Ləğv Edildi."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "POP vericisindən gözlənilməz cavab alındı: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "fayl adı bildirilməyib."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "İsmarış kriptlənə bilmir: alıcı bildirilməyib."
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "İsmarış kodu açıla bilmir."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "İsmarış təsdiqlənə bilmir: Müvəqqəti fayl yaradıla bilmir: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7672,21 +8299,17 @@ msgstr "%s üçün qıfıl faylını yarada bilmədim: %s"
 #: camel/camel-lock.c:150
 #, 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. Yenidən "
-"sına."
+msgstr "%s dakı(dəki) qıfıl fayllının alınması müddəti doldu. Yenidən sına."
 
 #: camel/camel-lock.c:204
 #, 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"
+msgstr "fcntl(2) istifadə edilərək qıfıl faylı alınması ifşlas etdi: %s"
 
 #: camel/camel-lock.c:266
 #, 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"
+msgstr "fclock(2) istifadə edilərək qıfıl faylı alınması iflas etdi: %s"
 
 #: camel/camel-movemail.c:107
 #, c-format
@@ -7742,89 +8365,23 @@ msgstr "Müvəqqəti məktub faylı yazılması xətası: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Müvəqqəti məktub faylı köçürülmə xətası: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "%s üçün %s parol kalimanizi lürfən girin"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Lütfən %s parol kəlimənizi girin"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "İsmarış imzalana bilmir: imzalamaq üçün düz mətn yoxdur"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "İsmarış imzalana bilmir: poarol verilməyib"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"İsmarış imzalana bilmir: GPG/PGP proqramına boru yaradıla bilmir. %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "İsmarış imzalana bilmir: imza üçün düz mətn yoxdur"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr ""
-"İsmarış təsdiqlənə bilmir: təsdiqlənmək üçün düz mətn yoxdur"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"İsmarış təsdiqlənə bilmir: GPG/PGP proqramına boru yaradıla bilmir. "
-"%s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"İsmarış təsdiqlənə bilmir: Müvəqqəti fayl yaradıla bilmir: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "İsmarış kriptlənə bilmir: kritpləmək üçün düz mətn yoxdur"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "İsmarış kriptlənə bilmir: parol verilməyib"
 
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
-"İsmarış kriptlənə bilmir: GPG/PGP proqramına boru yaradıla bilmir. %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "İsmarış kriptlənə bilmir: alıcı bildirilməyib."
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "İsmarış kriptlənə bilmir: kritlənəcək mətn yoxdur"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "İsmarış dekript edilə bilmir: parol verilməyib"
 
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"İsmarış dekript edilə bilmir: GPG/PGP proqramına boru yaradıla bilmir. "
-"%s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Başqa xəta"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7840,51 +8397,13 @@ msgstr "%s yüklənə bilmədi: %s"
 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:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s verici %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s üstündə %s üçün %s xidmətləri"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Bağlantı Ləğv edildi"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, 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:258
-msgid "(unknown host)"
-msgstr "(naməlum ev sahibi)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Əməliyyat ləğv edildi"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Verici gözlanilməz şakildə bağlantını kəsdi: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Adsız"
 
 #: camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
-msgstr ""
-"Bu seçənəklə siz vericisiyə adsız olaraq bağlana biləcəksiniz."
+msgstr "Bu seçənəklə siz vericisiyə adsız olaraq bağlana biləcəksiniz."
 
 #: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
@@ -7926,8 +8445,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Bu seçənək ,əgər dəstəkləyirsə, verici ilə CRAM-MD5 parolu ilə "
-"ünsiyyət quracaqdır."
+"Bu seçənək ,əgər dəstəkləyirsə, verici ilə CRAM-MD5 parolu ilə ünsiyyət "
+"quracaqdır."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -7938,8 +8457,8 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"Bu seçənək ,əgər dəstəkləyirsə, verici ilə DIGEST-MD5 parolu ilə "
-"ünsiyyət quracaqdır."
+"Bu seçənək ,əgər dəstəkləyirsə, verici ilə DIGEST-MD5 parolu ilə ünsiyyət "
+"quracaqdır."
 
 #: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
@@ -7972,8 +8491,8 @@ msgstr "Kerberos 4"
 #: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
-"Bu seçənəklə siz vericisiyə Kerberos 4 tanıdılması yolu ilə "
-"bağlana biləcəksiniz."
+"Bu seçənəklə siz vericisiyə Kerberos 4 tanıdılması yolu ilə bağlana "
+"biləcəksiniz."
 
 #: camel/camel-sasl-kerberos4.c:161
 #, c-format
@@ -7985,7 +8504,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
@@ -7996,8 +8515,7 @@ msgstr "NT Giriş"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr ""
-"Bu seçənəklə siz vericisiyə sadə parol ilə bağlana biləcəksiniz."
+msgstr "Bu seçənəklə siz vericisiyə sadə parol ilə bağlana biləcəksiniz."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -8013,14 +8531,12 @@ msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr ""
-"Bu seçənəklə siz vericisiyə Kerberos 4 tanıdılması yolu ilə "
-"bağlana biləcəksiniz."
+"Bu seçənəklə siz vericisiyə Kerberos 4 tanıdılması yolu ilə bağlana "
+"biləcəksiniz."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Parol"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -8047,52 +8563,52 @@ msgstr "Qeyri-POP mənbəyilə ək SMTP əvvəli POP tanıtma"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Qaydalı ifadə dərlanməsi bacarılmadı: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URLsi istifadəçi adına ehtiyac hiss edir"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URLsi ev sahibinə ehtiyac hiss edir"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLsi yola ehtiyac hiss edir"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "\"%s\" Həll edilir"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Ad axtarışında iflas etdim: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: qovşaq tapılmadı"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: naməlum səbəb"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "\"%s\" Həll edilir"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: qovşaq tapılmadı"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: naməlum səbəb"
@@ -8103,8 +8619,7 @@ msgstr "_Virtual Qovluq Sehirbazı ..."
 
 #: camel/camel-session.c:77
 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"
+msgstr "Başqa qovluq dəstələrinin istəyi olan məktubların oxunması üçün"
 
 #: camel/camel-session.c:351 camel/camel-session.c:419
 #, c-format
@@ -8157,11 +8672,11 @@ msgstr "İsmarış kodu açıla bilmir."
 msgid "Failed to verify certificates."
 msgstr "Vəsiqələr təsdiqlənə bilmir."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Qovluq alıa bilmir: Mənbədə hökmsüz əməliyyat"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Qovluq yaradıla bilmir: Ambarda sənv əməliyyat aparılıb"
 
@@ -8191,7 +8706,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8200,16 +8715,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8229,15 +8744,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' alına bilmir"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "\"%s\"da(də) %s deye bir ismarış yoxdur"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Bele bir ismarış yoxdur: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Bütün qovluqlarda yeni ePoçt üçün bax"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8259,68 +8774,77 @@ msgstr "Qovluq adı dəyişdirilə bilmir: %s: Səhv əməliyyat"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Qovluq adı dəyişdirilə bilmir: %s: Belə qovluq yoxdur"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Buradakı ismarışları zibilə göndərə bilməzsiniz."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Əməliyyat ləğv edildi"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Verici gözlanilməz şakildə bağlantını kəsdi: %s"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, 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:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Verci cavabı çox tez sonlandı."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, 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:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, 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
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s qovluğunu yarada bilmədim: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, 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:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Qovluq dağıdılıb vericidə yerinə yenisi yaradıldı."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Dəyişdirilmiş ismarışda dəyişikliklər daranır"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Bu ismarış hazırda mövcuddur"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Yeni ismarışların icmalı alınır"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Yeni ismarışlar daranır"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cavabında ismarış gövdəsi tapıla bilmədi"
 
@@ -8371,37 +8895,86 @@ msgstr "IMAP"
 
 #: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
-msgstr ""
-"IMAP vericisində məktubların saxlanması və oxuna bilməsi üçün."
+msgstr "IMAP vericisində məktubların saxlanması və oxuna bilməsi üçün."
+
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Parol"
 
 #: camel/providers/imap/camel-imap-provider.c:82
 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."
+"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:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "%s SMTP vericisi"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s üstündə %s üçün %s xidmətləri"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Bağlantı Ləğv edildi"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "%s a(ə) bağlana bilmirəm (qapı %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"POP vericisinə bağlana bilmədim.\n"
+"İstifadəçi adı göndərilmə xətası oldu: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Əməliyyat dəstəklənmir"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Tanıtma bacarılmadı."
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP vericisi %s tanıtma növünü dəstəkləmir"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s Tanıtma növü dəßtəklənmir"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, 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:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Parolu girmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8412,71 +8985,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "%s deyə bir qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Əlaqəli qovluğun alt qovluqlara malik olmağına icazə verilməyib"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Məktub qutusu açıla bilmir: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "MH-şəklində məktub qovluqları"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
-msgstr ""
-"Yerli məktubların MH oxşarı məktub qovluqlarında saxlamaq üçün."
+msgstr "Yerli məktubların MH oxşarı məktub qovluqlarında saxlamaq üçün."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Yerli göndərişlər"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Standart mbox şəklindəki məktubların saxlanması üçün."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "GƏLƏNLƏR qutusundakı yeni ismarışlara süzgəc əlavə et"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Maildir-şəklində məktub qovluqları"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Yerli məktubları maildir cərgələrində saxlaya bilmək üçün"
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Standart UNIX poçt qutusu hovuzu"
-
-#: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
-"Yerli məktubları mbox tərzi məktub cərgələrində saxlaya bilmək "
-"üçün."
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Standart UNIX poçt qutusu hovuzu"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "Yerli məktubları mbox tərzi məktub cərgələrində saxlaya bilmək üçün."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s kök saxlama dəqiq bir yol deyildir"
@@ -8502,7 +9091,7 @@ msgstr "Yerli saxlamaların gələnlər qutusu qovluğu yoxdur"
 msgid "Local mail file %s"
 msgstr "%s Yeli məktub faylı"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "%s faylı %s adi ilə yenidən adlandırıla bilmir: %s"
@@ -8522,33 +9111,31 @@ msgstr "`%s' Qovluq mündəricat faylı silinə bilmir: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' Qovluq indeks faylı silinə bilmir: %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "İcmal qeyd edilə bilmir: %s :%s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Xülasəyə ismarış əlavə edə bilmədim: naməlum səbəb"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Maildir imsarış əlavə edilməsi ləğv edildi"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "İsmarış məktub qovluğu fayllına əlavə edilə bilmir: %s: %s "
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8557,20 +9144,19 @@ msgstr ""
 "İSmarıc alına bilmir: %s\n"
 "   %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Belə bir ismarış yoxdur"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Hökmsüz ismarış mövtəviyyatı"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8581,13 +9167,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "`%s' faylı yoxdur ."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8603,7 +9189,7 @@ msgstr "`%s' məktub qovluğu faylı deyildir."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' qovluğu silinə bilmir: %s"
@@ -8612,8 +9198,8 @@ msgstr "`%s' qovluğu silinə bilmir: %s"
 msgid "not a maildir directory"
 msgstr "məktub qovluğu faylı deyildir"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "`%s' qovluğu darana bilmədi: %s"
@@ -8634,45 +9220,37 @@ msgstr "Yeni ePoçt üçün baxılır"
 msgid "Checking for new messages"
 msgstr "Yeni ismarışlar daranır"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Qovluqlar saxlanılır"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s üstündə qovluq qıfılı yaradıla bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, 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:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Məktub əlavəsi ləğv edildi"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "İsmarış mbox fayllına əlava edilə bimir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8681,13 +9259,11 @@ msgstr ""
 "İsmarış alına bilmir: %s qovluğundan %s\n"
 "   %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 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:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İSmarıc quruluşu bacarılmadı: Məktub qutusu yoxsa xəsərlidir?"
 
@@ -8730,151 +9306,150 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' qovluğu boş deyildir. Silinmədi."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Qovluq açıla bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, 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:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Qovluq yoxlana bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Faylı açıla bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, 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:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-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:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, 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:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, 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:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, 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:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, 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:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+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:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Naməlum xəta: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Qovluq yenidən adlandırıla bilmir: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, 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:990
+#, 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-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "MH ismarış əlavəsi ləğv edildi"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "mh qovluğuna ismarış əlavə edilə bilmir: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' qovluq deyildir."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH cərgə cığırı açıla bilmir: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "İsmarış hovuz faylına əlava edilə bimir: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Hovuz qovluqları yenidən adlandırıla bilməz"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "`%s' normal vir hovuz deyil ya da sıravı bir fayl deyildir"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "%s kök saxlama düzgün bir qovluq deyildir."
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Qovluq `%s/%s' faylı yoxdur."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "%s hovuz məktub faylı"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Hovuz qovluqları yenidən adlandırıla bilməz"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Hovuz qovluqları yenidən adlandırıla bilməz"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Hovuz qovluqları silinə bilməz"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Müvəqqəti məktub faylı %s sinxronlaşdırıla bilmir: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "%s hovuz qovluğu sinxronlaşdırıla bilmir: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8883,25 +9458,6 @@ msgstr ""
 "%s hovuz qovluğu sinxronlaşdırıla bilmir: %s\n"
 "Qovluq xəsarət görmüş ola bilər, üzü `%s' içində qeyd edildi"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Fayl tapıla bilmir: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "`%s' normal vir hovuz deyil ya da sıravı bir fayl deyildir"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "%s a(ə) məktub göndər"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET xəbərləri"
@@ -8909,21 +9465,31 @@ msgstr "USENET xəbərləri"
 #: camel/providers/nntp/camel-nntp-provider.c:43
 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."
+"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:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "%s qovluğunu yarada bilmədim: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s dan(dən) USENET Xəbərləri"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 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."
+"Bu seçənək NNTP verisici ilə düz mətn şəklindəki parol ilə ünsiyyət "
+"quracaqdır."
 
 #: camel/providers/nntp/camel-nntp-summary.c:234
 #, fuzzy, c-format
@@ -9022,7 +9588,7 @@ msgstr "İsmarışları Vericidə burax"
 msgid "Delete after %s day(s)"
 msgstr "%s gün sonra sil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -9035,9 +9601,9 @@ 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çənəkdir."
+"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çənəkdir."
 
 #: camel/providers/pop3/camel-pop3-provider.c:81
 msgid ""
@@ -9045,36 +9611,26 @@ msgid ""
 "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."
+"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:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %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:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Əməliyyat dəstəklənmir"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Tanıtma bacarılmadı."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, 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:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -9082,27 +9638,27 @@ 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:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "G/Ç xətası"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sLütfən %s@%s üçün POP3 parolunuzu girin"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -9111,13 +9667,13 @@ msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "Parol göndərmə xətası oldu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "`%s' deyə bir qovluq yoxdur."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9126,8 +9682,8 @@ 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."
+"Yerli sistemdəki \"sendmail\" proqramı istifadə edilərək məktub göndərmək "
+"üçün."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:108
 #, fuzzy
@@ -9137,9 +9693,7 @@ msgstr "URL `%s' alına bilmir"
 #: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, 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"
+msgstr "Sendmailə boru(pipe) çəkilə bilmədi bilmədi. %s: məktub göndərilmədi"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
@@ -9154,8 +9708,7 @@ msgstr "İsmarış göndərilə bilmədi: %s"
 #: camel/providers/sendmail/camel-sendmail-transport.c:178
 #, 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."
+msgstr "sendmail %s siqnalı verərək bağlandı: məktub göndərilə bilmədi."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:185
 #, c-format
@@ -9182,8 +9735,8 @@ msgstr "SMTP"
 #: camel/providers/smtp/camel-smtp-provider.c:39
 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.\n"
+"SMTP istifadə edilərək uzaq məktub yayıcısına bağlanaraq məktub göndərmək "
+"üçün.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
@@ -9243,8 +9796,7 @@ msgstr "Sorğulanan gediş ləğv edildi; xəta oldu"
 
 #: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
-msgstr ""
-"İstifadəçi yerli deyil; lütfən <çatdırma cığırı>nı sınayın"
+msgstr "İstifadəçi yerli deyil; lütfən <çatdırma cığırı>nı sınayın"
 
 #: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
@@ -9286,45 +9838,45 @@ msgstr "Müvəqqəti tanıtma iflası"
 msgid "Authentication required"
 msgstr "Tanıtma lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Xoş gəldin ismarışı cavab xətası: %s: ağır deyil dəyəsən"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "İstifadəçi adı göndərilmə xətası oldu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Bu ismarış düzgün qurulmuşa oxşamır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "%s SMTP vericisi %s tanıtma növünü dəstəkləmir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sLütfən %s@%s üçün SMTP parolunu girin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9335,91 +9887,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP vericisi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, 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:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
-msgstr ""
-"İsmarış göndrərilə bilmədi: göndərənin ünvanı hökmsüzdür."
+msgstr "İsmarış göndrərilə bilmədi: göndərənin ünvanı hökmsüzdür."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "İsmarış göndərilir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "SMTP Qarşılaması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, 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:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP Tanıtma"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "SASL tanıtma cismi yaratma xətası."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH istək bacarılmadı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Vericidən xətalı tanıtma istəyi alındı.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, 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:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAİL FROM cavablama xətası: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, 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:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, 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"
@@ -9427,40 +9978,39 @@ msgstr "DATA istək vaxt dolamsı. %s: məktub göndərilə bilmədi"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
-"DATA göndərmə vaxt dolması: ismarış qurtarılır: %s: məktub "
-"göndərilə bilmədi"
+"DATA göndərmə vaxt dolması: ismarış qurtarılır: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, 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:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET cavablama xətası: %s"
@@ -9534,65 +10084,70 @@ msgstr "MIME növü:"
 msgid "Suggest automatic display of attachment"
 msgstr "İlişdirilmişin öz-özünə göstərilməyini tövsiyyə et"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Ünvan dəftəri üçün buraya tıqla"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Göndərən:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Cavab ver"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Mövzu :"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Gn:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "İsmarışın göndərildiği adamlar"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "İsmarışın nüsxəsinin göndəriləcəyi ünvanlar"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
-"İsmarışın nüsxələrinin göndəriləcəyi ünvanları bildir; bunlar "
-"özlərini ismarışın göndərildiği adamlar arasında görməyəcəkdir ."
+"İsmarışın nüsxələrinin göndəriləcəyi ünvanları bildir; bunlar özlərini "
+"ismarışın göndərildiği adamlar arasında görməyəcəkdir ."
 
 #: composer/e-msg-composer-select-file.c:267
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Bir fayl yapışdır"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "PGP imza məzmunu yaradıla bilmir."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9601,34 +10156,34 @@ msgstr ""
 "%s faylı oxunurkən xəta oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Xəbərdarlıq!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Fayl mövcuddur, üstünə yazaq?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fayl qeyd edərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fayl yüklərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fayla yetişilirkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Editordan ismarışlar alına bilmir"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9637,7 +10192,7 @@ msgstr ""
 "Faylda axtarış aparıla bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9646,7 +10201,7 @@ msgstr ""
 "Fayl parçalana bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9655,7 +10210,7 @@ msgstr ""
 "İsmarışın öz-özünə qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9663,7 +10218,7 @@ msgstr ""
 "Ximian Evolution əvvəlki iclasdan qalan qeyd edilməmiş fayllar tapdı.\n"
 "Onları indi bərpa etməyə cəhd etməyimi istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9673,23 +10228,43 @@ msgstr ""
 "\n"
 "Dəyişiklikləri qeyd etmak istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Xəbərdarlıq: Düzəldilmiş İsmarış"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Faylı aç"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Faylı Daxil Et"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Imzanı qeyd et"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (varsayılan) "
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Bir ismarış yaz"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9697,7 +10272,7 @@ msgstr ""
 "Yazıçı pəncərəsi yaradıla bilmir:\n"
 "Ünvan seçici idarə fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9705,13 +10280,18 @@ msgstr ""
 "Yazıçı pəncərəsi yaradıla bilmir:\n"
 "HTML editor parçası fəaliyyətə keçirilə bilmir."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
-"Yazıçı pəncərəsini yarada bilmirəm, çünkü siz məktub "
-"parçasındakı\n"
+"Yazıçı pəncərəsini yarada bilmirəm, çünkü siz məktub parçasındakı\n"
 "heç bir qurǧulari, aparmamısınız."
 
 #: composer/evolution-composer.c:391
@@ -9767,7 +10347,7 @@ msgstr "Daxil edən mövzu"
 msgid "Subject does not contain"
 msgstr "Daxil etməyən mövzu"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9912,7 +10492,7 @@ msgstr "saat"
 msgid "minute"
 msgstr "dəqiqə"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "saniyə"
 
@@ -9987,7 +10567,7 @@ msgstr " əvvəl"
 msgid "ago"
 msgstr "əvvəl"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9999,6 +10579,21 @@ msgstr "<vaxtı görə bilmək üçün buraya tıqlayın>"
 msgid "Filter Rules"
 msgstr "Süzgəc Qaydaları"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Tərz adı :"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "`%s' normal vir hovuz deyil ya da sıravı bir fayl deyildir"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Gediş seç:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -10014,11 +10609,10 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 "Qovluq seçməyi unutdunuz.\n"
-"Lütfən arxaya gedin və məktubların toplanacağı hökmlü bir qovluq "
-"seçin."
+"Lütfən arxaya gedin və məktubların toplanacağı hökmlü bir qovluq seçin."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Qovluq Seçin"
 
@@ -10031,7 +10625,11 @@ msgstr ""
 "'%s' qaydalı ifadələrdə xəta oldu:\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Sınaq"
 
@@ -10061,7 +10659,7 @@ msgstr "bütün kriteriyalar uyğun gəlirsə"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
 
 #: filter/filter-rule.c:780
@@ -10140,194 +10738,203 @@ msgid "Beep"
 msgstr "Beliz"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Şirkət"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "daxil edir"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Qovluğa Köçürt"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Alınma tarixi"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Göndərilmə tarixi"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Silinən"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "daxil etmir"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "ilə sonlanmır"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "yoxdur"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "oxçamır"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "başlamır"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Mövcud Deyildir"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Lahiyə"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "sonlanır"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Mövcuddur"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "mövcuddur"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "İfadə"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Vacib"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "dir(dır)"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "sonra idi"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "əvvəl idi"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "Bayraqlı"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "böyükdür"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "azdır"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "deyil"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Bayraqlı"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+msgid "Label"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Məktublaşma qrupu"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "İsmarış Gövdəsi"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "İsmarış Başlığı"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Qovluğa Köçür"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Səs çal:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Oxu"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Alıcılar"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regex Uyğunluqları"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Cavab verilən"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Göndərən"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Hal Seç"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Böyüklük (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "oxşayır"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Mənbə Hesabı"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Xas başlıq"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "başlayır"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "İşi Dayandır"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Mövzu"
 
@@ -10382,7 +10989,8 @@ msgid "Scanning %s"
 msgstr "%s daranır"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Məktub"
 
@@ -10398,10 +11006,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Ünvan Dəftəri"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10451,7 +11055,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution köhnə Netscape verilənlərini idxal edir"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Zibil Qutusu"
 
@@ -10587,268 +11193,278 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Məktub daxil edən qovluq"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Virtual Zibil"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Virtual Zibil Qovluğu"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Bu qovluq ismarış daxil edə bilməz."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Xüsusiyyətlər..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Qovluqların seçənəklərini dəyişdir"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
-"Bəzi məktub qurğularınız deyəsən xəsarət görüb, xahiş edirik, "
-"hər şeyin yerində olub olmadığını yoxlayın."
+"Bəzi məktub qurğularınız deyəsən xəsarət görüb, xahiş edirik, hər şeyin "
+"yerində olub olmadığını yoxlayın."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Məktub nəql yolunu bildirməmisən"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Xəbərdarlıq: Düzəldilmiş İsmarış"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Yeni Məktub İsmarışı"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Məktub İsmarışı"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolutionun poçt quraşdırma parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolutionun qovluq info parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Vericiyə bağlantı qurulur..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"in Seçənəkləri"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Seçənəklər"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d yeni"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d gizli"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d seçili"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d yollanmamış"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d yollanmış"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "cəmi %d"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "İsmarışdan _Virtual Qovluq Yarat"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "_Mövzudakı vFolder"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "Gön_dərəndəki vFolder"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "_Alıcıdakı vFolder"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "Məktublaşma Q_rupundakı VFolder"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Mö_vzudakı Süzgəc"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Gön_dərəndəki  Süzgəc"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "_Alıcıdakı Süzgəc"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "_Məktublaşma Qrupundakı Süzgəc"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "Yeni İsmarış olaraq _Düzəlt ..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Ver"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "_Qrupa Cavab Ver"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Ver"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Çatdır"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Bitirmə Tarixi"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Təmizlə"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Oxun_muş olaraq İşarələ"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Ox_unmamış olaraq İşarələ"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "_Vacib olaraq İşarələ"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "_Qeyri-Vacib olaraq İşarələ"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Geri Gətir"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: mail/folder-browser.c:1645
-msgid "Label"
-msgstr ""
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Yollayanı Ünvan dəftərinə Əlavə Et"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Süzgəclər Əlavə Et"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "İsmarışdan Qa_yda Yarat"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Məktublaşma Qrupunda Süz (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "(%s) Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "Ə_sas"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Qovluq Məlumatı Alınır"
 
@@ -10862,8 +11478,7 @@ msgstr "'Mbox' fayllarını Evolution içinə gətirir"
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
 msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-"'Outlook Express 4' məktublarını Evolution içinə gətirən emalatxana."
+msgstr "'Outlook Express 4' məktublarını Evolution içinə gətirən emalatxana."
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
 msgid "Imports Outlook Express 4 files into Evolution"
@@ -10904,7 +11519,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Lazımi bütün məlumatlar verilməlidir."
 
@@ -10914,83 +11529,111 @@ msgid "Evolution News Editor"
 msgstr "Evolution Xəbər Düzəldicisi"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesab Düzəldicisi"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Qovşaq:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "İ_stifadəci Adı:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Cığır:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Radio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Eyni adda və iki hesab yarada bilməzsiniz."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Silmə"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Həqiqətən də hesabı silək?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Bağla"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Fəallaşdır"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Bu xəbər hesabını həqiqətən də silmək istəyirsiniz?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Fəal"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Hesab adı:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Riko"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "%s a(ə) məktub göndər"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Mövzu %s dir(dır)"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Məktub %s dandır(dəndir)"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "%s məktublaşma qrupu"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Süzgəc Qaydası Əlavə Et"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"Aşağıdakı vFolder(lər):\n"
+"%ssilinmiş qovluq istifadə etdi:\n"
+"    '%s'\n"
+"Və güncəlləndilər."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11002,7 +11645,7 @@ msgstr ""
 "bunu quraşdırmalısınız.\n"
 "Bunu indi quraşdırmaq istəyirsiniz?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11010,7 +11653,7 @@ msgstr ""
 "ePoçt göndərməkdən əvvəl bir \n"
 "şəxs tanıtmalısan."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11019,19 +11662,19 @@ msgstr ""
 "nəqliyyatını qurmalısan."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
-"HTML şəklində imsarış göndərirsiniz, amma aşağıdakı alıcılar "
-"HTML şəklində məktub istəmirlər:\n"
+"HTML şəklində imsarış göndərirsiniz, amma aşağıdakı alıcılar HTML şəklində "
+"məktub istəmirlər:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Yenə də yollayaq?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11039,19 +11682,19 @@ msgstr ""
 "Bu ismarışın mövzusu yoxdur .\n"
 "Həqiqətən də göndərim?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
-"Nə vaxta qədər ki, əlaqə siyahınız qrup ünvanıarını gizləyəcək "
-"şəkildə sazlanıb, bi ismarış təkcə Bcc alıcılar daxil edəcək."
+"Nə vaxta qədər ki, əlaqə siyahınız qrup ünvanıarını gizləyəcək şəkildə "
+"sazlanıb, bi ismarış təkcə Bcc alıcılar daxil edəcək."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "İsmarış təkcə Bcc alıcıları daxil edir."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11061,17 +11704,17 @@ msgstr ""
 "məlumatlndırmaq istəsin.\n"
 "Yenə də göndərək?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 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:497
+#: mail/mail-callbacks.c:499
 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:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11079,28 +11722,28 @@ msgstr ""
 "Bu hesab üçün lahiyə cərgəsə açıla bilmədi.\n"
 "Əsas lahiyə cərgəsini işlətmək istəyirsiniz?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "naməlum yollayan"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d at %H:%M, tarixidə %%s yazmışdır ki:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "İsmarış(ları) buraya daşı "
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "İsmarış(ları) buraya köçürt"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Bütün `%d' ismarışlarını düzəltmək istəyirsiniz?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11108,7 +11751,7 @@ msgstr ""
 "Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
 "ismarışları düzəldə bilərsiniz."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11116,53 +11759,51 @@ msgstr ""
 "Sadəcə olaraq Göndərilən cərgəsinə qeyd edilən\n"
 "ismarışları yeniden gönderebilirsiniz."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
-msgstr ""
-"Həqiqətən də bütün `%d' ismarışı yenidən yollamaq istəyirsən?"
+msgstr "Həqiqətən də bütün `%d' ismarışı yenidən yollamaq istəyirsən?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Heç İsmarış Seçilmədi"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Faylının üsütünə yazım mı?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "İsmarışı Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "İsmarışları Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Sonrakı oxunamış ismarışı göstər"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"Bu əməliyyat silinəcəklər deyə işarələnmiş bütün məktubları "
-"həmişəlik siləcəkdir. Davam etsəniz, bu ismarışları geri gətirə "
-"bilməyəcəksiniz.\n"
+"Bu əməliyyat silinəcəklər deyə işarələnmiş bütün məktubları həmişəlik "
+"siləcəkdir. Davam etsəniz, bu ismarışları geri gətirə bilməyəcəksiniz.\n"
 "\n"
 "İsmarışları həqiqətən də silək?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11171,32 +11812,67 @@ msgstr ""
 "Süzgəc məlumatını yükləmə xətası:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Süzgəclər"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%d İsmarışın %d qədərə alınır"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "İsmarışı Çap Et"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "İsmarıların çap edilməsi bacarılmadı"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "Bütün %d ismarışlarını başqa pəncərədə açmaq istəyirsiniz?"
+
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "izah"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
 msgstr ""
-"Bütün %d ismarışlarını başqa pəncərədə açmaq istəyirsiniz?"
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Adsız Əlaqə"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Göndər"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Kriteriya əlavə et"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Imzanı qeyd et"
 
 #: mail/mail-config-druid.c:146
 msgid ""
@@ -11204,10 +11880,9 @@ msgid ""
 "below do not need to be filled in,\n"
 "unless you wish to include this information in email you send."
 msgstr ""
-"Lütfən, adınızı və ePoçt ünvanınızı aşağıya yazın. \"Arzuya "
-"bağlı\" sahələrin doldurulmağa çox ehtiyacı yoxdur. Əlbətdə "
-"yolladığınız məktublarda bu məlumatların görünməyini "
-"istəmirsinizsə."
+"Lütfən, adınızı və ePoçt ünvanınızı aşağıya yazın. \"Arzuya bağlı\" "
+"sahələrin doldurulmağa çox ehtiyacı yoxdur. Əlbətdə yolladığınız məktublarda "
+"bu məlumatların görünməyini istəmirsinizsə."
 
 #: mail/mail-config-druid.c:148
 msgid ""
@@ -11215,8 +11890,8 @@ msgid ""
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"Lütfən, gələn ePoçt vericisi üçün bilgi verin. Əgər əmin "
-"deyilsinizsə, sistem idarəçinizə, ya da İnternet Xidmət\n"
+"Lütfən, gələn ePoçt vericisi üçün bilgi verin. Əgər əmin deyilsinizsə, "
+"sistem idarəçinizə, ya da İnternet Xidmət\n"
 "vericinizə müraciət edin."
 
 #: mail/mail-config-druid.c:150
@@ -11243,205 +11918,184 @@ msgid ""
 "space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"Məktub quraşdırma əməliyyatı hardasa qurtardı. Bildirdiyiniz "
-"şəxsiyyət, gələn məktub vericisi və\n"
+"Məktub quraşdırma əməliyyatı hardasa qurtardı. Bildirdiyiniz şəxsiyyət, "
+"gələn məktub vericisi və\n"
 "məktub göndərmə şəkli haqqında məlumatlar hamısı birlikdə\n"
-"Evolution məktub hesabı qurmaq üçün işlədiləcək. Xahiş edirik, bu "
-"hesab üçün aşağıdakı boşluğa bir ad girin.\n"
+"Evolution məktub hesabı qurmaq üçün işlədiləcək. Xahiş edirik, bu hesab üçün "
+"aşağıdakı boşluğa bir ad girin.\n"
 "Bu ad təkcə ekranda göstərilmək məqsədilə işlədiləcəkdir."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesab Yardımçısı"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "İşləyir"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Toqo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "sonra"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"Yeni məktub ambarı üçün gələnlər qismi alına bilmir:\n"
-"%s\n"
-"Qısa yol yaradılmayacaqdır."
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Hesab"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Xidmət Yoxlanılır"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Vericiyə bağlantı qurulur..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Adsız Əlaqə"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "_Düzəlt"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Yeni"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " Dəstəklənən növləri _yoxla "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr "Kriplənmiş məktub göndərdiyin vaxt məktubu _həmişə mənim üçün kriptlə"
+
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
-"Kriplənmiş məktub göndərdiyin vaxt məktubu _həmişə mənim üçün "
-"kriptlə"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Hesab %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Hesab Haqqında"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Hesab İdarəsi"
 
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "Kriteriya əlavə et"
+
 #: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Əməliyyatı Ləğv Et"
+msgid "Add new signature..."
+msgstr "Imzanı qeyd et"
 
 #: mail/mail-config.glade.h:12
-msgid "Afrikaans"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr ""
-"Kriplənmiş məktub göndərdiyin vaxt məktubu _həmişə mənim üçün "
-"kriptlə"
+msgstr "Kriplənmiş məktub göndərdiyin vaxt məktubu _həmişə mənim üçün kriptlə"
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alarm"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
-msgstr ""
-"Bu hesabı işlədərək göndərdiyin bütün məktubları həmişə _imzala"
+msgstr "Bu hesabı işlədərək göndərdiyin bütün məktubları həmişə _imzala"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "İsmarışa bir fayl əlavə et"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Yapışdırılmış fayl"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Tanıtma"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Yeni Məktubları _avtomatik yoxla"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Naməlum hərf dəstəsi: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_Qapat"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Yeni Məktubları Yoxla"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Bugünkü vəzifə rəngi"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "Bir ismarış yaz"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Quraşdırma"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11457,55 +12111,47 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Qurtar\"a basın."
 
-#: mail/mail-config.glade.h:37
-msgid "Dari"
-msgstr ""
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "Ə_sas"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Əsas"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Əsas dil kodlaması:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Poçt Alınır"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Digital ID-lər..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "İsmarış açıla bilmir"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Qurtardı"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Lahiyələr qovluğu:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "Fə_allaşdır"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11526,40 +12172,35 @@ msgstr "ePoçt Ünvanı: "
 msgid "Empty _trash folders on exit"
 msgstr "Çıxışda zibil qutularını _boşalt"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Gedişi işə sal"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "sonlanır"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Seçənəklər"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Çatdırılmış ismarış"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Digital ID Al..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Sitatları belə _Rəngləndir"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Tuvalu"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11613,72 +12254,66 @@ msgstr "Mikroneziya"
 msgid "NNTP Server:"
 msgstr "NNTP Vericisi:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "ePoçt Quraşdırılması"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "_Xəbərlər"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Arzuya Bağlı Məlumatlar"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Orqanizasiya:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _Açar ID:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Rəng al"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
-"Təkcə _Bcc alıcıları bildirlən ismarış yollamağa çalışdığımda "
-"bildir"
+msgstr "Təkcə _Bcc alıcıları bildirlən ismarış yollamağa çalışdığımda bildir"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Seçili əlaqələri çap et"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail cərgəsi "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "İsmarış açıla bilmir"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Sitatlandırılmış"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Bu parolu _yadda saxla"
@@ -11712,117 +12347,121 @@ msgid "S_ecurity"
 msgstr "Təhlükəsizlik"
 
 #: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Etibarlı MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "PGP binarını seç"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Imza faylı : "
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "İmza xaricindəkiləri sil"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "ePoçt Göndərilir"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Göndərilən _ismarışlar qovluğu:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Göndərilən və Lahiyə İsmarışları"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Veri_ci tanıtmaya ehtiyac hiss edər"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Verici Quraşdırılması"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Verici _Növü: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Qısa Yollar"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Imzanı qeyd et"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Imzanı qeyd et"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Qaynaq"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Mənbə Məlumatı"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Tərz adı :"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX poçt qutusu faylı"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "_HTML Imza:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Dəyişən"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11832,148 +12471,139 @@ msgstr ""
 "\n"
 "Başlamaq üçün \"Sonrakı\" düyməsinə basın. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Şərq"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_HTML Imza:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "_Həmişə netdə olmayan rəsmləri yüklə"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
-msgstr ""
-"Bu hesabı işlədərək göndərdiyin bütün məktubları _həmişə imzala"
+msgstr "Bu hesabı işlədərək göndərdiyin bütün məktubları _həmişə imzala"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "Kimlik Yo_xlama Növü: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Kimlik Yo_xlama Növü: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "Yeni Məktubları _avtomatik yoxla"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "Yeni Məktubları _avtomatik yoxla"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_Vəsiqə ID:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Qovluq açılırkən Təsdiqlə"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "_HTML Imza:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Əsas"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Fayl adı:"
+msgid "_Enable"
+msgstr "Fəallaşdır"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Fərqli Çatdır"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Tam Ad:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML məktubda"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "_HTML Imza:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Dil"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "Yollayan ünvan dəftərində varsa, rəsmləri _yüklə"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Bunu ə_sas hesab olaraq göstər"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "İsmarışları bundan sonra \"Oxundu\" olaraq _işarələ: "
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "Netdə olmayan rəsmləri he_ç bir vaxt yükləmə"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "_PGP binarı cığırı:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
-"Əlaqələrə HTML məktubları göndərəndə bu tərzu istəməyənlər "
-"varsa xəbər ver"
+"Əlaqələrə HTML məktubları göndərəndə bu tərzu istəməyənlər varsa xəbər ver"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Boş mövzu qisimli məktub göndərdiyim vaxt bildir"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Radio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -12014,69 +12644,52 @@ msgstr "_HTML Imza:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "_HTML Imza:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "E_tibarlı bağlantı (SSL) işlət"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Dəyişən"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_hər"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " rəng"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "izah"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "xəbərlərpəncərəsi1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "PGP imza məzmunu yaradıla bilmir."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "PGP təsdiq məzmunu yaradıla bilmir."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "PGP kripsiya məzmunu yaradıla bilmir."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "PGP dekripsiya məzmunu yaradıla bilmir."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "S/MIME imza məzmunu yaradıla bilmir."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "S/MIME məzmunu yaradıla bilmir."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "S/MIME enkripsiya məzmunu yaradıla bilmir."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "S/MIME zərf məzmunu yaradıla bilmir."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME kod açma məzmunu yaradıla bilmir."
 
@@ -12119,100 +12732,136 @@ msgstr "Xarici Göstərici"
 msgid "Loading message content"
 msgstr "İsmarış içindəkilər yüklənir"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Ge_cikmiş işlər:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Körpünü Səyyahda Aç"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Körpü Ünvanınə Köçür"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Körpünü Fərqli qeyd et"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Rəsmi Fərqli qeyd et..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s yapışdırılmış fayl"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ismarışı açıla bilmədi: Mənbə kodu gösteriliyor."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarix"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Səhv Ünvan"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Göndərən"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Cavablama"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Gn:"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Göndərici:  "
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "İsmarışı Fərqli Qeyd Et..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Bu ismarış digital olaraq imzalanmışdır. Ətraflı məlumat üçün qıfıl "
+"timsalına tıqla."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "PGP təsdiq məzmunu yaradıla bilmir."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Bu ismarış digital olaraq imzalanmışdır və original olduğu düşünülür."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Bu ismarış digital olaraq imzalanmışdır amma original olduğu düşünülmür."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP saytını göstərən ox (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, 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:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerli faylyi göstərən ox (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Uzaq verilənlər (%s) nişanı"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, 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:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Xəsərli xarici proqram parçası."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Yerli Qovluqlar"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Qovluq yenidən qurulur"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12221,27 +12870,27 @@ msgstr ""
 "Qovluğun meta məlumatını qeyd eda bilmədim; Bu qovluğu bir də aça\n"
 "bilməyə bilərsən: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "%s üstündə meta verilənlər qeyd edilə bilmir: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Qovluq meta verilənləri %s silinə bilmir: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" qovluğu \"%s\" şəklinə çevrilir"
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s yerli qovluq olmadığı üçün yenidən sazlana bilməz"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12249,11 +12898,11 @@ msgstr ""
 "Bu qovluğu bir də aça bilməsən, onu əllə\n"
 "bərpa etməlisən."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Yerli olmayan qovluqların şəklini dəyişdirə bilməzsiniz."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "%s i(ı) Yenidən Quraşdır"
@@ -12311,81 +12960,73 @@ msgstr "%d/%d ismarışda xəta"
 msgid "Complete."
 msgstr "Qurtadı."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "İsmarışlar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarışlar \"%s\"a(ə) daşınır"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İsmarışlar \"%s\"a(ə) köçürülür"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Daşınır"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Köçürdülür"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" dakı qovluqlar daranır"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Çatdırılmış ismarış"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "%s qaynağı açılır"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s qovluğu çıxardılır"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Qovluq yenilənir"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Qovluq açılır"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarışı alınır"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d ismarış alınır"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d ismarış qeyd edilir"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12394,7 +13035,7 @@ msgstr ""
 "Nəticə faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12403,11 +13044,11 @@ msgstr ""
 "İsmarışların buraya qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Yapışdırılmış Fayl Qeyd Edilir"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12416,27 +13057,27 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Data yazıla bilmədi: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ilə bağlantı kəsilir"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "A_xtar"
 
@@ -12507,10 +13148,6 @@ msgstr "Güncəllənir ..."
 msgid "Waiting..."
 msgstr "Gözləyir..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Ləğv Edildi."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "İstifadəçi əməliyyatı ləğv etdi."
@@ -12524,16 +13161,16 @@ msgstr "%s üçün Parol girin"
 msgid "Enter Password"
 msgstr "Parol Girin"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "İmza faylı qeyd edilə bilmir."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Imzanı qeyd et"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12543,10 +13180,30 @@ msgstr ""
 "\n"
 "Dəyişikliklərinizin qeyd edilməyini istəyirsinizmi?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Ad :"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "Imza faylı : "
+msgid "Signature hint"
+msgstr "Imzanı qeyd et"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "HTML imza faylı:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12561,17 +13218,17 @@ msgstr "Çatdırılmış ismarış"
 msgid "Forwarded Message"
 msgstr "Çatdırılmış İsmarış"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "vfolder qurulur: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Uri üçün vfolder məlumatı güncəllənir: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12584,90 +13241,95 @@ msgstr ""
 "    '%s'\n"
 "Və güncəlləndilər."
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "VFolderlər"
+
+#: mail/mail-vfolder.c:784
 #, fuzzy
 msgid "vFolders"
 msgstr "Qovluqlar"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "VFolder-i Düzəlt"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Mövcud olmayan '%s' vfolder-i düzəldilməyə çalışılır."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Yeni VFolder"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Mövzusuz)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - İsmarış"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Görülməmiş"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Görülmüş"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Cavab cerilmiş"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Çoxlu Görülməmiş İsmarış"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Çoxlu İsmarış"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Ən Alçaq"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Alçalt"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Yüksək"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Ən Yüksək"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Sabah: %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "İsmarış siyahısı yaradılır"
 
@@ -12690,10 +13352,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Əsl Əlaqə:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Alındı"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Böyüklük"
 
@@ -17886,5805 +18553,5800 @@ msgstr "Latviya"
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "Daha _Enli"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 #, fuzzy
 msgid "La Verne"
 msgstr "Keyp Verde"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "Livan"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 #, fuzzy
 msgid "Learmouth"
 msgstr "Lesoto"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 #, fuzzy
 msgid "Leesburg"
 msgstr "Lüksemburq"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "İda"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "Martiniq"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 #, fuzzy
 msgid "Lemmon"
 msgstr "Livan"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "Sil"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "il"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 #, fuzzy
 msgid "Lewisburg"
 msgstr "Lüksemburq"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "Lesoto"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 #, fuzzy
 msgid "Lewistown"
 msgstr "Lesoto"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 #, fuzzy
 msgid "Lexington"
 msgstr "Livan"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Liberal"
 msgstr "Liberiya"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Libya"
 msgstr "Liberiya"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "Niger"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Lihue"
 msgstr "Niu"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limoges"
 msgstr "Ən Alçaq"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "ay"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Lincoln"
 msgstr "gələn"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 #, fuzzy
 msgid "Lisboa"
 msgstr "Liberiya"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "siyahı"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 #, fuzzy
 msgid "Litchfield"
 msgstr "Yüngül dolu yağışı"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "NT Giriş"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "Şir"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "London"
 msgstr "Livan"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "Honduras"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 #, fuzzy
 msgid "Los Alamos"
 msgstr "Alarm"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 #, fuzzy
 msgid "Lousiana"
 msgstr "Botsvana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "Livan"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "gedən"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "Lüksemburq"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "Latviya"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "Mart"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macapa"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "Makedoniya"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "İda"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "Makedoniya"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "Kanada"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "İda"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "İda"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "Malavi"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "İdarəci"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "Malayziya"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manchester"
 msgstr "Oxşayır:"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "İda"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "Çən"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "Ana vasitə çubuğu"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "Məktub"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 #, fuzzy
 msgid "Maraba"
 msgstr "Mavritaniya"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "Mart"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "Mavritaniya"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "Mavritaniya"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "Mavritaniya"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "Kənarlar"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 #, fuzzy
 msgid "Marquette"
 msgstr "Martiniq"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "Marşal Adaları"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 #, fuzzy
 msgid "Marshalltown"
 msgstr "Marşal Adaları"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "Martiniq"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Ox_unmamış olaraq İşarələ"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Martiniq"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "Martiniq"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "İrlandiya"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "Malayziya"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "Makedoniya"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "Komor"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mattoon"
 msgstr "İda"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "İdarəci"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "Mayot"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Qazaxıstan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 #, fuzzy
 msgid "Mazu"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "Mart"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McClellan"
 msgstr "İslandiya"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "Şir"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "əvvəl"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 #, fuzzy
 msgid "Mehamn"
 msgstr "İda"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "Makedoniya"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "Cümə"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 #, fuzzy
 msgid "Merril Field"
 msgstr "_Göndərən Girişi"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "Meksika"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 #, fuzzy
 msgid "Miami"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middle East"
 msgstr "_Orta ad:"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middleton Island"
 msgstr "Solomon Adaları"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "_Orta ad:"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "Finlandiya"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "Fayl növü:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 #, fuzzy
 msgid "Milford"
 msgstr "üçün"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "%s a(ə) məktub göndər"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minatitlan"
 msgstr "Mavritaniya"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "gələn"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 #, fuzzy
 msgid "Minnesota"
 msgstr "Mikroneziya"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "deyil"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missoula"
 msgstr "Miss"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Missouri"
 msgstr "Miss"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitchell"
 msgstr "Oxşayır:"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 #, fuzzy
 msgid "Mitilini"
 msgstr "Məktublaşma qrupu"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "B.ei"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "Əl Telefonu"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "Əl Telefonu"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Modesto"
 msgstr "Orta çən"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "Daşı"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "Əl Telefonu"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Moldova"
 msgstr "Bazar ertəsi"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 #, fuzzy
 msgid "Molokai"
 msgstr "Malavi"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "Bazar ertəsi"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "İdarəci"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montana"
 msgstr "Botsvana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "Orta qar yadışı"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Aylıq Nümayiş"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 #, fuzzy
 msgid "Montego Bay"
 msgstr "Monqolustan"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 #, fuzzy
 msgid "Monterrey"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 #, fuzzy
 msgid "Montgomery"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morelia"
 msgstr "Monqolustan"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "Quruluş"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "İlk"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "Əl Telefonu"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "Aylıq Nümayiş"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "Cənubi Şərq"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Aylıq Nümayiş"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 #, fuzzy
 msgid "Mullan"
 msgstr "İda"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 #, fuzzy
 msgid "Muncie"
 msgstr "İyun"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 #, fuzzy
 msgid "Murcia"
 msgstr "Mavritaniya"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "Məs"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 #, fuzzy
 msgid "Muscatine"
 msgstr "Martiniq"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "knots"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 #, fuzzy
 msgid "Najran"
 msgstr "Bahreyn"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "Ad"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "Xəbərdarlıq"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "Yaponiya"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "Ad"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Napoli"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "ULəqəb"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "İtaliya"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natchez"
 msgstr "Oxşayır:"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 #, fuzzy
 msgid "Nebraska"
 msgstr "Yeni Vəzifə"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "Qrenada"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Nevada"
 msgstr "Qrenada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "Yeni Vəzifə"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bedford"
 msgstr "Yeni Bəsləmə"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "Yeni Zellandiya"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "Newcastle"
 msgstr "Xəbərlər"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Yeni Zellandiya"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Yeni Zellandiya"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "Yeni Kaledoniya"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Iberia"
 msgstr "Yeni Kaledoniya"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "Yeni İsmarış"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Mexico"
 msgstr "Meksika"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "Hollandiya"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "Şimal"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "Yeni VFolder"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "Yeni"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "New York"
 msgstr "Yeni VFolder"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "Ölçülər :"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "İspaniya"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nis"
 msgstr "dir(dır)"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "Ad"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "Norfolk Adaları"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 #, fuzzy
 msgid "Norfolk NAS"
 msgstr "Norfolk Adaları"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norrkoping"
 msgstr "İşləyir"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Adams"
 msgstr "Şimali Şərq"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "Şimal"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "Norveç"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "Şimali Şərq"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "Şimali Şərq"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "Norveç"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "Cənubi Fransız Sahələri"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "Şimal"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "Norveç"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "Qeyd"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "Başlamayıb"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "Tayland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Yamayka"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Oceanside"
 msgstr "İslandiya"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "Bir"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "Aç"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "Aç"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "Başqa"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 #, fuzzy
 msgid "Ojika Island"
 msgstr "Kuku Adaları"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "Britaniya Virgin Adaları"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "Başqa"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 #, fuzzy
 msgid "Olbia"
 msgstr "Albaniya"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 #, fuzzy
 msgid "Omaha"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "İstiqamət"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oostende"
 msgstr "Ziyarətçilər"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oran"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "Qur"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 #, fuzzy
 msgid "Oregon"
 msgstr "Qur"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "İrlandiya"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orlando"
 msgstr "İrlandiya"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 #, fuzzy
 msgid "Oruro"
 msgstr "Xəta"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr "saniyə"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 #, fuzzy
 msgid "Ostrava"
 msgstr "Avstraliya"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "həftə"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 #, fuzzy
 msgid "Oxford"
 msgstr "üçün"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "Səhifə"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 #, fuzzy
 msgid "Palacios"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "Peycer"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 #, fuzzy
 msgid "Palmdale"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "Peycer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "Məktub Qurğuları"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 #, fuzzy
 msgid "Pamplona"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama City"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Ləğv Edildi"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "Yaponiya"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Paphos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 #, fuzzy
 msgid "Paris"
 msgstr "İlk"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "Qismi çisələmə"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "Parol"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "Ağır qum"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "Səs çal:"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "Sual"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "Yenilə"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "Seçki : "
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "Gürcüstan"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "İlk"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philip"
 msgstr "Filippin"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Filippin"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 #, fuzzy
 msgid "Phillips"
 msgstr "Filippin"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "Nümayiş"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 #, fuzzy
 msgid "Pisa"
 msgstr "Pakistan"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 #, fuzzy
 msgid "Plymouth"
 msgstr "ay"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 #, fuzzy
 msgid "Podgorica Titograd"
 msgstr "Qismi tornado"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "Zərfi Çap Et"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "İcmalı Çap Et"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "İsmarışı Çap Et"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "Seçənəklər"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponca City"
 msgstr "Telefon Siyahısı"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponce"
 msgstr "Yoxdur"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "Əlaqələr"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Təqvimi çap et"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "Zərfi Çap Et"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "Nümayiş"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Kartı çap et"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Portland"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto"
 msgstr "_Qapı:"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "Gedişat"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "Portret"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Portret"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "Portret"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poza Rica"
 msgstr "Kosta Rika"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poznan"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Praha"
 msgstr "Paraqvay"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "Qismi çisələmə"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Çap Etmə nümayişi"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Pretoria"
 msgstr "Gürcüstan"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "Nümayiş"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Price-Carbon"
 msgstr "Pitkairn"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "Ənənəvi"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Providence"
 msgstr "_Vilayət"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "Nümayiş"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "Məs"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 #, fuzzy
 msgid "Pucallpa"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Puebla"
 msgstr "Ümumi"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Pueblo"
 msgstr "Ümumi"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 #, fuzzy
 msgid "Puerto Barrios"
 msgstr "Porto Riko"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 #, fuzzy
 msgid "Puerto Escondido"
 msgstr "Porto Riko"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "Porto Riko"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Porto Riko"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 #, fuzzy
 msgid "Puerto Maldonado"
 msgstr "Qismi tornado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "Porto Riko"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "Porto Riko"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "İcmalı Çap Et"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pula"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Təqvimi çap et"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "Sual"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quebec"
 msgstr "Mövzu"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 #, fuzzy
 msgid "Rapid City"
 msgstr "Cavab verilən"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Rawlins"
 msgstr "Yağış "
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Reading"
 msgstr "Başlıqlar"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Rebun Island"
 msgstr "Buvet Adası"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Recife"
 msgstr "Alındı"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redding"
 msgstr "Başlıqlar"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "Oxu"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redmond"
 msgstr "Xatırladıcı"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "Bölgələr"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Rennes"
 msgstr "Xatırladıcılar"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Reno"
 msgstr "Reyunion"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "Reyunion"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "Qaydalar"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "il"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reynosa"
 msgstr "Yenilə"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Finlandiya"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Rhode Island"
 msgstr "Buvet Adası"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 #, fuzzy
 msgid "Riberalta"
 msgstr "Gibraltar"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "Ləqəb"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "Haiti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "Rolu"
 
-#: my-evolution/Locations.h:1881
-#, fuzzy
-msgid "Riga"
-msgstr "Sağ :"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rijeka"
 msgstr "Oxu"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 #, fuzzy
 msgid "Rimini"
 msgstr "Ruminıya"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rioja"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "Nikaraqua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "Britaniya Virgin Adaları"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "Liberiya"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 #, fuzzy
 msgid "Riyadh"
 msgstr "Oxu"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Roatan"
 msgstr "Xırvatıstan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 #, fuzzy
 msgid "Robore"
 msgstr "əvvəl"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rodos"
 msgstr "Otaq"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Rogers"
 msgstr "Qovluqlar"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "Ruminıya"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "Komor"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 #, fuzzy
 msgid "Rosario"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Roseglen"
 msgstr "Rolu"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "Qovşaq"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "Təkrarlama"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Russia"
 msgstr "Avstriya"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 #, fuzzy
 msgid "Rutland"
 msgstr "Butan"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 #, fuzzy
 msgid "Sacramento"
 msgstr "Bölmə"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 #, fuzzy
 msgid "Saginaw"
 msgstr "İspaniya"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saint Paul"
 msgstr "Müqəddəs Lusiya"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "İspaniya"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Salalah"
 msgstr "Kir"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salem"
 msgstr "Qeyd Et"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "Somali"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "Somali"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "Somali"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salmon"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "_Şn"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 #, fuzzy
 msgid "Salvador"
 msgstr "Elsalvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samos"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "Ba_z"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 #, fuzzy
 msgid "Sana'A"
 msgstr "Qum"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 #, fuzzy
 msgid "San Angelo"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "San Carlos"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "Qum"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sandberg"
 msgstr "Göndərən"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sanderson"
 msgstr "Göndərən"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 #, fuzzy
 msgid "San Diego"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 #, fuzzy
 msgid "Sand Point"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sanford"
 msgstr "Qum"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 #, fuzzy
 msgid "San Francisco"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "Kölgələmə"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Joaquin"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "Qeyd Et və Qapat"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Juan"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "Somali"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 #, fuzzy
 msgid "San Miguel"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 #, fuzzy
 msgid "San Nicholas Island"
 msgstr "Norfolk Adaları"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 #, fuzzy
 msgid "San Salvador"
 msgstr "Elsalvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 #, fuzzy
 msgid "San Sebastian"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 #, fuzzy
 msgid "Santa Ana"
 msgstr "Müqəddəs Lusiya"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 #, fuzzy
 msgid "Santa Maria"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santa Monica"
 msgstr "Müqəddəs Lusiya"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "Göndərən"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santarem"
 msgstr "Qum fırtınası"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 #, fuzzy
 msgid "Santiago"
 msgstr "Müqəddəs Lusiya"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santorini"
 msgstr "Qum fırtınası"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "Hal"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 #, fuzzy
 msgid "Sao Luiz"
 msgstr "Müqəddəs Lusiya"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 #, fuzzy
 msgid "Sarasota"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "Şri Lanka"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "Ba_z"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "Hal"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "Quruluş"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "Qurğular"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "Somali"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "Görülmüş"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "İdxal başlanır"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "Axtar"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "Kölgələmə"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "Axtar"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "Şənbə"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "Şənbə"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Shearwater"
 msgstr "Başlama Tarixi"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "İsveç"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "Seçki : "
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Sheridan"
 msgstr "Sudan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "Böyüklük"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Shoreham"
 msgstr "Xal"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "Alçaq qar yağışı"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 #, fuzzy
 msgid "Sidney"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Silver City"
 msgstr "Təhlükəsizlik"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "Böyüklük"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skopje"
 msgstr "Dayan"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "Göndərilənlər"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "Albaniya"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "dəqiqə"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Snowshoe Lake"
 msgstr "Qar yağışları"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Sochi"
 msgstr "Cənub"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socorro"
 msgstr "Xal"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Socotra"
 msgstr "Xal"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 #, fuzzy
 msgid "Soda Springs"
 msgstr "Qar dənələri"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sofia"
 msgstr "Somali"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Soldotna"
 msgstr "Sloveniya"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Somerset"
 msgstr "Yağış"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Göndərən"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "Southampton"
 msgstr "Cənubi Şərq"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "Cənub"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Carolina"
 msgstr "Cənubi Afrika"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "South Dakota"
 msgstr "Cənubi Şərq"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "Cənub"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "Marşal Adaları"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "Göndərən"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "siyahı"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "İspaniya"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "Bəsitləşdirilmiş"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "State College"
 msgstr "Bitirmə Tarixi:"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "Başlayır:"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "Başlayır:"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "Dayan"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "Stephenville"
 msgstr "Seyşel"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 #, fuzzy
 msgid "St. George"
 msgstr "Müqəddəs Helena"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "Dayan"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 #, fuzzy
 msgid "St Louis"
 msgstr "Müqəddəs Lusiya"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Şri Lanka"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "Norveç"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "St Paul"
 msgstr "Hal"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "Solomon Adaları"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "Şənbə"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "Xal"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Lüksemburq"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "Mündəricat"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 #, fuzzy
 msgid "Sutton"
 msgstr "Ba_z"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Ənənəvi"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "Vəzifə"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "Qana"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 #, fuzzy
 msgid "Taejon"
 msgstr "Onda"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Taif"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Tainan"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Taiz"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "Tayvan"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Tayvan"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 #, fuzzy
 msgid "Tampa"
 msgstr "Yaponiya"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "Kağız"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "Kanada"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Taranto"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "Vəzifə"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Tarija"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "Ənənəvi"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "Tokelo"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "Teleks"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "Texas"
 msgstr "Vəzifə"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 #, fuzzy
 msgid "The Dalles"
 msgstr "Seyşel"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "Başlıq"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "Cümə Axşamı"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tianjin"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Tijuana"
 msgstr "Litvaniya"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tirana"
 msgstr "Tayvan"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "Boş"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "Başlıq"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "Şəxsi"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 #, fuzzy
 msgid "Tokunoshima Island"
 msgstr "Kristmas Adası"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 #, fuzzy
 msgid "Toledo"
 msgstr "Gizlə/Göstər"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 #, fuzzy
 msgid "Toluca"
 msgstr "Tokelo"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "Tonqa"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Topeka"
 msgstr "Tokelo"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 #, fuzzy
 msgid "Toronto"
 msgstr "Tornado"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "Üst :"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torrance"
 msgstr "Fransa"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Torreon"
 msgstr "Koreyaca"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "İdxal başlanır"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Toulouse"
 msgstr "Qapat"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trabzon"
 msgstr "Qabon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 #, fuzzy
 msgid "Trapani"
 msgstr "Yaponiya"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "Teleks"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "İstiqamət"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "Əvvəlki"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 #, fuzzy
 msgid "Trieste"
 msgstr "Sınaq"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 #, fuzzy
 msgid "Trinidad"
 msgstr "Tornado"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "Türkiyə"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "Çərşənbə axşamı"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "Tunis"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "Ça_x"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turaif"
 msgstr "Türkçə"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "Türkçə"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turku"
 msgstr "Türkiyə"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 #, fuzzy
 msgid "Twenthe"
 msgstr "Girişimli"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "Növ"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "Ça_x"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "Birləşmiş Ərəb Əmirlikləri"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 #, fuzzy
 msgid "Unst"
 msgstr "Görülməmiş"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruapan"
 msgstr "Yaponiya"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Uruqvay"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 #, fuzzy
 msgid "Utah"
 msgstr "."
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vadso"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Dəyişən"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vagar"
 msgstr "Peycer"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valencia"
 msgstr "Sloveniya"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 #, fuzzy
 msgid "Valentine"
 msgstr "İçərisini Göstər"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 #, fuzzy
 msgid "Van"
 msgstr "İda"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "Ləğv Et"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 #, fuzzy
 msgid "Varadero"
 msgstr "Barbados"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Varna"
 msgstr "Vanuatu"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "sonra"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 #, fuzzy
 msgid "Venezia"
 msgstr "Venezuela"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 #, fuzzy
 msgid "Venice"
 msgstr "Yunikod"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vermont"
 msgstr "ay"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "Ümumi"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 #, fuzzy
 msgid "Vicenza"
 msgstr "Venezuela"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "Fayl adı:"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "Avstraliya"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "Finlandiya"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volkel"
 msgstr "Tokelo"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 #, fuzzy
 msgid "Volk Field"
 msgstr "_Göndərən Girişi"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 #, fuzzy
 msgid "Voslau"
 msgstr "Tokelo"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 #, fuzzy
 msgid "Waco"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 #, fuzzy
 msgid "Wallops Island"
 msgstr "Folkland Adaları"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "Xəbərdarlıq"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "Hava"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Waterloo"
 msgstr "Hava"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "Hava"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 #, fuzzy
 msgid "Waterville"
 msgstr "Kateqoriyalar"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 #, fuzzy
 msgid "Wausau"
 msgstr "Vanuatu"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Webster City"
 msgstr "Web Səhifəsi"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "Çə"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Hava"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 #, fuzzy
 msgid "Wendover"
 msgstr "Göndərən"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "West Burke"
 msgstr "Qərbi Avropa"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "Hollandiya"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westfield"
 msgstr "Qərb"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "Vaxtlaşdırılır"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "Kristmas Adası"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "ULəqəb"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 #, fuzzy
 msgid "Wien"
 msgstr "Çə"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 #, fuzzy
 msgid "Williston"
 msgstr "siyahı"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 #, fuzzy
 msgid "Winchester"
 msgstr "Lixtenşteyn"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 #, fuzzy
 msgid "Windsor"
 msgstr "Qum fırtınası"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 #, fuzzy
 msgid "Winslow"
 msgstr "indi"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 #, fuzzy
 msgid "Winter Park"
 msgstr "Parol Girin"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 #, fuzzy
 msgid "Wisconsin"
 msgstr "Mikroneziya"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "Çə"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "Honq Konq"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "Axırıncı :"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "həmişə"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "Polşa"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "İşləyir"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "İşləyir"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 #, fuzzy
 msgid "Xiamen"
 msgstr "Ad"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 #, fuzzy
 msgid "Yao Airport"
 msgstr "İdxal etmə"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 #, fuzzy
 msgid "Yenbo"
 msgstr "Yəmən"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zadar"
 msgstr "Təqvim"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 #, fuzzy
 msgid "Zagreb"
 msgstr "Səhifə"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zanesville"
 msgstr "Ləğv Edildi"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 #, fuzzy
 msgid "Zaragoza"
 msgstr "Paraqvay"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 #, fuzzy
 msgid "Zurich"
 msgstr "Türkçə"
@@ -23714,17 +24376,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "izah"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Poçt icmalı"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "VFolderlər"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Yerli Qovluqlar"
 
@@ -23733,56 +24390,46 @@ msgstr "Yerli Qovluqlar"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Word of the Day"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Günün Sitatları"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Xəbər əlavə et"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Əlavə etmək istədiyiniz xəbərlərin URL-sini girin"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Ad :"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "RDF endirmə xətası"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Yeni Bəsləmə"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
-#, fuzzy
-msgid "Add ->"
-msgstr "_Əlavə Et"
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "<- Remove"
-msgstr " _Sil"
+msgid "Add"
+msgstr "Ə_lavə Et"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Yağış"
@@ -23824,10 +24471,46 @@ msgstr "İcmalı Çap Et"
 msgid "Printing of Summary failed"
 msgstr "İcmal Çapı bacarılmadı"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "İcraçı icmal qismi Bonobo-nu hazırlaya bilmədi.\n"
 
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " F"
+msgstr "F"
+
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " C"
+msgstr "C"
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "knots"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "mil"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometr"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Təmizlə"
@@ -24979,100 +25662,106 @@ msgid "C_elsius"
 msgstr "S_elsius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Bütün xə_bərlər:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Təqvim bir dəfədə ən çox neçə gün göstərsin?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Göstəriləcək ən ço_x miqdar:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Xəbərlər Qurğuları"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Bir a_y"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "Bir hə_ftə"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "Y_enilə vaxtı (saniyələrlə):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "Yeniləma vax_tı (saniyələrlə):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "Qovluqların tam cığırını g_östər"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "B_ütün vəzifələri göstər"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "_Bugünku vəzifələri göstər"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "İstiliklərini göstər:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Vəzifələr"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Hava qurğuları"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenayt"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Beş gün"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Məktub"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "_Xəbərlər"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Bur Gün"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Vaxtlaşdır"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Hava"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Evolutionun məktub yazıçısı emalatxanası."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Xüsusi Cərgələr"
+msgid "Folder Settings"
+msgstr "Qurğular"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution qabığı."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -25083,6 +25772,39 @@ msgstr "Təfsilatı Göstər"
 msgid "Cancel Operation"
 msgstr "Əməliyyatı Ləğv Et"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Qovluğu daşıya bilmirəm:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Qovluq Seçin"
+
+#: shell/e-local-storage.c:174
+#, fuzzy
+msgid "Drafts"
+msgstr "Lahiyə"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Gələnlər qutusu"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Gedənlər qutusu"
+
+#: shell/e-local-storage.c:177
+#, fuzzy
+msgid "Sent"
+msgstr "Görülmüş"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution qurulması"
@@ -25098,8 +25820,8 @@ msgstr ""
 #: shell/e-setup.c:131
 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."
+"Lütfən \"Oldu\"'ya tıqlayıb, faylları qurun, ya da \"Ləğv Et\"ə basaraq "
+"çıxın."
 
 #: shell/e-setup.c:171
 msgid "Could not update files correctly"
@@ -25191,6 +25913,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Sizə gətirən"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Qurtarma Vaxtı"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Xüsusi Cərgələr"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Xüsusi Cərgələr"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Xüsusi Cərgələr"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Qurtarma Vaxtı"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -25220,20 +25967,20 @@ msgstr "Qovluq içindəkilərdən birinə daçına bilməz."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "\"%s\" qovluğunun köçürələcəyi qovluğu bildir:"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Qovluğu köçürt"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "\"%s\" qovluğunun daşınacağı qovluğu bildir:"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Qovluğu daşı"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25242,18 +25989,19 @@ msgstr ""
 "Qovluq silinə bilmir:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\"-i Sil"
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Həqiqətən də \"%s\" qovluğunu silmək istəyirsiniz?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"Qovluq silinə bilmir:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25262,16 +26010,16 @@ msgstr ""
 "Qovluaq adı dəyişdirilə bilmir:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "%s qovluğu adını buna dəyişdir:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Qovluğun adını dəyişdir"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -25290,7 +26038,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "\"Evolution\" - Yeni qovluq yarat"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -25298,7 +26046,7 @@ msgstr ""
 "Bildirilən gediş üçün bu seçili qovluq növü \n"
 "hökmlü deyildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Yeni ..."
 
@@ -25318,11 +26066,11 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"\"Evolution\" içinə almaq istədiyiniz faylı seçin. Aşağıdakı "
-"siyahıdan alacağınız faylın növünü də seçin.\n"
+"\"Evolution\" içinə almaq istədiyiniz faylı seçin. Aşağıdakı siyahıdan "
+"alacağınız faylın növünü də seçin.\n"
 "\n"
-"Əgər təsəvvürünüz yoxdursa \"Avtomatik\" seçənəyini seçin, "
-"\"Evolution\" özü bildiyi kimi edər."
+"Əgər təsəvvürünüz yoxdursa \"Avtomatik\" seçənəyini seçin, \"Evolution\" özü "
+"bildiyi kimi edər."
 
 #: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
 msgid "Please select the information that you would like to import:"
@@ -25350,22 +26098,27 @@ msgstr ""
 "%s Alınır\n"
 "%d üzvü alınır."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Qovluq Seçin"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' faylı yoxdur"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Təkcə yerli qovluqlara idxal edə bilərisiniz"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25374,11 +26127,11 @@ msgstr ""
 "İş görəcək alıcı mövcud deyildir\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Alınır"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25387,17 +26140,17 @@ msgstr ""
 "%s Alınır.\n"
 "%s Başladılır"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "%s başladırkən xəta oldu"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "%s yüklənərkən xəta oldu"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25406,31 +26159,31 @@ msgstr ""
 "%s Alınır\n"
 "Alınan üzv 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Fayl adı:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Fayl seç"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Fayl növü:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Köhnə proqramlardakı verilən və qurğuları idxal et"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Tək fayl idxal et"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25438,31 +26191,78 @@ msgstr ""
 "Xahiş edirik gözləyin...\n"
 "Mövcud qurğular axtarılır"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Ağıllı İdxalçılar Başladılır"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Göndərən %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Qovluq seçin"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Bu verilənin idxal ediləcəyi hədəf qovluğu seçin"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Al"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Bağlantılar qapadılır..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"'%s' sırasında xəta:\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Qovluqlar sinxronlaşdırılır"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution Alarmı"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "%s qovluğu açılır"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "%s qovluğu açılır"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "%s da(də) Aç ..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Bildirilən qovluq yaradıla bilmədi:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -25476,8 +26276,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolutionun ePoçt Yardımçısı ara üzü başladıla bilmir\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Yeni"
@@ -25498,43 +26298,43 @@ msgstr "Qovluq adı keski daxil edə bilməz."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' və '..' saxlanmış qovluq adlarıdır."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH yolunda tapıla bilmədi."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "\"Bug-buddy\" işə salına bilmədi."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution Haqqında"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Qovluğa get ..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Açmaq istədiyiniz qovluğu seçin"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Yeni bir qısa yol yarat"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Qısa yolun nişanlayacağı qovluğu seçin:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "Xətdə _İşlə"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "Xətdən Qopuq _İşlə"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Xətdən Qopuq İşlə"
 
@@ -25555,8 +26355,7 @@ msgstr "(Heç Biri)"
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
-"Ximian Evolution hazırda xətdədir. Xətdən çıxmaq üçün bu "
-"düyməyə basın."
+"Ximian Evolution hazırda xətdədir. Xətdən çıxmaq üçün bu düyməyə basın."
 
 #: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
@@ -25566,10 +26365,9 @@ msgstr "Ximian Evolution xətdən çıxmaq gedişatındadır."
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Ximian Evolution hazırda xətdə deyil. Xətdə girmək üçün bu "
-"düyməyə tıqlayın."
+"Ximian Evolution hazırda xətdə deyil. Xətdə girmək üçün bu düyməyə tıqlayın."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25581,41 +26379,35 @@ msgstr ""
 "Fəallaşdırma sistemi xətası:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerli qeydi quraşdıra bilmədim -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
 "has unexpectedly quit. You will need to quit Evolution and restart\n"
 "in order to access that data again."
 msgstr ""
-"\"%s\" növündəki qovluqları işləyə bilən Evolution komponenti "
-"gözlənilməz\n"
-"şəkildə öldü. Evolution proqramından çıxıb yenidən "
-"başlatmalısınız ki,\n"
+"\"%s\" növündəki qovluqları işləyə bilən Evolution komponenti gözlənilməz\n"
+"şəkildə öldü. Evolution proqramından çıxıb yenidən başlatmalısınız ki,\n"
 "verilənlərə yenidən çata biləsiniz."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "Oldu"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Hökmsüz arqumentlər"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "OAF-a qeyd edə bilmirəm"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Quraşdırma Databeyzi Tapılmadı"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Ümumi xəta"
 
@@ -25640,95 +26432,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Silmə"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Qısa Yol Qrupunu Yenidən Adlandır"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Seçili qısa yol qrupunu belə adlandır:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Kiçik Timsallar"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Qısa yolları kiçik timsallar olaraq göstər"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "_Böyük Timsallar"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Qısa yolları böyük timsallar olaraq göstər"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Yeni Qrup..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Yeni bir qısa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "Bu Qrupu _Sil..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Bu qısa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "Bu Qrupu _Yenidən Adlandır..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Bu qısa yol qrupunu yenidən adlandır"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "Qısa yol Çubuğunu _Gizlə"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Qısa yol Çubuğunu Gizlə"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Bu qısa yolu yenidən adlandır"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Bu qısa yolun adını belə dəyişdir:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Bu qısa yola körpülənmiş qovluğu aç"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Yeni _Pəncərədə Aç"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Bu qısa yol ilə niçanlanan qovluğu yeni pəncərədə göstər"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "Yeni_dən Adlandır"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Bu qısa yolu yenidən adlandır"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "_Sil"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu qısa yolu qısa yol çubuğundan sil"
 
@@ -25740,10 +26532,6 @@ msgstr "Qısa yolları qeyd edərkən xəta oldu."
 msgid "Shortcuts"
 msgstr "Qısa Yollar"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Gələnlər qutusu"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -25806,10 +26594,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% qurtardı)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 
@@ -25850,67 +26639,67 @@ msgstr ""
 "Fəallaşdırma sistemi xətası:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "CORBA xətası"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Kəsilmiş"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Səhv qrqument"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Onsuz da yiyəsi var"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Yiyəsi yoxdur"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Tapıla bilmədi"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Dəstəklənməyən növ"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Dəstəklənməyən sxem"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Dəstəklənməyən gedişat"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Daxili xəta"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Mövcuddur"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "Hökmsüz URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Alt qovluqları var"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Heç yer qalmayıb"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "Köhnə yiyəsi öldü"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Fayl növü:"
@@ -25921,8 +26710,7 @@ msgstr "Fəal bağlantılar"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
-msgstr ""
-"Bu bağlantıları kəsərək xətdən çıxmaq üçün Oldu-ya tıqlayın"
+msgstr "Bu bağlantıları kəsərək xətdən çıxmaq üçün Oldu-ya tıqlayın"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "Host"
@@ -25987,9 +26775,7 @@ msgstr ""
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Faylın \"Evolution\" içina alınması üçün \"Al\" düyməsini "
-"tıqlayın. "
+msgstr "Faylın \"Evolution\" içina alınması üçün \"Al\" düyməsini tıqlayın. "
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -26041,49 +26827,81 @@ msgstr "Mənə bir də soruşma"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution aşağıdakı fayllardan verilənləri ala bilər:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution əndə çıxır..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution _FAQ"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Mənə bir də soruşma"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution qabığına çata bilmədim."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution qabığını başlada bilmədim: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Açılış ekranını gösdərmə"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "İdxal başlanır"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Ağıllı İdxalçılar Başladılır"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Bütün xəta ayıqlama verilənlərini bir fayla yazdır."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parçalar sistemini başlada bilmədim."
 
@@ -26197,11 +27015,11 @@ msgstr "indiki vaxt"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Gedişlər"
 
@@ -26323,8 +27141,8 @@ msgstr "Bu üzvü qapat"
 msgid "Delete this item"
 msgstr "Bu üzvü sil"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Ana vasitə çubuğu"
 
@@ -26364,7 +27182,7 @@ msgstr "Bu üzvü diskə qeyd et"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Fayl"
 
@@ -26430,19 +27248,19 @@ msgstr "v_Calendar şəklində çatdır"
 msgid "Forward this item via email"
 msgstr "Bu üzvü məktubla çatdır"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Son görüş məlumatını öyrən"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "Görüşü Ye_nilə"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "_Görüşləri Planlaşdır"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Bu üzvlə görüş vaxtlaşdır"
 
@@ -26450,10 +27268,6 @@ msgstr "Bu üzvlə görüş vaxtlaşdır"
 msgid "Customise My Evolution"
 msgstr "Evolution Proqramımı Xüsusiləşdir"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Ləğv Et"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Hazırkı məktub əməliyyatını ləğv et"
@@ -26464,8 +27278,7 @@ msgstr "_Yeni İsmarış Yaz"
 
 #: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit rules for filtering new mail"
-msgstr ""
-"Yeni məktub süzülməsi qaydalarını yaradın və ya təkmilləşdirin"
+msgstr "Yeni məktub süzülməsi qaydalarını yaradın və ya təkmilləşdirin"
 
 #: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
@@ -26481,8 +27294,7 @@ msgstr "_Parolları Unut"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
-"Yenidən xəbərdar edilmək üçün yadda saxlanan bütün parolları unut"
+msgstr "Yenidən xəbərdar edilmək üçün yadda saxlanan bütün parolları unut"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
@@ -26498,8 +27310,7 @@ msgstr "İsmarış nümayiş pəncərəsini göster"
 
 #: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
-"Uzaq vericilərdəki qovluqlara qeydiyyatdan keç ya da qeydiyyatdan çıx"
+msgstr "Uzaq vericilərdəki qovluqlara qeydiyyatdan keç ya da qeydiyyatdan çıx"
 
 #: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
@@ -26548,8 +27359,7 @@ msgstr "_Oxunmuş İsmarışları Gizlə"
 #: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
-"Üstünə çızıq çəkmək yerinə silinmiş ismarışları eləcə gizlə"
+msgstr "Üstünə çızıq çəkmək yerinə silinmiş ismarışları eləcə gizlə"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
@@ -26578,13 +27388,11 @@ msgstr "İl_gəyi Seç"
 #: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
-"Təkcə hazırda seçili olmayan ismarışlar olmaq üzərə bütün "
-"ismarışları seç"
+"Təkcə hazırda seçili olmayan ismarışlar olmaq üzərə bütün ismarışları seç"
 
 #: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-"Seçili ismarış ilgəklərin olduğu kimi bütün ismarışları seç"
+msgstr "Seçili ismarış ilgəklərin olduğu kimi bütün ismarışları seç"
 
 #: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
@@ -26614,7 +27422,7 @@ msgstr "İlgək_lənmiş İsmarışlar Siyahısı"
 msgid "_Expunge"
 msgstr "_Təmizlə"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Qovluq"
 
@@ -26679,8 +27487,7 @@ msgstr "Bu alıcıların ismarışlarını süzmək üçün qayda yarat"
 
 #: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
-msgstr ""
-"Bu məktublaşma qrupundakı ismarışları süzmək üçün qayda yarat"
+msgstr "Bu məktublaşma qrupundakı ismarışları süzmək üçün qayda yarat"
 
 #: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
@@ -26921,8 +27728,7 @@ msgstr "Göstərilən ismarışın vücudunda mətn axtar"
 
 #: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
-msgstr ""
-"Səhifə qurğularını hazırkı çap edicinizə göra uyğunlaşdırın"
+msgstr "Səhifə qurğularını hazırkı çap edicinizə göra uyğunlaşdırın"
 
 #: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
@@ -27030,7 +27836,7 @@ msgstr "Əvvəlki İsmarış"
 msgid "_Quoted"
 msgstr "Sitatlandırılmış"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Vasitələr"
 
@@ -27045,12 +27851,12 @@ msgstr "Bu pəncərəni qapat"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_Qapat"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Göstər"
 
@@ -27237,7 +28043,7 @@ msgstr "_Aç ..."
 msgid "_Reply-To Field"
 msgstr "_Cavab_Verləcək Girişi"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Kömək"
 
@@ -27386,111 +28192,120 @@ msgid "Move this folder to another place"
 msgstr "Bu qovluğu başqa yerə daşı"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Yeni _Qovluq Yarat..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Yeni Pəncərədə Aç"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Bu qovluğu yeni pəncərədə aç"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Al / Göndər"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Sorğulanmış məktubu göndər və yeni məktubları al"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution haqqında məlumat göstər"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Xəta Raportunu Göndər"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "_Xəta Raportunu Göndər"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug-buddy ilə bir xəta raportunu göndər"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Gizlə/Göstər"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Qovluqlar çubuğunun nümayiş etdiriləcəyi yeri bildir"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 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:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Oflayn işləmənin harda olacağını bildirər"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Seçili qovluğu göstər"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolution Haqqında..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Köçürt..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_Qovluq Çubuğu"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "Qovluğa _Get ..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_İdxal Et..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Daşı ..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Yeni"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Yeni Qovluq"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "_Pilot Qurğuları..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Adını Dəyişdir..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Göndər / Al"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Qısa Yol"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "_Qısa Yol Çubuğu"
 
@@ -27571,25 +28386,25 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"Xəritə üstündə sahəni seçib vaxt zolağına qərar vermək üçün "
-"siçanını sol düyməsiylə o qismi böyüdərək seç.\n"
+"Xəritə üstündə sahəni seçib vaxt zolağına qərar vermək üçün siçanını sol "
+"düyməsiylə o qismi böyüdərək seç.\n"
 " Sağ siçan düyməsini uzaqlaşdırmaq üçün işlət."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Hazırkı Görünüş"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "_Hazırkı Görünüş"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Görünüşləri Müəyyənləşdir"
 
@@ -27619,8 +28434,7 @@ msgstr "Gün %s şəklində girilməlidir."
 
 #: widgets/misc/e-cell-percent.c:77
 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"
+msgstr "Faiz qiyməti ikisi də daxil olam üzərə 0 ilə 100 arasında olmalıdır"
 
 #: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
@@ -27712,16 +28526,21 @@ msgstr "Axtarış Editoru"
 msgid "Save Search"
 msgstr "Axtarışı Qeyd Et"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Axtarışı Qeyd Et"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Qeydedilmiş Axtarışlara Əlavə Et"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Ətraflı..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Məlumat"
@@ -27743,21 +28562,21 @@ msgstr "İsmarış"
 msgid "Don't show this message again."
 msgstr "Bu ismarışı bir də göstərmə."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "İndi Axtar"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Təmizlə"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Təmizlə"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "İndi Axtar"
 
@@ -27783,6 +28602,189 @@ msgstr "init_corba(): GNOME başladıla bilmədi"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Ünvan Dəftəri Qaynağı"
+
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "Hökmsüz mənasız iz məlumatı:\n"
+#~ "%s"
+
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolutionun İcracı mündəricat parçası."
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Təqvim Mündəricatı parçası emalatxanası."
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Gününb _başlanğıcı:"
+
+#~ msgid "_End of day:"
+#~ msgstr "Gün _sonu:"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "_Başqa Təşkilatçı"
+
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Bu qeydlərdə müəyyənləşdirilən imzalama növü dəstəklənmir"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "%s üçün %s parol kalimanizi lürfən girin"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Lütfən %s parol kəlimənizi girin"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "İsmarış imzalana bilmir: imzalamaq üçün düz mətn yoxdur"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "İsmarış imzalana bilmir: poarol verilməyib"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "İsmarış imzalana bilmir: GPG/PGP proqramına boru yaradıla bilmir. %s"
+
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "İsmarış imzalana bilmir: imza üçün düz mətn yoxdur"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "İsmarış təsdiqlənə bilmir: təsdiqlənmək üçün düz mətn yoxdur"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "İsmarış təsdiqlənə bilmir: GPG/PGP proqramına boru yaradıla bilmir. %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "İsmarış kriptlənə bilmir: kritpləmək üçün düz mətn yoxdur"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "İsmarış kriptlənə bilmir: parol verilməyib"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "İsmarış kriptlənə bilmir: GPG/PGP proqramına boru yaradıla bilmir. %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "İsmarış kriptlənə bilmir: kritlənəcək mətn yoxdur"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "İsmarış dekript edilə bilmir: parol verilməyib"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "İsmarış dekript edilə bilmir: GPG/PGP proqramına boru yaradıla bilmir. %s"
+
+#~ msgid "%s server %s"
+#~ msgstr "%s verici %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(naməlum ev sahibi)"
+
+#~ msgid "No such message: %s"
+#~ msgstr "Bele bir ismarış yoxdur: %s"
+
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Buradakı ismarışları zibilə göndərə bilməzsiniz."
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "İsmarış hovuz faylına əlava edilə bimir: %s: %s"
+
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Fayl tapıla bilmir: %s: %s"
+
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "`%s' normal vir hovuz deyil ya da sıravı bir fayl deyildir"
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Radio"
+
+#~ msgid ""
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
+#~ msgstr ""
+#~ "Yeni məktub ambarı üçün gələnlər qismi alına bilmir:\n"
+#~ "%s\n"
+#~ "Qısa yol yaradılmayacaqdır."
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "_Düzəlt"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Yeni"
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Əməliyyatı Ləğv Et"
+
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Tuvalu"
+
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Imza faylı : "
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "İmza xaricindəkiləri sil"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "_HTML Imza:"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Fayl adı:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "_HTML Imza:"
+
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Dil"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Radio"
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "PGP kripsiya məzmunu yaradıla bilmir."
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "PGP dekripsiya məzmunu yaradıla bilmir."
+
+#~ msgid "Moving"
+#~ msgstr "Daşınır"
+
+#~ msgid "Copying"
+#~ msgstr "Köçürdülür"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Imza faylı : "
+
+#, fuzzy
+#~ msgid "Riga"
+#~ msgstr "Sağ :"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_Əlavə Et"
+
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr " _Sil"
+
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Həqiqətən də \"%s\" qovluğunu silmək istəyirsiniz?"
+
 #~ msgid "Card: "
 #~ msgstr "Kart: "
 
@@ -28035,27 +29037,25 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgstr "Verici Adı"
 
 #~ msgid "The information below is required in order to add an addressbook.  "
-#~ msgstr ""
-#~ "Aşağıdakı məlumat ünvan dəftərinə əlavə edilmək üçün "
-#~ "işlədilcək.  "
+#~ msgstr "Aşağıdakı məlumat ünvan dəftərinə əlavə edilmək üçün işlədilcək.  "
 
 #~ msgid "This information is not required for most ldap servers. "
 #~ msgstr "Bu məlumat bir çox lap verici üçün lüzumsuzdur.  "
 
 #~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
 #~ msgstr ""
 #~ "Bu məlumat ldap vericiniz tərəfindən axtarışda hansı düyünlərin "
-#~ "işlədiləcəyini təyin etmək üçün istifadə edilir. Ətraflı "
-#~ "məlumat üçün sistem idarəçinizlə əlaqə qurun."
+#~ "işlədiləcəyini təyin etmək üçün istifadə edilir. Ətraflı məlumat üçün "
+#~ "sistem idarəçinizlə əlaqə qurun."
 
 #~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
 #~ msgstr ""
-#~ "Bu, ldap vericidikə bütün axtarışlarınız üçün əsas düyündür. "
-#~ "Ətraflı məlumat üçün sistem idarəçinizlə əlaqə qurun."
+#~ "Bu, ldap vericidikə bütün axtarışlarınız üçün əsas düyündür. Ətraflı "
+#~ "məlumat üçün sistem idarəçinizlə əlaqə qurun."
 
 #~ msgid "This is the name of the server where your addressbook is located."
 #~ msgstr "Bu, ünvan dəftərinizin yerləşdiyi vericinin adıdır."
@@ -28066,12 +29066,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "_My server requires authentication"
 #~ msgstr "Verici_m tanıtmaya ehtiyac hiss edər"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Digər Əlaqələr"
-
-#~ msgid "(none)"
-#~ msgstr "(heç biri)"
-
 #~ msgid "Co_ntacts:"
 #~ msgstr "_Əlaqələr:"
 
@@ -28119,242 +29113,15 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 
 #~ msgid "The journal entry has changed. Send an updated version?"
 #~ msgstr ""
-#~ "Jurnal girişi məlumatı dəyişdir. Güncəllənmiş buraxılışını "
-#~ "yollayaq?"
-
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
+#~ "Jurnal girişi məlumatı dəyişdir. Güncəllənmiş buraxılışını yollayaq?"
 
 #~ msgid "_Delete this Task"
 #~ msgstr "Bu Vəzifəni _Sil"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "İclas başlayır: <b>"
-
-#~ msgid "Task begins: <b>"
-#~ msgstr "Vəzifə başlayır: <b>"
-
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Sərbəst/Məşğul infosu başlayır: <b>"
-
-#~ msgid "Begins: <b>"
-#~ msgstr "Başlayır: <b>"
-
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "İclas sonlanır: <b>"
-
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Sərbəst/Məşğul infosu sonlanır: <b>"
-
-#~ msgid "Ends: <b>"
-#~ msgstr "Sonlanır: <b>"
-
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Vəzifə Qurtardı: <b>"
-
-#~ msgid "Task Due: <b>"
-#~ msgstr "Vəzifə Vaxtı: <b>"
-
-#~ msgid "iCalendar Information"
-#~ msgstr "iCalendar Məlumatı"
-
-#~ msgid "iCalendar Error"
-#~ msgstr "iCalendar Xətası"
-
-#~ msgid "An unknown person"
-#~ msgstr "Naməlum şəxs"
-
-#~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
-#~ msgstr ""
-#~ "<br> Xahiş edirik, aşağıdakı məlumatı gözdən keçirdin və "
-#~ "aşağıdakı menüdən gediçi seçin."
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Heç biri</i>"
-
-#~ msgid "Choose an action:"
-#~ msgstr "Gediş seç:"
-
-#~ msgid "Update"
-#~ msgstr "Güncəllə"
-
-#~ msgid "Accept"
-#~ msgstr "Qəbul Et"
-
-#~ msgid "Tentatively accept"
-#~ msgstr "Girişimli qəbul et"
-
-#~ msgid "Decline"
-#~ msgstr "Rədd Et"
-
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Sərbəst/Məşğul Məlumatını Yolla"
-
-#~ msgid "Update respondent status"
-#~ msgstr "Cavablayıcı vəziyyətini güncəllə"
-
-#~ msgid "Send Latest Information"
-#~ msgstr "Ən Son Məlumatı Yolla"
-
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> görüş məlumatını dərc edib."
-
-#~ msgid "Meeting Information"
-#~ msgstr "Görüş Məlumatı"
-
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> sizin görüşdə olmağınızı xahiş edir."
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "Görüş Məqsədi"
-
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> mövcud görüşə əlavə etmək istəyir."
-
-#~ msgid "Meeting Update"
-#~ msgstr "Görüş Güncəllənməsi"
-
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> ən son görüş məlumatını almaq istəyir."
-
-#~ msgid "Meeting Update Request"
-#~ msgstr "Görüş Güncəllənmə İstəyi"
-
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> görüş istəyini cavabladı."
-
-#~ msgid "Meeting Reply"
-#~ msgstr "Görüş Cavabı"
-
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> görüşü ləğv etdi."
-
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Görüş Ləğvi"
-
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> pozğun ismarış yolladı."
-
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Pis Görüş İsmarışı"
-
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> vəzifə məlumatını dərc etdi."
-
-#~ msgid "Task Information"
-#~ msgstr "Vəzifə Məlumatı"
-
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> sizdən vəzifəni görməyinizi istədi."
-
-#~ msgid "Task Proposal"
-#~ msgstr "Vəzifə Təklifi"
-
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> mövcud vəzifəyə qoşulmaq istəyir."
-
-#~ msgid "Task Update"
-#~ msgstr "Vəzifə Gencəllənməsi"
-
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> ən son vəzifə məlumatını almaq istəyir."
-
-#~ msgid "Task Update Request"
-#~ msgstr "Vəzifə Güncəllənmə İstəyi"
-
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> vəzifə verilməsinə cavab verdi."
-
-#~ msgid "Task Reply"
-#~ msgstr "Vəzifə Cavabı"
-
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> vəzifəni ləğv etdi."
-
-#~ msgid "Task Cancellation"
-#~ msgstr "Vəzifə Ləğvi"
-
-#~ msgid "Bad Task Message"
-#~ msgstr "Pis Vəzifə İsmarışı"
-
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> sərbəst/məşğul məlumatını dərc etdi."
-
-#~ msgid "Free/Busy Information"
-#~ msgstr "Sərbəst/Məşğul Məlumatı"
-
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> sizin sərbəst/məşğul məlumatınızı istəyir."
-
-#~ msgid "Free/Busy Request"
-#~ msgstr "Sərbəst/Məşğul İstəyi"
-
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> sərbəst/məşğul istəyinə cavab verdi."
-
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Sərbəst/Məşğul Cavabı"
-
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Pis Sərbəst/Məşğul İsmarışı"
-
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Bu ismarış təkə dəstəklənməyən istəklər daxil edir."
-
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "İlişgidəki hökmlü təqvim ismarışı daxil etmir"
-
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "İlişgidəki göstəriləbilən təqvim üzvləri daxil etmir"
-
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr ""
-#~ "Sizin göstərdiyiniz heç bir sorağa cavab verən iştirakçı syahıda "
-#~ "tapıla bilmədi\n"
-
-#~ msgid "Status: %s"
-#~ msgstr "Hal: %s"
-
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Qurtaran Nisbət: %i"
-
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
-
-#~ msgid "Categories: %s"
-#~ msgstr "Kateqoriyalar: %s"
-
-#~ msgid "Contacts: "
-#~ msgstr "Əlaqələr:"
+#~ "Sizin göstərdiyiniz heç bir sorağa cavab verən iştirakçı syahıda tapıla "
+#~ "bilmədi\n"
 
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Cismdə hökmsüz yazı, kəlimə xaric"
@@ -28419,7 +29186,8 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgstr "%s POP vericisindən ismarışlar alına bilmədi: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "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."
@@ -28433,15 +29201,11 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "(Unknown)"
 #~ msgstr "(Naməlum)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "POP vericisindən gözlənilməz cavab alındı: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "İsmarışda 'Göndərən' ünvanı tapıla bilmədi"
 
 #~ msgid "Cannot send message: sender address not defined."
-#~ msgstr ""
-#~ "İsmarış göndrərilə bilmədi: göndərənin ünvanı bildirilməyib."
+#~ msgstr "İsmarış göndrərilə bilmədi: göndərənin ünvanı bildirilməyib."
 
 #~ msgid "RCPT TO response error: %s: mail not sent"
 #~ msgstr "RCTP TO cavablama xətası: %s: məktub göndərilə bilmədi"
@@ -28451,8 +29215,7 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 
 #~ msgid "DATA response error: message termination: %s: mail not sent"
 #~ msgstr ""
-#~ "DATA cavablama xətası: ismarış qurtarılması: %s: məktub göndərilə "
-#~ "bilmədi"
+#~ "DATA cavablama xətası: ismarış qurtarılması: %s: məktub göndərilə bilmədi"
 
 #~ msgid "QUIT response error: %s: non-fatal"
 #~ msgstr "QUİT cavablama xətası: %s: ağır deyil"
@@ -28484,37 +29247,18 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Filter on Mailing List"
 #~ msgstr "Məktublaşma Qrupundakı Süzgəc"
 
-#~ msgid "Indexing:"
-#~ msgstr "İndekslənir:"
-
 #~ msgid "Mailbox Format"
 #~ msgstr "Məktub Qutusu Şəkli"
 
-#~ msgid " (default)"
-#~ msgstr " (varsayılan) "
-
-#~ msgid "Subject is %s"
-#~ msgstr "Mövzu %s dir(dır)"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Məktub %s dandır(dəndir)"
-
-#~ msgid "%s mailing list"
-#~ msgstr "%s məktublaşma qrupu"
-
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "İsmarış hökmsüz alıcılar daxil edir."
 
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Gələnlər"
 
-#~ msgid "Account"
-#~ msgstr "Hesab"
-
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr ""
-#~ "Kriplənmiş məktub göndərdiyin vaxt məktubu həmişə mənim üçün "
-#~ "_kriptlə"
+#~ "Kriplənmiş məktub göndərdiyin vaxt məktubu həmişə mənim üçün _kriptlə"
 
 #~ msgid "Composer"
 #~ msgstr "Yazıçı"
@@ -28525,9 +29269,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Edit..."
 #~ msgstr "Düzəlt..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML imza faylı:"
-
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Süzgəc Qeyd Faylını seç..."
 
@@ -28555,26 +29296,9 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "seconds."
 #~ msgstr "saniyə."
 
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "Bu ismarış digital olaraq imzalanmışdır. Ətraflı məlumat üçün "
-#~ "qıfıl timsalına tıqla."
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Evolution bu tərz imzalı mətnləri başa düşmür."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr ""
-#~ "Bu ismarış digital olaraq imzalanmışdır və original olduğu "
-#~ "düşünülür."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Bu ismarış digital olaraq imzalanmışdır amma original olduğu "
-#~ "düşünülmür."
-
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "İcracı mündəricat üçün Evolution parçası."
 
@@ -28582,26 +29306,7 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgstr "Evolution İcmal qismi hazırlana bilmir."
 
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
-#~ msgstr ""
-#~ "<dd><b>Hava vəziyyəti vericisi ilə bağlantı qurula bilmədi</b></dd>"
-
-#~ msgid "F"
-#~ msgstr "F"
-
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid "kph"
-#~ msgstr "kph"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "kilometers"
-#~ msgstr "kilometr"
+#~ msgstr "<dd><b>Hava vəziyyəti vericisi ilə bağlantı qurula bilmədi</b></dd>"
 
 #~ msgid "Al_l stations:"
 #~ msgstr "Büt_ün dayancaqlar:"
@@ -28609,9 +29314,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "All _folders:"
 #~ msgstr "Bütün _qovluqlar:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "Bütün xə_bərlər:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "Qovluqları _göstər:"
 
@@ -28621,19 +29323,9 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "_Displayed feeds:"
 #~ msgstr "Məlzəmələri _göstər:"
 
-#~ msgid "Outbox"
-#~ msgstr "Gedənlər qutusu"
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Təlif haqqı 1999, 2000, 2001 Helix Code, Inc."
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Qovluğu daşıya bilmirəm:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "( Adsızdır )"
 
@@ -28666,8 +29358,7 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr ""
-#~ "Məktub hesabları yaradın və ya təkmilləşdirin, başqa əməliyyatlar "
-#~ "aparın"
+#~ "Məktub hesabları yaradın və ya təkmilləşdirin, başqa əməliyyatlar aparın"
 
 #~ msgid "_Mail Settings..."
 #~ msgstr "_Məktub Qurğuları..."
diff --git a/po/bg.po b/po/bg.po
index a4e5daa740..3c509c73b2 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0RC2\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-04-30 11:47GMT\n"
 "Last-Translator: Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -35,7 +35,7 @@ msgstr "����� VCard ������� � ��������."
 msgid "File As"
 msgstr "���� ����:"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "���"
@@ -46,7 +46,7 @@ msgid "Email"
 msgstr "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "�������"
 
@@ -56,7 +56,7 @@ msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "��������"
@@ -64,8 +64,8 @@ msgstr "��������"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "������"
 
@@ -75,12 +75,12 @@ msgid "Bus"
 msgstr "��. ���."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "��������"
 
@@ -91,8 +91,8 @@ msgstr "��������"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "�������"
 
@@ -107,18 +107,18 @@ msgstr "���"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "���. ����"
@@ -128,13 +128,13 @@ msgid "Bus Fax"
 msgstr "��. ����"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "������� ����"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "������ 2"
 
@@ -143,43 +143,43 @@ msgid "Bus 2"
 msgstr "�������� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "������� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "�����"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "���� ����"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "�����"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "������"
@@ -191,14 +191,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "��. ���� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "��. ���� 3"
@@ -336,7 +336,7 @@ msgstr "VCard �� %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -344,7 +344,7 @@ msgid "Could not initialize Bonobo"
 msgstr "�� ���� �� ������������� Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "�����..."
 
@@ -357,32 +357,32 @@ msgstr "��������"
 msgid "Error in search expression."
 msgstr "������ � ������� �� �����."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "������� �������� � LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "����� �������� �� LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "������� �������� � LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "������ ������ ���������."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "��������� ����������� �� �������� �� LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "������ ��� ��������� �� �����"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "�� ���� �� ���������� URL `%s'"
@@ -431,105 +431,141 @@ msgstr "����� ������� �� Bonobo ����� ������� ������� �����."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #, fuzzy
-msgid "Addressbook Settings"
-msgstr "��������� �� ������"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr "������� �� ����������� �� Evolution "
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "��������� �� Evolution �� �������� �� ��������"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr "������� �� ����������� �� Evolution "
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "��������"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "�����, ����� ������� ������������ �� ��������"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP ������"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "LDAP ������ �������� ���������� �� �������"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "��� ������ � ��������"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "������ _��������"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "��� �������"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_�������"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "��� ������ � ��������"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "�� ����� �� �� ������ � LDAP �������."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "������ _��������"
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"�� ���� �� �� ���������� ���� IMAP ������.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP ������� �� ������� %s ����������"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"������ ��� ��������� ������������ �� �������:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP ������� �� ������� %s ����������"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL �� �� ������� � ���� ������ �� evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "�� ���� �� ������������� gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "����� ��������"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "�� ���� �� ������ ��������� �����"
@@ -564,50 +600,59 @@ msgstr ""
 "�� ���� �� ������ ���� ������� �����. ���������\n"
 "���� ���� ���������� � ���� ����� ����� �� ������."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "���������� ������ �� %s (���������� %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "�������� �"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "��. ���� 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "����������� �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "��� �� � ���� �������"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "������������..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "��� �� � ���������"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(����)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "������� ����� �� ��. ����"
 
@@ -653,106 +698,59 @@ msgstr "������� ���������"
 msgid "Enable Queries (Dangerous!)"
 msgstr "������� ��������� (������!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "�� ����� �� �� ������ � LDAP �������."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"�� ���� �� �� ���������� ���� IMAP ������.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"������ ���������� ��� ���������:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP ������� �� ������� %s ����������"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL �� �� ������� � ���� ������ �� evolution)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "���� �� �����������"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr " _�������� �� ��������� ������"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "�����"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "�����"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "80%"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "�����"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "�����"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -761,8 +759,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "��������� �� ������"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "������"
@@ -855,8 +853,8 @@ msgstr "������������"
 msgid "Mappings"
 msgstr "������"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_�����"
@@ -1037,14 +1035,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1067,8 +1065,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1100,7 +1098,7 @@ msgid "Using email address"
 msgstr "���� � �����_��� �����"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1108,7 +1106,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "���_���"
 
@@ -1155,7 +1153,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1272,10 +1270,12 @@ msgstr "��������� �� ��������� �� ����� � ��������� ����� �� ��������"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "������� �� ��������� �� ����� � ��������� ����� �� ��������"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "��������"
 
@@ -1402,7 +1402,7 @@ msgstr "��������������"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "�������� �� ��������"
 
@@ -1411,7 +1411,7 @@ msgid "D_epartment:"
 msgstr "��_���"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "�������"
 
@@ -1468,11 +1468,12 @@ msgstr "����� �� ��������� _HTML mail"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "������"
 
@@ -1501,7 +1502,7 @@ msgid "_Web page address:"
 msgstr "_Web �����:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "���"
 
@@ -2007,12 +2008,11 @@ msgid "Laos"
 msgstr "����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "�����"
 
@@ -2021,7 +2021,7 @@ msgid "Lesotho"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "�������"
 
@@ -2030,12 +2030,12 @@ msgid "Liechtenstein"
 msgstr "����������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "����������"
 
@@ -2068,7 +2068,7 @@ msgid "Mali"
 msgstr "����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "�����"
 
@@ -2093,7 +2093,7 @@ msgid "Mayotte"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "�������"
 
@@ -2119,7 +2119,7 @@ msgid "Montserrat"
 msgstr "���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "������"
 
@@ -2144,7 +2144,7 @@ msgid "Nepal"
 msgstr "�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "��������"
 
@@ -2157,12 +2157,12 @@ msgid "New Caledonia"
 msgstr "���� ���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "���� ��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "���������"
 
@@ -2179,7 +2179,7 @@ msgid "Niue"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "�������"
 
@@ -2188,17 +2188,17 @@ msgid "Northern Mariana Islands"
 msgstr "��������� �������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "��������"
 
@@ -2211,7 +2211,7 @@ msgid "Palestinian Territory"
 msgstr "���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "������"
 
@@ -2220,12 +2220,12 @@ msgid "Papua New Guinea"
 msgstr "����� ���� ������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "����"
 
@@ -2238,22 +2238,22 @@ msgid "Pitcairn"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "����������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "������ ����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "�����"
 
@@ -2262,7 +2262,7 @@ msgid "Reunion"
 msgstr "�������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "�������"
 
@@ -2299,7 +2299,7 @@ msgid "Sao Tome And Principe"
 msgstr "��� ���� � ��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "��������� ������"
 
@@ -2316,17 +2316,17 @@ msgid "Sierra Leone"
 msgstr "����� �����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "��������"
 
@@ -2339,7 +2339,7 @@ msgid "Somalia"
 msgstr "�������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "���� ������"
 
@@ -2348,7 +2348,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "�������"
 
@@ -2369,7 +2369,7 @@ msgid "Sudan"
 msgstr "�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "�������"
 
@@ -2382,17 +2382,17 @@ msgid "Swaziland"
 msgstr "���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "������"
 
@@ -2430,7 +2430,7 @@ msgid "Tunisia"
 msgstr "�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "������"
 
@@ -2451,7 +2451,7 @@ msgid "Uganda"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "�������"
 
@@ -2460,7 +2460,7 @@ msgid "United Arab Emirates"
 msgstr "��������� ������� ��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "����������� ��������"
 
@@ -2469,7 +2469,7 @@ msgid "United States Minor Outlying Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "�������"
 
@@ -2482,12 +2482,12 @@ msgid "Vanuatu"
 msgstr "�������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "�������"
 
@@ -2510,12 +2510,12 @@ msgid "Western Sahara"
 msgstr "������� ������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "���������"
 
@@ -2528,26 +2528,34 @@ msgid "Zimbabwe"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"������� �� ���, �� ������\n"
+"�� �������� ���� �������?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "��������� �� �������?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "�������� �� ��������� �� � �������"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "���� ������� ���������� �� �������� ���������:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "������� ������� ���� VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�� ���� �� ������ �������� ����� �� ����: `%s'"
@@ -2574,11 +2582,11 @@ msgstr "E-����"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2714,11 +2722,11 @@ msgid "contact-list-editor"
 msgstr "�������� �� ��������"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "�������� �� ��������"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "������� ������ ���� VCard"
 
@@ -2796,21 +2804,21 @@ msgid "Error getting book view"
 msgstr "������ ��� ���������� �� %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "������ ��� ������������ �� �����"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "�������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "���������� ������"
 
@@ -2819,7 +2827,7 @@ msgid "Repository offline"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "������� ������"
 
@@ -2837,55 +2845,70 @@ msgstr "��������� �� �� �������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "����������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "������������ ��������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "������� �������������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "����� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "������ �� �� ��������� ���������?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "������ ��� �������� �� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "������ ��� �������� �� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "������ ��� ������������ �� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "������ ��� ��������� �� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "������ ��� ��������� �� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2893,22 +2916,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "�������� ��������(���/���) �"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "������ ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "���� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "���� �����"
@@ -2973,102 +2996,108 @@ msgstr "���� �������"
 msgid "Other Address"
 msgstr "���� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "������� �����"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "������� ���� VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "��� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "��� ������ � ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "����� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "�����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "���_�� �� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "�������� �� ������� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "��������� �� Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "�������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "������� ����������� �� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "����� �� ����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "������� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "�������� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3078,7 +3107,7 @@ msgstr "_����� �������"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�"
 
@@ -3086,7 +3115,7 @@ msgstr ",123,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�,�"
 
@@ -3238,7 +3267,7 @@ msgstr "������"
 msgid "Number of columns:"
 msgstr "���� ������:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "�����"
 
@@ -3248,7 +3277,7 @@ msgid "Orientation"
 msgstr "����������"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "��������"
 
@@ -3322,29 +3351,33 @@ msgstr "��������:"
 msgid "_Font..."
 msgstr "_�����..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "���������� �����"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "������"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "��������"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "�����"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "������������"
 
@@ -3387,42 +3420,34 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "������� �� ����������� �� Evolution "
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "�������� �� Evolution iTip/iMip �������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "��������� �� Evolution �� �������� �� ��������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "������� �� ������� �� ������ � Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "������� �� ����� ������� �� ��������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3434,10 +3459,22 @@ msgstr "�������� ����������� ����������"
 msgid "Factory for the alarm notification service"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "���������:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "���������:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "������ �����"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+msgid "Evolution Alarm"
+msgstr "������ �� Evolution."
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3476,7 +3513,7 @@ msgstr ""
 "�� ������� ����."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "��������"
@@ -3497,15 +3534,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "�� �������� ���� ��������� ������."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "�� ���� �� ������������� GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "�� ���� �� ������ ���������� �� �������� �����������"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3521,7 +3558,7 @@ msgstr "���������� �� ��������"
 msgid "Comment contains"
 msgstr "���������� �� ��������"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "����������"
 
@@ -3562,14 +3599,16 @@ msgstr ""
 "OAF"
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "������"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "��������������"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "��������"
 
@@ -3590,27 +3629,32 @@ msgid "W"
 msgstr "�"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "�����"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "�� � ���������"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "� �������"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "����������"
 
@@ -3625,11 +3669,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3644,12 +3689,14 @@ msgstr "��������"
 msgid "Assigned"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "��"
 
@@ -3669,62 +3716,64 @@ msgstr "������ �� �������"
 msgid "Month View"
 msgstr "����� �� �����"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "��������"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "������� ������� ����� � �������"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "������"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "������� ������� ������ �� �������"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "��������� �� �������� �� ������"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "�����"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "���� ������"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_������"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "���� �����"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "���� _�����"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "���� �����"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "�����"
@@ -3932,7 +3981,7 @@ msgstr "���������"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "��������:"
 
@@ -3961,7 +4010,7 @@ msgstr "���� �� �����"
 msgid "hour(s)"
 msgstr "���(���)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "�����(�/�)"
 
@@ -3989,79 +4038,81 @@ msgstr "30 ������"
 msgid "60 minutes"
 msgstr "60 ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "�������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "��������� �� �������� � ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "���� �� ���������� ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "���� �� ������ �� ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "�����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "����������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "�_��"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "�������� �������� �� ��������� � ����������� �� _���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "������ �� �_���:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "�_��"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "_������, ����� ���� ������ ����:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "_���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "_��"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4090,81 +4141,96 @@ msgid "Tuesday"
 msgstr "�������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "�����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "������� �������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ���� (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_���� �� ������������� ��� ��������� �� ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "���� ��������� ��� � ������� ���_����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "������ �� ������: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "_���� �� ����:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "����� ���������_�� ������ ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "��_�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "�_��������� ������:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "�������� ������� �� �_�������� �� ������� � ��������� � ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "�������_�����:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_��"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "���� �������� �� �������"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4248,40 +4314,61 @@ msgstr " (������"
 msgid "Due "
 msgstr "������"
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
 msgstr "�� ���� �� ������ ������!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "�� ���� �� ������ ������!"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "����������� �� �����"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "����� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "����� � ������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "���� ������"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "������� ����..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "�� ���� �� ������ �������� ������!"
 
@@ -4339,27 +4426,27 @@ msgstr "�������� ��:"
 msgid "Enter Delegate"
 msgstr "�������� ��������"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "�����"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "�������"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "����������"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "�������������"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "�����"
 
@@ -4406,7 +4493,7 @@ msgid "Pu_blic"
 msgstr "��������"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "������ ������� ����"
 
@@ -4428,19 +4515,19 @@ msgstr "����:"
 msgid "_Start time:"
 msgstr "������:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "��������� � �����������."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "��������� � ���� ���� ��������."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "���� ���� ���� � �� �������!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_�������� ��.."
 
@@ -4451,49 +4538,56 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "���� ���"
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* ��������� ��� �� �� �������� ������� *"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "��������� ��"
+msgid "Common Name"
+msgstr "���� ���"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "��������� ��"
+msgid "Delegated From"
+msgstr "��������� ��"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "����"
+msgid "Delegated To"
+msgstr "��������� ��"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "����"
+msgid "Language"
+msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "����"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "������"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "���"
@@ -4508,14 +4602,10 @@ msgid "_Change Organizer"
 msgstr "_����� �� �����������"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_����� ��������..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "��_�� �����������"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4704,7 +4794,7 @@ msgid "Progress"
 msgstr "�������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4716,19 +4806,19 @@ msgstr "_���������:"
 msgid "_Status:"
 msgstr "_������:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "�������"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "��������:"
 
@@ -4740,23 +4830,78 @@ msgstr "��_����� ����:"
 msgid "_Due Date:"
 msgstr "_������ ����"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "������ ��������� ������"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_������"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "������� ����..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4764,20 +4909,20 @@ msgstr "������� ����..."
 msgid "_Print..."
 msgstr "_�����..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "������"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "�������"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4785,35 +4930,36 @@ msgstr "�������"
 msgid "_Paste"
 msgstr "_�������"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "����������� �� ������"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "�������� ���� _i��������"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_������� ���� ����������"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "���_����� ���� ������ ���� ���������"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_������� ��������� ������"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "�������� �� �� �������� ������"
 
@@ -4821,47 +4967,48 @@ msgstr "�������� �� �� �������� ������"
 msgid "Alarms"
 msgstr "������"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "����������"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "���� �� �����������"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "����"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "������ ����"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "���������� �������"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "���������"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "������� ����"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "������"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "��������� �� ������"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4909,11 +5056,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -4953,7 +5102,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_������������� ����������"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "������������"
@@ -4964,7 +5113,7 @@ msgid "_Configure Pilot..."
 msgstr "������������"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "������ ����..."
 
@@ -4991,72 +5140,389 @@ msgid "Delete _All Occurrences"
 msgstr "������ ������ _�������"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "����������� GNOME Pilot �������� �� � ���������� �� ���� �������"
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "������ ��� ���������� �� %s"
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "������ �� �����: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "������ �� ������: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "������ �� ���������� ��������/����: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "������: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "���� �� �������:: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "���� �� ���������� ��������/����: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "����: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "�������� ����������: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "���������� ������: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "i���������� ����������"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "i�������� ������"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "���������� �������"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> ����, ����������� �������� ���������� � ������ �������� �������� �� "
+"������� ����."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>���</i>"
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "_������:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "�����"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "�������� ������"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "�������"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "������������ ���� �� ���� �� ���� �������!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "������ ��������:"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "��������"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "������"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "�������� ������"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "������"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "������� ���������� ��������/����"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "�������� ������� �� ������������"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "������� ���������� ����������"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> ��������� ���������� �� �����."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "���������� �� �����"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> ������� ������ ���������� �� �������."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "����������� �� �������:"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> ����� �� ���� ������� �� �������������� �����."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "���������� �� �������:"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> ����� �� ������ ���������� ���������� �� �������.."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "������ �� ���������� �� �������:"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> �������� �� ��������� �� �������."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "������� �� �����"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> �������� �������."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "���������� �� �������"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> ������� ������������ ���������."
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "���� ��������� �� �����"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> ��������� ���������� �� ��������."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "���������� �� ������"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> ������� ������ ������� � ������.."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "����������� �� ������"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> ����� �� ���� ������� ��� ������������ ������.."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "���������� �� ������"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> ����� �� ������ ���������� ���������� �� ������.."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "������ �� ���������� �� ������"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> �������� �� ��������� � ������."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "������� �� ������"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> �������� ������."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "���������� �� ������"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "���� ��������� �� ������"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> ��������� ���������� ��������/����."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "���������� ��������/����"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> ������� �� ��� ���������� �� ��������/����."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "������ ��������/����"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> �������� �� �������� ��������/����."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "������� ��������/����"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "���� ��������/���� ���������"
+
+#: calendar/gui/e-itip-control.c:1354
+msgid "The message does not appear to be properly formed"
+msgstr "������� �������� �� � ������������� ���������."
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "����������� ������� ���� ����������� ������."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "����������� �� ������� ������� �������� ���������."
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "����������� ���� ������ ������ �� ��������"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "������ �� ���� �� ���� ��������!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "������������ ����������\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "������������ ���� �� ���� �� ���� �������!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "������������� ����������"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "������ ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "������ �� ���� �� ���� ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "������ �����"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "������ �����"
@@ -5098,93 +5564,92 @@ msgstr "������ ����"
 msgid "date-start"
 msgstr "������� ����"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "������������������"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "�������"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "������������ �������"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "�� ���������"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "������������"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "�����"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "������������������"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "������ ��������"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "������������ ��������"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "�� ��������"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "���������� ��������"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "�����"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "�������"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "� �������"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
@@ -5196,63 +5661,63 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "����� �����"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "���� ����������"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_�����"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "�����_�� ���� ��������� ������"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "������� _���������"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_�������� ��������/����"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_�����������"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_������ ���� � �������"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "���_��� ���� � ���� ������"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "_������� ����"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "������� ���� � _���� ������"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "������ �� �������:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "���� �� �������:"
 
@@ -5271,17 +5736,22 @@ msgstr "�� ���� �� ������ ������ � `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "������ ������ �� ��������� �� `%s' �� �� �������"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "�� ���� �� ������ ����� � `%s'"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "���� �� �����������"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "������ ��������� ������"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "��������� �� �����"
@@ -5294,17 +5764,17 @@ msgstr "���� _�����..."
 msgid "_Delete this Appointment"
 msgstr "_������ ���� �����"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "������ ������ �� �������� �� `%s' �� �� �������"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "������ �������� � %s"
@@ -5365,19 +5835,53 @@ msgstr "��������"
 msgid "September"
 msgstr "���������"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "��������� � ���� ���� ��������."
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "������ �� ���� ������� �����������."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr "���������� �� �������"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "���������� �� ������"
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr "���������� �� �������"
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr "���������� ��������/����"
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr "���������� ����������"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "��������"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "�������� ������"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "��� ������ �� ��� ������� �� ���������."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "�� ���� �� ������ ������� �� ��������� �� ���������"
 
@@ -5566,12 +6070,45 @@ msgstr "������ ����� (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "������� ������ (%Y)"
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "������"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "������: %s"
+
+#: calendar/gui/print.c:2324
+#, c-format
+msgid "Priority: %s"
+msgstr "���������: %s"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "���������� � ��������: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "���������: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "��������:"
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "��������� ��������"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5609,8 +6146,8 @@ msgstr ""
 "\n"
 "������������ �� �� ������ �����������?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "�� �������� ���� ��������� ������."
 
@@ -5674,6 +6211,11 @@ msgstr "����� VCard ������� � ��������."
 msgid "Imports vCalendar files into Evolution"
 msgstr "����� VCard ������� � ��������."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "�������"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5767,8 +6309,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -6695,638 +7237,654 @@ msgid "Asia/Macao"
 msgstr "����/�����"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "����/�����"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "����/�������"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "����/�������"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "����/������"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "����/������"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "����/�������"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "����/�����������"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "����/����"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "����/�����"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "����/���� ���"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "����/�������"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "����/�����"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "����/����"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "����/������"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "����/����"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "����/������"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "����/�������"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "����/���������"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "����/����"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "����/������"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "����/��������"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "����/�����"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "����/�������"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "����/�������"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "����/�������"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "����/�����"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "����/���� �����"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "����/��������"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "����/�����������"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "����/������"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "����/������"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "���������/������� �������"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "���������/��������� �������"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "���������/�������� �������"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "���������/���� �����"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "��������/�������� �������"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "���������/�������"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "��������/��������"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "���������/��������"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "���������/��������"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr ""
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "���������/������"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "���������/������"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "���������/��������"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr ""
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "���������/�������"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "���������/����"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "���������/������"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "������/���������"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "������/������"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "������/�����"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "������/�������"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "������/�������"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "������/������"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "������/����������"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "������/�������"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "������/�������"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "������/��������"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "������/����������"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "������/������"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "������/���������"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "������/��������"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "������/���������"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "������/�����������"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "������/����"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "������/�������"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "������/��������"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "������/������"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "������/����������"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "������/������"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "������/�����"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "������/�����"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "������/������"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "������/�����"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "������/�������"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "������/����"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "������/�����"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "������/�����"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "������/����"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "������/���"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "������/������"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "������/��� ������"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "������/�������"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "������/����������"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "������/������"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "������/�����"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "������/��������"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "������/�����"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "������/������"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "������/�������"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "������/�����"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "������/��������"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "������/�����"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "������/������"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "������/�������"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "������/������"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "������/���������"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "������/�����"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "������� �����/������"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "�������� �����/��������� �������"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "�������� �����/�������"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr ""
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "��������/�������"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "���� �����/�����"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "���� �����/���������"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "���� �����/����"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "���� �����/��������"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "���� �����/�����"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "���� �����/�������"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "���� �����/��� ���"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "���� �����/�����"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "���� �����/�����"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "���� �����/������"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "������ �� �� ������� �� ���� �����"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr ""
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "����������� �� �� ������� �� ���� �����"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "���������� �� �� ������� �� ���� �����"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "������������ �� �� ������� �� ���� �����"
 
@@ -7337,12 +7895,12 @@ msgstr ""
 "�� ���� �� ������ ������� ����: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "�� ���� �� ������ cache ���������� %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7350,7 +7908,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7361,11 +7919,16 @@ msgstr ""
 "%s\n"
 "����������� ������� � ���� ����� ���� �� ����� ��������������."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "�������������� ��� ������"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "��������� �� ����� %s"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "��� ������ �� ��� � 'online' �� �� ��������� ���� ��������"
 
@@ -7373,57 +7936,68 @@ msgstr "��� ������ �� ��� � 'online' �� �� ��������� ���� ��������"
 msgid "Syncing folders"
 msgstr "�������������� �� �����"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "������ ��� ������ � ������: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ��� ���������� �� ������: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "�� ���� �� ������ spool �����"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "�� ���� �� �������� spool �����"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "���������� �� ��������� ����� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "�� ���� �� ������ ���������"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "������ �� ��������� %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "�������������� �� �����"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "���������� �� ��������� ����� %d �� %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "������ �� ��������� - %d �� %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "������� ��� ���������� �� �����������"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "������� ��� �������� �� ��������� %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "������� ��� �������� �� ��������� %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "������ ��� ������� �� ������: %s: %s"
@@ -7455,25 +8029,102 @@ msgstr "(���������� �� �����) ������� �������� ����� �������"
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "����������� ��������: �������� �� ��������� �� %s"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "����������� ��������: ������� �� �����: �� %s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "����������� ��������: ������� �� uids: �� %s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "�������� ���������"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "�������� �� ����������� � %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "����������."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "��������� ������� �� POP ������: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "���� ��� �� ����"
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "�� ���� �� ��������� ���� ���������: ���� ������� ���������"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "������� ��� �������� �� ��������� %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "������� ��� �������� �� ��������� %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "������� ��� ���������� �� �����������"
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "�� ���� �� ������� �����������: �� ���� �� ������ �������� ����: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7571,90 +8222,23 @@ msgstr "������ ��� ������ �� ���� ��� �������� ���� %s"
 msgid "Error copying mail temp file: %s"
 msgstr "������ ��� �������� �� ���� ��� �������� ����: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "���� �������� ������ %s ����� �� %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "���� �������� ������ ����� %s"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "�� ���� �� ������� ���� ���������: ���� ��������� ����� �� ������"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "�� ���� �� ������� ���� ���������: ���� ������"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"�� ���� �� ������� ���� ���������: �� ���� �� ������ ��������� ����� �� "
-"GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "�� ���� �� ������� ���� ���������: ���� ��������� ����� �� ��������"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"�� ���� �� ������� ���� ���������: �� ���� �� ������ ��������� ����� �� "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "�� ���� �� ������� �����������: �� ���� �� ������ �������� ����: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "�� ���� �� ��������� ���� ���������: ���� ����� ����� �� ����������"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "�� ���� �� ��������� ���� ���������: ���� ������"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"�� ���� �� ��������� ���� ���������: �� ���� �� ������ ��������� ����� �� "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "�� ���� �� ��������� ���� ���������: ���� ������� ���������"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-"�� ���� �� ����������� ���� ���������: ���� �������� ����� �� ������������"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "�� ���� �� ����������� ���� ���������: ���� ������"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"�� ���� �� ����������� ���� ���������: �� ���� �� ������ ��������� ����� �� "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "����� ������"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7670,43 +8254,6 @@ msgstr "�� ���� �� ������ %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "�� ���� �� ������ %s: ���� ������������� ��� � ������."
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s ������ %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s ������ �� %s �� %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "��������� ����������"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "�� ���� �� �� ������ ���  %s (���� %d): %s"
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(���������� ����)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "���������� ����������"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "������� ���������� �� ������: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "��������"
@@ -7812,7 +8359,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "������ ���������� �������� �������."
 
@@ -7840,11 +8387,9 @@ msgid ""
 "Password Authentication."
 msgstr "���� ����� �� �� ������ ��� ������ ��������� Kerberos 4 �� ����������"
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "������"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7871,52 +8416,52 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "������������� �� ��������� ����� ��������  %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' �� ������ �� ��������� ��� �� ����������"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' �� ������ �� ��������� ����"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' �� ������ �� ��������� ���"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "����������: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "������� ��� ������� ����� %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "��������� �� ���� ��������: %s: ����� �� � �������"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "��������� �� ���� ��������: %s: ���������� �������"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "����������: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "��������� �� ���� ��������: %s: ����� �� � �������"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "��������� �� ���� ��������: %s: ���������� �������"
@@ -7980,11 +8525,11 @@ msgstr "������� ��� ���������� �� �����������"
 msgid "Failed to verify certificates."
 msgstr "������� ��� �������� �� �����������"
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "�� ���� �� ����� �������. ������ �������� �� ���� ���������"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�� ���� �� ������ �������: ������ �������� �� ���� ���������"
 
@@ -8012,7 +8557,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8021,16 +8566,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8050,15 +8595,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "�� ���� �� ���������� URL `%s'"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "���� ������ ���������: %s � %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "���� ������ ���������: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "������� �� ���� ��������� ��� ������ �����"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8080,68 +8625,77 @@ msgstr "�� ���� �� ����������� ������� %s ������ ��������"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "�� ���� �� ����������� ������� %s ���� ������ �����"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "��� �� ���� �� �������� ��������� �� ���� ����� ������"
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "���������� ����������"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "������� ���������� �� ������: %s"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "��������� ������� �� IMAP ������: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ������� ��������: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "�������� �� ������� ������� ������ �����"
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ������� �� ������� %s ����������"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "��������� OK �� IMAP ������: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "�� ���� �� ������ ���������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "�� ���� �� ������ ��������� �� %s"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "������� � ���� ��������� � ������������ �� �������."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "�������� �� ��������� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "����������� �� � �������"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "�������� �������� ���������� �� ���� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "�������� �� ���� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "�� ���� �� ������ ������ �� ����������� � FETCH ��������."
 
@@ -8194,32 +8748,83 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "�� ������ � ��������� �� ���� �� IMAP �������"
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "������"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "���� ����� �� �� ������ � IMAP ������ ��������� ����������� ������"
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP ������ %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s ������ �� %s �� %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "��������� ����������"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "�� ���� �� �� ������ ���  %s (���� %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"�� ���� �� �� ������ � POP �����.\n"
+"������ ��������� ��� �� ���������� %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "���������� �� �� �������"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "������������ ��������"
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ������ %s �� ������� ��������� ���������� ��� %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "���� �������� �� ���������� ��� %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s���� �������� IMAP �������� �� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "��� �� ��� ������ ������."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8230,68 +8835,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "���� ������ ����� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "�� �������� ����� �� � ��������� �� ��� ��������"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "�� ���� �� ������ mailbox: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "MH-������ mail ����������"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "�� ���������� �� ������� ���� � MH-������� �������� ����������"
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "������� ������������"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "�� ���������� �� ������� ���� � ���������� mbox ���������� spools."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "�������� ������ �� ���� ��������� � INBOX"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Maildir-������ �������� ����������"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "�� ���������� �� ������� ���� � maildir ����������"
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "���������� Unix mailbox spools"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "�� ������ � ���������� �� ������� ���� � ���������� mbox spool �������"
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "���������� Unix mailbox spools"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "�� ������ � ���������� �� ������� ���� � ���������� mbox spool �������"
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8317,7 +8941,7 @@ msgstr "������� ���������� ���� � inbox"
 msgid "Local mail file %s"
 msgstr "������� mail ���� %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
@@ -8337,33 +8961,31 @@ msgstr "�� ���� �� ������ ���� � ��������� �� ����� `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "�� ���� �� ������ �������� ���� �� ����� `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "�� ���� �� ������ ��������� %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "�� ���� �� ������ ��������� ��� ���������: ���������� �������"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "�� ���� �� ������ ����������� � maildir �������: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8372,20 +8994,19 @@ msgstr ""
 "�� ���� �� ����� ���������: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "���� ������ ���������"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "������ ���������� �� ���������"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8396,13 +9017,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "������� `%s' �� ����������."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8418,7 +9039,7 @@ msgstr "`%s' �� � maildir ����������."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "�� ���� �� ������ ������� `%s': %s"
@@ -8427,8 +9048,8 @@ msgstr "�� ���� �� ������ ������� `%s': %s"
 msgid "not a maildir directory"
 msgstr "�� � maildir ����������"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -8451,45 +9072,37 @@ msgstr "�������� �� ���� ����"
 msgid "Checking for new messages"
 msgstr "�������� �� ���� ���������"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "������� �����"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "�� ���� �� ������ ��������� �� ������� %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "�� ���� �� ������ mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "���������� �������� �� ���� � ����������"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "�� ���� �� ������ ����������� � mbox �����: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8498,13 +9111,11 @@ msgstr ""
 "�� ���� �� ������ ���������  %s �� ����� %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "������� �������� �� � ������������� ���������."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "�������������� �� ����������� ��������: �������� mailbox?"
 
@@ -8547,149 +9158,149 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "������� `%s' �� � ������. �� � �������."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "�� ���� �� ������ ������� `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "������� ������ � ������ ����� �� %ld � ����� %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "�� ���� �� ������� ������� `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "�� ���� �� ������ ���� `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�� ���� �� ������ ��������� mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "����������� � ������� �� �������� ���� ���� �������������"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "������ ��� ������ � ��������� mailbox: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "�������� � ��������� mailbox ���������: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "�� ���� �� ������� ������� �������� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "�� ���� �� ������� ���������� �����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "�� ���� �� ����������� �������: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "����������� � ������� �� �������� ���� ���� �������������"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "���������� ������: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "�� ���� �� ����������� �������: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "������ ��� ������ � ��������� mailbox: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "�������� � ��������� mailbox ���������: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "�������� �������� �� MH ���������"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "�� ���� �� ������ ����������� � mh �������: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' �� � ����������."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "�� ���� �� ������ MH ����������: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "�� ���� �� ������ ����������� � spool �����: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Spool ������� �� ����� �� ����� ������������"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Spool `%s' �� ���������� ��� �� � ��������� ����"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "`%s' �� � maildir ����������."
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "������� `%s/%s' �� ����������."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool mail ���� %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Spool ������� �� ����� �� ����� ������������"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Spool ������� �� ����� �� ����� ������������"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Spool ������� �� ����� �� ���� �������"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "�� ���� �� ������������� ���������� �����: %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "�� ���� �� ������������� spool ������� `%s': %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8698,25 +9309,6 @@ msgstr ""
 "�� ���� �� ������������� spool ������� `%s': %s\n"
 "������� ���� �� � ���������, ������� � �������� � `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "�� ���� �� �����������: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Spool `%s' �� ���������� ��� �� � ��������� ����"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Mail �� %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET ������"
@@ -8725,12 +9317,22 @@ msgstr "USENET ������"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "�� ���� �� ������ ���������� %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET ������ ���� %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8833,7 +9435,7 @@ msgstr "������ ������ �� �������"
 msgid "Delete after %s day(s)"
 msgstr "������� ���� %s ���"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8858,32 +9460,22 @@ msgstr ""
 "���� ����� �� �� ������ � POP ������ ��������� ���������� ���������� APOP "
 "��������. �������� �� �� ������ �� ������ ����������� �� POP �������."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "�� ���� �� �� ������ � POP �����.\n"
 "������ ��������� ��� �� ���������� %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "���������� �� �� �������"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "������������ ��������"
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "�� ���� �� �� ������ ��� POP ������ %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8891,27 +9483,27 @@ msgstr ""
 "�� ���� �� �� ������ � POP ������.\n"
 "������������ �� ��������� ����������"
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "IMAP ������� ��������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "������/������� ������"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s ���� �������� POP3 ������ �� %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8920,13 +9512,13 @@ msgstr ""
 "�� ���� �� �� ������ � POP ������.\n"
 "������ ��������� ������ %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "���� ������ ����� `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9092,45 +9684,45 @@ msgstr ""
 msgid "Authentication required"
 msgstr "������� �������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "�� ���� �� �� ������ � POP �����.\n"
 "������ ��������� ��� �� ���������� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "������� �������� �� � ������������� ���������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH ������ �� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP ������ %s �� ������� ��������� ��� ���������� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s���� �������� SMTP �������� �� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9141,90 +9733,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP ���� ���� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "�� ���� �� ������� ���������: ��������� ����� �� ���������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "��������� �� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "�� ���� �� ������� ���������: ���� ������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "�� ���� �� ������� ���������: ���� ������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "SMTP ������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO �������� �� ������� %s: �� � �������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO ������ ������� %s: �� � �������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP �������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "������ ��� ��������� �� SASL ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH ������ �� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH �������� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "��� ������� �� ���������� �� �������.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM �� �������� ������� %s ������ �� � ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM ������ �������  %s: ������ �� � ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9232,38 +9824,38 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "������ ���������� �������� �������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET ����� ������: %s"
@@ -9337,52 +9929,52 @@ msgstr "MIME ���:"
 msgid "Suggest automatic display of attachment"
 msgstr "�������� ����������� ��������� �� ��������"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "�������� ��� �� ������� �����"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "��:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "�������-��:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "��:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "�������� ��������� �� �����������"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�������� ������ �� ���������� �� ������ ����� �� ���� ���������"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9395,7 +9987,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "�������� ����"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "�� ���� �� ������ ���������� �������� �� PGP"
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9404,34 +10001,34 @@ msgstr ""
 "������ ��� ������ �� ����: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "��������!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "����� ����������. �� �� ���������?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "������ ��� ������������ �� ����: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ ��� ����������� �� ����: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "������ ��� ������ �� ����: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "�� ���� �� ������ ��������� �� ���������"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9440,7 +10037,7 @@ msgstr ""
 "�� ���� �� ������ ��� ���� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9449,7 +10046,7 @@ msgstr ""
 "�� ���� �� ������ ���� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9458,7 +10055,7 @@ msgstr ""
 "������ ��� ������������� ��������� �� ����: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9466,7 +10063,7 @@ msgstr ""
 "Ximian Evolution ������ ���������� ������� �� ���������� �����.\n"
 "������ �� �� �� ������ �� �� ����������?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9476,34 +10073,60 @@ msgstr ""
 "\n"
 "������ �� �� �������� ���������?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "��������������: ������������ ���������"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "������ ����"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "������ ����"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "������� ���������"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (�� ������������)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "������ ���������"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9562,7 +10185,7 @@ msgstr "������ �������"
 msgid "Subject does not contain"
 msgstr "������ ���������"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9707,7 +10330,7 @@ msgstr "���"
 msgid "minute"
 msgstr "������"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "�������"
 
@@ -9776,7 +10399,7 @@ msgstr " �����"
 msgid "ago"
 msgstr "�����"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9788,6 +10411,21 @@ msgstr "<��������� ��� �� �� �������� ����>"
 msgid "Filter Rules"
 msgstr "������� �� ����������"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "��� �� ����:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Spool `%s' �� ���������� ��� �� � ��������� ����"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "������ ��������:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9806,7 +10444,7 @@ msgstr ""
 "����, ������� �� � ������� ������� ����� �� ������."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "������ �����"
 
@@ -9819,7 +10457,11 @@ msgstr ""
 "������ � ��������� ����� '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "����"
 
@@ -9849,7 +10491,7 @@ msgstr "��� ������ �������� �� ���������"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "��� ����� �� ���������� � ��������"
 
 #: filter/filter-rule.c:780
@@ -9927,194 +10569,204 @@ msgid "Beep"
 msgstr "�����"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "��������"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "������� � �����"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "�������� �� ����"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "��������� �� ����"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "�� �������"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "�� �������� �"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "�� ����������"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "�� ����� ����"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "�� ������� �"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "�� ����������"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "�������� �"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "�����"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "�����"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "�"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "���� ����"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "���� �����"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "� ��-������ ��"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "� �� ����� ��"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "�� �"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "������"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "�������� ������t"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "���� �� ���������"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "�������� �� ���������"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "�������� � �����"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "������ ����:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "�������� ��"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "��������:"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "������ ������"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "������ (��)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "����� ����"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "���������� ��������"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "������� �"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "�������� �����������"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "����"
 
@@ -10169,7 +10821,8 @@ msgid "Scanning %s"
 msgstr "������� �� \"%s\""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "����"
 
@@ -10185,10 +10838,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "������� �����"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10238,7 +10887,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution ��������� ������ ����� ���� �� Netscape"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "�����"
 
@@ -10374,31 +11025,31 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "����� ��������� ����"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "��������� �����"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "����� �� ��������� �����"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "���� ����� �� ���� �� ������� ���������."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "��������..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "������� ����������� �� ���� �����"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10406,238 +11057,246 @@ msgstr ""
 "����� �� ������ ��������� �� ������ ��������� ���������, ���� ��������� ���� "
 "������ � �����."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "�� �� ������� ������ �� ��������� �� ����"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "��������������: ������������ ���������"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "���� _Mail ���������"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_�������� ���������"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "�� ���� �� ������������� mail ����������� �� Evolution �� �������������."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution �� ����."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "��������� ��� �������..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "�� ���� �� ����������� ����������� ��� shell"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "�������� �� \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "��������"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "�� ���� �� ������ �������� ����������: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d ���"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d �����"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr " %d �������"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr " %d �����������"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr " %d ���������"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d ����"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "������� ��������� _����� �� ���������"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "VFolder ����� _����"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "_v����� �� ��������"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "v_����� �� ����������"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "������ ����� _Mailing List"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "������ ����� �_���"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "������ ����� ��_������"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "������ ����� ��_��������"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "������ ����� Mailing _List"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "���������� ���� ���� ���������..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "�����"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "�������� �� ��������"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "�������� �� �������"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "�������� �� ������"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "��������"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "����������"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "�������"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "��������: ���������"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "��������: �����������"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "������� ���� �_����"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "�������� ���� ��_�����"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "���������� �������"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "�������� � �����..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "������� � �����..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "������"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "������ �������� � ��������� �����"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "������� ������"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "������ ������� �� �����������"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "������ �� �������� ������"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "������ �� �������� ������ (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "������ �� �������� ������ (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "�� ������������"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "��������� ���������� �� �����"
 
@@ -10694,7 +11353,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "��� �� ��� ��������� ����� ������ �� ������������ ����������."
 
@@ -10704,83 +11363,107 @@ msgid "Evolution News Editor"
 msgstr "Evolution - �������� �� ������"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "�������� �� ������� � Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_����:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "_������������ ���:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_���:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "�����"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "��� �� ���� �� ����� ��� ��������� � ���� ���."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "������� �� ���, �� ������ �� �������� ���� ������?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "�� ��������"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "������������ �� �� ������ �������?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "�������"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "���������"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "������� �� ���, �� ������ �� �������� ���� ������?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "��������"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "������������� ���:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "������ ����"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, c-format
+msgid "Mail to %s"
+msgstr "Mail �� %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "������ � %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Mail �� %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "%s �������� ������"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "������ ������� �� ������"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10792,7 +11475,7 @@ msgstr ""
 "���������� ��� ������ ����.\n"
 "������ �� �� �� ������������� ����?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10800,7 +11483,7 @@ msgstr ""
 "���������� � �� ������������� ����������\n"
 "����� �� ��������� ����."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10809,7 +11492,7 @@ msgstr ""
 "����� �� ��������� ����."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10817,11 +11500,11 @@ msgstr ""
 "��� ��������� HTML-����������� ���������, �� �������� ���������� �� ����� "
 "HTML ����������� ����:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "������� ������� ����?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10829,32 +11512,32 @@ msgstr ""
 "����������� ���� ����.\n"
 "�������� �� �� �� �������?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "���� ��������� ������� ���� Bcc ���������."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "������ �� ������� ���������(�) �� �� ���� �� ��������� �����������."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "������ �� ������������� ������ account �� �� ���� �� ��������� ����."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10862,28 +11545,28 @@ msgstr ""
 "�� ���� �� ������ ������� ������� �� ���� ������.\n"
 "������ �� �� ���������� ������������ ��?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "���������� ��������"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "�� %a, %Y-%m-%d � %H:%M, %%s ������:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "�������� ��������(���/���) �"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "������� ��������(���/���) �"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������� �� ���, �� ������ �� ����������� ������ %d ���������?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10891,7 +11574,7 @@ msgstr ""
 "������ �� ����������� ���� ��������� ��������\n"
 "� ������� Drafts."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10899,39 +11582,39 @@ msgstr ""
 "������ �� ��������� ������ ���� ��������� ��������\n"
 "� ������� Sent."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������� �� ���, �� ������ �� ���������� �������� %d ���������?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "���� ������� ���������"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "������������ �� ����?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "������� ���������� ����������� ���������"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10944,7 +11627,7 @@ msgstr ""
 "\n"
 "������������ �� �� ������ �����������?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10953,33 +11636,69 @@ msgstr ""
 "������ ��� ��������� ������������ �� �������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "������"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "���������� �� ��������� ����� %d �� %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "��������� �����������"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-�����"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "������������� ���������"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "������� �� ���, �� ������ �� �������� ������ %d ��������� � ������� ��������?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "���� ��������"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "���������� �������"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "�������"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "������ ��������"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "������� ���������"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11032,195 +11751,177 @@ msgstr ""
 "���� ��� �� ���� ������������� ���� �� ���������."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "�������� �� Evolution �� �������"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "����"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "������"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "����"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "����"
 
-#: mail/mail-config.c:2458
+#: mail/mail-config.c:625
 #, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"�� ���� �� ������ inbox �� ��������� �� ���� ����:\n"
-"%s\n"
-"���� �� ���� ���������� ���������."
+msgid "Account %d"
+msgstr "������ %d"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "��������� ����������"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "��������� ��� �������..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "���������� �������"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr " C"
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "_����������"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "���"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _�������� �� ��������� ������"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL �� �� ������� � ���� ������ �� evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL �� �� ������� � ���� ������ �� evolution)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "_������ �� ������������ ��� ��������� �� ���������� ����"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "������ %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Account ����������"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "�������� �� ������"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "�������� ����������"
+msgid "Add Sc_ript"
+msgstr "������ ��������"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "��������"
+msgid "Add new signature..."
+msgstr "������� ���������"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_������ �� ������������ ��� ��������� �� ���������� ����"
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "�������"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "������ _�������� ����������� ���� ��� ���������� �� ���� ������"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "������"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "�������� ���� ��� �����������"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "�������������"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_����������� �������� �� ��� email"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "���������� ������ �������: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_�������"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "�������� �� ��� email"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "���� �� ������ �� ����"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "������ ���������"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "������������"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11236,56 +11937,47 @@ msgstr ""
 "\n"
 "�������� �� \"�������\" �� �� �������� �����������."
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "����"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "�� ������������"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "��� �����"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "������������ �� ������ �������:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "���������� �� ������"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "������ IDs..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "�� ���� �� ������ ���������"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "����� _������"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "���_�����"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11306,40 +11998,35 @@ msgstr "����� �� ��. ����"
 msgid "Empty _trash folders on exit"
 msgstr "_�������� ������� ��� ��������"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "��������� ��������"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "�������� �"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "���������� ���������"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "�������� ������ ID..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_����������� �������� �"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "��������"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11393,68 +12080,64 @@ msgstr "����������"
 msgid "NNTP Server:"
 msgstr "NNTP ������:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Mail ������������"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "������"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "���������� ����������"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "��������_���:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _���� ID:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "���� ������ �� ������� ���� ���� � ���������� � ������ _Bcc"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "PGP"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "��������� ��������� ����������"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "�������� ���������� Qmail"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "�� ���� �� ������ ���������"
 
-#: mail/mail-config.glade.h:93
-msgid "Quoted"
-msgstr ""
-
 #: mail/mail-config.glade.h:95
-msgid "Randomized"
+msgid "Quoted"
 msgstr ""
 
 #: mail/mail-config.glade.h:96
@@ -11490,117 +12173,121 @@ msgid "S_ecurity"
 msgstr "���������"
 
 #: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "������� MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "������ PGP ��������"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "���� � ������:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "������� ������ ���������"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "��������� �� Email"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "������ _����� ��� ���������:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "������� � ������� ���������"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "�������� ������� ���_�������"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "������ ������������"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "��� �_�����:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "������� ���������"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "������� ���������"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "�������� �� ����������"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "��� �� ����:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "���������� Unix mbox"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "_HTML ���������:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11610,145 +12297,138 @@ msgstr ""
 "\n"
 "�������� �� \"�������\" �� �� ���������."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_���� � ������:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "_������ ������� �� ������� �������� �� �������"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "�_����� �������� ���������� ��������� ������ �������� ���� ������"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "��� �� ����������_���:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "��� �� ����������_���:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "_����������� �������� �� ��� email"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_����������� �������� �� ��� email"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_������������ ID:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "������������� ��� ����������� �� �����"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "_HTML ���������:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "�� ������������"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "��� �� ����:"
+msgid "_Enable"
+msgstr "���������"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "�������� ����"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "_����� ���:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "� HTML ����"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "_HTML ���������:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "����"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_������� �������� ��� ��������� � � ��������� �����"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "����� ���� ��� ����������� �� ������"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "������_�� ����������� ���� \"���������\" ����:"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_���:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_������ �� ������� �������� �� �������"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "_PGP ��� �� ��������:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "���� ��� ��������� �� HTML ��������� �� �������� ����� �� � �����"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "���� ��_� ��������� �� ���� ��� ����"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "�����"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11789,69 +12469,52 @@ msgstr "_���� � ������:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "_HTML ���������:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "������� ���������� ������ (_SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_�����"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " ����"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "�������� �� ������ 1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "�� ���� �� ������ ���������� �������� �� PGP"
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "�� ���� �� ������ �������� �� �������� �� PGP"
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "�� ���� �� ������ ��������� �������� �� PGP"
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "�� ���� �� ������ PGP ����������� ��������."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "�� ���� �� ������ ���������� �������� �� S/MIME"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "�� ���� �� ������ S/MIME ��������� ��������."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "�� ���� �� ������ ��������� �������� �� S/MIME"
 
@@ -11894,127 +12557,168 @@ msgstr "������ Viewer"
 msgid "Loading message content"
 msgstr "�������� ������������� �� �����������"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "�_��������� ������:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "_������ �������� � �������"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "������ ��������������� �� ��������"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "������� ��������� ���� (FIXME)"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "������� �������� ����..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s ��������"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "�� ���� �� ���������� MIME ���������. �������� �� � ������� ���."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "������ �����"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "��"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "�������-��"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "��"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "�������� ��������: "
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "������� ����������� ����..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
+"������ ����������."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "�� ���� �� ������ �������� �� �������� �� PGP"
+
+#: mail/mail-format.c:1868
+#, fuzzy
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+"���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
+"������ ����������."
+
+#: mail/mail-format.c:1876
+#, fuzzy
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
+"������ ����������."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "�������� ��� FTP ���� (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "�������� ��� ������� ���� (%s) ������� �� ����� \"%s\""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "�������� ��� ������� ���� (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "�������� ��� ���������� ����� (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "�������� ��� ���������� ������ ����� (\"%s\" type)"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "������� �����"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "��������������� �� �����"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�� ���� �� ����� ���� ���������� � ����� %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�������� ����� \"%s\" � \"%s\" ������"
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s �� ���� �� ���� ���������������� ������ �� � ������� �����"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12022,11 +12726,11 @@ msgstr ""
 "��� �� ���� ������ �� �������� ���� mailbox,\n"
 "���������� � �� �� ��������� �����."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "��� �� ���� �� ��������� ������� �� ��������� �����."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "������������� /%s"
@@ -12084,81 +12788,73 @@ msgstr "������ �� ��������� %d �� %d"
 msgid "Complete."
 msgstr "����������."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "������� ����������� � �����"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "�������� �������� � %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "�������� �� ����������� � %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "�����������"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "��������"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "��������� �� ����� � \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "���������� ���������"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "�������� �� ����� %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "������ ��������� %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "�������� ����� %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "��������� �� ����� %s"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "���������� �� �����"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "��������� �� �����"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "��������� ��������� %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "��������� %d ���������"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "����������� �� %d ���������"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12167,7 +12863,7 @@ msgstr ""
 "�� ���� �� ������ ������� ����: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12176,11 +12872,11 @@ msgstr ""
 "������ ��� ��������� �� ��������� �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "�������� ���������"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12189,27 +12885,27 @@ msgstr ""
 "�� ���� �� ������ ������� ����: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�� ���� �� ������ �������: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "���������� �� %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "������ ������ � %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "�������"
 
@@ -12280,10 +12976,6 @@ msgstr "���������� ..."
 msgid "Waiting..."
 msgstr "��������� ..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "����������."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "����������� �������� ����������."
@@ -12297,16 +12989,16 @@ msgstr "���������� ������ �� %s"
 msgid "Enter Password"
 msgstr "���������� ������"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "�� ���� �� ������ ���������� ����."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "������� ���������"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12316,10 +13008,30 @@ msgstr ""
 "\n"
 "������ �� �� �������� ���������?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "���:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "���� � ������:"
+msgid "Signature hint"
+msgstr "������� ���������"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "HTML ���������� ����"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12334,17 +13046,17 @@ msgstr "���������� ���������"
 msgid "Forwarded Message"
 msgstr "���������� ���������"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "��������� �� v����� %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "���������� �� v����� �� uri: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12353,89 +13065,94 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "VFolders"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "v�����"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "���������� V�����"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "���� �� ����������� �� v����� '%s' ����� �� ����������."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "��� VFolder"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(���� ����)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - ���������"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "������������"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "����������"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "����������"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "��������� �������� ���������"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "��������� ���������"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "��� ����"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "�����"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "�� ����"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "��� ����"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "����� %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "��������� ������ �� �����������"
 
@@ -12458,10 +13175,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "���������� �������:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "��������"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "������"
 
@@ -17173,5232 +17895,5229 @@ msgstr ""
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "������"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "�� �����"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr ""
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "�� ���"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr ""
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr ""
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr ""
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr ""
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr ""
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr ""
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr ""
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr ""
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr ""
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr ""
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr ""
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "����"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr ""
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "������"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "������/����"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "������/�������"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "������/������"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr ""
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "��� ������"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "��� �������"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "������"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr ""
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "������"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr ""
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "������"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr ""
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "������"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr ""
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "������ (�������)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "������"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr ""
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr ""
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr ""
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "������"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr ""
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr ""
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "������"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "������"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr ""
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr ""
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr ""
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "������"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "��� ��������"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "������"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "������"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr ""
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "������"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "������"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "������"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "������ ���������"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr ""
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr ""
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr ""
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr ""
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr ""
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr ""
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "������"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "������"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "������-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "������"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr ""
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "������ �����"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr ""
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "������/������"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "������/��������"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr ""
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "������"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "������"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "���������� ����"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "���������� [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "���������� [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "������"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "���"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr ""
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr ""
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr ""
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "������"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr ""
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "����� ��������"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "����� ��������"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "����������/�������"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr ""
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "������� �������"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr ""
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "������ ����������"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "������ �����������"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "������"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "�������� ������"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "����"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr ""
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "������"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "������"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "������"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "������"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr ""
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr ""
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr ""
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr ""
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "�� ������"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr ""
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "�� ������"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "�� �������"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "�� �������"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "�� ������� NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "������"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr ""
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "�� ����"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "�� ���� - ������ ������"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "������� �������"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr ""
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr ""
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "���"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr ""
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr ""
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr ""
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "������� ��������"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr ""
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "������� ������"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr ""
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr ""
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr ""
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "���� ������"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "������"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr ""
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "������"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Odesa"
 msgstr "������"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr ""
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "������ �������"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "������ ���"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "�������� ����"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "����"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "����"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr ""
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "����"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr ""
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "������"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "������"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "����"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr ""
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "������"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr ""
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "����� �� �������"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "������"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "���� ������"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "������ ����"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr ""
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "����"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "�����/���� �� ���"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "�����/�� �����"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "�����/����"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "������"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr ""
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr ""
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr ""
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr ""
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "������"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "����"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "����"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "�������������-��������"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "������"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "������"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "������"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr ""
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr ""
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "������"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "����-�-�����"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "���� ��������"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr ""
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "����� �����"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "��� ����"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "������"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "������"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr ""
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "������"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "������"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "������ �����"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "������ �������"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "����"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "����� ����"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "����� �����"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr ""
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "������"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "������ ����"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "������"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "������"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "������"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "������ ��������"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "������"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "����"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "������"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr ""
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr ""
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr ""
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr ""
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr ""
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "����"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "������"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "��� ������"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "������"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "������"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "����"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "������"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "���/��������"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "���/��������"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "���/����"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "������"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "����"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "������ �� ���"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "������"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr ""
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "������"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "������"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "������"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "������ (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "���� ���� ����"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "������"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "������"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "��� ������"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "��� �������"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "��� ������"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr ""
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "��� ����� - �������"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "��� ����� - ���������"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "��� ���������"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr ""
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr ""
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "����-���������"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "��� ��������"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "��� ���������"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "����� ���"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "����� ����"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "����� ��"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "����� �����"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "����� ����"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "������� �� ����"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "������"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr ""
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "������"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr ""
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "������������ ������ ����"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr ""
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "������"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr ""
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr ""
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "������"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "������ ����"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "������"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr ""
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "������"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr ""
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "������"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr ""
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr ""
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr ""
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "������"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "����"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "������"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr ""
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr ""
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "���� ��������"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "���� ������"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr ""
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "������"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "���������/����"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr ""
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "�������� (�������)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "�������� (�����)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "���� ����"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "���� ���������"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "������"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 #, fuzzy
 msgid "Sympheropol"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "������"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "������"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "����"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "������"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "������ ���������"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "������"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "�����"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "�����"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "������"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "������"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "������"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "����"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "������"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "������"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "������"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr ""
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr ""
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "������"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "������"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr " "
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "����� ������ �� �����������"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "����� ������������ ������"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "����� ���� ������������ ������"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "������"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "������"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "������"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "������"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "������/������"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "����"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "������"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "������ ������"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "������"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr ""
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr ""
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "������"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "������ ������"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "������"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr ""
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "������"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr ""
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "������"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr ""
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "���"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "��������� ������� ��������"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr ""
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "���"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 #, fuzzy
 msgid "Uzhgorod"
 msgstr "������/�������"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr ""
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "������ 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "���"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "������"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr ""
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "������"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "����"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "������"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "�������� ����������"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr ""
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "������"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr ""
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr ""
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr ""
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "������� �������"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "������� ���� ����"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "������� ��������"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr ""
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr ""
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr ""
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "������"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "������"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "������ �������"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "������������"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "����"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "������"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "���� ������"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "�����"
 
@@ -22426,17 +23145,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "���� ��������"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "��������� �� ����"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "VFolders"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "������� �����"
 
@@ -22445,56 +23159,46 @@ msgstr "������� �����"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com ���� �� ����"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "����� �� ����"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "������ �������� �� ������"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�������� URL �� ��������� �� ������ ����� ������ �� ��������"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "���:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "������ ��� ����������� �� RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "������"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
+msgid "Add"
 msgstr "�_�����"
 
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "�����"
-
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "������"
@@ -22535,10 +23239,42 @@ msgstr "����� �� ���������"
 msgid "Printing of Summary failed"
 msgstr "�������� ���������� �� ��������"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "������"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "��./�."
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "���� �.��."
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "����"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "���������"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "���� ����"
@@ -23690,100 +24426,106 @@ msgid "C_elsius"
 msgstr "������"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "������ ��������� �� ������:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "����� ��� �� ������� ��������� ������������?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "����. ���� ���������:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "��������� �� �������� �� ������"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "���� �����"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "_���� �������"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "����� �� �_��������� (�������):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "����� �� ����_������ (�������):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "��_����� ������� ��� �� �����"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "������ ������ ��������"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "������ �������� ������"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "������ ������������� �:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "������"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "�������������� ���������"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_���������"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_��� ����"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_����"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_���� ���"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_�����"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "������� �� ����������� �� Evolution "
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "��������� �����"
+msgid "Folder Settings"
+msgstr "��������� �� ����"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Shell �� Evolution"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -23794,6 +24536,37 @@ msgstr "������� �������"
 msgid "Cancel Operation"
 msgstr "�������� ����������"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"�� ���� �� ��������� �����:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "������ �����"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "�������"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Outbox"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "�������"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "���������� �� Evolution"
@@ -23904,6 +24677,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "�������� �� ��� ��"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "���� �� �����������"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "��������� �����"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "��������� �����"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "��������� �����"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "���� �� �����������"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -23933,20 +24731,20 @@ msgstr "�� ���� �� �������� ����� � ���� �� ������� ��������."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "������� ����� �� �������� �� ����� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "������� �����"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "������� ����� �� �� ���������� � ��� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "�������� �����"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23955,18 +24753,19 @@ msgstr ""
 "�� ���� �� ������ �������:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "������ \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "������� �� ���, �� ������ �� �������� ����� \"%s\"?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"�� ���� �� ������ �������:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23975,16 +24774,16 @@ msgstr ""
 "�� ���� �� ����������� �������:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "����������� ������� \"%s\" ��:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "����������� �����"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24003,7 +24802,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - ������ ���� �����"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -24011,7 +24810,7 @@ msgstr ""
 "���� �� ��������� ����� �� � �������\n"
 "�� ��������� ��������."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "���..."
 
@@ -24063,21 +24862,26 @@ msgstr ""
 "���������� %s\n"
 "���������� ����� %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "������ �����"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "������ `%s' �� ����������."
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "������ � Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "��� ���� �� ����������� ���� ������� �����"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24086,11 +24890,11 @@ msgstr ""
 "���� �������� ����� �� �������\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "���������"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24099,17 +24903,17 @@ msgstr ""
 "���������� %s.\n"
 "��������� %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "������ ��� ���������� �� %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "������ ��� ����������� �� %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24118,31 +24922,31 @@ msgstr ""
 "���������� %s\n"
 "���������� ����� 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "�����������"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "��� �� ����:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "������ ����"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "��� �� ����:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "������ �� ����� � ��������� �� ����� ��������"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "������ �� �������� ����"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24150,31 +24954,78 @@ msgstr ""
 "����, ���������...\n"
 "�������� �� ������������ ���������"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "�������� ������������ �����������"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "�� %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "������ �����"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "����� �� ���������� ����� �� ����������� �� ���� �����"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "������"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "�������� ��������..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"������ ��� '%s':\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "�������������� �� �����"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "�������� "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "�������� �� ����� %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "�������� �� ����� %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "������ � %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"�� ���� �� ������ ��������� �����:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -24188,8 +25039,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution.\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "���"
@@ -24210,43 +25061,43 @@ msgstr "����� �� ����� �� ���� �� ������� ������"
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' � '..' �� �������� ����� �� �����."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy �� ���� ������ � $PATH."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy �� ���� �� ���� ���������."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "������� Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "����� � �����..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "����� �� ����� ����� ������ �� ��������"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "������ ���� ���������"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "�������� ������� �� ����� ������ �� ���� �����������:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "������ � 'O_nline' "
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "������ � '_Offline'"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "������ � 'Offline'"
 
@@ -24281,7 +25132,7 @@ msgstr ""
 "Evolution  � ������� � 'offline.' �������� �� ���� ����� �� �� �� "
 "����������� �� 'online'."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24293,12 +25144,12 @@ msgstr ""
 "�������� �� ���������� �� ��������� �:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�� ���� �� ������� ��������� ��������� -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24310,23 +25161,19 @@ msgstr ""
 "�������������\n"
 "�� �� �������� ������ �� ������� ������."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "������ ���������"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "�� ���� �� ����������� � OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "����������������� ���� ����� �� � ��������"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "�������� ������"
 
@@ -24351,95 +25198,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "�� ��������"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "���������� ����� ���������"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "���������� ��������� ����� ��������� ��:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "����� �����"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "������� ��������� ���� ����� �����"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "��_���� �����"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "������� ��������� ���� ������ �����"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_���� �����..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "������� ���� ����� ���������"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "�_������� ���� �����..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "�������� ���� ����� ���������"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "�_��������� ���� �����..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "���������� ���� ����� ���������"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "�_����� ������� � ���������"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "������ ������� � ���������"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "���������� ���������"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "���������� ��������� ��������� ��:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "������ ������� �������� � ���� ���������"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "_������ � ��� ��������"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "������ ����� �������� � ���� ��������� � ��� ��������"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_����������"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "����������� ���� ���������"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "��_������"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "������� ���� ��������� �� ������� � ���������"
 
@@ -24451,10 +25298,6 @@ msgstr "������ ��� ��������� �� ���������."
 msgid "Shortcuts"
 msgstr "���������"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Inbox"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -24518,10 +25361,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ����������)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<��������� ��� �� �� �������� �����>"
 
@@ -24562,67 +25406,67 @@ msgstr ""
 "�������� �� ���������� �� ��������� �:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "������ � CORBA"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "���������"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "������ ��������"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "���� ��� ����������"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "���� ���������"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "�� � �������"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "���������� ���"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "����������� �����"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "����������� ��������"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "�������� ������"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "�����������"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "������ URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "��� ��������"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "���� �����"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "������� ���������� � �����"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "��� �� ����:"
@@ -24752,49 +25596,81 @@ msgstr "�� �� ����� ������"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution �� ���� �� ��������� ����� �� �������� �������:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ���� ������..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "������� Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "�� �� ����� ������"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "����� ������ �� Ximian Evolution shell."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "�� ���� �� ������������� Ximian Evolution shell: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "��������� 'splash' �����"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "�������� ������"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "�������� ������������ �����������"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "������� ������ �� ������ �� ������ ���������� ��� ����."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "�� ���� �� ������������� ��������� ���������� �� Bonobo"
 
@@ -24908,11 +25784,11 @@ msgstr "�������� �����"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_��������"
 
@@ -25034,8 +25910,8 @@ msgstr "������� ���� �����"
 msgid "Delete this item"
 msgstr "��������� �� ���� �����"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "������ ����� � �����������"
 
@@ -25075,7 +25951,7 @@ msgstr "������� ���� ����� �� �����"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_����"
 
@@ -25140,19 +26016,19 @@ msgstr "�������� ���� _i��������"
 msgid "Forward this item via email"
 msgstr "�������� ���� ��������� ���� ��. ����"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "�������� ���������� ���������� �� �����"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "�������_� �����"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "���� �� _�����"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "���������� ����� �� ���� ������"
 
@@ -25160,10 +26036,6 @@ msgstr "���������� ����� �� ���� ������"
 msgid "Customise My Evolution"
 msgstr "�������� �� ��� Evolution..."
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "���������"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "�������� �������� �������� ��������"
@@ -25318,7 +26190,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr "_���������"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "�����"
 
@@ -25732,7 +26604,7 @@ msgstr "�������� ���������"
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "���_��������"
 
@@ -25747,12 +26619,12 @@ msgstr "������� ���� ��������"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "�������"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_������"
 
@@ -25939,7 +26811,7 @@ msgstr "_������..."
 msgid "_Reply-To Field"
 msgstr "�������-�� ����"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_�����"
 
@@ -26088,111 +26960,120 @@ msgid "Move this folder to another place"
 msgstr "�������� ���� ����� �������"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "������ ���� �����..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "������ � ��� ��������"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "������ ���� ����� � ���� ��������"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "��������� / ����������"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "������� �������� �� ���� � �������� ����"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "������ ���������� �� Ximian ��������"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "������� ������ �� ������"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "������� ������ �� ������"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "������� ������ �� ������ ���� ��� ����"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "���������"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "��������� ����������� �� ������ � �������"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "��������� ����������� �� ������ � ������������"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "��������� ������ ��/��-����"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "������ ��������� �����"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "������� Ximian ��������..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "�������..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "����� � �����"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "����� � �����..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "�����..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "��������..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "���"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "���� �����"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "��������� �� Pilot..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "�����������..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "��������� / ����������"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "���������"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "����� � ����������"
 
@@ -26277,21 +27158,21 @@ msgstr ""
 "�������� ��������� ����.\n"
 "����� ����� ��������."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_����� �������"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "_����� �������"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "������ ��������"
 
@@ -26413,16 +27294,21 @@ msgstr "�������� �� �������"
 msgid "Save Search"
 msgstr "������ �������"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "������ �������"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "������ � ���������� ��������"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "������������..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "����������"
@@ -26444,21 +27330,21 @@ msgstr "���������"
 msgid "Don't show this message again."
 msgstr "�� �������� ���� ��������� ������."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "������ ����"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "�������"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "�������"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "������ ����"
 
@@ -26484,372 +27370,207 @@ msgstr "init_corba(): �� ���� �� ������������� GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 
-#~ msgid "Other Contacts"
-#~ msgstr "����� ��������"
-
-#~ msgid "(none)"
-#~ msgstr "(����)"
-
 #, fuzzy
-#~ msgid "&lt;- _Remove"
-#~ msgstr "�����"
+#~ msgid "Addressbook Settings"
+#~ msgstr "��������� �� ������"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#, fuzzy
+#~ msgid "Could not query for schema information"
 #~ msgstr ""
-#~ "������� �� ���, �� ������\n"
-#~ "�� �������� ���� �������?"
-
-#~ msgid "Starting:"
-#~ msgstr "���������:"
+#~ "������ ���������� ��� ���������:\n"
+#~ "%s"
 
-#~ msgid "Ending:"
-#~ msgstr "���������:"
+#~ msgid "Sta_rt of day:"
+#~ msgstr "������ �� �_���:"
 
-#~ msgid "Evolution Alarm"
-#~ msgstr "������ �� Evolution."
+#~ msgid "_End of day:"
+#~ msgstr "_���� �� ����:"
 
-#~ msgid "0%"
-#~ msgstr "0%"
+#~ msgid "_Other Organizer"
+#~ msgstr "��_�� �����������"
 
-#~ msgid "10%"
-#~ msgstr "10%"
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "���� �������� ������ %s ����� �� %s"
 
-#~ msgid "20%"
-#~ msgstr "20%"
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "���� �������� ������ ����� %s"
 
-#~ msgid "30%"
-#~ msgstr "30%"
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "�� ���� �� ������� ���� ���������: ���� ��������� ����� �� ������"
 
-#~ msgid "40%"
-#~ msgstr "40%"
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "�� ���� �� ������� ���� ���������: ���� ������"
 
-#~ msgid "50%"
-#~ msgstr "50%"
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "�� ���� �� ������� ���� ���������: �� ���� �� ������ ��������� ����� �� "
+#~ "GPG/PGP: %s"
 
-#~ msgid "60%"
-#~ msgstr "60%"
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "�� ���� �� ������� ���� ���������: ���� ��������� ����� �� ��������"
 
-#~ msgid "70%"
-#~ msgstr "70%"
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "�� ���� �� ������� ���� ���������: �� ���� �� ������ ��������� ����� �� "
+#~ "GPG/PGP: %s"
 
-#~ msgid "80%"
-#~ msgstr "80%"
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "�� ���� �� ��������� ���� ���������: ���� ����� ����� �� ����������"
 
-#~ msgid "90%"
-#~ msgstr "90%"
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "�� ���� �� ��������� ���� ���������: ���� ������"
 
-#~ msgid "100%"
-#~ msgstr "100%"
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "�� ���� �� ��������� ���� ���������: �� ���� �� ������ ��������� ����� �� "
+#~ "GPG/PGP: %s"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "������ �� �����: <b>"
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "�� ���� �� ����������� ���� ���������: ���� �������� ����� �� ������������"
 
-#~ msgid "Task begins: <b>"
-#~ msgstr "������ �� ������: <b>"
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "�� ���� �� ����������� ���� ���������: ���� ������"
 
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "������ �� ���������� ��������/����: <b>"
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "�� ���� �� ����������� ���� ���������: �� ���� �� ������ ��������� ����� "
+#~ "�� GPG/PGP: %s"
 
-#~ msgid "Begins: <b>"
-#~ msgstr "������: <b>"
+#~ msgid "%s server %s"
+#~ msgstr "%s ������ %s"
 
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "���� �� �������:: <b>"
+#~ msgid "(unknown host)"
+#~ msgstr "(���������� ����)"
 
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "���� �� ���������� ��������/����: <b>"
+#~ msgid "No such message: %s"
+#~ msgstr "���� ������ ���������: %s"
 
-#~ msgid "Ends: <b>"
-#~ msgstr "����: <b>"
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "��� �� ���� �� �������� ��������� �� ���� ����� ������"
 
-#~ msgid "Task Completed: <b>"
-#~ msgstr "�������� ����������: <b>"
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "�� ���� �� ������ ����������� � spool �����: %s: %s"
 
-#~ msgid "Task Due: <b>"
-#~ msgstr "���������� ������: <b>"
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "�� ���� �� �����������: %s: %s"
 
-#~ msgid "iCalendar Information"
-#~ msgstr "i���������� ����������"
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Spool `%s' �� ���������� ��� �� � ��������� ����"
 
-#~ msgid "iCalendar Error"
-#~ msgstr "i�������� ������"
+#, fuzzy
+#~ msgid "Mail tree %s"
+#~ msgstr "Mail �� %s"
 
-#~ msgid "An unknown person"
-#~ msgstr "���������� �������"
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "�����"
 
 #~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
 #~ msgstr ""
-#~ "<br> ����, ����������� �������� ���������� � ������ �������� �������� �� "
-#~ "������� ����."
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>���</i>"
+#~ "�� ���� �� ������ inbox �� ��������� �� ���� ����:\n"
+#~ "%s\n"
+#~ "���� �� ���� ���������� ���������."
 
 #, fuzzy
-#~ msgid "Status:"
-#~ msgstr "_������:"
+#~ msgid " Edit "
+#~ msgstr "_����������"
 
 #, fuzzy
-#~ msgid "Tentatively Accepted"
-#~ msgstr "�������� ������"
-
-#~ msgid "Choose an action:"
-#~ msgstr "������ ��������:"
-
-#~ msgid "Update"
-#~ msgstr "��������"
-
-#~ msgid "Accept"
-#~ msgstr "������"
-
-#~ msgid "Tentatively accept"
-#~ msgstr "�������� ������"
-
-#~ msgid "Decline"
-#~ msgstr "������"
-
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "������� ���������� ��������/����"
-
-#~ msgid "Update respondent status"
-#~ msgstr "�������� ������� �� ������������"
-
-#~ msgid "Send Latest Information"
-#~ msgstr "������� ���������� ����������"
-
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> ��������� ���������� �� �����."
-
-#~ msgid "Meeting Information"
-#~ msgstr "���������� �� �����"
-
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> ������� ������ ���������� �� �������."
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "����������� �� �������:"
-
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> ����� �� ���� ������� �� �������������� �����."
-
-#~ msgid "Meeting Update"
-#~ msgstr "���������� �� �������:"
-
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> ����� �� ������ ���������� ���������� �� �������.."
+#~ msgid " New "
+#~ msgstr "���"
 
-#~ msgid "Meeting Update Request"
-#~ msgstr "������ �� ���������� �� �������:"
-
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> �������� �� ��������� �� �������."
-
-#~ msgid "Meeting Reply"
-#~ msgstr "������� �� �����"
-
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> �������� �������."
-
-#~ msgid "Meeting Cancellation"
-#~ msgstr "���������� �� �������"
-
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> ������� ������������ ���������."
-
-#~ msgid "Bad Meeting Message"
-#~ msgstr "���� ��������� �� �����"
-
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> ��������� ���������� �� ��������."
-
-#~ msgid "Task Information"
-#~ msgstr "���������� �� ������"
-
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> ������� ������ ������� � ������.."
-
-#~ msgid "Task Proposal"
-#~ msgstr "����������� �� ������"
-
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> ����� �� ���� ������� ��� ������������ ������.."
-
-#~ msgid "Task Update"
-#~ msgstr "���������� �� ������"
-
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> ����� �� ������ ���������� ���������� �� ������.."
-
-#~ msgid "Task Update Request"
-#~ msgstr "������ �� ���������� �� ������"
-
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> �������� �� ��������� � ������."
-
-#~ msgid "Task Reply"
-#~ msgstr "������� �� ������"
-
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> �������� ������."
-
-#~ msgid "Task Cancellation"
-#~ msgstr "���������� �� ������"
-
-#~ msgid "Bad Task Message"
-#~ msgstr "���� ��������� �� ������"
-
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> ��������� ���������� ��������/����."
-
-#~ msgid "Free/Busy Information"
-#~ msgstr "���������� ��������/����"
-
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> ������� �� ��� ���������� �� ��������/����."
-
-#~ msgid "Free/Busy Request"
-#~ msgstr "������ ��������/����"
-
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> �������� �� �������� ��������/����."
-
-#~ msgid "Free/Busy Reply"
-#~ msgstr "������� ��������/����"
-
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "���� ��������/���� ���������"
-
-#~ msgid "The message does not appear to be properly formed"
-#~ msgstr "������� �������� �� � ������������� ���������."
-
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "����������� ������� ���� ����������� ������."
-
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "����������� �� ������� ������� �������� ���������."
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "�������� ����������"
 
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "����������� ���� ������ ������ �� ��������"
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "��������"
 
-#~ msgid "Event information"
-#~ msgstr "���������� �� �������"
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "������"
 
-#~ msgid "Task information"
-#~ msgstr "���������� �� ������"
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "����"
 
-#~ msgid "Journal information"
-#~ msgstr "���������� �� �������"
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "��������"
 
-#~ msgid "Free/Busy information"
-#~ msgstr "���������� ��������/����"
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "���� � ������:"
 
-#~ msgid "Calendar information"
-#~ msgstr "���������� ����������"
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "������� ������ ���������"
 
 #, fuzzy
-#~ msgid "Updated"
-#~ msgstr "��������"
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "_HTML ���������:"
 
 #, fuzzy
-#~ msgid "Refresh"
-#~ msgstr "�������� ������"
+#~ msgid "_Filename:"
+#~ msgstr "��� �� ����:"
 
-#~ msgid "Task"
-#~ msgstr "������"
+#~ msgid "_HTML Signature:"
+#~ msgstr "_HTML ���������:"
 
-#~ msgid "Status: %s"
-#~ msgstr "������: %s"
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "����"
 
-#~ msgid "Priority: %s"
-#~ msgstr "���������: %s"
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "�����"
 
-#~ msgid "Percent Complete: %i"
-#~ msgstr "���������� � ��������: %i"
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "�� ���� �� ������ ��������� �������� �� PGP"
 
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "�� ���� �� ������ PGP ����������� ��������."
 
-#~ msgid "Categories: %s"
-#~ msgstr "���������: %s"
+#~ msgid "Moving"
+#~ msgstr "�����������"
 
-#~ msgid "Contacts: "
-#~ msgstr "��������:"
+#~ msgid "Copying"
+#~ msgstr "��������"
 
 #, fuzzy
-#~ msgid "Reminder!!"
-#~ msgstr "�������"
-
-#~ msgid "Default"
-#~ msgstr "�� ������������"
+#~ msgid "Signature name:"
+#~ msgstr "���� � ������:"
 
-#~ msgid "Mail to %s"
-#~ msgstr "Mail �� %s"
+#~ msgid "Riga"
+#~ msgstr "����"
 
-#~ msgid "Subject is %s"
-#~ msgstr "������ � %s"
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "�_�����"
 
-#~ msgid "Mail from %s"
-#~ msgstr "Mail �� %s"
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "�����"
 
-#~ msgid "%s mailing list"
-#~ msgstr "%s �������� ������"
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "������� �� ���, �� ������ �� �������� ����� \"%s\"?"
 
-#~ msgid "Account %d"
-#~ msgstr "������ %d"
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "�����"
 
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Inbox"
 
-#, fuzzy
-#~ msgid "View messages..."
-#~ msgstr "������� ����������� ����..."
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
-#~ "������ ����������."
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Evolution �� ���������� ���� ��� ��������� ���������."
 
-#~ msgid " F"
-#~ msgstr " F"
-
-#~ msgid " C"
-#~ msgstr " C"
-
-#~ msgid "knots"
-#~ msgstr "������"
-
-#~ msgid "kph"
-#~ msgstr "��./�."
-
-#~ msgid "inHg"
-#~ msgstr "���� �.��."
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "����"
-
-#~ msgid "kilometers"
-#~ msgstr "���������"
-
-#~ msgid "Drafts"
-#~ msgstr "�������"
-
-#~ msgid "Outbox"
-#~ msgstr "Outbox"
-
-#~ msgid "Sent"
-#~ msgstr "�������"
-
 #, fuzzy
 #~ msgid "_Advanced Search..."
 #~ msgstr "������������ �������"
@@ -27118,15 +27839,17 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgstr "���� ���������� �� � ���������� �� �������� LDAP �������. "
 
 #~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
 #~ msgstr ""
-#~ "������������ �� �������� �� LDAP �������� ��, �� �� ��������, ��� ����� ��\n"
-#~ "��������� ��� ������. �������� �� � �������������� �� �� ������ ����������."
+#~ "������������ �� �������� �� LDAP �������� ��, �� �� ��������, ��� ����� "
+#~ "��\n"
+#~ "��������� ��� ������. �������� �� � �������������� �� �� ������ "
+#~ "����������."
 
 #~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
 #~ msgstr ""
 #~ "���� � �������� ����� �� ������ ������ ��� LDAP �������.\n"
 #~ "�������� �� � �������������� �� �� ������ ����������."
@@ -27260,7 +27983,8 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgstr "�� ���� �� ������ ��������� �� POP ������ %s: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
 #~ msgstr "���� �� �� ������ ��� POP ������ ��������� �� ���������� Kerberos 4"
 
 #~ msgid "Could not authenticate to KPOP server: %s"
@@ -27272,9 +27996,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "(Unknown)"
 #~ msgstr "(����������)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "��������� ������� �� POP ������: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "�� ���� �� ������ '��' ����� � �����������"
 
@@ -27332,12 +28053,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "Mailbox Format"
 #~ msgstr "������ �� ���������� �����"
 
-#~ msgid " (default)"
-#~ msgstr " (�� ������������)"
-
-#~ msgid "Mail Settings"
-#~ msgstr "��������� �� ����"
-
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "���� ��������� ������� ������ ���������:"
 
@@ -27353,9 +28068,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "Edit..."
 #~ msgstr "��������...."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML ���������� ����"
-
 #~ msgid "News"
 #~ msgstr "������"
 
@@ -27401,9 +28113,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "All _folders:"
 #~ msgstr "������ �����"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "������ ��������� �� ������:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "�_����� �������:"
 
@@ -27413,19 +28122,9 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "_Displayed feeds:"
 #~ msgstr "_��������� ������"
 
-#~ msgid "Evolution "
-#~ msgstr "�������� "
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "�� ���� �� ��������� �����:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(���� ���)"
 
diff --git a/po/ca.po b/po/ca.po
index 790b32814a..a7706a2927 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.0.6\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\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"
@@ -38,7 +38,7 @@ msgstr ""
 msgid "File As"
 msgstr "Arxiva com:"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nom"
@@ -50,7 +50,7 @@ msgid "Email"
 msgstr "Adre�a electr�nica 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Primari"
 
@@ -61,7 +61,7 @@ msgstr "Primari"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistent"
@@ -69,8 +69,8 @@ msgstr "Assistent"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Feina"
 
@@ -81,12 +81,12 @@ msgid "Bus"
 msgstr "Ocupat"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Crida de retorn"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Empresa"
 
@@ -98,8 +98,8 @@ msgstr "Copia"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Particular"
 
@@ -114,18 +114,18 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "M�bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Cotxe"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax de la feina"
@@ -136,13 +136,13 @@ msgid "Bus Fax"
 msgstr "Fax de la feina"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax particular"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Feina 2"
 
@@ -152,43 +152,43 @@ msgid "Bus 2"
 msgstr "Ocupat"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Particular 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "XDSI"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Altres"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Un altre fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Busca"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "R�dio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "T�lex"
@@ -201,14 +201,14 @@ msgstr "TTY/TDD"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "Adre�a electr�nica 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Adre�a electr�nica 3"
@@ -363,7 +363,7 @@ msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -371,7 +371,7 @@ msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 #, fuzzy
 msgid "Searching..."
 msgstr "Cerca"
@@ -389,34 +389,34 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr ""
@@ -467,128 +467,165 @@ msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #, fuzzy
-msgid "Addressbook Settings"
-msgstr "Afegeix una font"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#, fuzzy
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-"Utilitat de configuraci� per al conducte de les coses per fer de "
-"l'Evolution.\n"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #, 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 #, fuzzy
 msgid "Directory Servers"
 msgstr "N_ou servidor de directori"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 #, 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:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 #, 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:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the Addressbook's address popup"
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 #, fuzzy
 msgid "Factory for the sample Addressbook control"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 #, fuzzy
 msgid "Contacts"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "Folder containing contact information"
 msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "New Contact List"
+msgstr "Visualitza tots els contactes"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Contactes..."
+
+#: addressbook/gui/component/addressbook-component.c:581
 #, fuzzy
 msgid "New Contact"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 #, fuzzy
 msgid "_Contact"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
-msgid "New Contact List"
-msgstr "Visualitza tots els contactes"
+msgid "Failed to connect to LDAP server"
+msgstr ""
+"No es pot autenticar davant del servidor IMAP.\n"
+"%s\n"
+"\n"
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "_Contactes..."
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"No es pot autenticar davant del servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Error en carregar la informaci� del filtre:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Contacte _nou"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "No es pot obrir la llibreta d'adreces"
@@ -614,54 +651,64 @@ msgid ""
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "acaba amb"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "categories"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 #, fuzzy
 msgid "Any field contains"
 msgstr "El cos cont�"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 #, fuzzy
 msgid "Advanced..."
 msgstr "Afegeix..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 #, fuzzy
 msgid "Any Category"
 msgstr "categories"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que mostrar� el navegador de carpetes"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(Sense nom)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Adre�a electr�nica principal"
 
@@ -712,56 +759,6 @@ msgstr "Categories disponibles:"
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr ""
-"No es pot autenticar davant del servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"No es pot autenticar davant del servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Error en carregar la informaci� del filtre:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Completat"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
@@ -769,51 +766,51 @@ msgstr "Detecta els tipus suportats..."
 
 #: addressbook/gui/component/ldap-config.glade.h:2
 #, fuzzy
-msgid "<< Fewer Options"
-msgstr "Opcions"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "Elimina"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
-#, fuzzy
 msgid "1234"
 msgstr "123"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "380"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Elimina"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Opcions"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -823,8 +820,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Afegeix una font"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Alarmes"
@@ -918,8 +915,8 @@ msgstr "Configuraci� del correu"
 msgid "Mappings"
 msgstr "Marges"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
@@ -1106,14 +1103,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1133,8 +1130,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1166,7 +1163,7 @@ msgid "Using email address"
 msgstr "Adre�a electr�nica:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1174,7 +1171,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Afegeix"
 
@@ -1221,7 +1218,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1341,10 +1338,12 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Elimina"
 
@@ -1475,7 +1474,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Contacta l'editor"
 
@@ -1485,7 +1484,7 @@ msgid "D_epartment:"
 msgstr "_Departament:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Detalls"
 
@@ -1548,11 +1547,12 @@ msgstr "Vol rebre correu _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Suprimeix"
 
@@ -1583,7 +1583,7 @@ msgid "_Web page address:"
 msgstr "Adre�a de p�gina web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 #, fuzzy
 msgid "United States"
 msgstr "Mou el missatge"
@@ -2114,12 +2114,11 @@ msgid "Laos"
 msgstr "Baixa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
@@ -2129,7 +2128,7 @@ msgid "Lesotho"
 msgstr "Baixa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 #, fuzzy
 msgid "Liberia"
 msgstr "abril"
@@ -2139,13 +2138,13 @@ msgid "Liechtenstein"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 #, fuzzy
 msgid "Lithuania"
 msgstr "vuit�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr ""
 
@@ -2181,7 +2180,7 @@ msgid "Mali"
 msgstr "_Correu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 #, fuzzy
 msgid "Malta"
 msgstr "_Correu"
@@ -2210,7 +2209,7 @@ msgid "Mayotte"
 msgstr "Dilluns"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr ""
 
@@ -2236,7 +2235,7 @@ msgid "Montserrat"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr ""
 
@@ -2264,7 +2263,7 @@ msgid "Nepal"
 msgstr "Recupera el correu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 #, fuzzy
 msgid "Netherlands"
 msgstr "Selecciona'ls _tots"
@@ -2279,13 +2278,13 @@ msgid "New Caledonia"
 msgstr "Visualitza tots els contactes"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 #, fuzzy
 msgid "New Zealand"
 msgstr "Recupera el correu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr ""
 
@@ -2305,7 +2304,7 @@ msgid "Niue"
 msgstr "Minut"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr ""
 
@@ -2314,18 +2313,18 @@ msgid "Northern Mariana Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norway"
 msgstr "Ara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 #, fuzzy
 msgid "Pakistan"
 msgstr "Enganxa"
@@ -2339,7 +2338,7 @@ msgid "Palestinian Territory"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 #, fuzzy
 msgid "Panama"
 msgstr "Canad�"
@@ -2349,12 +2348,12 @@ msgid "Papua New Guinea"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 #, fuzzy
 msgid "Peru"
 msgstr "Paper"
@@ -2368,24 +2367,24 @@ msgid "Pitcairn"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 #, fuzzy
 msgid "Poland"
 msgstr "Finl�ndia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 #, fuzzy
 msgid "Portugal"
 msgstr "Vertical"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 #, fuzzy
 msgid "Qatar"
 msgstr "despr�s de"
@@ -2396,7 +2395,7 @@ msgid "Reunion"
 msgstr "Seccions:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr ""
 
@@ -2435,7 +2434,7 @@ msgid "Sao Tome And Principe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr ""
 
@@ -2454,17 +2453,17 @@ msgid "Sierra Leone"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr ""
 
@@ -2478,7 +2477,7 @@ msgid "Somalia"
 msgstr "Normal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr ""
 
@@ -2487,7 +2486,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 #, fuzzy
 msgid "Spain"
 msgstr "_Envia"
@@ -2510,7 +2509,7 @@ msgid "Sudan"
 msgstr "dg."
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 #, fuzzy
 msgid "Suriname"
 msgstr "_Sobrenom:"
@@ -2525,18 +2524,18 @@ msgid "Swaziland"
 msgstr "Finl�ndia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 #, fuzzy
 msgid "Sweden"
 msgstr "Vist"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 #, fuzzy
 msgid "Taiwan"
 msgstr "R�dio"
@@ -2578,7 +2577,7 @@ msgid "Tunisia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 #, fuzzy
 msgid "Turkey"
 msgstr "dm."
@@ -2602,7 +2601,7 @@ msgid "Uganda"
 msgstr "Canad�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr ""
 
@@ -2611,7 +2610,7 @@ msgid "United Arab Emirates"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr ""
 
@@ -2620,7 +2619,7 @@ msgid "United States Minor Outlying Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr ""
 
@@ -2633,12 +2632,12 @@ msgid "Vanuatu"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 #, fuzzy
 msgid "Viet Nam"
 msgstr "Seleccioneu els noms"
@@ -2660,13 +2659,13 @@ msgid "Western Sahara"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 #, fuzzy
 msgid "Yemen"
 msgstr "Vist"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr ""
 
@@ -2679,29 +2678,38 @@ msgid "Zimbabwe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Voleu suprimir el contacte?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 #, fuzzy
 msgid "Category editor not available."
 msgstr "No hi ha cap resum disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "El(s) element(s) pertanyen a aquestes categories:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "Desa com a VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
@@ -2731,12 +2739,12 @@ msgstr "Adre�a electr�nica 2"
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 #, fuzzy
 msgid "list"
 msgstr "�s"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2875,12 +2883,12 @@ msgid "contact-list-editor"
 msgstr "Contacta l'editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "Contacta l'editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Desa com a VCard"
@@ -2962,23 +2970,23 @@ msgid "Error getting book view"
 msgstr "Error en carregar el fitxer: %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 #, fuzzy
 msgid "Error modifying card"
 msgstr "Error en carregar el fitxer: %s"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 #, fuzzy
 msgid "Success"
 msgstr "Fonts"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -2988,7 +2996,7 @@ msgid "Repository offline"
 msgstr "S'est� movent"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Perm�s denegat"
 
@@ -3008,62 +3016,77 @@ msgstr "Operaci� no suportada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancel�lat"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
 #, fuzzy
+msgid "Authentication Failed"
+msgstr "Autenticaci�:"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autenticaci�:"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
 msgid "Other error"
 msgstr "Error d'E/S"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 #, fuzzy
 msgid "Error adding list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 #, fuzzy
 msgid "Error adding card"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #, fuzzy
 msgid "Error modifying list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 #, fuzzy
 msgid "Error removing list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 #, fuzzy
 msgid "Error removing card"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "_Visualitzaci�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "_Visualitzaci�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -3071,22 +3094,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "No iniciat"
@@ -3165,106 +3188,113 @@ msgstr "Contacte _nou"
 msgid "Other Address"
 msgstr "Comprova l'adre�a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#, fuzzy
+msgid "Addressbook"
+msgstr "Desa a la llibreta d'adreces"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_V�s a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "S'est� movent"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Cerca contactes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Afegeix una font"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Par�metres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Reenvia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimeix el missatge..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Copia a la carpeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Mou a la carpeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Cut"
 msgstr "Personalitzat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Enganxa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3274,7 +3304,7 @@ msgstr "l'hora actual"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3282,7 +3312,7 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3439,7 +3469,7 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Nombre de columnes:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opcions"
 
@@ -3449,7 +3479,7 @@ msgid "Orientation"
 msgstr "Orientaci�"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "P�gina"
 
@@ -3524,30 +3554,34 @@ msgstr "Amplada:"
 msgid "_Font..."
 msgstr "Lletra..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "Edita una cita"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Baixa"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr ""
 
@@ -3591,50 +3625,39 @@ msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 #, 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:6
-#, fuzzy
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Conducte de l'agenda de l'Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#, 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:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 #, 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:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, 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_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3646,11 +3669,26 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "_Par�metres"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Ombrejat"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 #, fuzzy
 msgid "invalid time"
 msgstr "Hora de _finalitzaci�:"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, fuzzy, c-format
 msgid "Alarm on %s"
@@ -3690,7 +3728,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
@@ -3712,17 +3750,17 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Envia aquest missatge"
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 #, fuzzy
 msgid "Could not create the alarm notify service"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
@@ -3742,7 +3780,7 @@ msgstr "Descripci�:"
 msgid "Comment contains"
 msgstr "cont�"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr ""
 
@@ -3784,14 +3822,16 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "P�blic"
 
@@ -3812,28 +3852,33 @@ msgid "W"
 msgstr "O"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
 msgstr "setmana"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Ocupat"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "No iniciat"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "En proc�s"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 #, fuzzy
 msgid "Completed"
 msgstr "% comp_let:"
@@ -3849,11 +3894,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3870,12 +3916,14 @@ msgstr "Recurr�ncia"
 msgid "Assigned"
 msgstr "Assigna una puntuaci�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 #, fuzzy
 msgid "No"
 msgstr "Ara"
@@ -3900,64 +3948,66 @@ msgstr "Setmana"
 msgid "Month View"
 msgstr "Mes"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tasques"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "Filtre sobre la llista de correu"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "Cancel�lat"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "Cancel�lat"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "Tasca"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "_Task"
 msgstr "Tasca"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cites:"
@@ -4186,7 +4236,7 @@ msgstr "Recordatoris"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resum:"
 
@@ -4218,7 +4268,7 @@ msgstr "Recorda'm totes les cites"
 msgid "hour(s)"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 #, fuzzy
 msgid "minute(s)"
 msgstr "minuts"
@@ -4248,86 +4298,86 @@ msgstr "30 minuts"
 msgid "60 minutes"
 msgstr "60 minuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alarmes"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
 msgid "Calendar and Tasks Settings"
 msgstr "_Par�metres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
 msgid "Color for tasks due today"
 msgstr "Element per fer que ven� avui:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "Day _ends:"
+msgstr "N�meros de dia:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Dies"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Divendres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Hores"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Dilluns"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "dg."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #, fuzzy
 msgid "Show week _numbers in date navigator"
 msgstr "Mostra els n�meros de les setmanes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#, fuzzy
-msgid "Sta_rt of day:"
-msgstr "Inici del dia:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, fuzzy
-msgid "Su_n"
-msgstr "dg."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Elemts que vencen avui"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "T_hu"
 msgstr "dj."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#, fuzzy
-msgid "T_ue"
-msgstr "dm."
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4357,95 +4407,108 @@ msgid "Tuesday"
 msgstr "Dimarts"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Work Week"
 msgstr "Setmana de treball"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #, fuzzy
 msgid "_12 hour (AM/PM)"
 msgstr "12 hores (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #, fuzzy
 msgid "_24 hour"
 msgstr "24 hores"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "_Compress weekends in month view"
 msgstr "Comprimeix els caps de setmana"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "_Display"
-msgstr "_Visualitzaci�"
+msgid "_Day begins:"
+msgstr "N�meros de dia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #, fuzzy
-msgid "_End of day:"
-msgstr "Final del dia:"
+msgid "_Display"
+msgstr "_Visualitzaci�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_Fri"
 msgstr "dv."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_General"
 msgstr "General"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "Suprimeix el missatge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Mon"
 msgstr "dl."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Elements ven�uts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #, fuzzy
 msgid "_Sat"
 msgstr "ds."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Mostra les hores d'acabament de les cites"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Divisions de temps:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "dm."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
 msgid "_Wed"
 msgstr "dc."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 #, fuzzy
-msgid "before the start of the appointment"
-msgstr "Crea una nova cita"
+msgid "before every appointment"
+msgstr "Recorda'm totes les cites"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
@@ -4539,41 +4602,61 @@ msgstr ""
 msgid "Due "
 msgstr "Data de venciment"
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "No s'han pogut actualitzar correctament els fitxers"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
 #, fuzzy
-msgid "Could not update object!"
+msgid "Could not update object"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Sense resum"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4655,29 +4738,29 @@ msgstr "Suprimeix"
 msgid "Enter Delegate"
 msgstr "Suprimeix"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 #, fuzzy
 msgid "Appointment"
 msgstr "Cites:"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Recordatori"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Recurr�ncia"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 #, fuzzy
 msgid "Scheduling"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 #, fuzzy
 msgid "Meeting"
 msgstr "Cancel�lat"
@@ -4730,7 +4813,7 @@ msgid "Pu_blic"
 msgstr "P�_blic"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Show Time As"
 msgstr "Mostra"
@@ -4754,19 +4837,19 @@ msgstr "Hora de _finalitzaci�:"
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Suprimeix"
@@ -4780,55 +4863,62 @@ msgstr "Tots els assistents"
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
 #, fuzzy
-msgid "Common Name"
-msgstr "Completat"
+msgid "Click here to add an attendee"
+msgstr "<feu clic aqu� per seleccionar una data>"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
 #, fuzzy
-msgid "Delegated From"
-msgstr "Suprimeix"
+msgid "Common Name"
+msgstr "Completat"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
-msgid "Delegated To"
+msgid "Delegated From"
 msgstr "Suprimeix"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
 #, fuzzy
-msgid "Language"
-msgstr "Busca"
+msgid "Delegated To"
+msgstr "Suprimeix"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
 #, fuzzy
-msgid "Member"
-msgstr "desembre"
+msgid "Language"
+msgstr "Busca"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr ""
+#, fuzzy
+msgid "Member"
+msgstr "desembre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 #, fuzzy
 msgid "Role"
 msgstr "M�bil"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 #, fuzzy
 msgid "Status"
 msgstr "_Estat:"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 #, fuzzy
 msgid "Type"
@@ -4846,15 +4936,10 @@ msgid "_Change Organizer"
 msgstr "Organitzaci�:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Invita a altres..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#, fuzzy
-msgid "_Other Organizer"
-msgstr "Organitzaci�:"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -5049,7 +5134,7 @@ msgid "Progress"
 msgstr "En proc�s"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
@@ -5062,21 +5147,21 @@ msgstr "_Prioritat:"
 msgid "_Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 #, fuzzy
 msgid "Basic"
 msgstr "Enganxa"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 #, fuzzy
 msgid "Assignment"
 msgstr "Assigna una puntuaci�"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Descripci�:"
 
@@ -5089,25 +5174,80 @@ msgstr "Data d'ini_ci:"
 msgid "_Due Date:"
 msgstr "_Data de venciment:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Suprimeix un contacte"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "_Open"
 msgstr "_Obre"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -5116,14 +5256,14 @@ msgstr "Anomena i desa..."
 msgid "_Print..."
 msgstr "Imprimeix..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 msgstr "Personalitzat"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
@@ -5131,7 +5271,7 @@ msgstr "Personalitzat"
 msgid "_Copy"
 msgstr "Copia"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -5140,37 +5280,38 @@ msgstr "Copia"
 msgid "_Paste"
 msgstr "Enganxa"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "_Tasca (FIXME)"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
@@ -5179,53 +5320,54 @@ msgstr "Feu clic aqu� per a la llibreta d'adreces"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 #, fuzzy
 msgid "Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 #, fuzzy
 msgid "Completion Date"
 msgstr "Completat"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Data de venciment"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 #, fuzzy
 msgid "End Date"
 msgstr "Hora de _finalitzaci�:"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioritat"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 #, fuzzy
 msgid "Start Date"
 msgstr "Data d'ini_ci:"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 #, fuzzy
 msgid "Summary"
 msgstr "R_esum"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 #, fuzzy
 msgid "Task sort"
 msgstr "Tasques"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 #, fuzzy
 msgid "URL"
 msgstr "URL:"
@@ -5274,11 +5416,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -5324,7 +5468,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "Cap informaci�"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Mou a la carpeta"
@@ -5335,7 +5479,7 @@ msgid "_Configure Pilot..."
 msgstr "Mou a la carpeta"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 #, fuzzy
 msgid "_Save As..."
 msgstr "Anomena i desa..."
@@ -5366,77 +5510,433 @@ msgid "Delete _All Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Error en desar el fitxer: %s"
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+#, fuzzy
+msgid "Meeting begins: <b>"
+msgstr "Hora de _finalitzaci� de la reuni�:"
+
+#: calendar/gui/e-itip-control.c:683
+#, fuzzy
+msgid "Task begins: <b>"
+msgstr "% comp_let:"
+
+#: calendar/gui/e-itip-control.c:688
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:692
+#, fuzzy
+msgid "Begins: <b>"
+msgstr "Hora de _finalitzaci� de la reuni�:"
+
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Hora de _finalitzaci� de la reuni�:"
+
+#: calendar/gui/e-itip-control.c:707
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:711
+#, fuzzy
+msgid "Ends: <b>"
+msgstr "Hora de _finalitzaci� de la reuni�:"
+
+#: calendar/gui/e-itip-control.c:725
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "% comp_let:"
+
+#: calendar/gui/e-itip-control.c:735
+#, fuzzy
+msgid "Task Due: <b>"
+msgstr "% comp_let:"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "Cap informaci�"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Agenda"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "An unknown person"
+msgstr "Error desconegut"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "_Estat:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+#, fuzzy
+msgid "Accepted"
+msgstr "set"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "Tentatiu"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#, fuzzy
+msgid "Declined"
+msgstr "Suprimeix"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Fitxer de signatura:"
+
+#: calendar/gui/e-itip-control.c:972
+#, fuzzy
+msgid "Update"
+msgstr "ha estat despr�s de"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1000
+#, fuzzy
+msgid "Accept"
+msgstr "set"
+
+#: calendar/gui/e-itip-control.c:1001
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Tentatiu"
+
+#: calendar/gui/e-itip-control.c:1002
+#, fuzzy
+msgid "Decline"
+msgstr "Suprimeix"
+
+#: calendar/gui/e-itip-control.c:1026
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "Cancel�lat"
+
+#: calendar/gui/e-itip-control.c:1117
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:1118
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:1122
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "_Aquesta �s l'adre�a de correu"
+
+#: calendar/gui/e-itip-control.c:1123
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Cancel�lat"
+
+#: calendar/gui/e-itip-control.c:1127
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "_Aquesta �s l'adre�a de correu"
+
+#: calendar/gui/e-itip-control.c:1128
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Hora de _finalitzaci� de la reuni�:"
+
+#: calendar/gui/e-itip-control.c:1132
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "_Aquesta �s l'adre�a de correu"
+
+#: calendar/gui/e-itip-control.c:1133
+#, fuzzy
+msgid "Meeting Update Request"
+msgstr "FIXME: Pe_tici� de cita"
+
+#: calendar/gui/e-itip-control.c:1156
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "_Aquesta �s l'adre�a de correu"
+
+#: calendar/gui/e-itip-control.c:1157
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Cancel�lat"
+
+#: calendar/gui/e-itip-control.c:1161
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "_Aquesta �s l'adre�a de correu"
+
+#: calendar/gui/e-itip-control.c:1162
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Fitxer de signatura:"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1167
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "_Edita el missatge"
+
+#: calendar/gui/e-itip-control.c:1189
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:1190
+#, fuzzy
+msgid "Task Information"
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1195
+#, fuzzy
+msgid "Task Proposal"
+msgstr "TaskPad"
+
+#: calendar/gui/e-itip-control.c:1199
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "_Aquesta �s l'adre�a de correu"
+
+#: calendar/gui/e-itip-control.c:1200
+#, fuzzy
+msgid "Task Update"
+msgstr "ha estat despr�s de"
+
+#: calendar/gui/e-itip-control.c:1204
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "_Aquesta �s l'adre�a de correu"
+
+#: calendar/gui/e-itip-control.c:1205
+#, fuzzy
+msgid "Task Update Request"
+msgstr "FIXME: _Petici� de tasca"
+
+#: calendar/gui/e-itip-control.c:1229
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "_Aquesta �s l'adre�a de correu"
+
+#: calendar/gui/e-itip-control.c:1230
+#, fuzzy
+msgid "Task Reply"
+msgstr "Respon"
+
+#: calendar/gui/e-itip-control.c:1234
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "_Aquesta �s l'adre�a de correu"
+
+#: calendar/gui/e-itip-control.c:1235
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Cancel�lat"
+
+#: calendar/gui/e-itip-control.c:1240
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Agenda"
+
+#: calendar/gui/e-itip-control.c:1259
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:1260
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:1264
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:1265
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "Imprimeix el missatge"
+
+#: calendar/gui/e-itip-control.c:1269
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "_Aquesta �s l'adre�a de correu"
+
+#: calendar/gui/e-itip-control.c:1270
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "Imprimeix el missatge"
+
+#: calendar/gui/e-itip-control.c:1275
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Imprimeix el missatge"
+
+#: calendar/gui/e-itip-control.c:1354
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1373
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "S'est� afegint un missatge sense cap assumpte"
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "No es pot executar el Bug Buddy."
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1579
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Data completa:"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
+#: calendar/gui/e-itip-control.c:1671
 #, fuzzy
-msgid "Attendee status could not be updated!\n"
+msgid "Attendee status updated\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
-msgid "Attendee status updated\n"
+msgid "Attendee status could not be updated!\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1709
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data d'enviament"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccioneu una carpeta"
@@ -5484,90 +5984,87 @@ msgstr ""
 msgid "date-start"
 msgstr "Inici del dia:"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 #, fuzzy
 msgid "Required Participants"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 #, fuzzy
 msgid "Group"
 msgstr "Grup %i"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 #, fuzzy
 msgid "Resource"
 msgstr "Font"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 #, fuzzy
 msgid "Chair"
 msgstr "Cotxe"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 #, fuzzy
 msgid "Required Participant"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 #, fuzzy
 msgid "Needs Action"
 msgstr "Elimina una acci�"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-#, fuzzy
-msgid "Accepted"
-msgstr "set"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#, fuzzy
-msgid "Declined"
-msgstr "Suprimeix"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 #, fuzzy
 msgid "Delegated"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 #, fuzzy
 msgid "In Process"
 msgstr "En proc�s"
@@ -5575,14 +6072,14 @@ msgstr "En proc�s"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5594,63 +6091,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Opcions"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Mostra _nom�s les hores de treball"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Mostra-ho reduint el zoom"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Actualitza lliure/ocupat"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "Tria autom�tica"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Totes les persones i recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Totes les persones i un recurs"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Persones _requerides"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Persones requerides i _un recurs"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Hora d'_inici de la reuni�:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
@@ -5669,17 +6166,24 @@ msgstr "No s'ha pogut carregar l'agenda en `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr ""
+"No s'ha pogut obrir la carpeta `%s':\n"
+"%s"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Completat"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Suprimeix un contacte"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "_Esborra"
@@ -5694,19 +6198,19 @@ msgstr "Nova cita..."
 msgid "_Delete this Appointment"
 msgstr "Suprimeix aquesta cita"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, 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:1549
+#: calendar/gui/gnome-cal.c:1533
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Obre l'agenda"
@@ -5781,19 +6285,58 @@ msgstr "octubre"
 msgid "September"
 msgstr "setembre"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "Cap informaci�"
+
+#: calendar/gui/itip-utils.c:356
+#, fuzzy
+msgid "Task information"
+msgstr "Cap informaci�"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "Cap informaci�"
+
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "Cap informaci�"
+
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "Cap informaci�"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "ha estat despr�s de"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Refresca la llista"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
@@ -5986,12 +6529,47 @@ msgstr "Aquest mes (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Enguany (%Y)"
 
+#: calendar/gui/print.c:2249
+#, fuzzy
+msgid "Task"
+msgstr "Tasca"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_Estat:"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioritat:"
+
+#: calendar/gui/print.c:2338
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Marca la tasca com a completa"
+
+#: calendar/gui/print.c:2350
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2364
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr "categories"
+
+#: calendar/gui/print.c:2375
+#, fuzzy
+msgid "Contacts: "
+msgstr "_Contactes..."
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -6025,8 +6603,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Envia aquest missatge"
@@ -6084,6 +6662,11 @@ msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Recordatori"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -6174,8 +6757,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -7115,656 +7698,670 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Assistent"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "despr�s de"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr ""
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 #, fuzzy
 msgid "Asia/Muscat"
 msgstr "Assistent"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr ""
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 #, fuzzy
 msgid "Asia/Omsk"
 msgstr "_Tasca (FIXME)"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "_Tasca (FIXME)"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 #, fuzzy
 msgid "Asia/Qatar"
 msgstr "despr�s de"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr ""
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr ""
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr ""
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr ""
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr ""
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr ""
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr ""
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr ""
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr ""
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr ""
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr ""
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr ""
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 #, fuzzy
 msgid "Australia/Darwin"
 msgstr "agost"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 #, fuzzy
 msgid "Australia/Hobart"
 msgstr "agost"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr ""
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr ""
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr ""
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 #, fuzzy
 msgid "Australia/Perth"
 msgstr "agost"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 #, fuzzy
 msgid "Australia/Sydney"
 msgstr "agost"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr ""
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr ""
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 #, fuzzy
 msgid "Europe/Athens"
 msgstr "Propietats..."
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr ""
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr ""
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr ""
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr ""
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr ""
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr ""
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr ""
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr ""
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr ""
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr ""
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr ""
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr ""
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr ""
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr ""
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr ""
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr ""
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr ""
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr ""
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr ""
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 #, fuzzy
 msgid "Europe/Monaco"
 msgstr "Dilluns"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr ""
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr ""
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 #, fuzzy
 msgid "Europe/Paris"
 msgstr "Propietats..."
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr ""
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr ""
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr ""
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr ""
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr ""
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr ""
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr ""
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr ""
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr ""
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr ""
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr ""
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 #, fuzzy
 msgid "Indian/Comoro"
 msgstr "Colors"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr ""
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 #, fuzzy
 msgid "Indian/Mauritius"
 msgstr "Marges"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 #, fuzzy
 msgid "Indian/Mayotte"
 msgstr "Dilluns"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 #, fuzzy
 msgid "Indian/Reunion"
 msgstr "Seccions:"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:209
-#, fuzzy
-msgid "Clearsigning is not supported by this cipher"
-msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
@@ -7774,12 +8371,12 @@ msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 msgid "Unable to create cache path"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7787,7 +8384,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7795,11 +8392,16 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -7808,62 +8410,72 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/camel-filter-driver.c:911
-#, fuzzy
+#: camel/camel-filter-driver.c:908
+#, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 #, fuzzy
 msgid "Cannot open message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 #, fuzzy
 msgid "Syncing folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "No s'ha pogut crear el conducte a %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Missatge de _correu (FIXME)"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
@@ -7895,30 +8507,107 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 #, fuzzy
 msgid "Moving messages"
 msgstr "C�pia de missatges"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "C�pia de missatges"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#, fuzzy
+msgid "Cancelled."
+msgstr "Cancel�lat"
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Resposta inesperada del servidor IMAP: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "(Cap carpeta mostrada)"
+
+#: camel/camel-gpg-context.c:827
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr ""
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Missatge de _correu (FIXME)"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Missatge de _correu (FIXME)"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Missatge de _correu (FIXME)"
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "No s'ha pogut crear el conducte: %s"
+
 #: camel/camel-lock-client.c:111
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7949,8 +8638,8 @@ msgstr "No s'ha pogut crear el fitxer de blocatge per a %s: %s"
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
-"S'ha excedit el temps m�xim en intentar recuperar el fitxer de blocatge en "
-"%s. Torneu-ho a provar m�s tard."
+"S'ha excedit el temps m�xim en intentar recuperar el fitxer de blocatge en %"
+"s. Torneu-ho a provar m�s tard."
 
 #: camel/camel-lock.c:204
 #, c-format
@@ -8016,84 +8705,23 @@ msgstr "Error en escriure el fitxer temporal de correu: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Error en escriure el fitxer temporal de correu: %s"
 
-#: camel/camel-pgp-context.c:193
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
-
-#: camel/camel-pgp-context.c:196
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
-
-#: camel/camel-pgp-context.c:621
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr ""
-"No es pot recuperar el missatge: %s\n"
-"  %s"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, fuzzy, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:993
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "No s'ha pogut crear el conducte: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1194
-#, fuzzy, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1387
-#, fuzzy, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Error d'E/S"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -8110,45 +8738,6 @@ 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:199
-#, c-format
-msgid "%s server %s"
-msgstr "Servidor %s %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "Servei %s per a %s en %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-#, fuzzy
-msgid "Connection cancelled"
-msgstr "Cancel�lat"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, 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:258
-msgid "(unknown host)"
-msgstr "(ordinador central desconegut)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-#, fuzzy
-msgid "Operation cancelled"
-msgstr "Obre l'agenda"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, fuzzy, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "El servidor ha rebutjat el nom d'usuari"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr ""
@@ -8200,8 +8789,8 @@ 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."
+"Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per autenticar-"
+"vos-hi."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -8250,8 +8839,8 @@ msgstr ""
 #, 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."
+"Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per autenticar-"
+"vos-hi."
 
 #: camel/camel-sasl-kerberos4.c:161
 #, fuzzy, c-format
@@ -8261,7 +8850,7 @@ msgid ""
 msgstr "No s'ha pogut crear el conducte: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
@@ -8293,14 +8882,12 @@ msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr ""
-"Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per "
-"autenticar-vos-hi."
+"Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per autenticar-"
+"vos-hi."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Contrasenya"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -8328,51 +8915,51 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Error en escriure a la b�stia de correu temporal: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component d'ordinador central"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de cam�"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "S'est� comprovant \"%s\""
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "S'est� comprovant \"%s\""
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8436,12 +9023,12 @@ msgstr "Missatge de _correu (FIXME)"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
@@ -8465,7 +9052,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8474,16 +9061,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8500,15 +9087,15 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vee-folder.c:753
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "L'ordinador central %s no existeix."
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Comprova si hi ha nou correu"
 
 #: camel/camel-vee-store.c:262
 #, fuzzy, c-format
@@ -8530,77 +9117,84 @@ msgstr "No es pot bifurcar %s: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vtrash-folder.c:117
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
 #, fuzzy
-msgid "You cannot copy messages from this trash folder."
-msgstr ""
-"Nom�s podeu editar els missatges que s'hagin desat\n"
-"a la carpeta Esborranys."
+msgid "Operation cancelled"
+msgstr "Obre l'agenda"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, fuzzy, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "El servidor ha rebutjat el nom d'usuari"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 #, fuzzy
 msgid "Server response ended too soon."
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta D'acord inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, 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:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "S'estan desant els canvis al missatge..."
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
 "Aquest missatge no t� cap assumpte.\n"
 "Voleu que l'envi� igualment?"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "C�pia de missatges"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
@@ -8658,36 +9252,88 @@ 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-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Contrasenya"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 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:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Servidor %s %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Servei %s per a %s en %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "Cancel�lat"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "No s'ha pogut connectar a %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"No es pot connectar al servidor POP.\n"
+"Error en enviar el nom d'usuari: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operaci� no suportada"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Autenticaci�:"
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, 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:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autenticaci�:"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, 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:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8698,76 +9344,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%2$s%1$s"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "No es pot obrir la b�stia de correu temporal: %s"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%2$s%1$s"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "Directoris de correu en format MH d'UNIX"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 #, fuzzy
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 #, fuzzy
 msgid "Local delivery"
 msgstr "Carpetes virtuals"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 #, fuzzy
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "Directoris de correu en format MH d'UNIX"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 #, fuzzy
 msgid "For storing local mail in maildir directories."
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-#, fuzzy
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
+msgid "Standard Unix mbox spool or directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8793,7 +9456,7 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, 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"
@@ -8813,34 +9476,32 @@ msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "No s'ha pogut obrir el resum %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8849,21 +9510,20 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 #, fuzzy
 msgid "No such message"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8874,13 +9534,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8896,7 +9556,7 @@ msgstr "`%s' no �s un directori."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
@@ -8906,8 +9566,8 @@ msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 msgid "not a maildir directory"
 msgstr "Directori de correu local %s"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -8930,47 +9590,39 @@ msgstr "Comprova si hi ha nou correu"
 msgid "Checking for new messages"
 msgstr "C�pia de missatges"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8979,13 +9631,11 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -9028,182 +9678,163 @@ msgstr ""
 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:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "No s'ha pogut obrir el fitxer %s:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, 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:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-#, 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:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, 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:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, 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:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, 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:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, 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:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, 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:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+#, 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:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, 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:990
+#, 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-mh-folder.c:175
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' no �s un directori."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, fuzzy, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
+#: camel/providers/local/camel-spool-store.c:116
 #, fuzzy, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "No es pot afegir el missatge al fitxer mbox: %s"
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: camel/providers/local/camel-spool-store.c:115
+#: camel/providers/local/camel-spool-store.c:128
 #, fuzzy, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
+msgid "Spool `%s' is not a regular file or directory"
 msgstr "`%s' no �s un fitxer habitual."
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Les carpetes Mbox no es poden imbricar."
+
+#: camel/providers/local/camel-spool-store.c:182
 #, fuzzy
 msgid "Spool folders cannot be renamed"
 msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 #, fuzzy
 msgid "Spool folders cannot be deleted"
 msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "No s'ha pogut obrir el fitxer temporal de correu %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "No s'ha pogut tancar la carpeta font %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, fuzzy, c-format
-msgid "Could not file: %s: %s"
-msgstr "No s'ha pogut carregar %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "`%s' no �s un fitxer habitual."
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Correu per a %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Not�cies d'USENET"
@@ -9212,12 +9843,22 @@ msgstr "Not�cies d'USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Prove�dor per llegir i publicar als grups de not�cies d'USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "No s'ha pogut crear el directori %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Not�cies d'USENET mitjan�ant %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9326,7 +9967,7 @@ msgstr "No suprimeixis els missatges del servidor"
 msgid "Delete after %s day(s)"
 msgstr "Suprimeix la tasca"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -9353,32 +9994,22 @@ 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:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Operaci� no suportada"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Autenticaci�:"
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "No s'ha pogut connectar al servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -9386,27 +10017,27 @@ 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:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "Error d'E/S"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sSi us plau, introdu�u la contrasenya POP3 per a %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -9415,13 +10046,13 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar la contrasenya: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9598,46 +10229,46 @@ msgstr "Autenticaci�:"
 msgid "Authentication required"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
+#: camel/providers/smtp/camel-smtp-transport.c:461
 #, fuzzy, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+msgid "SMTP 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/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, 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:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9648,95 +10279,95 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, 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:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 #, fuzzy
 msgid "Sending message"
 msgstr "Envia aquest missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, 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:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, 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:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, 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."
@@ -9744,38 +10375,38 @@ msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, 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:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Error desconegut: %s"
@@ -9849,21 +10480,21 @@ msgstr "Tipus de MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Respon"
@@ -9871,31 +10502,31 @@ msgstr "Respon"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Introdu�u els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 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:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9908,7 +10539,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "No s'ha pogut crear el quadre de di�leg."
+
+#: composer/e-msg-composer.c:774
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9917,63 +10553,63 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 #, fuzzy
 msgid "Warning!"
 msgstr "S'est� movent"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9983,37 +10619,63 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Reenvia el missatge"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 #, fuzzy
 msgid "Insert File"
 msgstr "FIXME: Insereix el fitxer..."
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Fitxer de signatura:"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr "Valors predeterminats"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -10080,7 +10742,7 @@ msgstr "L'assumpte cont�"
 msgid "Subject does not contain"
 msgstr "L'assumpte no cont�"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -10238,7 +10900,7 @@ msgstr "hora"
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "segons"
 
@@ -10315,7 +10977,7 @@ msgstr "fa"
 msgid "ago"
 msgstr "fa"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
@@ -10328,6 +10990,21 @@ msgstr "<feu clic aqu� per seleccionar una data>"
 msgid "Filter Rules"
 msgstr "Regles del filtre"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Nom de l'estil:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "`%s' no �s un fitxer habitual."
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Fitxer de signatura:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -10344,7 +11021,7 @@ msgid ""
 msgstr ""
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
@@ -10357,7 +11034,11 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Comprova"
 
@@ -10387,7 +11068,7 @@ msgstr "si es compleixen tots els criteris"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "si es compleix qualsevol criteri"
 
 #: filter/filter-rule.c:780
@@ -10478,205 +11159,215 @@ msgid "Beep"
 msgstr "Mida"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Empresa"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "cont�"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Data de recepci�"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Data d'enviament"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 #, fuzzy
 msgid "Deleted"
 msgstr "Suprimeix"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "no cont�"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "no acaba amb "
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "no existeix"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 #, fuzzy
 msgid "does not sound like"
 msgstr "no acaba amb "
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "no comen�a per"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "no existeix"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Draft"
 msgstr "Data de venciment"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "acaba amb"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Exist"
 msgstr "S_urt"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "existeix"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Expressi�"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "�s"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "ha estat despr�s de"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "ha estat abans de"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "�s m�s gran que"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "�s m�s petit que"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "no �s"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "no �s"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "etiqueta9"
+
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Mailing list"
 msgstr "Llista de correu %s"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 #, fuzzy
 msgid "Message Header"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Final del dia:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Read"
 msgstr "R�dio"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "Replied to"
 msgstr "Respon a tots"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuaci�"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Remitent"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 #, fuzzy
 msgid "Set Status"
 msgstr "Estat de la connexi�"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Mida"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "Source Account"
 msgstr "cont�"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Especifiqueu la cap�alera"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "comen�a per"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Assumpte"
 
@@ -10737,7 +11428,8 @@ msgid "Scanning %s"
 msgstr "S'est� examinant %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 #, fuzzy
 msgid "Mail"
 msgstr "_Correu"
@@ -10752,11 +11444,6 @@ msgstr ""
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-#, fuzzy
-msgid "Addressbook"
-msgstr "Desa a la llibreta d'adreces"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10804,7 +11491,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Trash"
 msgstr "Tasca"
@@ -10953,289 +11642,298 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "Carpetes virtuals"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Carpetes virtuals"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 #, fuzzy
 msgid "Properties..."
 msgstr "Propietats..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Propietats de la llista de coses per fer"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap m�tode de transport de correu"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Reenvia el missatge"
+
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "New Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 #, fuzzy
 msgid "_Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propietats..."
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 #, fuzzy
 msgid "Properties"
 msgstr "Propietats..."
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Suprimeix"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " segons"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr " segons"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "VFolder sobre el remite_nt"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "VFolder sobre els destinata_ris"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "_Anomena i desa..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "% comp_let:"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Agenda"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Suprimeix"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mou a la carpeta"
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta"
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "etiqueta9"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Desa a la llibreta d'adreces"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "Valors predeterminats"
+
+#: mail/folder-info.c:71
 #, fuzzy
 msgid "Getting Folder Information"
 msgstr "Cap informaci�"
@@ -11293,7 +11991,7 @@ msgstr ""
 msgid "mh"
 msgstr "h"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
@@ -11304,94 +12002,118 @@ msgid "Evolution News Editor"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Host:"
 msgstr "Hores"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Nom d'usuari:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Path:"
 msgstr "Cam�:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "R�dio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 #, fuzzy
 msgid "Don't delete"
 msgstr "Suprimeix"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 #, fuzzy
 msgid "Disable"
 msgstr "Inhabilitat"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Enabled"
 msgstr "Inhabilitat"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "cont�"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Correu per a %s"
+
+#: mail/mail-autofilter.c:223
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "Assumpte"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Correu de %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "Llista de correu %s"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11403,7 +12125,7 @@ msgstr ""
 "rebre o redactar correu.\n"
 "El voleu configurar ara?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11411,7 +12133,7 @@ msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11420,18 +12142,18 @@ msgstr ""
 "abans de poder redactar correu."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 #, fuzzy
 msgid "Send anyway?"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11439,66 +12161,66 @@ msgstr ""
 "Aquest missatge no t� cap assumpte.\n"
 "Voleu que l'envi� igualment?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 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:497
+#: mail/mail-callbacks.c:499
 #, 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:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Error desconegut"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11506,7 +12228,7 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -11515,44 +12237,44 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 #, fuzzy
 msgid "No Message Selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11560,7 +12282,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11569,35 +12291,71 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtres de correu ..."
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Descripci�:"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Contacte _nou"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "n"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Afegeix un criteri"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Fitxer de signatura:"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11635,179 +12393,161 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "S'est� movent"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Per a"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "despr�s de"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "cont�"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Contacte _nou"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 msgid " "
 msgstr ""
 
 #: mail/mail-config.glade.h:2
 #, fuzzy
-msgid " Edit "
-msgstr "Edita"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Nou"
-
-#: mail/mail-config.glade.h:4
-#, fuzzy
 msgid " _Check for supported types "
 msgstr "Detecta els tipus suportats..."
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "cont�"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Account Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "Afegeix un criteri"
+
 #: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Cancel�lat"
+msgid "Add new signature..."
+msgstr "Fitxer de signatura:"
 
 #: mail/mail-config.glade.h:12
-msgid "Afrikaans"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-#, fuzzy
-msgid "Alerts"
-msgstr "Alarmes"
-
-#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "adjunci�"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Authentication"
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Error desconegut: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "Tanca"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
@@ -11815,15 +12555,20 @@ msgstr "Comprova si hi ha nou correu"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Element per fer que ven� avui:"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "Redacta un missatge"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -11836,57 +12581,49 @@ msgstr ""
 "Ja teniu enllestida la configuraci� del correu.\n"
 "Feu clic a \"Finalitza\" per desar els nous par�metres"
 
-#: mail/mail-config.glade.h:37
-msgid "Dari"
-msgstr ""
-
 #: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "De_fault"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Done"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Creaci� d'una nova carpeta"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "E_nable"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11906,39 +12643,35 @@ msgstr "Adre�a electr�nica:"
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executa les accions"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "acaba amb"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propietats de l'adjunci�"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Ressalta els elemts que vencen avui"
 
-#: mail/mail-config.glade.h:59
-msgid "Hulu"
-msgstr ""
-
 #: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "IMAPv4 "
@@ -11997,71 +12730,67 @@ msgstr "�s"
 msgid "NNTP Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "Edita el servidor de not�cies"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Optional Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organitzaci�:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Agafa un color"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimeix els contactes"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Adre�a electr�nica 2"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Quoted"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
@@ -12097,272 +12826,268 @@ msgid "S_ecurity"
 msgstr ""
 
 #: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Seleccioneu els noms"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Fitxer de signatura:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Fitxer de signatura:"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Agenda"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Mostra la barra de _dreceres"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Font"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Source Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nom de l'estil:"
 
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
+msgstr ""
+
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
 #: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+msgid "Standard Unix mbox"
 msgstr ""
 
 #: mail/mail-config.glade.h:126
-msgid "Standard Unix mbox"
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "Fitxer de signatura:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "�ltim"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "Comprova si hi ha nou correu"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "S'est� esborrant \"%s\""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Nom del fitxer:"
+msgid "_Enable"
+msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Reenvia"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nom complet:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:160
-#, fuzzy
-msgid "_HTML Signature:"
-msgstr "Fitxer de signatura:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitat"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Busca"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marca el missatge com a vist [ms]: "
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Name:"
 msgstr "Nom:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "R�dio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -12402,80 +13127,59 @@ msgid "_Signatures"
 msgstr "Fitxer de signatura:"
 
 #: mail/mail-config.glade.h:183
-#, fuzzy
-msgid "_Text Signature:"
-msgstr "Fitxer de signatura:"
-
-#: mail/mail-config.glade.h:184
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 #, fuzzy
 msgid "_every"
 msgstr "Cada"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr "Colors"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 #, fuzzy
 msgid "description"
 msgstr "Descripci�:"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 #, fuzzy
 msgid "newswindow1"
 msgstr "finestra1"
 
-#: mail/mail-crypto.c:59
-#, fuzzy
-msgid "Could not create a PGP signature context."
-msgstr "No s'ha pogut crear el quadre de di�leg."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
 #, fuzzy
-msgid "Could not create a PGP verification context."
-msgstr "No s'ha pogut crear el quadre de di�leg."
-
-#: mail/mail-crypto.c:113
-#, fuzzy
-msgid "Could not create a PGP encryption context."
-msgstr "No s'ha pogut crear el quadre de di�leg."
-
-#: mail/mail-crypto.c:138
-#, fuzzy
-msgid "Could not create a PGP decryption context."
-msgstr "No s'ha pogut crear el quadre de di�leg."
-
-#: mail/mail-crypto.c:173
-#, fuzzy
 msgid "Could not create a S/MIME signature context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 #, fuzzy
 msgid "Could not create a S/MIME certsonly context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 #, fuzzy
 msgid "Could not create a S/MIME encryption context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
@@ -12520,110 +13224,143 @@ msgstr "Visualitzador extern"
 msgid "Loading message content"
 msgstr "S'estan reenviant els missatges \"%s\""
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Elements que ja han ven�ut:"
+
+#: mail/mail-display.c:1833
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Obre'l en una nova finestra"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Contacte (FIXME)"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Tasca (FIXME)"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunci�"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 #, fuzzy
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Date"
 msgstr "Data de venciment"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adre�a electr�nica:"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 #, fuzzy
 msgid "Reply-To"
 msgstr "Respon"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Per a"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "_Correu"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Anomena i desa..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "No s'ha pogut crear el quadre de di�leg."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Carpetes virtuals"
+
+#: mail/mail-local.c:670
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12632,29 +13369,29 @@ msgstr ""
 "No es pot desar la informaci� meta de la carpeta; probablement\n"
 "no la podreu tornar a obrir: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'est� convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12662,11 +13399,11 @@ msgstr ""
 "Si ja no podeu obrir aquesta b�stia de correu\n"
 "potser us caldr� reparar-la manualment."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "_Configura la carpeta"
@@ -12728,131 +13465,123 @@ msgstr "S'est� marcant el missatge %d de %d"
 msgid "Complete."
 msgstr "% comp_let:"
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "S'est� movent"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "S'est� copiant"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'est� esborrant \"%s\""
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, 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:1947
+#: mail/mail-ops.c:1915
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, fuzzy, c-format
 msgid ""
 "Cannot 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:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 #, fuzzy
 msgid "_Search"
 msgstr "Cerca"
@@ -12936,11 +13665,6 @@ msgstr "_Par�metres"
 msgid "Waiting..."
 msgstr "_Par�metres"
 
-#: mail/mail-send-recv.c:534
-#, fuzzy
-msgid "Cancelled."
-msgstr "Cancel�lat"
-
 #: mail/mail-session.c:222
 #, fuzzy
 msgid "User canceled operation."
@@ -12956,19 +13680,19 @@ msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 msgid "Enter Password"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr ""
 "No s'ha pogut obrir el fitxer de signatura %s:\n"
 "%s"
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 #, fuzzy
 msgid "Save signature"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -12979,9 +13703,29 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Nom:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
+msgid "Signature hint"
+msgstr "Fitxer de signatura"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
 msgstr "Fitxer de signatura:"
 
 #: mail/mail-tools.c:257
@@ -12999,17 +13743,17 @@ msgstr "Missatge reenviat - %s"
 msgid "Forwarded Message"
 msgstr "Reenvia el missatge"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "S'est� carregant la carpeta %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13018,101 +13762,106 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "VFolders"
+
+#: mail/mail-vfolder.c:784
 #, fuzzy
 msgid "vFolders"
 msgstr "Carpetes"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Edita les VFolders"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 #, fuzzy
 msgid "(No subject)"
 msgstr "Re: (sense assumpte)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "_Missatge"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Mou el missatge"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 #, fuzzy
 msgid "Lowest"
 msgstr "Baixa"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 #, fuzzy
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 #, fuzzy
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 #, fuzzy
 msgid "Highest"
 msgstr "Alta"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 #, fuzzy
 msgid "Generating message list"
 msgstr "C�pia de missatges"
@@ -13137,10 +13886,15 @@ msgstr ""
 
 #: mail/message-list.etspec.h:8
 #, fuzzy
+msgid "Original Location"
+msgstr "Autor original:"
+
+#: mail/message-list.etspec.h:9
+#, fuzzy
 msgid "Received"
 msgstr "Data de recepci�"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Mida"
 
@@ -18254,5725 +19008,5720 @@ msgstr "R�dio"
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "Busca"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 #, fuzzy
 msgid "Learmouth"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 #, fuzzy
 msgid "Leknes"
 msgstr "dc."
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "Minut"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "Elimina"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "anys"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 #, fuzzy
 msgid "Lewistown"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr ""
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Liberal"
 msgstr "abril"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Libya"
 msgstr "abril"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "Alta"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Lihue"
 msgstr "Minut"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limoges"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "mes"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Lincoln"
 msgstr ""
 "Entrant\n"
 "Sortint\n"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 #, fuzzy
 msgid "Lisboa"
 msgstr "abril"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "�s"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 #, fuzzy
 msgid "Litchfield"
 msgstr "vuit�"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "Avui"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "Redacta"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "London"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "Hores"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 #, fuzzy
 msgid "Los Alamos"
 msgstr "Alarmes"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr ""
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "Agrupament"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr ""
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macapa"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "Busca"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "_Missatge"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manchester"
 msgstr "Cam�:"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "�s"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "Marges"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "Marges"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "Marges"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 #, fuzzy
 msgid "Marquette"
 msgstr "Minut"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "Minut"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Marca'l com a per _llegir"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Minut"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "Minut"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "Colors"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mattoon"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Busca"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 #, fuzzy
 msgid "Mazu"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "Copia"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "abans de"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 #, fuzzy
 msgid "Mehamn"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "Divendres"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 #, fuzzy
 msgid "Miami"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middle East"
 msgstr "_Mig:"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "_Mig:"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "Nom del fitxer:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 #, fuzzy
 msgid "Milford"
 msgstr "per a"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "Envia per correu _a:"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr ""
 "Entrant\n"
 "Sortint\n"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 #, fuzzy
 msgid "Minnesota"
 msgstr "Minuts"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "no �s"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missoula"
 msgstr "�s"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Missouri"
 msgstr "�s"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitchell"
 msgstr "Cam�:"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 #, fuzzy
 msgid "Mitilini"
 msgstr "Llista de correu %s"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 #, fuzzy
 msgid "Miyazaki Airport"
 msgstr "Transport de correu"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "Dl"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Modesto"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "Mou"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Moldova"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 #, fuzzy
 msgid "Molokai"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "Busca"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montana"
 msgstr "cont�"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Mes"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "Mes"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "Mes"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "Lletres"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr ""
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organitzaci�"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "Primari"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "Mes"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "Fonts"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Mes"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 #, fuzzy
 msgid "Mullan"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 #, fuzzy
 msgid "Muncie"
 msgstr "juny"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 #, fuzzy
 msgid "Murcia"
 msgstr "agost"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "Ocupat"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 #, fuzzy
 msgid "Muscatine"
 msgstr "Minut"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "Lletres"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "Nom"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "S'est� movent"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "Recupera el correu"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "Nom"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Napoli"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "_Sobrenom:"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "avui"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natchez"
 msgstr "Cam�:"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 #, fuzzy
 msgid "Nebraska"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 #, fuzzy
 msgid "Needles"
 msgstr "dc."
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Nevada"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bedford"
 msgstr "Servidors de not�cies"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "Nova a_genda"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "Newcastle"
 msgstr "Nou"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Recupera el correu"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Recupera el correu"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "Nova a_genda"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Iberia"
 msgstr "Visualitza tots els contactes"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "_Missatge"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr ""
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "Selecciona'ls _tots"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "quart"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "Nova a_genda"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "Nou"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "New York"
 msgstr "Nova VFolder"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "Dimensions:"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nis"
 msgstr "�s"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "Nom"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norrkoping"
 msgstr "S'est� movent"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Adams"
 msgstr "No_tes:"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "quart"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "Ara"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "No_tes:"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "No_tes:"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "Ara"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "quart"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "Ara"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "Cap"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "No iniciat"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 #, fuzzy
 msgid "Oahu"
 msgstr "Opac"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "_Obre"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "_Obre"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "_Obre"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "Altres"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "Altres"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "D'acord"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 #, fuzzy
 msgid "Omsk"
 msgstr "D'acord"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "Orientaci�"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oostende"
 msgstr "Tots els assistents"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oran"
 msgstr "Cancel�lat"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "Cancel�lat"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 #, fuzzy
 msgid "Oregon"
 msgstr "Seccions:"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orlando"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 #, fuzzy
 msgid "Oruro"
 msgstr "Cap error"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr "segon"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "setmana"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 #, fuzzy
 msgid "Oxford"
 msgstr "per a"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "P�gina"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "Busca"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "Busca"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "_Par�metres"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 #, fuzzy
 msgid "Pamplona"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama City"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Cancel�lat"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "Paper"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Paphos"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 #, fuzzy
 msgid "Paris"
 msgstr "Primari"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "Vertical"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "Contrasenya"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "Final del dia:"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "Final del dia:"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "Descripci�:"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "Seccions:"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "Primari"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "Primari"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "Paper"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "Paper"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "Paper"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "Previsualitzaci�:"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 #, fuzzy
 msgid "Pine Bluff"
 msgstr "Adre�a electr�nica principal"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 #, fuzzy
 msgid "Pisa"
 msgstr "Enganxa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 #, fuzzy
 msgid "Plymouth"
 msgstr "mes"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "Imprimeix el missatge..."
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "R_esum"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Imprimeix el missatge"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "Propietats..."
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponca City"
 msgstr "Tipus de tel�fon"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponce"
 msgstr "Cap"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "_Contactes..."
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Imprimeix l'agenda"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "Imprimeix el missatge..."
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "Previsualitzaci�:"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Imprimeix l'agenda"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Portland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto"
 msgstr "Prioritat:"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "En proc�s"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "Vertical"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Vertical"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "Vertical"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poznan"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Praha"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Previsualitzaci� d'impressi�"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Pretoria"
 msgstr "Vertical"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "Anterior"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "Opcions"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Providence"
 msgstr "_Comarca:"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "Previsualitzaci�:"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "Anterior"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Puebla"
 msgstr "P�blic"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Pueblo"
 msgstr "P�blic"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Descripci�:"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "R_esum"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pula"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Imprimeix l'agenda"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "Descripci�:"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quebec"
 msgstr "Assumpte"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 #, fuzzy
 msgid "Rapid City"
 msgstr "Respon a tots"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Rawlins"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Reading"
 msgstr "Encap�alaments"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Recife"
 msgstr "Data de recepci�"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redding"
 msgstr "Encap�alaments"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redmond"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "Seccions:"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Rennes"
 msgstr "Recordatoris"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Reno"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "Seccions:"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "anys"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reynosa"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 #, fuzzy
 msgid "Riberalta"
 msgstr "abril"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "_Sobrenom:"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1881
-#, fuzzy
-msgid "Riga"
-msgstr "Dreta:"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rijeka"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 #, fuzzy
 msgid "Rimini"
 msgstr "min."
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rioja"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "abril"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Imprimeix"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 #, fuzzy
 msgid "Riyadh"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Roatan"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 #, fuzzy
 msgid "Robore"
 msgstr "abans de"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rodos"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Rogers"
 msgstr "Carpetes"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 #, fuzzy
 msgid "Roosevelt"
 msgstr "set�"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "Colors"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 #, fuzzy
 msgid "Rosario"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Roseglen"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "Hores"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "Recurr�ncia"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Russia"
 msgstr "agost"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 #, fuzzy
 msgid "Rutland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 #, fuzzy
 msgid "Sacramento"
 msgstr "_Departament:"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 #, fuzzy
 msgid "Saginaw"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "Imprimeix l'agenda"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salem"
 msgstr "Desa"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salmon"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salta"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "ds."
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samos"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "dg."
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 #, fuzzy
 msgid "Sana'A"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "San Carlos"
 msgstr "Desa i tanca"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sandberg"
 msgstr "Remitent"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sanderson"
 msgstr "Remitent"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sanford"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "Ombrejat"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "Desa i tanca"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Juan"
 msgstr "dg."
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "Remitent"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santarem"
 msgstr "despr�s de"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "_Estat:"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 #, fuzzy
 msgid "Sarasota"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "dg."
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "_Estat:"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "Organitzaci�"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "_Par�metres"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "Vist"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "Data d'_inici:"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "Cerca"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "Ombrejat"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "Cerca"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "Dissabte"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "Dissabte"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Shearwater"
 msgstr "Data d'ini_ci:"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "Vist"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "Seccions:"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Sheridan"
 msgstr "dg."
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "Mida"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Shoreham"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "Mostra 1 setmana"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 #, fuzzy
 msgid "Sidney"
 msgstr "Imprimeix"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr ""
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "Mida"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skopje"
 msgstr "Atura"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "Vist"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "minuts"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Sochi"
 msgstr "quart"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socorro"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Socotra"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sofia"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Somerset"
 msgstr "Mostra"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Remitent"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "Southampton"
 msgstr "Fonts"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "quart"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "South Dakota"
 msgstr "Fonts"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "quart"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "Remitent"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "�s"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "_Envia"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "State College"
 msgstr "Data completa:"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "_Par�metres"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "_Par�metres"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "Atura"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "Stephenville"
 msgstr "Seleccioneu una carpeta"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 #, fuzzy
 msgid "St. George"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "Atura"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 #, fuzzy
 msgid "St Louis"
 msgstr "Atura la c�rrega"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "Ara"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "St Paul"
 msgstr "_Estat:"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 #, fuzzy
 msgid "Strevell"
 msgstr "Subscriu-me"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "Dissabte"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "R_esum"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 #, fuzzy
 msgid "Sutton"
 msgstr "dg."
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Opcions"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "mar�"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 #, fuzzy
 msgid "Taejon"
 msgstr "Aleshores"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Taif"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Tainan"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Taiz"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "R�dio"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "R�dio"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 #, fuzzy
 msgid "Tampa"
 msgstr "Puntuaci�"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "Paper"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "Baixa"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 #, fuzzy
 msgid "Taoyuan"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Taranto"
 msgstr "Transparent"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Tarija"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "Opcions"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "T�lex"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "T�lex"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "Texas"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 #, fuzzy
 msgid "The Dalles"
 msgstr "Seleccioneu una carpeta"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "_T�tol:"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "Dijous"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tianjin"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Tijuana"
 msgstr "vuit�"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 #, fuzzy
 msgid "Timisoara"
 msgstr "Format de l'hora"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tirana"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "setmana"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "_T�tol:"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "Privat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 #, fuzzy
 msgid "Toledo"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "Avui"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Topeka"
 msgstr "Superior:"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "Superior:"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torrance"
 msgstr "Cancel�lat"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr ""
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "Data d'_inici:"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Toulouse"
 msgstr "Tanca"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 #, fuzzy
 msgid "Trapani"
 msgstr "Transparent"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "T�lex"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "Orientaci�"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "Ant_erior"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 #, fuzzy
 msgid "Trieste"
 msgstr "Comprova"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "dm."
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "Dimarts"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "Dimarts"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "dm."
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turaif"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "Tasca"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turku"
 msgstr "dm."
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 #, fuzzy
 msgid "Twenthe"
 msgstr "des�"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "Tipus:"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "dm."
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "Mou el missatge"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 #, fuzzy
 msgid "Unst"
 msgstr "No vist"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 #, fuzzy
 msgid "Utah"
 msgstr "4"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vadso"
 msgstr "R�dio"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Inhabilitat"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vagar"
 msgstr "Busca"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "_Correu"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valencia"
 msgstr "Agenda"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 #, fuzzy
 msgid "Valentine"
 msgstr "Visualitza en l�nia"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 #, fuzzy
 msgid "Van"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "Cancel�lat"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 #, fuzzy
 msgid "Varadero"
 msgstr "Inhabilitat"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Varna"
 msgstr "Inhabilitat"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "despr�s de"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vermont"
 msgstr "mes"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "General"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "Nom del fitxer:"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 #, fuzzy
 msgid "Villahermosa"
 msgstr "Alarmes visuals"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "Alarmes visuals"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volkel"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 #, fuzzy
 msgid "Volk Field"
 msgstr "Camps"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 #, fuzzy
 msgid "Waco"
 msgstr "Dilluns"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "S'est� movent"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "Altres"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Waterloo"
 msgstr "Altres"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "Altres"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 #, fuzzy
 msgid "Waterville"
 msgstr "categories"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "Dc"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Altres"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 #, fuzzy
 msgid "Wendover"
 msgstr "Remitent"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "Selecciona'ls _tots"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westfield"
 msgstr "Comprova"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 #, fuzzy
 msgid "Westhampton"
 msgstr "La setmana comen�a el"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "Seleccioneu una carpeta"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "_Sobrenom:"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 #, fuzzy
 msgid "Wien"
 msgstr "Dc"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 #, fuzzy
 msgid "Williamsport"
 msgstr "Transport de correu"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 #, fuzzy
 msgid "Williston"
 msgstr "�s"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 #, fuzzy
 msgid "Winslow"
 msgstr "ara"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 #, fuzzy
 msgid "Winter Park"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 #, fuzzy
 msgid "Wisconsin"
 msgstr "segons"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "Dc"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "Peu de p�gina:"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "per sempre"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "Finl�ndia"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "S'est� movent"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "S'est� movent"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 #, fuzzy
 msgid "Xiamen"
 msgstr "Nom"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 #, fuzzy
 msgid "Yao Airport"
 msgstr "No l'eliminis"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 #, fuzzy
 msgid "Yenbo"
 msgstr "Vist"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zadar"
 msgstr "Agenda"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 #, fuzzy
 msgid "Zagreb"
 msgstr "P�gina"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zanesville"
 msgstr "Cancel�lat"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr ""
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 #, fuzzy
 msgid "Zurich"
 msgstr "Tasca"
@@ -24006,18 +24755,13 @@ msgstr "%A, %d de %B"
 msgid "No description"
 msgstr "Descripci�:"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 #, fuzzy
 msgid "Mail summary"
 msgstr "Sense resum"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "VFolders"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 #, fuzzy
 msgid "Local Folders"
 msgstr "Carpetes virtuals"
@@ -24027,59 +24771,49 @@ msgstr "Carpetes virtuals"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Afegeix un servidor de not�cies"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Nom:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "Error en carregar el fitxer: %s"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 #, fuzzy
 msgid "News Feed"
 msgstr "Servidors de not�cies"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
-msgstr "Afegeix >>"
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "<< Elimina"
+msgid "Add"
+msgstr "Afegeix"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Mostra"
@@ -24127,11 +24861,47 @@ msgstr "R_esum"
 msgid "Printing of Summary failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Lletres"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "S'est� movent"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "_Filtres de correu ..."
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "_Filtres de correu ..."
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -25327,108 +26097,113 @@ msgid "C_elsius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Afegeix un servidor de not�cies"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "One mont_h"
 msgstr "mes"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "One w_eek"
 msgstr "Mostra 1 setmana"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "Mostra en aquest ordre"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "Show _all tasks"
 msgstr "Mostra les _adjuncions"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "Mostra les _adjuncions"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 #, fuzzy
 msgid "Tasks "
 msgstr "Tasques"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 #, fuzzy
 msgid "Weather settings"
 msgstr "Par�metres de prova"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "_Five days"
 msgstr "Divendres"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Correu"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "_News Feeds"
 msgstr "Servidors de not�cies"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 #, fuzzy
 msgid "_One day"
 msgstr "Dimecres"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 #, fuzzy
 msgid "_Schedule"
 msgstr "Seleccioneu una carpeta"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 #, fuzzy
 msgid "_Weather"
 msgstr "Altres"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 #, fuzzy
-msgid "Configuration control for Evolution default folders."
+msgid "Configuration control for Evolution folder settings."
 msgstr ""
 "Utilitat de configuraci� per al conducte de les coses per fer de "
 "l'Evolution.\n"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Carpetes virtuals"
+msgid "Folder Settings"
+msgstr "_Par�metres"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 #, fuzzy
@@ -25436,7 +26211,7 @@ msgid "The Evolution shell."
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -25449,6 +26224,39 @@ msgstr "Detalls"
 msgid "Cancel Operation"
 msgstr "Cancel�lat"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"No s'ha pogut suprimir la carpeta `%s':\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Afegeix una regla de la VFolder"
+
+#: shell/e-local-storage.c:174
+#, fuzzy
+msgid "Drafts"
+msgstr "Data de venciment"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:177
+#, fuzzy
+msgid "Sent"
+msgstr "Vist"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instal�laci� de l'Evolution"
@@ -25550,6 +26358,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Completat"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Carpetes virtuals"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Carpetes virtuals"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Carpetes virtuals"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Completat"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -25583,22 +26416,22 @@ msgstr ""
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 #, fuzzy
 msgid "Copy folder"
 msgstr "Copia a la carpeta"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 #, fuzzy
 msgid "Move folder"
 msgstr "Mou a la carpeta"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25607,20 +26440,17 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Crea \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
+#: shell/e-shell-folder-commands.c:407
 #, fuzzy, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
+msgid "Really delete folder \"%s\"?"
+msgstr "Suprimeix la tasca"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25629,17 +26459,17 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, fuzzy, c-format
 msgid "The specified folder name is not valid: %s"
@@ -25658,7 +26488,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea una nova carpeta"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -25666,7 +26496,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:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Nou..."
 
@@ -25708,118 +26538,168 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Seleccioneu una carpeta"
+
+#: shell/e-shell-importer.c:498
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "No hi ha nou correu a %s."
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 #, fuzzy
 msgid "Importing"
 msgstr "S'est� movent"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 #, fuzzy
 msgid "Automatic"
 msgstr "Tria autom�tica"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 #, fuzzy
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 #, fuzzy
 msgid "Select a file"
 msgstr "Fitxer de signatura:"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 #, fuzzy
 msgid "File type:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 #, fuzzy
 msgid "Import a single file"
 msgstr "S'est� movent"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 #, fuzzy
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr ""
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr "Sincronitza \"%s\""
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "S'est� sincronitzant \"%s\""
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "Sincronitza \"%s\""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Instal�laci� de l'Evolution"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Obre a %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"No es pot crear la carpeta indicada:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
@@ -25834,8 +26714,8 @@ msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "No es pot inicialitzar el hash d'emmagatzematge de correu de l'Evolution."
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nou"
@@ -25858,47 +26738,47 @@ msgstr "No s'ha pogut crear el directori %s: %s"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 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:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "_Quant a l'Evolution..."
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "V�s a la carpeta..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 #, fuzzy
 msgid "_Work Online"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 #, fuzzy
 msgid "_Work Offline"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 #, fuzzy
 msgid "Work Offline"
 msgstr "S'est� movent"
@@ -25931,7 +26811,7 @@ msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25939,12 +26819,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25952,25 +26832,21 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr ""
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configuraci� del correu"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Error gen�ric"
 
@@ -25995,109 +26871,109 @@ msgstr ""
 msgid "Don't remove"
 msgstr "No l'eliminis"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "Icones _petites"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra les dreceres com a icones petites"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "Icones _grans"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra les dreceres com a icones grans"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Nou grup..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "Obre'l en una nova finestra"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Envia aquest missatge"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 #, fuzzy
 msgid "_Rename"
 msgstr "Nom de la regla: "
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 #, fuzzy
 msgid "Re_move"
 msgstr "Elimina"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
@@ -26110,10 +26986,6 @@ msgstr "Error en desar les dreceres."
 msgid "Shortcuts"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr ""
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -26178,11 +27050,11 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:196
-#, fuzzy
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% comp_let:"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<feu clic aqu� per seleccionar una carpeta>"
 
@@ -26212,78 +27084,78 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 #, fuzzy
 msgid "CORBA error"
 msgstr "Error d'E/S"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 #, fuzzy
 msgid "Invalid argument"
 msgstr "adjunci�"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 #, fuzzy
 msgid "No owner"
 msgstr "Cap"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 #, fuzzy
 msgid "Not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Detecta els tipus suportats..."
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Consulta cancel�lada per l'usuari."
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 #, fuzzy
 msgid "Internal error"
 msgstr "Error d'E/S"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 #, fuzzy
 msgid "Exists"
 msgstr "S_urt"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Agenda"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 #, fuzzy
 msgid "Has subfolders"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 #, fuzzy
 msgid "No space left"
 msgstr "S'ha rebut el missatge"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Nom del fitxer:"
@@ -26416,51 +27288,106 @@ msgstr "Envia aquest missatge"
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "_Par�metres"
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, fuzzy, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\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"
+"M�s o menys durant el darrer mes i mig ens hem concentrat en fer que\n"
+"l'Evolution es pugui utilitzar. Molts dels seus desenvolupadors ja estan\n"
+"utilitzant-lo per llegir sempre el seu correu, aix� que tamb� ho podeu fer\n"
+"(per� feu c�pies de seguretat per si un cas!).\n"
+"\n"
+"Per�, encara que hem solucionat molts problemes que afectaven a "
+"l'estabilitat\n"
+"de l'Evolution, aqu� teniu encara el desc�rrec. L'Evolution pot: deixar de\n"
+"funcionar, perdre el correu que no voleu perdre, negar-se a suprimir el "
+"correu\n"
+"que voleu suprimir, deixar processos en marxa per tot arreu, consumir el "
+"100%\n"
+"de la CPU, anar massa de pressa, blocar-se, enviar correu HTML a llistes de\n"
+"correu a l'atzar, i deixar-vos en rid�cul davant dels vostres amics i "
+"companys\n"
+"de feina. Utilitzeu-lo nom�s sota un control estricte.\n"
+"\n"
+"Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
+"ansiosament les vostres contribucions!\n"
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"Gr�cies\n"
+"L'equip de l'Evolution\n"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Envia aquest missatge"
+
+#: shell/main.c:347
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Data d'_inici:"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Data d'_inici:"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No es pot inicialitzar el sistema de components del Bonobo."
 
@@ -26592,11 +27519,11 @@ msgstr "l'hora actual"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Accions"
 
@@ -26740,8 +27667,8 @@ msgstr "Suprimeix aquest element"
 msgid "Delete this item"
 msgstr "Suprimeix aquest element"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr ""
 
@@ -26784,7 +27711,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Fitxer"
 
@@ -26860,21 +27787,21 @@ msgstr "FIXME: Reenvia com a v_Calendar"
 msgid "Forward this item via email"
 msgstr "Reenvia aquest missatge"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Meeting"
 msgstr "Refresca la llista"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 #, fuzzy
 msgid "Schedule _Meeting"
 msgstr "Seleccioneu una carpeta"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "Seleccioneu una carpeta"
@@ -26884,11 +27811,6 @@ msgstr "Seleccioneu una carpeta"
 msgid "Customise My Evolution"
 msgstr "Evolution - %s"
 
-#: ui/evolution-mail-global.xml.h:1
-#, fuzzy
-msgid "Cancel"
-msgstr "Cancel�lat"
-
 #: ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
@@ -27065,7 +27987,7 @@ msgstr "Llista de missatges en cadena"
 msgid "_Expunge"
 msgstr "_Esborra"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Carpeta"
 
@@ -27535,7 +28457,7 @@ msgstr "Imprimeix el missatge"
 msgid "_Quoted"
 msgstr "Cap"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Eines"
 
@@ -27552,13 +28474,13 @@ msgstr "Suprimeix aquesta cita"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Close"
 msgstr "Tanca"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Visualitza"
 
@@ -27778,7 +28700,7 @@ msgstr "_Obre..."
 msgid "_Reply-To Field"
 msgstr "Respon"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Ajuda"
 
@@ -27944,130 +28866,139 @@ msgid "Move this folder to another place"
 msgstr "Mou un missatge a una nova carpeta"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "_Crea una carpeta nova..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Obre'l en una nova finestra"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "Envia aquest missatge"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 #, fuzzy
 msgid "Send / Receive"
 msgstr "Sendmail"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Envia el correu de la cua i recupera'n el nou"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Mostra informaci� referent a l'Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "Submit Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Envia un informe d'error mitjan�ant el Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Toggle"
 msgstr "M�bil"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commuta la visualitzaci� o no de la barra de dreceres"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Toggle whether we are working offline."
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Visualitza la carpeta seleccionada"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Copy..."
 msgstr "Copia"
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_V�s a la carpeta..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Import..."
 msgstr "S'est� movent"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 #, fuzzy
 msgid "_Move..."
 msgstr "Mou"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nova VFolder"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "_Par�metres"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Tanca..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Send / Receive"
 msgstr "Sendmail"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Shortcut"
 msgstr "Mostra la barra de _dreceres"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
@@ -28164,23 +29095,23 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 #, fuzzy
 msgid "_Current View"
 msgstr "l'hora actual"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "Cerca personalitzada"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 #, fuzzy
 msgid "Save Custom View"
 msgstr "Cerca personalitzada"
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr ""
 
@@ -28311,16 +29242,21 @@ msgstr "Contacta l'editor"
 msgid "Save Search"
 msgstr "Cerca"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Cerca"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Cerca"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Afegeix..."
+
 #: widgets/misc/e-messagebox.c:152
 #, fuzzy
 msgid "Information"
@@ -28347,22 +29283,22 @@ msgstr "_Missatge"
 msgid "Don't show this message again."
 msgstr "Envia aquest missatge"
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "finestra2"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Agenda"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 #, fuzzy
 msgid "Clear"
 msgstr "Agenda"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 #, fuzzy
 msgid "Find Now"
 msgstr "finestra2"
@@ -28394,6 +29330,190 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Afegeix una font"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Addressbook."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de les coses per fer de "
+#~ "l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "Error en carregar la informaci� del filtre:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr ""
+#~ "No es pot inicialitzar el component de resum del correu de l'Evolution."
+
+#, fuzzy
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr ""
+#~ "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
+
+#, fuzzy
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Inici del dia:"
+
+#, fuzzy
+#~ msgid "_End of day:"
+#~ msgstr "Final del dia:"
+
+#, fuzzy
+#~ msgid "before the start of the appointment"
+#~ msgstr "Crea una nova cita"
+
+#, fuzzy
+#~ msgid "_Other Organizer"
+#~ msgstr "Organitzaci�:"
+
+#, fuzzy
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
+
+#, fuzzy
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
+
+#, fuzzy
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr ""
+#~ "No es pot recuperar el missatge: %s\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
+
+#, fuzzy
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
+
+#, fuzzy
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
+
+#~ msgid "%s server %s"
+#~ msgstr "Servidor %s %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(ordinador central desconegut)"
+
+#, fuzzy
+#~ msgid "No such message: %s"
+#~ msgstr "L'ordinador central %s no existeix."
+
+#, fuzzy
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr ""
+#~ "Nom�s podeu editar els missatges que s'hagin desat\n"
+#~ "a la carpeta Esborranys."
+
+#, fuzzy
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "No es pot afegir el missatge al fitxer mbox: %s"
+
+#, fuzzy
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "No s'ha pogut carregar %s: %s"
+
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "`%s' no �s un fitxer habitual."
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "R�dio"
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "Edita"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Nou"
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Cancel�lat"
+
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Fitxer de signatura:"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Fitxer de signatura:"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "Fitxer de signatura:"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Nom del fitxer:"
+
+#, fuzzy
+#~ msgid "_HTML Signature:"
+#~ msgstr "Fitxer de signatura:"
+
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Busca"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "R�dio"
+
+#, fuzzy
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "No s'ha pogut crear el quadre de di�leg."
+
+#, fuzzy
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "No s'ha pogut crear el quadre de di�leg."
+
+#~ msgid "Moving"
+#~ msgstr "S'est� movent"
+
+#~ msgid "Copying"
+#~ msgstr "S'est� copiant"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Fitxer de signatura:"
+
+#, fuzzy
+#~ msgid "Riga"
+#~ msgstr "Dreta:"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "Afegeix >>"
+
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "<< Elimina"
+
+#, fuzzy
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr ""
+#~ "Esteu segur que voleu\n"
+#~ "suprimir aquest contacte?"
+
+#, fuzzy
 #~ msgid "Card: "
 #~ msgstr "Cotxe"
 
@@ -28508,14 +29628,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
 
 #, fuzzy
-#~ msgid "Other Contacts"
-#~ msgstr "Contacte _nou"
-
-#, fuzzy
-#~ msgid "(none)"
-#~ msgstr "(Sense nom)"
-
-#, fuzzy
 #~ msgid "Co_ntacts:"
 #~ msgstr "_Contactes..."
 
@@ -28538,14 +29650,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "_Mobile"
 #~ msgstr "_M�bil"
 
-#, fuzzy
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "Esteu segur que voleu\n"
-#~ "suprimir aquest contacte?"
-
 #~ msgid "Create a new appointment"
 #~ msgstr "Crea una nova cita"
 
@@ -28570,169 +29674,9 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Altres"
 
 #, fuzzy
-#~ msgid "Click here to add an attendee"
-#~ msgstr "<feu clic aqu� per seleccionar una data>"
-
-#, fuzzy
 #~ msgid "_Delete this Task"
 #~ msgstr "Suprimeix la tasca"
 
-#, fuzzy
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Cap informaci�"
-
-#, fuzzy
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Hora de _finalitzaci� de la reuni�:"
-
-#, fuzzy
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Cap informaci�"
-
-#, fuzzy
-#~ msgid "Task Completed: <b>"
-#~ msgstr "% comp_let:"
-
-#, fuzzy
-#~ msgid "iCalendar Information"
-#~ msgstr "Cap informaci�"
-
-#, fuzzy
-#~ msgid "iCalendar Error"
-#~ msgstr "Agenda"
-
-#, fuzzy
-#~ msgid "An unknown person"
-#~ msgstr "Error desconegut"
-
-#, fuzzy
-#~ msgid "Choose an action:"
-#~ msgstr "Fitxer de signatura:"
-
-#, fuzzy
-#~ msgid "Update"
-#~ msgstr "ha estat despr�s de"
-
-#, fuzzy
-#~ msgid "Accept"
-#~ msgstr "set"
-
-#, fuzzy
-#~ msgid "Tentatively accept"
-#~ msgstr "Tentatiu"
-
-#, fuzzy
-#~ msgid "Decline"
-#~ msgstr "Suprimeix"
-
-#, fuzzy
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Cap informaci�"
-
-#, fuzzy
-#~ msgid "Send Latest Information"
-#~ msgstr "Cap informaci�"
-
-#, fuzzy
-#~ msgid "Meeting Information"
-#~ msgstr "Cap informaci�"
-
-#, fuzzy
-#~ msgid "Meeting Proposal"
-#~ msgstr "Cancel�lat"
-
-#, fuzzy
-#~ msgid "Meeting Update"
-#~ msgstr "Hora de _finalitzaci� de la reuni�:"
-
-#, fuzzy
-#~ msgid "Meeting Update Request"
-#~ msgstr "FIXME: Pe_tici� de cita"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "_Aquesta �s l'adre�a de correu"
-
-#, fuzzy
-#~ msgid "Meeting Reply"
-#~ msgstr "Cancel�lat"
-
-#, fuzzy
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Fitxer de signatura:"
-
-#, fuzzy
-#~ msgid "Bad Meeting Message"
-#~ msgstr "_Edita el missatge"
-
-#, fuzzy
-#~ msgid "Task Information"
-#~ msgstr "Cap informaci�"
-
-#, fuzzy
-#~ msgid "Task Proposal"
-#~ msgstr "TaskPad"
-
-#, fuzzy
-#~ msgid "Task Update"
-#~ msgstr "ha estat despr�s de"
-
-#, fuzzy
-#~ msgid "Task Update Request"
-#~ msgstr "FIXME: _Petici� de tasca"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "_Aquesta �s l'adre�a de correu"
-
-#, fuzzy
-#~ msgid "Task Reply"
-#~ msgstr "Respon"
-
-#, fuzzy
-#~ msgid "Task Cancellation"
-#~ msgstr "Cancel�lat"
-
-#, fuzzy
-#~ msgid "Bad Task Message"
-#~ msgstr "Agenda"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "Cap informaci�"
-
-#, fuzzy
-#~ msgid "Free/Busy Information"
-#~ msgstr "Cap informaci�"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "_Aquesta �s l'adre�a de correu"
-
-#, fuzzy
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Imprimeix el missatge"
-
-#, fuzzy
-#~ msgid "Status: %s"
-#~ msgstr "_Estat:"
-
-#, fuzzy
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Marca la tasca com a completa"
-
-#, fuzzy
-#~ msgid "URL: %s"
-#~ msgstr "URL:"
-
-#, fuzzy
-#~ msgid "Categories: %s"
-#~ msgstr "categories"
-
-#, fuzzy
-#~ msgid "Contacts: "
-#~ msgstr "_Contactes..."
-
 #~ msgid "Please enter the NNTP password for %s@%s"
 #~ msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
@@ -28779,7 +29723,8 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "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."
@@ -28795,10 +29740,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "(Desconegut)"
 
 #, fuzzy
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Resposta inesperada del servidor IMAP: %s"
-
-#, fuzzy
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
@@ -28842,24 +29783,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Format"
 
 #, fuzzy
-#~ msgid " (default)"
-#~ msgstr "Valors predeterminats"
-
-#, fuzzy
-#~ msgid "Subject is %s"
-#~ msgstr "Assumpte"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Correu de %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "Llista de correu %s"
-
-#, fuzzy
-#~ msgid "Accounts"
-#~ msgstr "cont�"
-
-#, fuzzy
 #~ msgid "Composer"
 #~ msgstr "Redacta"
 
@@ -28867,10 +29790,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Edita..."
 
 #, fuzzy
-#~ msgid "HTML signature file:"
-#~ msgstr "Fitxer de signatura:"
-
-#, fuzzy
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Fitxer de signatura:"
 
@@ -28924,22 +29843,10 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "_Par�metres"
 
 #, fuzzy
-#~ msgid "inHg"
-#~ msgstr "S'est� movent"
-
-#, fuzzy
-#~ msgid "kilometers"
-#~ msgstr "_Filtres de correu ..."
-
-#, fuzzy
 #~ msgid "All _folders:"
 #~ msgstr "Carpetes"
 
 #, fuzzy
-#~ msgid "All news _feeds:"
-#~ msgstr "Afegeix un servidor de not�cies"
-
-#, fuzzy
 #~ msgid "_Display folders:"
 #~ msgstr "Visualitza les carpetes que continguin:"
 
@@ -28955,14 +29862,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#, fuzzy
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "No s'ha pogut suprimir la carpeta `%s':\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(Sense nom)"
 
@@ -29152,51 +30051,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "%s - Ximian Evolution %s [%s]"
 #~ msgstr "Evolution - %s"
 
-#, fuzzy
-#~ msgid ""
-#~ "Hi.  Thanks for taking the time to download this preview release\n"
-#~ "of the Ximian Evolution groupware suite.\n"
-#~ "\n"
-#~ "Ximian Evolution is not yet complete. It's getting close, but there are\n"
-#~ "places where features are either missing or only half working. \n"
-#~ "\n"
-#~ "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
-#~ "This product comes with no warranty and is not intended for\n"
-#~ "individuals prone to violent fits of anger.\n"
-#~ "\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"
-#~ "M�s o menys durant el darrer mes i mig ens hem concentrat en fer que\n"
-#~ "l'Evolution es pugui utilitzar. Molts dels seus desenvolupadors ja estan\n"
-#~ "utilitzant-lo per llegir sempre el seu correu, aix� que tamb� ho podeu fer\n"
-#~ "(per� feu c�pies de seguretat per si un cas!).\n"
-#~ "\n"
-#~ "Per�, encara que hem solucionat molts problemes que afectaven a "
-#~ "l'estabilitat\n"
-#~ "de l'Evolution, aqu� teniu encara el desc�rrec. L'Evolution pot: deixar de\n"
-#~ "funcionar, perdre el correu que no voleu perdre, negar-se a suprimir el "
-#~ "correu\n"
-#~ "que voleu suprimir, deixar processos en marxa per tot arreu, consumir el "
-#~ "100%\n"
-#~ "de la CPU, anar massa de pressa, blocar-se, enviar correu HTML a llistes de\n"
-#~ "correu a l'atzar, i deixar-vos en rid�cul davant dels vostres amics i "
-#~ "companys\n"
-#~ "de feina. Utilitzeu-lo nom�s sota un control estricte.\n"
-#~ "\n"
-#~ "Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
-#~ "ansiosament les vostres contribucions!\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Ximian Evolution Team\n"
-#~ msgstr ""
-#~ "Gr�cies\n"
-#~ "L'equip de l'Evolution\n"
-
 #~ msgid "F_ormat"
 #~ msgstr "F_ormat"
 
@@ -29229,10 +30083,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Crea una nova cita"
 
 #, fuzzy
-#~ msgid "before end of appointment"
-#~ msgstr "Recorda'm totes les cites"
-
-#, fuzzy
 #~ msgid "Evolution Shortcuts"
 #~ msgstr "Barra de _dreceres de l'Evolution"
 
@@ -29241,10 +30091,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "l'hora actual"
 
 #, fuzzy
-#~ msgid "Delete folder '%s'"
-#~ msgstr "Suprimeix la tasca"
-
-#, fuzzy
 #~ msgid "Rename"
 #~ msgstr "Nom de la regla: "
 
@@ -29291,9 +30137,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "m"
 #~ msgstr "m"
 
-#~ msgid "n"
-#~ msgstr "n"
-
 #~ msgid "o"
 #~ msgstr "o"
 
@@ -29384,12 +30227,13 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "%s"
 
 #~ 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."
+#~ "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 ""
-#~ "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."
+#~ "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."
 
 #, fuzzy
 #~ msgid "%d/%m/%Y"
@@ -29416,10 +30260,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Obre a %s..."
 
 #, fuzzy
-#~ msgid "Synchronizing '%s'"
-#~ msgstr "Sincronitza \"%s\""
-
-#, fuzzy
 #~ msgid "%l:%M%p"
 #~ msgstr "%I:%M %p"
 
@@ -29522,10 +30362,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Visualitza les carpetes que continguin:"
 
 #, fuzzy
-#~ msgid "My Evolution Settings"
-#~ msgstr "Instal�laci� de l'Evolution"
-
-#, fuzzy
 #~ msgid "%A, %d %B %Y"
 #~ msgstr "%A, %d de %B de %Y"
 
@@ -29701,9 +30537,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Items Not Yet Due:"
 #~ msgstr "Elements que encara no han ven�ut:"
 
-#~ msgid "Overdue Items:"
-#~ msgstr "Elements que ja han ven�ut:"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Temps fins al venciment"
 
@@ -30137,11 +30970,11 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
 #~ msgid ""
-#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
-#~ "the server supports it."
+#~ "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."
+#~ "Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya "
+#~ "de text net."
 
 #~ msgid "No such host %s."
 #~ msgstr "L'ordinador central %s no existeix."
@@ -30164,18 +30997,18 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, 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 "
+#~ "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."
+#~ "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."
 
 #, fuzzy
 #~ msgid ""
-#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-#~ "connection.\n"
+#~ "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."
@@ -30250,8 +31083,8 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "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."
+#~ "Per llegir el correu lliurat al sistema local i per emmagatzemar correu "
+#~ "en el disc local."
 
 #, fuzzy
 #~ msgid "Connect to server"
@@ -30368,9 +31201,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Edit Filter Rule"
 #~ msgstr "Edita una regla de filtre"
 
-#~ msgid "Add VFolder Rule"
-#~ msgstr "Afegeix una regla de la VFolder"
-
 #~ msgid "Edit VFolder Rule"
 #~ msgstr "Edita una regla de la VFolder"
 
@@ -30431,8 +31261,8 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ 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."
+#~ "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"
@@ -30640,26 +31470,23 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Respon"
 
 #~ 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."
+#~ "Enter your name and email address to be used in outgoing mail. You may "
+#~ "also, optionally, enter the name of your organization, and the name of a "
+#~ "file to read your signature from."
 #~ msgstr ""
 #~ "Introdu�u el vostre nom i adre�a electr�nica que es far� servir al correu "
-#~ "desortida. Podeu, opcionalment, introduir el nom de la vostra organitzaci�, "
-#~ "iel nom d'un fitxer d'on llegir la vostra signatura."
-
-#~ msgid "Signature File"
-#~ msgstr "Fitxer de signatura"
+#~ "desortida. Podeu, opcionalment, introduir el nom de la vostra "
+#~ "organitzaci�, iel nom d'un fitxer d'on llegir la vostra signatura."
 
 #~ msgid "Mail source type:"
 #~ msgstr "Tipus de font del correu:"
 
 #~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant information "
-#~ "about it.\n"
+#~ "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."
+#~ "If the server requires authentication, you can click the \"Detect "
+#~ "supported types...\" button after entering the other information."
 #~ msgstr ""
 #~ "Seleccioneu el tipus de servidor de correu que teniu, i introdu�u-ne la "
 #~ "informaci� corresponent.\n"
@@ -30671,11 +31498,11 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Tipus de font de not�cies:"
 
 #~ msgid ""
-#~ "Select the kind of news server you have, and enter the relevant information "
-#~ "about it.\n"
+#~ "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."
+#~ "If the server requires authentication, you can click the \"Detect "
+#~ "supported types...\" button after entering the other information."
 #~ msgstr ""
 #~ "Seleccioneu el tipus del vostre servidor de not�cies, i introdu�u-ne la "
 #~ "informaci� corresponent.\n"
@@ -30687,10 +31514,10 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
 #~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant information "
-#~ "about it.\n"
-#~ "If the server requires authentication, you can click the \"Detect supported "
-#~ "types...\" button after entering the other information."
+#~ "Select the kind of mail server you have, and enter the relevant "
+#~ "information about it.\n"
+#~ "If the server requires authentication, you can click the \"Detect "
+#~ "supported types...\" button after entering the other information."
 #~ msgstr ""
 #~ "Seleccioneu el tipus de servidor de correu que teniu, i introdu�u-ne la "
 #~ "informaci� corresponent.\n"
@@ -30797,9 +31624,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Highlighted day:"
 #~ msgstr "Dia ressaltat:"
 
-#~ msgid "Day numbers:"
-#~ msgstr "N�meros de dia:"
-
 #~ msgid "Current day's number:"
 #~ msgstr "N�mero del dia d'avui:"
 
@@ -30891,7 +31715,8 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Reenvia el missatge \"%s\""
 
 #~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded message."
+#~ "Failed to generate mime part from message while generating forwarded "
+#~ "message."
 #~ msgstr ""
 #~ "No s'ha pogut generar la part mime del missatge en generar el missatge "
 #~ "reenviat."
@@ -30961,8 +31786,8 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "However, the appointment will recur at the appropriate time and will be "
 #~ "displayed properly in the calendar views."
 #~ msgstr ""
-#~ "Aquesta cita t� regles de recurr�ncia personalitzades que l'Evolution no pot "
-#~ "editar.\n"
+#~ "Aquesta cita t� regles de recurr�ncia personalitzades que l'Evolution no "
+#~ "pot editar.\n"
 #~ "\n"
 #~ "No obstant aix�, la cita recurrir� en el moment oport� i es visualitzar� "
 #~ "correctament en les vistes de l'agenda."
@@ -31060,9 +31885,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "de correu electr�nic i podreu comen�ar immediatament a enviar\n"
 #~ "i rebre correu. Feu clic a Seg�ent per continuar."
 
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr "No s'ha pogut crear el conducte a %s: %s"
-
 #~ msgid "Could not execute %s: %s\n"
 #~ msgstr "No es pot executar %s: %s\n"
 
diff --git a/po/cs.po b/po/cs.po
index 4328c8747a..af2ac1f607 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-12 16:41-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-06-26 19:09-0400\n"
 "Last-Translator: Radka Doul�kov� <doulikova@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -34,7 +34,7 @@ msgstr "Importuje soubory Vkarta do Evolution."
 msgid "File As"
 msgstr "Ulo� jako"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Jm�no"
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Nen� mo�n� spustit Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Vyhled�v�m..."
 
@@ -356,31 +356,31 @@ msgstr "Po_loha..."
 msgid "Error in search expression."
 msgstr "Chyba v hledan�m v�razu."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "P�id�v�m kartu do serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Odstra�uji kartu ze serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Upravuji kartu ze serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Znovu spou�t�m vyhled�v�n�."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "P�ij�m�m v�sledky hled�n� LDAP"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 msgid "Error performing search"
 msgstr "Chyba p�i prov�d�n� hled�n�"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 msgid "Could not parse query string"
 msgstr ""
 
@@ -491,21 +491,53 @@ msgid "LDAP server containing contact information"
 msgstr "Server LDAP obsahuj�c� kontaktn� informace"
 
 #: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Nov� seznam kontakt�"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "_Seznam kontakt�"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Nov� kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact List"
-msgstr "Nov� seznam kontakt�"
+#: addressbook/gui/component/addressbook-config.c:197
+msgid "Failed to connect to LDAP server"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "Contact _List"
-msgstr "_Seznam kontakt�"
+#: addressbook/gui/component/addressbook-config.c:216
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1174
+msgid "Error retrieving schema information"
+msgstr "Chyba p�i na��t�n� informac� o sch�matu"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1638
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
@@ -639,86 +671,56 @@ msgstr "Znemo�nit dotazy"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Umo�nit dotazy (nebezpe�n�!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:216
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:239
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:648
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1152
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1174
-msgid "Error retrieving schema information"
-msgstr "Chyba p�i na��t�n� informac� o sch�matu"
-
-#: addressbook/gui/component/addressbook-config.c:1182
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1627
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-msgid "&lt;&lt; Fewer Options"
-msgstr "&lt;&lt; m�n� voleb"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-msgid "&lt;- _Remove"
-msgstr "&lt;- _Odstranit"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "380"
 msgstr "380"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "<- Odstranit"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "&lt;&lt; m�n� voleb"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -813,7 +815,7 @@ msgid "Mappings"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Nikdy"
 
@@ -1048,7 +1050,7 @@ msgid "Using email address"
 msgstr "Pou�it� e-mailov� adresy"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:137
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1056,13 +1058,14 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_P�idat"
 
 #: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add -&gt;"
-msgstr "_P�idat -&gt;"
+#, fuzzy
+msgid "_Add ->"
+msgstr "P�idat ->"
 
 #: addressbook/gui/component/ldap-config.glade.h:106
 msgid "_Add Mapping"
@@ -1097,7 +1100,7 @@ msgid "_Download limit:"
 msgstr "_Omezen� stahov�n�"
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:155 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1131,7 +1134,8 @@ msgid "_Log in method:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_More Options &gt;&gt;"
+#, fuzzy
+msgid "_More Options >>"
 msgstr "_V�ce voleb &gt;&gt;"
 
 #: addressbook/gui/component/ldap-config.glade.h:122
@@ -1206,7 +1210,7 @@ msgstr ""
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:534
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
 #: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Odstranit"
@@ -1333,7 +1337,7 @@ msgid "D_epartment:"
 msgstr "O_dd�len�:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Podrobnosti"
 
@@ -1390,12 +1394,12 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706
+#: calendar/gui/dialogs/meeting-page.c:673
 #: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
 #: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:153 ui/evolution-calendar.xml.h:27
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
 #: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "Smazat"
 
@@ -1424,7 +1428,7 @@ msgid "_Web page address:"
 msgstr "Adresa _webov� str�nky:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Spojen� St�ty"
 
@@ -1929,12 +1933,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Loty�sko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libanon"
 
@@ -1943,7 +1946,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Lib�rie"
 
@@ -1952,12 +1955,12 @@ msgid "Liechtenstein"
 msgstr "Lichten�tejnsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litva"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Lucembursko"
 
@@ -1990,7 +1993,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2015,7 +2018,7 @@ msgid "Mayotte"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexiko"
 
@@ -2040,7 +2043,7 @@ msgid "Montserrat"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Maroko"
 
@@ -2065,7 +2068,7 @@ msgid "Nepal"
 msgstr "Nep�l"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Holandsko"
 
@@ -2078,12 +2081,12 @@ msgid "New Caledonia"
 msgstr "Nov� Kaledonie"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nov� Z�land"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
@@ -2100,7 +2103,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolsk� ostrovy"
 
@@ -2109,17 +2112,17 @@ msgid "Northern Mariana Islands"
 msgstr "Severn� Mari�nsk� ostrovy"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Om�n"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "P�kist�n"
 
@@ -2132,7 +2135,7 @@ msgid "Palestinian Territory"
 msgstr "Palestinsk� teritorium"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2141,12 +2144,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Nov� Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Parguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2159,22 +2162,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugalsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Portoriko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Katar"
 
@@ -2183,7 +2186,7 @@ msgid "Reunion"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rumunsko"
 
@@ -2220,7 +2223,7 @@ msgid "Sao Tome And Principe"
 msgstr "Svat� Tom� a Princ�v ostrov"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Sa�dsk� Ar�bie"
 
@@ -2237,17 +2240,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapur"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovensko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slovinsko"
 
@@ -2260,7 +2263,7 @@ msgid "Somalia"
 msgstr "Som�lsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Ji�n� Afrika"
 
@@ -2269,7 +2272,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Ji�n� Georgie a Ji�n� Sandwichovy ostrovy"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "�pan�lsko"
 
@@ -2290,7 +2293,7 @@ msgid "Sudan"
 msgstr "S�d�n"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -2303,17 +2306,17 @@ msgid "Swaziland"
 msgstr "Svazijsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "�v�dsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "�v�carsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Tchaj-wan"
 
@@ -2350,7 +2353,7 @@ msgid "Tunisia"
 msgstr "Tunis"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turecko"
 
@@ -2371,7 +2374,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukrajina"
 
@@ -2380,7 +2383,7 @@ msgid "United Arab Emirates"
 msgstr "Spojen� arabsk� emir�ty"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Spojen� kr�lovstv�"
 
@@ -2389,7 +2392,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "Spojen� st�ty men��ch vzd�len�ch ostrov�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2402,12 +2405,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2428,12 +2431,12 @@ msgid "Western Sahara"
 msgstr "Z�padn� Sahara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugosl�vie"
 
@@ -2500,11 +2503,11 @@ msgstr "E-mail"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "seznam"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3165,7 +3168,7 @@ msgstr "Okraje"
 msgid "Number of columns:"
 msgstr "Po�et sloupc�:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Volby"
 
@@ -3175,7 +3178,7 @@ msgid "Orientation"
 msgstr "Orientace"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Str�nka"
 
@@ -3249,26 +3252,26 @@ msgstr "���ka"
 msgid "_Font..."
 msgstr "_P�smo..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Neozna�en� ud�lost"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:688
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Vysok�"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:687
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Norm�ln�"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:686
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "N�zk�"
 
@@ -3536,7 +3539,7 @@ msgid "Free"
 msgstr "Voln�"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:435
+#: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Obsazen�"
@@ -3555,8 +3558,8 @@ msgstr "Prob�h�"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2296
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Dokon�eno"
 
@@ -3571,12 +3574,12 @@ msgstr ""
 "\"45.436845,125.862501\""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1903
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
 #: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1620 mail/mail-accounts.c:442
-#: mail/mail-accounts.c:451 mail/mail-accounts.c:506
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3591,14 +3594,14 @@ msgstr "Opakovan�"
 msgid "Assigned"
 msgstr "P�i�azeno"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
-#: calendar/gui/e-meeting-model.c:821
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Ano"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Ne"
 
@@ -3618,7 +3621,7 @@ msgstr "T�denn� n�hled"
 msgid "Month View"
 msgstr "M�s��n� n�hled"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1362
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
 #: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
@@ -3907,7 +3910,7 @@ msgstr "skon�en�(-m) ud�losti"
 msgid "hour(s)"
 msgstr "hodin(-u,-y)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:187
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minut(-u,-y)"
 
@@ -4038,7 +4041,8 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Wenesday"
+#: calendar/gui/dialogs/recurrence-page.c:1123
+msgid "Wednesday"
 msgstr "st�eda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
@@ -4079,7 +4083,7 @@ msgid "_Fri"
 msgstr "p_�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "O_becn�"
 
@@ -4199,52 +4203,59 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:327
+#: calendar/gui/dialogs/comp-editor.c:342
 msgid "Could not update invalid object"
 msgstr "Nen� mo�n� aktualizovat neplatn� objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:330
+#: calendar/gui/dialogs/comp-editor.c:345
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:333
+#: calendar/gui/dialogs/comp-editor.c:348
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:351
 msgid "Could not update object"
 msgstr "Nen� mo�n� aktualizovat objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:725
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Upravit ud�lost"
 
-#: calendar/gui/dialogs/comp-editor.c:730
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Ud�lost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:733
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "�kol - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:736
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Z�pis v den�ku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:750
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Nen� shrnut�"
 
-#: calendar/gui/dialogs/comp-editor.c:1129
+#: calendar/gui/dialogs/comp-editor.c:1203
 #: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1002
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Ulo�it jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1281
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Nen� mo�n� z�skat aktu�ln� verzi!"
 
@@ -4302,27 +4313,27 @@ msgstr "Postoupit komu:"
 msgid "Enter Delegate"
 msgstr "Zapsat postoupen�"
 
-#: calendar/gui/dialogs/event-editor.c:190 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Ud�lost"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "P�ipom�nka"
 
-#: calendar/gui/dialogs/event-editor.c:200
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Opakov�n�"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:265
-#: calendar/gui/dialogs/event-editor.c:370
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Pl�nov�n�"
 
-#: calendar/gui/dialogs/event-editor.c:212
-#: calendar/gui/dialogs/event-editor.c:268
-#: calendar/gui/dialogs/event-editor.c:373 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Sch�zka"
 
@@ -4391,19 +4402,19 @@ msgstr "_Konec:"
 msgid "_Start time:"
 msgstr "_Za��tek:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Je po�adov�n organiz�tor."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Je po�adov�n alespo� jeden ��astn�k."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Tato osoba se ji� sch�zky ��astn�!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Postoupit komu..."
 
@@ -4477,14 +4488,10 @@ msgid "_Change Organizer"
 msgstr "_Zm�nit organiz�tora"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Pozvat dal��..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Jin� organiz�tor"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4565,10 +4572,6 @@ msgstr "Dal�� data"
 msgid "day"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1123
-msgid "Wednesday"
-msgstr "st�eda"
-
 #: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "_"
@@ -4668,7 +4671,7 @@ msgid "Progress"
 msgstr "Pr�b�h"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:782
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4680,19 +4683,19 @@ msgstr "_Nal�havost:"
 msgid "_Status:"
 msgstr "_Stav:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Z�kladn�"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "P�ed�n�"
 
 #: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Popis:"
 
@@ -4971,7 +4974,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Zve�ejnit informaci o voln�m/obsazen�m �ase"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:39
 msgid "_Configure..."
 msgstr "_Nastavit..."
 
@@ -5005,12 +5008,12 @@ msgid "Delete _All Occurrences"
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:657
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:665
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr ""
@@ -5081,26 +5084,26 @@ msgstr ""
 msgid "Status:"
 msgstr "Stav"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:318
-#: calendar/gui/e-meeting-model.c:341 calendar/gui/e-meeting-model.c:835
-#: calendar/gui/itip-utils.c:323
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:326
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:320
-#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:836
-#: calendar/gui/itip-utils.c:329 calendar/gui/itip-utils.c:355
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
 msgid "Declined"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:289 calendar/gui/e-meeting-model.c:354
-#: calendar/gui/e-meeting-model.c:793 calendar/gui/e-meeting-model.c:809
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
@@ -5149,7 +5152,7 @@ msgstr ""
 msgid "Send Latest Information"
 msgstr "Poslat nejnov�j�� informace"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:343
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
 #: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zru�it"
@@ -5424,92 +5427,92 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533 calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Skupina"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535 calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:807
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:808
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543 calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:838
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr ""
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr ""
@@ -5521,63 +5524,63 @@ msgstr ""
 msgid "%m/%d/%Y"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "(Nen� informace)"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr ""
 
@@ -5596,7 +5599,7 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
@@ -5621,17 +5624,17 @@ msgstr "Nov� _ud�lost..."
 msgid "_Delete this Appointment"
 msgstr "_Zru�it tuto ud�lost"
 
-#: calendar/gui/gnome-cal.c:1521
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nelze otev��t slo�ku v `%s'"
 
-#: calendar/gui/gnome-cal.c:1532
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1914
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
@@ -5692,47 +5695,47 @@ msgstr "��jen"
 msgid "September"
 msgstr "z���"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:295
+#: calendar/gui/itip-utils.c:354
 msgid "Event information"
 msgstr "Informace o ud�losti"
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:356
 msgid "Task information"
 msgstr "Informace o �kolu"
 
-#: calendar/gui/itip-utils.c:299
+#: calendar/gui/itip-utils.c:358
 msgid "Journal information"
 msgstr "Informace o den�ku"
 
-#: calendar/gui/itip-utils.c:301
+#: calendar/gui/itip-utils.c:360
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:362
 msgid "Calendar information"
 msgstr "Informace o kalend��i"
 
-#: calendar/gui/itip-utils.c:339
+#: calendar/gui/itip-utils.c:398
 msgid "Updated"
 msgstr "Aktualizov�no"
 
-#: calendar/gui/itip-utils.c:347
+#: calendar/gui/itip-utils.c:406
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: calendar/gui/itip-utils.c:351
+#: calendar/gui/itip-utils.c:410
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -7067,638 +7070,650 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
-msgid "Asia/Magadan"
+msgid "Asia/Macau"
 msgstr ""
 
 #: calendar/zones.h:231
-msgid "Asia/Manila"
+msgid "Asia/Magadan"
 msgstr ""
 
 #: calendar/zones.h:232
-msgid "Asia/Muscat"
+msgid "Asia/Makassar"
 msgstr ""
 
 #: calendar/zones.h:233
-msgid "Asia/Nicosia"
+msgid "Asia/Manila"
 msgstr ""
 
 #: calendar/zones.h:234
-msgid "Asia/Novosibirsk"
+msgid "Asia/Muscat"
 msgstr ""
 
 #: calendar/zones.h:235
-msgid "Asia/Omsk"
+msgid "Asia/Nicosia"
 msgstr ""
 
 #: calendar/zones.h:236
-msgid "Asia/Phnom_Penh"
+msgid "Asia/Novosibirsk"
 msgstr ""
 
 #: calendar/zones.h:237
-msgid "Asia/Pontianak"
+msgid "Asia/Omsk"
 msgstr ""
 
 #: calendar/zones.h:238
-msgid "Asia/Pyongyang"
+msgid "Asia/Oral"
 msgstr ""
 
 #: calendar/zones.h:239
-msgid "Asia/Qatar"
+msgid "Asia/Phnom_Penh"
 msgstr ""
 
 #: calendar/zones.h:240
-msgid "Asia/Rangoon"
+msgid "Asia/Pontianak"
 msgstr ""
 
 #: calendar/zones.h:241
-msgid "Asia/Riyadh"
+msgid "Asia/Pyongyang"
 msgstr ""
 
 #: calendar/zones.h:242
-msgid "Asia/Saigon"
+msgid "Asia/Qatar"
 msgstr ""
 
 #: calendar/zones.h:243
-msgid "Asia/Sakhalin"
+msgid "Asia/Qyzylorda"
 msgstr ""
 
 #: calendar/zones.h:244
-msgid "Asia/Samarkand"
+msgid "Asia/Rangoon"
 msgstr ""
 
 #: calendar/zones.h:245
-msgid "Asia/Seoul"
+msgid "Asia/Riyadh"
 msgstr ""
 
 #: calendar/zones.h:246
-msgid "Asia/Shanghai"
+msgid "Asia/Saigon"
 msgstr ""
 
 #: calendar/zones.h:247
-msgid "Asia/Singapore"
+msgid "Asia/Sakhalin"
 msgstr ""
 
 #: calendar/zones.h:248
-msgid "Asia/Taipei"
+msgid "Asia/Samarkand"
 msgstr ""
 
 #: calendar/zones.h:249
-msgid "Asia/Tashkent"
+msgid "Asia/Seoul"
 msgstr ""
 
 #: calendar/zones.h:250
-msgid "Asia/Tbilisi"
+msgid "Asia/Shanghai"
 msgstr ""
 
 #: calendar/zones.h:251
-msgid "Asia/Tehran"
+msgid "Asia/Singapore"
 msgstr ""
 
 #: calendar/zones.h:252
-msgid "Asia/Thimphu"
+msgid "Asia/Taipei"
 msgstr ""
 
 #: calendar/zones.h:253
-msgid "Asia/Tokyo"
+msgid "Asia/Tashkent"
 msgstr ""
 
 #: calendar/zones.h:254
-msgid "Asia/Ujung_Pandang"
+msgid "Asia/Tbilisi"
 msgstr ""
 
 #: calendar/zones.h:255
-msgid "Asia/Ulaanbaatar"
+msgid "Asia/Tehran"
 msgstr ""
 
 #: calendar/zones.h:256
-msgid "Asia/Urumqi"
+msgid "Asia/Thimphu"
 msgstr ""
 
 #: calendar/zones.h:257
-msgid "Asia/Vientiane"
+msgid "Asia/Tokyo"
 msgstr ""
 
 #: calendar/zones.h:258
-msgid "Asia/Vladivostok"
+msgid "Asia/Ujung_Pandang"
 msgstr ""
 
 #: calendar/zones.h:259
-msgid "Asia/Yakutsk"
+msgid "Asia/Ulaanbaatar"
 msgstr ""
 
 #: calendar/zones.h:260
-msgid "Asia/Yekaterinburg"
+msgid "Asia/Urumqi"
 msgstr ""
 
 #: calendar/zones.h:261
-msgid "Asia/Yerevan"
+msgid "Asia/Vientiane"
 msgstr ""
 
 #: calendar/zones.h:262
-msgid "Atlantic/Azores"
+msgid "Asia/Vladivostok"
 msgstr ""
 
 #: calendar/zones.h:263
-msgid "Atlantic/Bermuda"
+msgid "Asia/Yakutsk"
 msgstr ""
 
 #: calendar/zones.h:264
-msgid "Atlantic/Canary"
+msgid "Asia/Yekaterinburg"
 msgstr ""
 
 #: calendar/zones.h:265
-msgid "Atlantic/Cape_Verde"
+msgid "Asia/Yerevan"
 msgstr ""
 
 #: calendar/zones.h:266
-msgid "Atlantic/Faeroe"
+msgid "Atlantic/Azores"
 msgstr ""
 
 #: calendar/zones.h:267
-msgid "Atlantic/Jan_Mayen"
+msgid "Atlantic/Bermuda"
 msgstr ""
 
 #: calendar/zones.h:268
-msgid "Atlantic/Madeira"
+msgid "Atlantic/Canary"
 msgstr ""
 
 #: calendar/zones.h:269
-msgid "Atlantic/Reykjavik"
+msgid "Atlantic/Cape_Verde"
 msgstr ""
 
 #: calendar/zones.h:270
-msgid "Atlantic/South_Georgia"
+msgid "Atlantic/Faeroe"
 msgstr ""
 
 #: calendar/zones.h:271
-msgid "Atlantic/St_Helena"
+msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
 #: calendar/zones.h:272
-msgid "Atlantic/Stanley"
+msgid "Atlantic/Madeira"
 msgstr ""
 
 #: calendar/zones.h:273
-msgid "Australia/Adelaide"
+msgid "Atlantic/Reykjavik"
 msgstr ""
 
 #: calendar/zones.h:274
-msgid "Australia/Brisbane"
+msgid "Atlantic/South_Georgia"
 msgstr ""
 
 #: calendar/zones.h:275
-msgid "Australia/Broken_Hill"
+msgid "Atlantic/St_Helena"
 msgstr ""
 
 #: calendar/zones.h:276
-msgid "Australia/Darwin"
+msgid "Atlantic/Stanley"
 msgstr ""
 
 #: calendar/zones.h:277
-msgid "Australia/Hobart"
+msgid "Australia/Adelaide"
 msgstr ""
 
 #: calendar/zones.h:278
-msgid "Australia/Lindeman"
+msgid "Australia/Brisbane"
 msgstr ""
 
 #: calendar/zones.h:279
-msgid "Australia/Lord_Howe"
+msgid "Australia/Broken_Hill"
 msgstr ""
 
 #: calendar/zones.h:280
-msgid "Australia/Melbourne"
+msgid "Australia/Darwin"
 msgstr ""
 
 #: calendar/zones.h:281
-msgid "Australia/Perth"
+msgid "Australia/Hobart"
 msgstr ""
 
 #: calendar/zones.h:282
-msgid "Australia/Sydney"
+msgid "Australia/Lindeman"
 msgstr ""
 
 #: calendar/zones.h:283
-msgid "Europe/Amsterdam"
+msgid "Australia/Lord_Howe"
 msgstr ""
 
 #: calendar/zones.h:284
-msgid "Europe/Andorra"
+msgid "Australia/Melbourne"
 msgstr ""
 
 #: calendar/zones.h:285
-msgid "Europe/Athens"
+msgid "Australia/Perth"
 msgstr ""
 
 #: calendar/zones.h:286
-msgid "Europe/Belfast"
+msgid "Australia/Sydney"
 msgstr ""
 
 #: calendar/zones.h:287
-msgid "Europe/Belgrade"
+msgid "Europe/Amsterdam"
 msgstr ""
 
 #: calendar/zones.h:288
-msgid "Europe/Berlin"
+msgid "Europe/Andorra"
 msgstr ""
 
 #: calendar/zones.h:289
-msgid "Europe/Bratislava"
+msgid "Europe/Athens"
 msgstr ""
 
 #: calendar/zones.h:290
-msgid "Europe/Brussels"
+msgid "Europe/Belfast"
 msgstr ""
 
 #: calendar/zones.h:291
-msgid "Europe/Bucharest"
+msgid "Europe/Belgrade"
 msgstr ""
 
 #: calendar/zones.h:292
-msgid "Europe/Budapest"
+msgid "Europe/Berlin"
 msgstr ""
 
 #: calendar/zones.h:293
-msgid "Europe/Chisinau"
+msgid "Europe/Bratislava"
 msgstr ""
 
 #: calendar/zones.h:294
-msgid "Europe/Copenhagen"
+msgid "Europe/Brussels"
 msgstr ""
 
 #: calendar/zones.h:295
-msgid "Europe/Dublin"
+msgid "Europe/Bucharest"
 msgstr ""
 
 #: calendar/zones.h:296
-msgid "Europe/Gibraltar"
+msgid "Europe/Budapest"
 msgstr ""
 
 #: calendar/zones.h:297
-msgid "Europe/Helsinki"
+msgid "Europe/Chisinau"
 msgstr ""
 
 #: calendar/zones.h:298
-msgid "Europe/Istanbul"
+msgid "Europe/Copenhagen"
 msgstr ""
 
 #: calendar/zones.h:299
-msgid "Europe/Kaliningrad"
+msgid "Europe/Dublin"
 msgstr ""
 
 #: calendar/zones.h:300
-msgid "Europe/Kiev"
+msgid "Europe/Gibraltar"
 msgstr ""
 
 #: calendar/zones.h:301
-msgid "Europe/Lisbon"
+msgid "Europe/Helsinki"
 msgstr ""
 
 #: calendar/zones.h:302
-msgid "Europe/Ljubljana"
+msgid "Europe/Istanbul"
 msgstr ""
 
 #: calendar/zones.h:303
-msgid "Europe/London"
+msgid "Europe/Kaliningrad"
 msgstr ""
 
 #: calendar/zones.h:304
-msgid "Europe/Luxembourg"
+msgid "Europe/Kiev"
 msgstr ""
 
 #: calendar/zones.h:305
-msgid "Europe/Madrid"
+msgid "Europe/Lisbon"
 msgstr ""
 
 #: calendar/zones.h:306
-msgid "Europe/Malta"
+msgid "Europe/Ljubljana"
 msgstr ""
 
 #: calendar/zones.h:307
-msgid "Europe/Minsk"
+msgid "Europe/London"
 msgstr ""
 
 #: calendar/zones.h:308
-msgid "Europe/Monaco"
+msgid "Europe/Luxembourg"
 msgstr ""
 
 #: calendar/zones.h:309
-msgid "Europe/Moscow"
+msgid "Europe/Madrid"
 msgstr ""
 
 #: calendar/zones.h:310
-msgid "Europe/Nicosia"
+msgid "Europe/Malta"
 msgstr ""
 
 #: calendar/zones.h:311
-msgid "Europe/Oslo"
+msgid "Europe/Minsk"
 msgstr ""
 
 #: calendar/zones.h:312
-msgid "Europe/Paris"
+msgid "Europe/Monaco"
 msgstr ""
 
 #: calendar/zones.h:313
-msgid "Europe/Prague"
+msgid "Europe/Moscow"
 msgstr ""
 
 #: calendar/zones.h:314
-msgid "Europe/Riga"
+msgid "Europe/Nicosia"
 msgstr ""
 
 #: calendar/zones.h:315
-msgid "Europe/Rome"
+msgid "Europe/Oslo"
 msgstr ""
 
 #: calendar/zones.h:316
-msgid "Europe/Samara"
+msgid "Europe/Paris"
 msgstr ""
 
 #: calendar/zones.h:317
-msgid "Europe/San_Marino"
+msgid "Europe/Prague"
 msgstr ""
 
 #: calendar/zones.h:318
-msgid "Europe/Sarajevo"
+msgid "Europe/Riga"
 msgstr ""
 
 #: calendar/zones.h:319
-msgid "Europe/Simferopol"
+msgid "Europe/Rome"
 msgstr ""
 
 #: calendar/zones.h:320
-msgid "Europe/Skopje"
+msgid "Europe/Samara"
 msgstr ""
 
 #: calendar/zones.h:321
-msgid "Europe/Sofia"
+msgid "Europe/San_Marino"
 msgstr ""
 
 #: calendar/zones.h:322
-msgid "Europe/Stockholm"
+msgid "Europe/Sarajevo"
 msgstr ""
 
 #: calendar/zones.h:323
-msgid "Europe/Tallinn"
+msgid "Europe/Simferopol"
 msgstr ""
 
 #: calendar/zones.h:324
-msgid "Europe/Tirane"
+msgid "Europe/Skopje"
 msgstr ""
 
 #: calendar/zones.h:325
-msgid "Europe/Uzhgorod"
+msgid "Europe/Sofia"
 msgstr ""
 
 #: calendar/zones.h:326
-msgid "Europe/Vaduz"
+msgid "Europe/Stockholm"
 msgstr ""
 
 #: calendar/zones.h:327
-msgid "Europe/Vatican"
+msgid "Europe/Tallinn"
 msgstr ""
 
 #: calendar/zones.h:328
-msgid "Europe/Vienna"
+msgid "Europe/Tirane"
 msgstr ""
 
 #: calendar/zones.h:329
-msgid "Europe/Vilnius"
+msgid "Europe/Uzhgorod"
 msgstr ""
 
 #: calendar/zones.h:330
-msgid "Europe/Warsaw"
+msgid "Europe/Vaduz"
 msgstr ""
 
 #: calendar/zones.h:331
-msgid "Europe/Zagreb"
+msgid "Europe/Vatican"
 msgstr ""
 
 #: calendar/zones.h:332
-msgid "Europe/Zaporozhye"
+msgid "Europe/Vienna"
 msgstr ""
 
 #: calendar/zones.h:333
-msgid "Europe/Zurich"
+msgid "Europe/Vilnius"
 msgstr ""
 
 #: calendar/zones.h:334
-msgid "Indian/Antananarivo"
+msgid "Europe/Warsaw"
 msgstr ""
 
 #: calendar/zones.h:335
-msgid "Indian/Chagos"
+msgid "Europe/Zagreb"
 msgstr ""
 
 #: calendar/zones.h:336
-msgid "Indian/Christmas"
+msgid "Europe/Zaporozhye"
 msgstr ""
 
 #: calendar/zones.h:337
-msgid "Indian/Cocos"
+msgid "Europe/Zurich"
 msgstr ""
 
 #: calendar/zones.h:338
-msgid "Indian/Comoro"
+msgid "Indian/Antananarivo"
 msgstr ""
 
 #: calendar/zones.h:339
-msgid "Indian/Kerguelen"
+msgid "Indian/Chagos"
 msgstr ""
 
 #: calendar/zones.h:340
-msgid "Indian/Mahe"
+msgid "Indian/Christmas"
 msgstr ""
 
 #: calendar/zones.h:341
-msgid "Indian/Maldives"
+msgid "Indian/Cocos"
 msgstr ""
 
 #: calendar/zones.h:342
-msgid "Indian/Mauritius"
+msgid "Indian/Comoro"
 msgstr ""
 
 #: calendar/zones.h:343
-msgid "Indian/Mayotte"
+msgid "Indian/Kerguelen"
 msgstr ""
 
 #: calendar/zones.h:344
-msgid "Indian/Reunion"
+msgid "Indian/Mahe"
 msgstr ""
 
 #: calendar/zones.h:345
-msgid "Pacific/Apia"
+msgid "Indian/Maldives"
 msgstr ""
 
 #: calendar/zones.h:346
-msgid "Pacific/Auckland"
+msgid "Indian/Mauritius"
 msgstr ""
 
 #: calendar/zones.h:347
-msgid "Pacific/Chatham"
+msgid "Indian/Mayotte"
 msgstr ""
 
 #: calendar/zones.h:348
-msgid "Pacific/Easter"
+msgid "Indian/Reunion"
 msgstr ""
 
 #: calendar/zones.h:349
-msgid "Pacific/Efate"
+msgid "Pacific/Apia"
 msgstr ""
 
 #: calendar/zones.h:350
-msgid "Pacific/Enderbury"
+msgid "Pacific/Auckland"
 msgstr ""
 
 #: calendar/zones.h:351
-msgid "Pacific/Fakaofo"
+msgid "Pacific/Chatham"
 msgstr ""
 
 #: calendar/zones.h:352
-msgid "Pacific/Fiji"
+msgid "Pacific/Easter"
 msgstr ""
 
 #: calendar/zones.h:353
-msgid "Pacific/Funafuti"
+msgid "Pacific/Efate"
 msgstr ""
 
 #: calendar/zones.h:354
-msgid "Pacific/Galapagos"
+msgid "Pacific/Enderbury"
 msgstr ""
 
 #: calendar/zones.h:355
-msgid "Pacific/Gambier"
+msgid "Pacific/Fakaofo"
 msgstr ""
 
 #: calendar/zones.h:356
-msgid "Pacific/Guadalcanal"
+msgid "Pacific/Fiji"
 msgstr ""
 
 #: calendar/zones.h:357
-msgid "Pacific/Guam"
+msgid "Pacific/Funafuti"
 msgstr ""
 
 #: calendar/zones.h:358
-msgid "Pacific/Honolulu"
+msgid "Pacific/Galapagos"
 msgstr ""
 
 #: calendar/zones.h:359
-msgid "Pacific/Johnston"
+msgid "Pacific/Gambier"
 msgstr ""
 
 #: calendar/zones.h:360
-msgid "Pacific/Kiritimati"
+msgid "Pacific/Guadalcanal"
 msgstr ""
 
 #: calendar/zones.h:361
-msgid "Pacific/Kosrae"
+msgid "Pacific/Guam"
 msgstr ""
 
 #: calendar/zones.h:362
-msgid "Pacific/Kwajalein"
+msgid "Pacific/Honolulu"
 msgstr ""
 
 #: calendar/zones.h:363
-msgid "Pacific/Majuro"
+msgid "Pacific/Johnston"
 msgstr ""
 
 #: calendar/zones.h:364
-msgid "Pacific/Marquesas"
+msgid "Pacific/Kiritimati"
 msgstr ""
 
 #: calendar/zones.h:365
-msgid "Pacific/Midway"
+msgid "Pacific/Kosrae"
 msgstr ""
 
 #: calendar/zones.h:366
-msgid "Pacific/Nauru"
+msgid "Pacific/Kwajalein"
 msgstr ""
 
 #: calendar/zones.h:367
-msgid "Pacific/Niue"
+msgid "Pacific/Majuro"
 msgstr ""
 
 #: calendar/zones.h:368
-msgid "Pacific/Norfolk"
+msgid "Pacific/Marquesas"
 msgstr ""
 
 #: calendar/zones.h:369
-msgid "Pacific/Noumea"
+msgid "Pacific/Midway"
 msgstr ""
 
 #: calendar/zones.h:370
-msgid "Pacific/Pago_Pago"
+msgid "Pacific/Nauru"
 msgstr ""
 
 #: calendar/zones.h:371
-msgid "Pacific/Palau"
+msgid "Pacific/Niue"
 msgstr ""
 
 #: calendar/zones.h:372
-msgid "Pacific/Pitcairn"
+msgid "Pacific/Norfolk"
 msgstr ""
 
 #: calendar/zones.h:373
-msgid "Pacific/Ponape"
+msgid "Pacific/Noumea"
 msgstr ""
 
 #: calendar/zones.h:374
-msgid "Pacific/Port_Moresby"
+msgid "Pacific/Pago_Pago"
 msgstr ""
 
 #: calendar/zones.h:375
-msgid "Pacific/Rarotonga"
+msgid "Pacific/Palau"
 msgstr ""
 
 #: calendar/zones.h:376
-msgid "Pacific/Saipan"
+msgid "Pacific/Pitcairn"
 msgstr ""
 
 #: calendar/zones.h:377
-msgid "Pacific/Tahiti"
+msgid "Pacific/Ponape"
 msgstr ""
 
 #: calendar/zones.h:378
-msgid "Pacific/Tarawa"
+msgid "Pacific/Port_Moresby"
 msgstr ""
 
 #: calendar/zones.h:379
-msgid "Pacific/Tongatapu"
+msgid "Pacific/Rarotonga"
 msgstr ""
 
 #: calendar/zones.h:380
-msgid "Pacific/Truk"
+msgid "Pacific/Saipan"
 msgstr ""
 
 #: calendar/zones.h:381
-msgid "Pacific/Wake"
+msgid "Pacific/Tahiti"
 msgstr ""
 
 #: calendar/zones.h:382
-msgid "Pacific/Wallis"
+msgid "Pacific/Tarawa"
 msgstr ""
 
 #: calendar/zones.h:383
-msgid "Pacific/Yap"
+msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: camel/camel-cipher-context.c:174
-msgid "Signing is not supported by this cipher"
+#: calendar/zones.h:384
+msgid "Pacific/Truk"
 msgstr ""
 
-#: camel/camel-cipher-context.c:214
-msgid "Clearsigning is not supported by this cipher"
+#: calendar/zones.h:385
+msgid "Pacific/Wake"
 msgstr ""
 
-#: camel/camel-cipher-context.c:254
+#: calendar/zones.h:386
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:387
+msgid "Pacific/Yap"
+msgstr ""
+
+#: camel/camel-cipher-context.c:170
+msgid "Signing is not supported by this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:297
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:339
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
@@ -7711,7 +7726,7 @@ msgstr ""
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
 
-#: camel/camel-disco-diary.c:183
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7719,7 +7734,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:246
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7727,7 +7742,7 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:280
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr ""
 
@@ -7837,24 +7852,93 @@ msgstr ""
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1155
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1195
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1311
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr ""
 
-#: camel/camel-folder.c:1311
+#: camel/camel-folder.c:1317
 msgid "Copying messages"
 msgstr "Kop�ruji zpr�vy"
 
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr ""
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:782
+msgid "No data provided"
+msgstr ""
+
+#: camel/camel-gpg-context.c:827
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr ""
+
+#: camel/camel-gpg-context.c:1077
+#, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1083
+#, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+msgid "Failed to execute gpg."
+msgstr ""
+
+#: camel/camel-gpg-context.c:1258
+#, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7950,81 +8034,23 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:206
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:209
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: camel/camel-pgp-context.c:634
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr ""
-
-#: camel/camel-pgp-context.c:641 camel/camel-pgp-context.c:815
-msgid "Cannot sign this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:647 camel/camel-pgp-context.c:821
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:808
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1000
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1006
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1017
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1190
-msgid "Cannot encrypt this message: no plaintext to encrypt"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1200
-msgid "Cannot encrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1207
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1216
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1385
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1393
-msgid "Cannot decrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1400
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Jin� chyba"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -8159,11 +8185,9 @@ msgid ""
 "Password Authentication."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
-msgid "Password"
-msgstr "Heslo"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -8321,7 +8345,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8330,16 +8354,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8354,12 +8378,12 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:622
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:769 camel/camel-vee-folder.c:775
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
@@ -8386,12 +8410,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2265
+#: camel/providers/imap/camel-imap-store.c:2276
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2268
+#: camel/providers/imap/camel-imap-store.c:2279
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8435,25 +8459,25 @@ msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:522
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1830
-#: camel/providers/imap/camel-imap-folder.c:2311
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1987
-#: camel/providers/imap/camel-imap-folder.c:2064
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1993
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2348
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8478,7 +8502,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1035
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
 msgid "Folders"
 msgstr "Soubory"
 
@@ -8506,6 +8530,12 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Heslo"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -8559,7 +8589,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:470
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
@@ -8570,7 +8600,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:511
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr ""
 
@@ -8588,67 +8618,79 @@ msgstr ""
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1648
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:44
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s p�i %s"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, c-format
+msgid "mailbox:%s (%s)"
+msgstr ""
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (...)"
+
+#: camel/providers/local/camel-local-provider.c:43
 msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:51
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:66
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:67
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:78
-#: camel/providers/local/camel-local-provider.c:96
+#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:84
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:85
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:102
-msgid "Standard Unix mbox spools"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:103
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:118
-msgid "Directory tree of mbox files"
+#: camel/providers/local/camel-local-provider.c:101
+msgid "Standard Unix mbox spool or directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:119
+#: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8694,13 +8736,12 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
@@ -8716,11 +8757,10 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:334
+#: camel/providers/local/camel-mbox-folder.c:348
 #: camel/providers/local/camel-mh-folder.c:201
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:218
-#: camel/providers/local/camel-spool-folder.c:585
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8728,9 +8768,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:334
+#: camel/providers/local/camel-mbox-folder.c:348
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-spool-folder.c:585
 msgid "No such message"
 msgstr ""
 
@@ -8779,7 +8818,7 @@ msgid "not a maildir directory"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -8798,58 +8837,48 @@ msgstr ""
 msgid "Checking for new messages"
 msgstr ""
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:271
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:350
-#: camel/providers/local/camel-mbox-folder.c:382
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:601
-#: camel/providers/local/camel-spool-folder.c:633
-#: camel/providers/local/camel-spool-folder.c:645
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:383
-#: camel/providers/local/camel-spool-folder.c:634
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:395
-#: camel/providers/local/camel-spool-folder.c:646
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -8886,82 +8915,76 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
+#, c-format
+msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
-msgid "Error writing to temp mailbox: %s"
+msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
+msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
-#, c-format
-msgid "Could not close source folder %s: %s"
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
-msgid "Could not close temp folder: %s"
+msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Nen� mo�n� otev��t slo�ku v '%s'"
+
+#: camel/providers/local/camel-mbox-summary.c:973
 #, c-format
-msgid "Could not rename folder: %s"
+msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:990
 #, c-format
-msgid "Unknown error: %s"
+msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mh-folder.c:175
@@ -8983,77 +9006,64 @@ msgstr ""
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-folder.c:518
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
-msgid "Cannot append message to spool file: %s: %s"
+msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:115
+#: camel/providers/local/camel-spool-store.c:128
 #, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
+msgid "Spool `%s' is not a regular file or directory"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "M�stn� slo�ky/%s"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, c-format
-msgid "Mail tree %s"
-msgstr ""
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr ""
@@ -9175,7 +9185,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr ""
 
@@ -9250,7 +9260,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr ""
 
@@ -9302,7 +9312,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr ""
 
@@ -9434,17 +9444,17 @@ msgstr ""
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:460
+#: camel/providers/smtp/camel-smtp-transport.c:461
 #, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:519
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9452,88 +9462,88 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:646
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:664
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "Zpr�vu nelze poslat: adresa odes�latele je neplatn�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:669 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Pos�l�m zpr�vu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:680
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Nelze poslat zpr�vu: nebyli ur�eni p��jemci."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nelze poslat zpr�vu: jeden nebo v�ce neplatn�ch p��jemc�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:840
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:871
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:891
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:945
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:962
-#: camel/providers/smtp/camel-smtp-transport.c:974
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:983
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1083
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1107
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1123
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1159
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9541,35 +9551,35 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1173
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:1231
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1245
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1268
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1282
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1305
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1319
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr ""
 
@@ -9698,125 +9708,125 @@ msgstr ""
 msgid "Attach a file"
 msgstr "P�ipojit soubor"
 
-#: composer/e-msg-composer.c:505
+#: composer/e-msg-composer.c:506
 msgid "Could not create a PGP signature context"
 msgstr ""
 
-#: composer/e-msg-composer.c:752
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1011
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:1015
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1037
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1087
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1095
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1109
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1118
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1220
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1366
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1373
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1405
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Otev��t soubor"
 
-#: composer/e-msg-composer.c:1554
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Vlo�it soubor"
 
-#: composer/e-msg-composer.c:1826
+#: composer/e-msg-composer.c:1841
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1863
+#: composer/e-msg-composer.c:1878
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: composer/e-msg-composer.c:1904 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
 msgid "Autogenerated"
 msgstr "automatick�"
 
-#: composer/e-msg-composer.c:1916
+#: composer/e-msg-composer.c:1931
 msgid "Set as default"
 msgstr "nastavit jako v�choz�"
 
-#: composer/e-msg-composer.c:2114 composer/e-msg-composer.c:2727
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2744
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2770 composer/e-msg-composer.c:2825
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3537
+#: composer/e-msg-composer.c:3665
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be editted.)"
 "<b>"
@@ -10024,7 +10034,7 @@ msgstr "hodinu"
 msgid "minute"
 msgstr "minutu"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:189
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "V�b�r ikony..."
 
@@ -10099,7 +10109,7 @@ msgstr " nazp�t"
 msgid "ago"
 msgstr "nazp�t"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1053
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
@@ -10336,8 +10346,8 @@ msgstr "V�raz"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:74
-#: mail/mail-config.glade.h:61
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "D�le�it�"
 
@@ -10666,11 +10676,11 @@ msgstr ""
 msgid "Font Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:67
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
 msgid "Mail Preferences"
 msgstr ""
 
@@ -10756,11 +10766,11 @@ msgstr ""
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 
-#: mail/component-factory.c:1240 mail/component-factory.c:1271
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1281
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -10945,7 +10955,7 @@ msgstr ""
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
 msgid "Default"
 msgstr "Implicitn�"
 
@@ -11014,19 +11024,19 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:162
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:132
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 msgid "User_name:"
 msgstr "_Jm�no u�ivatele:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1816
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -11042,32 +11052,32 @@ msgstr ""
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:356 mail/mail-accounts.c:390
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:358 mail/mail-accounts.c:392
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Povolit"
 
-#: mail/mail-accounts.c:635 mail/mail-accounts.c:639
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
-#: mail/mail-accounts.c:734 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:52
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:735 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr ""
 
-#: mail/mail-accounts.c:736 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -11132,7 +11142,9 @@ msgstr ""
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
-msgstr "Pos�l�te zpr�vu v HTML form�tu, av�ak n�sleduj� p��jemci si nep�ej� dost�vat zpr�vy v HTML form�tu:\n"
+msgstr ""
+"Pos�l�te zpr�vu v HTML form�tu, av�ak n�sleduj� p��jemci si nep�ej� dost�vat "
+"zpr�vy v HTML form�tu:\n"
 
 #: mail/mail-callbacks.c:211
 msgid "Send anyway?"
@@ -11275,7 +11287,7 @@ msgstr "A4"
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3138 mail/mail-callbacks.c:3178
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11295,7 +11307,7 @@ msgstr ""
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2818
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
 msgid "Unnamed"
 msgstr "Beze jm�na"
 
@@ -11353,35 +11365,35 @@ msgid "Evolution Account Assistant"
 msgstr ""
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:138
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 msgid "Work"
 msgstr ""
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:87
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Osobn�"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:129
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:65
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr ""
 
-#: mail/mail-config.c:623
+#: mail/mail-config.c:625
 #, c-format
 msgid "Account %d"
 msgstr "��et %d"
 
-#: mail/mail-config.c:2538
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2616 mail/mail-config.c:2620
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr ""
 
@@ -11446,59 +11458,63 @@ msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
 #: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:22
 msgid "Automatically _detect links"
 msgstr "Automaticky _zji��ovat odkazy"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltsk� (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltsk� (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Z_nakov� sada:"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Barvy"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Barva pro �koly, kter� maj� b�t spln�ny dnes"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Nastaven�"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11508,535 +11524,519 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "Drafts _folder:"
 msgstr "_Slo�ka koncept�:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Email _address:"
 msgstr "E-mailov� _adresa:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr "Vlastnosti p�sma"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:60 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "News Servers"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganizace:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Vyber barvu"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Zapamatovat si toto _heslo"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "Z_abezpe�en�"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "Select PGP program"
 msgstr ""
 
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Pos�l�m e-mail"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Soubory konfigurace"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Shortcuts _type:"
 msgstr "_Druh zkratek:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "Signature #1"
 msgstr "Podpis #1"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 msgid "Signature #2"
 msgstr "Podpis #2"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Zdroj"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:122
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "Spell Checking Language"
 msgstr "Kontrola pravopisu"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:124
 msgid "Spell _Checking"
 msgstr "_Kontrola pravopisu"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:126
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:134
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:140
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:142
 msgid "_Add Signature"
 msgstr "_P�idat podpis"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:146
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:148
 msgid "_Automatically insert smiley images"
 msgstr "_Automaticky vkl�dat checht�ky"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:151
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:152
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:153
 msgid "_Defaults"
 msgstr "_V�choz� hodnoty"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:157
 msgid "_Enable"
 msgstr "_Povolit"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:159
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:160
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:162
 msgid "_HTML Mail"
 msgstr "_HTML dopis"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:164
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Jm�no:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:178 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Zabezpe�en�"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Sending Mail"
 msgstr "_Pos�l�m po�tu"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "_Show animated images"
 msgstr "_Uk�zat animovan� obr�zky"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "_Signatures"
 msgstr "_Podpisy"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:183
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:184
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr ""
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:186
 msgid "color"
 msgstr ""
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:191
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr ""
-
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr ""
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
@@ -12144,49 +12144,49 @@ msgstr "Program elektronick� po�ty"
 msgid "View messages..."
 msgstr "Prohl��et zpr�vy ..."
 
-#: mail/mail-format.c:1831
+#: mail/mail-format.c:1832
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1857
+#: mail/mail-format.c:1859
 msgid "Could not create a PGP verfication context"
 msgstr ""
 
-#: mail/mail-format.c:1866
+#: mail/mail-format.c:1868
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1874
+#: mail/mail-format.c:1876
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2138
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2143
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2172
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2180
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2185
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -12472,10 +12472,6 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr ""
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr ""
@@ -12509,7 +12505,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:774
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
 msgid "Name:"
 msgstr "Jm�no:"
 
@@ -12560,7 +12556,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. Make this static, saves having to recompute it each time
 #: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
 #: my-evolution/e-summary-mail.c:733
 msgid "VFolders"
@@ -12592,63 +12587,63 @@ msgstr ""
 msgid "%s - Message"
 msgstr "%s - zpr�va"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:677
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:678
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:679
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:680
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:684
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:685
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Doln�"
 
-#: mail/message-list.c:689
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:690
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1017
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1024
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Dnes %k:%M"
 
-#: mail/message-list.c:1033
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "V�era %k:%M"
 
-#: mail/message-list.c:1045
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1055
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2435
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr ""
 
@@ -17378,5227 +17373,5224 @@ msgstr ""
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr ""
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr ""
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr ""
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr ""
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr ""
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr ""
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr ""
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr ""
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr ""
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr ""
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr ""
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr ""
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr ""
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr ""
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr ""
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr ""
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr ""
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr ""
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr ""
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr ""
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr ""
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr ""
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr ""
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr ""
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr ""
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr ""
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr ""
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr ""
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr ""
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr ""
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr ""
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr ""
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr ""
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr ""
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr ""
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr ""
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr ""
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr ""
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr ""
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr ""
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr ""
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr ""
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr ""
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr ""
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr ""
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr ""
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr ""
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr ""
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr ""
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr ""
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr ""
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr ""
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr ""
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr ""
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr ""
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr ""
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr ""
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr ""
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr ""
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr ""
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr ""
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr ""
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr ""
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr ""
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr ""
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr ""
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr ""
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr ""
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr ""
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr ""
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr ""
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr ""
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr ""
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr ""
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr ""
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr ""
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr ""
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr ""
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr ""
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr ""
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr ""
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr ""
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr ""
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr ""
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr ""
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr ""
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr ""
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr ""
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr ""
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr ""
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr ""
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr ""
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr ""
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr ""
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr ""
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr ""
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr ""
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr ""
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr ""
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr ""
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr ""
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr ""
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr ""
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr ""
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr ""
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr ""
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr ""
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr ""
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr ""
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr ""
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr ""
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr ""
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr ""
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr ""
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr ""
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr ""
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr ""
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr ""
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr ""
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr ""
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr ""
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr ""
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr ""
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr ""
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr ""
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr ""
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr ""
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr ""
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr ""
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr ""
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Str�nka"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr ""
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr ""
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr ""
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr ""
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr ""
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr ""
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr ""
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr ""
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr ""
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr ""
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr ""
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr ""
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr ""
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr ""
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr ""
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr ""
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr ""
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr ""
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr ""
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr ""
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr ""
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr ""
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr ""
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr ""
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr ""
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr ""
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr ""
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr ""
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr ""
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr ""
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr ""
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr ""
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr ""
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr ""
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr ""
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr ""
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr ""
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr ""
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr ""
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr ""
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr ""
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr ""
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr ""
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr ""
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr ""
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr ""
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr ""
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr ""
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr ""
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr ""
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr ""
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr ""
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr ""
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr ""
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr ""
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr ""
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr ""
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr ""
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr ""
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr ""
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr ""
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr ""
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr ""
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr ""
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr ""
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr ""
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr ""
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr ""
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr ""
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr ""
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr ""
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr ""
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr ""
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr ""
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr ""
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr ""
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr ""
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr ""
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr ""
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr ""
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr ""
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr ""
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr ""
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr ""
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr ""
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr ""
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr ""
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr ""
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr ""
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr ""
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr ""
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr ""
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr ""
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr ""
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr ""
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr ""
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr ""
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr ""
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr ""
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr ""
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Tchaj-wan"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr ""
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr ""
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr ""
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr ""
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr ""
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr ""
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr ""
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr ""
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr ""
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr ""
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr ""
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr ""
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr ""
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr ""
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr ""
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr ""
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr ""
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr ""
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr ""
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr ""
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr ""
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr ""
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr ""
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr ""
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr ""
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr ""
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr ""
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr ""
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr ""
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr ""
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr ""
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr ""
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr ""
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr ""
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr ""
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr ""
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr ""
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr ""
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr ""
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr ""
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr ""
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr ""
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr ""
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr ""
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr ""
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr ""
 
@@ -22630,7 +22622,7 @@ msgstr ""
 msgid "Mail summary"
 msgstr "Po�ta"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:409
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
 #: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "M�stn� slo�ky"
@@ -22640,45 +22632,45 @@ msgstr "M�stn� slo�ky"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:762
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:770
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:518
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:527
+#: my-evolution/e-summary-shown.c:545
 msgid "Add"
 msgstr "P�idat"
 
-#: my-evolution/e-summary-shown.c:542 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr ""
 
@@ -22718,7 +22710,7 @@ msgstr "Tisknout shrnut�"
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
@@ -23905,82 +23897,87 @@ msgid "C_elsius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Smazat tuto slo�ku"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr ""
 
@@ -24023,7 +24020,7 @@ msgstr "P�idat slo�ku"
 msgid "Drafts"
 msgstr "Rozepsan�"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:389
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
 #: shell/e-shortcuts.c:1033
 msgid "Inbox"
 msgstr "P��choz�"
@@ -24280,103 +24277,108 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Vybrat �asov� p�smo"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr ""
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automatick�"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Jm�no souboru:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr ""
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importovat"
 
@@ -24468,57 +24470,57 @@ msgstr ""
 msgid "About Ximian Evolution"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:492
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:493
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:613
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:614
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:783
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:796 ui/evolution.xml.h:60
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:809 ui/evolution.xml.h:36
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:228
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1824
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1826
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "Nic"
 
-#: shell/e-shell-view.c:1873
+#: shell/e-shell-view.c:1867
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1886
+#: shell/e-shell-view.c:1880
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -24647,7 +24649,7 @@ msgstr "P�ejmenovat vybranou zkratku na:"
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:22
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Otev��t v _nov�m okn�"
 
@@ -25135,7 +25137,7 @@ msgstr ""
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:39
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Akce"
 
@@ -25257,7 +25259,7 @@ msgid "Delete this item"
 msgstr "Smazat tuto polo�ku"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:17
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr ""
 
@@ -25297,7 +25299,7 @@ msgstr "Ulo�it tuto polo�ku na disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Soubor"
 
@@ -25408,7 +25410,8 @@ msgstr "Zapomenout _hesla"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Zapomene zapamatovan� hesla, tak�e budete znovu vyzv�ni k jejich zad�n�"
+msgstr ""
+"Zapomene zapamatovan� hesla, tak�e budete znovu vyzv�ni k jejich zad�n�"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
@@ -25535,7 +25538,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr "_Vymazat"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:45
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Slo�ka"
 
@@ -25927,7 +25930,7 @@ msgstr "_P�edchoz� zpr�va"
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:58
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_N�stroje"
 
@@ -25942,12 +25945,12 @@ msgstr "Zav��t toto okno"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "U_zav��t"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:59
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Zobrazen�"
 
@@ -26134,14 +26137,10 @@ msgstr "_Otev��t..."
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:48
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "N�_pov�da"
 
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Signature editor"
-msgstr "Editor _podpisu"
-
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
@@ -26275,134 +26274,126 @@ msgid "Exit the program"
 msgstr "Ukon�it program"
 
 #: ui/evolution.xml.h:15
-msgid "Full_screen"
-msgstr ""
-
-#: ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Move this folder to another place"
 msgstr "P�esunout tuto slo�ku na jin� m�sto"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 msgid "Open Other _User's Folder..."
 msgstr "Otev��t slo�ku _jin�ho u�ivatele..."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:19
 msgid "Open a folder that is made available by some other user on the server"
 msgstr "Otev��t slo�ku, kter� je zp��stupn�na jin�m u�ivatelem na serveru"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Otev��t v nov�m oknu"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Otev��t tuto slo�ku v jin�m okn�"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Odeslat / p�ijmout"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr "Poslat polo�ky �ekaj�c� ve front� a p�ijmout nov� polo�ky"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Uk�zat informace o Ximian Evolution"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "P�ep�na�"
 
-#: ui/evolution.xml.h:31
-msgid "Toggle fullscreen mode"
-msgstr "P�epnout celoobrazovkov� re�im"
-
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Kop�rovat..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_J�t na slo�ku..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Importovat..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_P�esunout..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nov�"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Nov� adres��"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr ""
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "P�e_jmenovat..."
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Odeslat / p�ijmout"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "Kl�vesov� zkratky"
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr ""
 
@@ -26482,7 +26473,8 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"Pro p�ibl��en� se na oblast mapy a v�b�r �aov�ho p�sma pou�ijte lev� tla��tko my�i.\n"
+"Pro p�ibl��en� se na oblast mapy a v�b�r �aov�ho p�sma pou�ijte lev� "
+"tla��tko my�i.\n"
 "Pro odd�len� pou�ijte prav� tla��tko my�i."
 
 #: widgets/menus/gal-view-menus.c:295
@@ -26690,6 +26682,24 @@ msgstr ""
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
+#~ msgid "&lt;- _Remove"
+#~ msgstr "&lt;- _Odstranit"
+
+#~ msgid "_Add -&gt;"
+#~ msgstr "_P�idat -&gt;"
+
+#~ msgid "Wenesday"
+#~ msgstr "st�eda"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "_Jin� organiz�tor"
+
+#~ msgid "_Signature editor"
+#~ msgstr "Editor _podpisu"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "P�epnout celoobrazovkov� re�im"
+
 #~ msgid "Sta_rt of day:"
 #~ msgstr "Z_a��tek dne:"
 
@@ -26744,14 +26754,6 @@ msgstr ""
 #~ msgid "_Language:"
 #~ msgstr "_Jazyk:"
 
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "P�idat ->"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "<- Odstranit"
-
 #~ msgid "Edit Addressbook"
 #~ msgstr "Uprav adres��"
 
diff --git a/po/da.po b/po/da.po
index 62453a1a1a..b65c7e3097 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.1\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-03-08 23:41+0100\n"
 "Last-Translator: Anna Jonna Armannsdottir <a@ingenioer.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -36,7 +36,7 @@ msgstr "Importerer VCard-filer i Evolution."
 msgid "File As"
 msgstr "Gem som"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Navn"
@@ -47,7 +47,7 @@ msgid "Email"
 msgstr "E-post"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Prim�r"
 
@@ -57,7 +57,7 @@ msgstr "Pri"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistent"
@@ -65,8 +65,8 @@ msgstr "Assistent"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Arbejde"
 
@@ -76,12 +76,12 @@ msgid "Bus"
 msgstr "Arb"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Ring tilbage"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Firma"
 
@@ -92,8 +92,8 @@ msgstr "Datamaskine"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Hjemme"
 
@@ -108,18 +108,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax p� arbejde"
@@ -129,13 +129,13 @@ msgid "Bus Fax"
 msgstr "Arb-fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax hjemme"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Arbejde 2"
 
@@ -144,43 +144,43 @@ msgid "Bus 2"
 msgstr "Arb 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Hjemme 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Andre"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Anden fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Persons�ger"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
@@ -192,14 +192,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-post 3"
@@ -337,7 +337,7 @@ msgstr "VCard for %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -345,7 +345,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "S�ger..."
 
@@ -358,32 +358,32 @@ msgstr "Indl�ser..."
 msgid "Error in search expression."
 msgstr "Fejl i s�geudtryk."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Tilf�jer kort p� LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Fjerner kort fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "�ndrer kort fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Starter s�gning igen."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Modtager s�geresultater fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Fejl ved fjernelse af kort"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Kunne ikke tolke URL `%s'"
@@ -431,104 +431,140 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Eksempel p� Bonobo-kontrol som viser en adressebog."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "Adressebog-kilder"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Kontrol som viser et minikort i Evolutions adressebog."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Minikort visning i Evolution adressebog"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Evolution komponent til h�ndtering af kontakter."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fabrik til styring af minikort for adressebogen"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Fabrik til adressebogens adressevisning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Fabrik for adressebogens adresse-pop-op"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik til styring af eksempel-adressebogen"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Mappe som indeholder kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "LDAP-server som indeholder kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Ny kontaktliste"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Kunne ikke koble til IMAP-server."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "_Kontaktliste"
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Kunne ikke autenticere mod IMAP-server.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Svar fra IMAP-server indeholdt ikke %s-information"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Fejl under indl�sning af filter-information:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "Svar fra IMAP-server indeholdt ikke %s-information"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL er ikke underst�ttet i denne version af evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunne ikke initiere gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Andre kontakter"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke �bne adressebogen"
@@ -563,50 +599,59 @@ msgstr ""
 "Kunne ikke �bne denne adressebog. Kontroll�r venligst  at stien\n"
 "eksisterer, og at du har rettigheder til at tilg� den."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Indtast adgangskode for %s (bruger %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "slutter med"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "E-post 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Et felt indeholder"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Avanceret..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappe-skimmeren vil vise"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(ingen)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Prim�r e-post"
 
@@ -652,106 +697,59 @@ msgstr "Deaktiv�r foresp�rgsler"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aktiv�r foresp�rgsler (farligt!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Kunne ikke koble til IMAP-server."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Kunne ikke autenticere mod IMAP-server.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Ugyldig ugennemsigtig sporingsinformation:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "Svar fra IMAP-server indeholdt ikke %s-information"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL er ikke underst�ttet i denne version af evolution)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Fuldf�rt dato"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "_S�g efter underst�ttede typer"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Alternativer"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr " Fje_rn"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr " Fje_rn"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Alternativer"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -760,8 +758,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Adressebog-kilder"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Alarmer"
@@ -854,8 +852,8 @@ msgstr "Konfiguration"
 msgid "Mappings"
 msgstr "Margener"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_hver"
@@ -1036,14 +1034,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1066,8 +1064,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1099,7 +1097,7 @@ msgid "Using email address"
 msgstr "De_tte er postadressen"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1107,7 +1105,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Tilf�j"
 
@@ -1154,7 +1152,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1271,10 +1269,12 @@ msgstr "Evolution adressebog-komponent"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fabrik til adressebogens gr�nseflade for navnevalg"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1405,7 +1405,7 @@ msgstr "Samarbejde"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -1414,7 +1414,7 @@ msgid "D_epartment:"
 msgstr "Af_deling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1474,11 +1474,12 @@ msgstr "�nsker at modtage e-post som _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Slet"
 
@@ -1507,7 +1508,7 @@ msgid "_Web page address:"
 msgstr "_Hjemmeside-adresse:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "U.S.A."
 
@@ -2013,12 +2014,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Letland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libanon"
 
@@ -2027,7 +2027,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
@@ -2036,12 +2036,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litauen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
@@ -2074,7 +2074,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2099,7 +2099,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexico"
 
@@ -2125,7 +2125,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marokko"
 
@@ -2150,7 +2150,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Holland"
 
@@ -2163,12 +2163,12 @@ msgid "New Caledonia"
 msgstr "Ny-kaledonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "New Zealand"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2185,7 +2185,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolk-�en"
 
@@ -2194,17 +2194,17 @@ msgid "Northern Mariana Islands"
 msgstr "Nordre Mariana-�erne"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norge"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2217,7 +2217,7 @@ msgid "Palestinian Territory"
 msgstr "Palestinensisk omr�de"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2226,12 +2226,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Ny Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2244,22 +2244,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
@@ -2268,7 +2268,7 @@ msgid "Reunion"
 msgstr "R�union"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rum�nien"
 
@@ -2305,7 +2305,7 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome og Principe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudi Arabien"
 
@@ -2322,17 +2322,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapore"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovakiet"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slovenien"
 
@@ -2345,7 +2345,7 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Sydafrika"
 
@@ -2354,7 +2354,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Syd Georgia og de sydlige sandwich-�erne"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Spanien"
 
@@ -2375,7 +2375,7 @@ msgid "Sudan"
 msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -2388,17 +2388,17 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Sverige"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Svejts"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
@@ -2436,7 +2436,7 @@ msgid "Tunisia"
 msgstr "Tunesien"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Tyrkiet"
 
@@ -2457,7 +2457,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraine"
 
@@ -2466,7 +2466,7 @@ msgid "United Arab Emirates"
 msgstr "De forenede arabiske emirater"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
@@ -2475,7 +2475,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "USA, mindre omliggende �er"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2488,12 +2488,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2516,12 +2516,12 @@ msgid "Western Sahara"
 msgstr "Vestlige Sahara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslavien"
 
@@ -2534,26 +2534,34 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Er du sikker p� at du vil\n"
+"slette denne kontakt?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Slet kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Kategori-redigering ikke tilg�ngelig."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakt h�rer til disse kategorier:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Gem kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunne ikke finde widget for felt: `%s'"
@@ -2580,11 +2588,11 @@ msgstr "E-post"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2719,11 +2727,11 @@ msgid "contact-list-editor"
 msgstr "kontakt-liste-redigering"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Gem liste som VCard"
 
@@ -2801,21 +2809,21 @@ msgid "Error getting book view"
 msgstr "Fejl under start af %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Fejl ved �ndring af kort"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Succes"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
@@ -2824,7 +2832,7 @@ msgid "Repository offline"
 msgstr "\"Offline\" lager"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Tilgang n�gtet"
 
@@ -2842,55 +2850,70 @@ msgstr "Protokollen er ikke underst�ttet"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Afbrudt"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Godkendelse mislykkedes."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autenticering kr�ves"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Anden fejl"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Vil du gemme �ndringene?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Fejl ved tilf�jelse af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Fejl ved tilf�jelse af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Fejl ved �ndring af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Fejl ved fjernelse af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Fejl ved fjernelse af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Vis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Vis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2898,22 +2921,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Sucro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Ingen kort"
@@ -2978,102 +3001,108 @@ msgstr "Anden telefon"
 msgid "Other Address"
 msgstr "Anden adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Adressebog"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Gem som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Ny kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_G� til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Import�r..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_S�g efter kontakter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Adressebogs-kilder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Indstillinger for _h�hdholdt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Send besked til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Udskriv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Udskriv konvolut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "K_opi�r til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Fl_yt til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klip ud"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Inds�t"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Slet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3083,7 +3112,7 @@ msgstr "_Aktiv visning"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,�,�,�"
 
@@ -3091,7 +3120,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,�,�,�"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,�,�,�"
 
@@ -3243,7 +3272,7 @@ msgstr "Margener"
 msgid "Number of columns:"
 msgstr "Antal kolonner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Alternativer"
 
@@ -3253,7 +3282,7 @@ msgid "Orientation"
 msgstr "Orientering"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Side"
 
@@ -3327,29 +3356,33 @@ msgstr "Bredde:"
 msgid "_Font..."
 msgstr "Skri_fttype..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Unavngivet aftale"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "H�j"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Lav"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Udefineret"
 
@@ -3392,43 +3425,35 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Fabrik for Evolution beskedsredigering."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution komponent for kalendersammendrag."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution kalender iTip/iMip-visning"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution komponent for h�ndtering af kalenderen."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Fabrik til kalenderens sammendragskomponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Fabrik til Evolution-opgavekontrol."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Fabrik for kalenderens iTip visningskontrol"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Fabrik til styring af eksempel-kaldender"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 "Fabrik til centralisering af dialoger for kalender-komponent-redigering"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Fabrik til oprettelse af en komponentredigering-fabrik"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3440,10 +3465,24 @@ msgstr "Alarm-tjeneste"
 msgid "Factory for the alarm notification service"
 msgstr "Fabrik til alarm-tjenesten"
 
+# Konteksten er planl�gning af opgaver. Dette er tidspunktet for begyndelsen
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "Begynder:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "Slutter:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "Ugyldig tidsangivelse"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3483,7 +3522,7 @@ msgstr ""
 "for p�mindelse i stedet."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advarsel"
@@ -3510,15 +3549,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Sp�rg mig ikke igen."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere Gnome"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "Kunne ikke oprette fabrik for alarm-tjenesten"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke oprette fabrik for alarm-tjenesten"
 
@@ -3534,7 +3573,7 @@ msgstr "Beskrivelse indeholder"
 msgid "Comment contains"
 msgstr "Kommentar indeholder"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Ingen tr�ffere"
 
@@ -3575,14 +3614,16 @@ msgstr ""
 "ORBit og OAF."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Fortroligt"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Offentlig"
 
@@ -3603,27 +3644,32 @@ msgid "W"
 msgstr "V"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Optaget"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Ikke startet"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "I gang"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Fuldf�rt"
 
@@ -3638,11 +3684,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3657,12 +3704,14 @@ msgstr "Genindtr�ffer"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Nej"
 
@@ -3682,62 +3731,64 @@ msgstr "Ugevisning"
 msgid "Month View"
 msgstr "M�nedsvisning"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Mappe som indeholder aftaler og h�ndelser"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Opgaver"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Mappe som indeholder opgaver"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "Indstillinger for nyhedstjeneste"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "M�de"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "Ny opgave"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Opgave"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Ny aftale"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Ny _aftale"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "Ny aftale"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "Aftale"
@@ -3947,7 +3998,7 @@ msgstr "P�mindelser"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -3976,7 +4027,7 @@ msgstr "slutning p� aftale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -4004,79 +4055,81 @@ msgstr "30 minutter"
 msgid "60 minutes"
 msgstr "60 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Indstillinger for kalender og opgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Farve for udg�ede opgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Farve for opgaver som g�r ud i dag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Dage"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Timer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Mandag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "S�_n"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "L�rdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Vis uge_nummer i datonavigation"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "Dagen sta_rter:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "S�_n"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "S�ndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Op_gaver som skal afsluttes i dag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "T_or"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "T_ir"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4105,81 +4158,96 @@ msgid "Tuesday"
 msgstr "Tirsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Arbejdsuge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "Sp�rg efter bekr�ftelse ved sletning _af opf�ringer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_Komprim�r weekender i m�nedsvisning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Opgave starter: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Vis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "Dag_en slutter:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_Fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Generelt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul udf�rte opgaver efter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Man"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Overskredne opga_ver:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "L_�r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Vis tid for aftal_ers slutning i uges- og m�nedsvisning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Opdeling a_f tid:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "T_ir"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_Ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "f�r aftalen starter"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4266,40 +4334,61 @@ msgstr " (F�rdig "
 msgid "Due "
 msgstr "F�rdig "
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Kunne ikke opdatere objektet."
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
 msgstr "Kunne ikke opdatere objektet."
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Redig�r aftale"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalopf�ring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Gem som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versionsdata!"
 
@@ -4357,27 +4446,27 @@ msgstr "Deleg�r til:"
 msgid "Enter Delegate"
 msgstr "Indtast delegat"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Aftale"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "P�mindelse"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Genindtr�ffelse"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "M�deplanl�gning"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "M�de"
 
@@ -4424,7 +4513,7 @@ msgid "Pu_blic"
 msgstr "Of_fentlig"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Vis tid som"
 
@@ -4446,19 +4535,19 @@ msgstr "S_lut-tid:"
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "En organisator er p�kr�vet."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Mindst en deltager er n�dvendig"
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Denne person er allerede sat op til dette m�de!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
@@ -4469,49 +4558,55 @@ msgstr "Deltager"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Normalt navn"
+msgid "Click here to add an attendee"
+msgstr "Klik her for at tilf�je en deltager"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delegeret fra"
+msgid "Common Name"
+msgstr "Normalt navn"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegeret til"
+msgid "Delegated From"
+msgstr "Delegeret fra"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Sprog"
+msgid "Delegated To"
+msgstr "Delegeret til"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Medlem"
+msgid "Language"
+msgstr "Sprog"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "SU"
+msgid "Member"
+msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "SU"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolle"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
@@ -4526,14 +4621,10 @@ msgid "_Change Organizer"
 msgstr "�n_dr organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Invit�r andre..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "Anden _organisator"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4722,7 +4813,7 @@ msgid "Progress"
 msgstr "Fremgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4734,19 +4825,19 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Grundl�ggende"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -4758,23 +4849,78 @@ msgstr "Sta_rt dato:"
 msgid "_Due Date:"
 msgstr "F�r_dig-dato:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, fuzzy, c-format
+msgid "100%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Sletter de valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_�bn"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Gem som..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4782,20 +4928,20 @@ msgstr "Gem som..."
 msgid "_Print..."
 msgstr "S_kriv ud..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klip _ud"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopi�r"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4803,35 +4949,36 @@ msgstr "_Kopi�r"
 msgid "_Paste"
 msgstr "_Inds�t"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Tildel opgave"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Videresend som i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_Mark�r som fuldf�rt"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Mark�r opgaver som fuldf�rte"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "Sle_t valgte opgaver"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klik for at tilf�je en opgave"
 
@@ -4839,47 +4986,48 @@ msgstr "Klik for at tilf�je en opgave"
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Fuldf�rt"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Fuldf�rt dato"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "F�rdig-dato"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Slutdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Geografisk placering"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Startdato"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Opgavesortering"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4927,11 +5075,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr " "
 
@@ -4971,7 +5121,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Udgiv ledig/optaget-information"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Konfiguration"
@@ -4982,7 +5132,7 @@ msgid "_Configure Pilot..."
 msgstr "Konfiguration"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "Gem _som..."
 
@@ -5009,74 +5159,393 @@ msgid "Delete _All Occurrences"
 msgstr "Slet _alle h�ndelser"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME pilotv�rkt�jerne ser ikke ud til at v�re installeret p� dette system."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Fejl under k�rsel af %s."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "M�de starter: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "Opgave starter: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "Ledig/optaget-information starter: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Starter: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "M�de slutter: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "Ledig/optaget-information starter: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "Slutter: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "Opgave fuldf�rt <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "Opgave p�begyndes: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "iCalendar-information"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "iCalendar-fejl"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "en ukendt afsender"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br>Kontroll�r venligst f�lgende information og v�lg s� en handling fra "
+"menuen nedenfor."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Ingen</i>"
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "_Status:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Godtaget"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "Foresl�et"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Afsl�et"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "Kalenderfilen kunne ikke opdateres!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "V�lg en handling"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Opgaveopdatering"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "O.k."
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "Godtaget"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "Foresl�et"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "Afsl�et"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "Send oplysning om ledig/optaget"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "Opdaterer modpartens status"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "Send nyeste oplysninger"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Afbryd"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> har offentliggjort m�deoplysning."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "M�deinformation"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> beder om din tilstedev�relse i et m�de."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "M�deforslag"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> �nsker at tilf�je information til et eksisterende m�de."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "M�deopdatering"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> �nsker at modtage seneste m�deinformation."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "Anmodning om m�deopdatering"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> har svaret p� en m�deforesp�rgsel."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "M�desvar"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> har aflyst et m�de."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "M�deaflysing"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> har sendt en uforst�elig besked."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Ugyldig m�debesked"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> har offentliggjort information om en opgave."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Opgaveinformation"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> anmoder om at du udf�rer en opgave."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Forslag om opgave"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> �nsker at tilf�je information til en eksisterende opgave."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Opgaveopdatering"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> �nsker at modtage den seneste information om opgaven."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Anmodning om opgaveopdatering"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> har svaret p� en opgavetildeling."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Svar p� opgave"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> har aflyst en opgave."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Aflysing af opgave"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Ugyldig opgavebesked"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> har publiseret ledig/optaget-information."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Ugyldig besked om ledig/optaget"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> anmoder om din oplysning om ledig/optaget."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Foresp�rgsel om ledig/optaget"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+"<b>%s</b> har svaret p� en foresp�rgsel efter oplysning om ledig/optaget."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Svar p� ledig/optaget"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Ugyldig besked om ledig/optaget"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Mappen ser ud til at have blevet korrupt og kan ikke repareres."
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "Denne besked indeholder foresp�rgsler, som ikke er underst�ttet."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "Bilaget indeholder ikke en gyldig kalender-besked"
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "Bilaget har ingen synlige kalender-elementer"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Elementet kunne ikke sendes!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Opdatering fuldf�rt\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Kalenderfilen kunne ikke opdateres!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltagerstatus kan ikke opdateres, fordi elementet ikke l�ngere eksisterer"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltagerstatus kunne ikke opdateres pga. ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "Deltagerstatus kunne ikke opdateres!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Deltagerstatus opdateret\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "Deltagerstatus kunne ikke opdateres!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Fjernelse fuldf�rt"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Elementet sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "V�lg mappe"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "V�lg mappe"
@@ -5118,93 +5587,92 @@ msgstr "slut-dato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Form�nd"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Obligatoriske deltagere"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Valgfrie deltagere"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Ikke-deltagere"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Individuel"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Ressourse"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Rum"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Formand"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Obligatorisk deltager"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Valgfri deltager"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Ikke-deltager"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Beh�ver handling"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Godtaget"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Afsl�et"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Foresl�et"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Delegeret"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "I gang"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A den %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m-%Y"
@@ -5216,63 +5684,63 @@ msgstr "%a %d/%m-%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m-%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Ude"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Ingen information"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Tilvalg"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Vis k_un arbejdstid"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Vis _zoomet ud"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Opdat�r ledig/optaget"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Autov�lg"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr "_>>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Alle mennesker og ressourser"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Alle _mennesker og en ressourse"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "_Obligatoriske deltagere"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Obligatoriske deltagere _og en ressourse"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Tid for m�dets _start:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Tid for m�dets slutning:"
 
@@ -5291,17 +5759,22 @@ msgstr "Kunne ikke indl�se opgaverne i `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Den n�dvendige metode til indl�sning af `%s' er ikke underst�ttet"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Kunne ikke �bne mappen i `%s'"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Fuldf�rt dato"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Sletter de valgte objekter"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "Fjerner slettede beskeder fra mappe"
@@ -5314,17 +5787,17 @@ msgstr "Ny _aftale..."
 msgid "_Delete this Appointment"
 msgstr "Sle_t denne aftale"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke �bne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Den n�dvendige metode til �bning af `%s' er ikke underst�ttet"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�bner kalender ved %s"
@@ -5385,19 +5858,53 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Mindst en deltager er n�dvendig"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "En organisator skal angives."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr "Kalenderinformation"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "Opgaveinformation"
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr "Journalinformation"
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr "Ledig/optaget-information"
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr "Kalenderinformation"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Opgaveopdatering"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "L�s listen igen"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Du m� v�re en deltager i arrangementet"
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "Kunne ikke oprette fabrik for komponentredigering"
 
@@ -5586,12 +6093,45 @@ msgstr "Valgt m�ned (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Valgt �r (%Y)"
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "Opgave"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Status: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioritet:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "F�rdige procenter: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Kategorier: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Kontakter: "
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Udskriv kalender"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5629,8 +6169,8 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse beskeder?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Sp�rg mig ikke igen."
 
@@ -5696,6 +6236,11 @@ msgstr "Importerer VCard-filer i Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importerer VCard-filer i Evolution."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "P�mindelse"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5790,8 +6335,8 @@ msgstr "contains? forventer at argument 2 er en streng"
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 "contains? forventer at argument 1 er en af \"any\", \"summary\", "
 "\"description\""
@@ -6722,638 +7267,654 @@ msgid "Asia/Macao"
 msgstr "Asien/Macao"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Asien/Macao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Asien/Magadan"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Asien/Magadan"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Asien/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Asien/Muscat"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Asien/Nicosia"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Asien/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Asien/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Asien/Kabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Asien/Phnom_Penh"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Asien/Pontianak"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Asien/Pyongyang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Asien/Qatar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Asien/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Asien/Rangoon"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Asien/Riyadh"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Asien/Saigon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Asien/Sakhalin"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Asien/Samarkand"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Asien/Seoul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Asien/Shanghai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Asien/Singapore"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Asien/Taipei"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Asien/Tashkent"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Asien/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Asien/Teheran"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Asien/Thimphu"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Asien/Tokyo"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Asien/Ujung_Pandang"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Asien/Ulaanbaatar"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Asien/Urumqi"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Asien/Vientiane"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Asien/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Asien/Jakutsk"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Asien/Jekaterinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Asien/Jerevan"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlanten/Azorene"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlanten/Bermuda"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlanteren/De canariske �er"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlanten/Kap_Verde"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlanten/F�r�erne"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlanten/Jan_Mayen"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlanten/Madeira"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlanten/Reykjav�k"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlanten/Syd-Georgia"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlanten/St_Helena"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlanten/Stanley"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australien/Adelaide"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australien/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australien/Broken_Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australien/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australien/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australien/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australien/Lord_Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australien/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australien/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australien/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europa/Athen"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europa/Beograd"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europa/Bryssel"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukarest"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europa/K�benhavn"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxembourg"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europa/Moskva"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europa/Prag"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europa/Rom"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europa/Tirane"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikanet"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europa/Wien"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europa/Warszawa"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europa/Z�rich"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Indiske hav/Antananarivo"
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Indiske hav/Chagos"
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Indiske hav/Jule�en"
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Indiske hav/Cocos"
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indiske hav/Comorerne"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Indiske hav/Kerguelen"
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indiske hav/Mahe"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indiske hav/Maldiverne"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indiske hav/Mauritius"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indiske hav/Mayotte"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indiske hav/Reunion"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Stillehavet/Apia"
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Stillehavet/Auckland"
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Stillehavet/Chatham"
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Stillehavet/P�ske�en"
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Stillehavet/Efate"
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Stillehavet/Enderbury"
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Stillehavet/Fakaofo"
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Stillehavet/Fiji�erne"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Stillehavet/Funafuti"
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Stillehavet/Galapagos"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Stillehavet/Gambier"
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Stillehavet/Guadalcanal"
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Stillehavet/Guam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Stillehavet/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Stillehavet/Johnston"
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Stillehavet/Kiritimati"
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Stillehavet/Kosrae"
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Stillehavet/Kwajalein"
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Stillehavet/Majuro"
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Stillehavet/Marquesas"
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Stillehavet/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Stillehavet/Nauru"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Stillehavet/Niue"
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Stillehavet/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Stillehavet/Noumea"
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Stillehavet/Pago_Pago"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Stillehavet/Palau"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Stillehavet/Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Stillehavet/Ponape"
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Stillehavet/Port_Moresby"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Stillehavet/Rarotonga"
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Stillehavet/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Stillehavet/Tahiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Stillehavet/Tarawa"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Stillehavet/Tongatapu"
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Stillehavet/Truk"
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Stillehavet/Wake"
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Stillehavet/Wallis"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Stillehavet/Yap"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Signering er ikke underst�ttet af dette cipher"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "\"Clearsigning\" er ikke underst�ttet af dette cipher"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Verificering er ikke underst�ttet af dette cipher"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering er ikke underst�ttet af dette cipher"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke underst�ttet af dette cipher"
 
@@ -7364,12 +7925,12 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kan ikke �bne cache-katalog: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7380,7 +7941,7 @@ msgstr ""
 "Videre operationer p� denne server vil ikke kunne afspilles, n�r\n"
 "du kobler til dette netv�rk igen."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7391,11 +7952,16 @@ msgstr ""
 "%s\n"
 "�ndringer i denne mappe vil ikke blive resynkroniseret."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Resynkroniserer med server"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Gemmer mappe '%s'"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Du skal arbejde opkoblet for at fuldf�re denne operation"
 
@@ -7403,57 +7969,68 @@ msgstr "Du skal arbejde opkoblet for at fuldf�re denne operation"
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fejl under l�sning af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fejl under k�rsel af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke �bne spool-mappen"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Kan ikke behandle spool-mappen"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter besked %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Kan ikke �bne besked"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Mislykkedes p� besked %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mislykkedes p� besked %d af %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Kunne ikke afkode besked."
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Fejl under mellemlagring af besked %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Fejl under mellemlagring af besked %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fejl under udf�relse af filters�gning: %s: %s"
@@ -7485,25 +8062,103 @@ msgstr "(match-all) kr�ver et enkelt boolsk resultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Udf�rer foresp�rgsel p� ukendt header: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Uunderst�ttet operation: till�g besked: for %s"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Uunderst�ttet operation: s�g efter udtryk: efter %s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Uunderst�ttet operation: s�g efter uid'er: efter %s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Flytter beskeder"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Kopierer beskeder til %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Afbrudt."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Uventet svar fra POP-server: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Intet filnavn specificeret."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Kan ikke kryptere denne besked: ingen modtagere opgivet"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Fejl under mellemlagring af besked %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Fejl under mellemlagring af besked %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Kunne ikke afkode besked."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+"Kan ikke verificere denne besked: kunne ikke oprette midlertidig fil: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7599,86 +8254,23 @@ msgstr "Fejl under skriving af midlertidig fil: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Fejl under kopiering midlertidig beskedsfil: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Indtast venligst din %s adgangsfrase for %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Indtast venligst din %s adgangsfrase"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Kan ikke signere denne besked: ingen tekst at signere"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "Kan ikke signere denne besked: ingen adgangskode opgivet"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Kan ikke signere denne besked: kunne ikke oprette kanal til GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Kan ikke signere denne besked: ingen tekst for \"clearsign\""
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Kan ikke verificere denne besked: ingen tekst at verificere"
 
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
-"Kan ikke verificere denne besked: kunne ikke oprette kanal til GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-"Kan ikke verificere denne besked: kunne ikke oprette midlertidig fil: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Kan ikke kryptere denne besked: ingen tekst at kryptere"
 
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Kan ikke kryptere denne besked: ingen adgangskode opgivet"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Kan ikke kryptere denne besked: kunne ikke oprette kanal til GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Kan ikke kryptere denne besked: ingen modtagere opgivet"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Kan ikke dekryptere denne besked: ingen ciphertekst at dekryptere"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Kan ikke dekryptere denne besked: ingen adgangskode opgivet"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Kan ikke dekryptere denne besked: kunne ikke oprette kanal til GPG/PGP: %s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt underskrevet brevdel"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Anden fejl"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7695,43 +8287,6 @@ msgstr "Kunne ikke indl�se %s: %s"
 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:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s-server %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s-tjeneste for %s p� %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Tilkobling afbrudt"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, 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:258
-msgid "(unknown host)"
-msgstr "(ukendt v�rt)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Operation afbrudt"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Server koblet fra uventet: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonym"
@@ -7806,8 +8361,8 @@ msgstr "Ugyldig udfordring fra server\n"
 #: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
-"Udfordring fra server indeholdt ugyldig tegn for \"Kvalitet for "
-"beskyttelse\"\n"
+"Udfordring fra server indeholdt ugyldig tegn for \"Kvalitet for beskyttelse"
+"\"\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
@@ -7840,7 +8395,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Ugyldigt svar p� autenticering fra server."
 
@@ -7869,11 +8424,9 @@ msgid ""
 msgstr ""
 "Dette valg g�r brug af Kerberos 4 godkendelse ved opkobling til serveren."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Adgangskode"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7900,52 +8453,52 @@ msgstr "POP f�r SMTP-godkendelse via ikke-pop kilde"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Overs�ttelse af regul�rt udtryk mislykkedes: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' skal indeholde et brugernavn"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' skal indeholde et v�rtsnavn"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' skal indeholde en sti"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Finder: \"%s\""
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fejl i navneopslag: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "V�rtsopslag mislykkedes: %s: v�rt ikke fundet"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "V�rtsopslag mislykkedes: %s: ukendt �rsag"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Finder: \"%s\""
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "V�rtsopslag mislykkedes: %s: v�rt ikke fundet"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "V�rtsopslag mislykkedes: %s: ukendt �rsag"
@@ -8009,11 +8562,11 @@ msgstr "Kunne ikke afkode besked."
 msgid "Failed to verify certificates."
 msgstr "Fejl under verificering af certifikater."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finde mappe: Ugyldig operation p� dette lager"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke oprette mappe: Ugyldig operation p� dette lager"
 
@@ -8041,7 +8594,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8050,16 +8603,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8079,15 +8632,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Kunne ikke tolke URL `%s'"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ingen s�dan besked %s i %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Ingen s�dan besked: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Se efter nye beskeder i alle mapper"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8109,68 +8662,77 @@ msgstr "Kan ikke �ndre navn p� mappe: %s: Ugyldig operation"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke �ndre navn p� mappe: %s: Ingen s�dan mappe"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Du kan ikke kopiere beskeder fra dette affalds-katalog."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Operation afbrudt"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Server koblet fra uventet: %s"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Uventet svar fra IMAP-server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Svar fra server blev afsluttet for tidligt."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Svar fra IMAP-server indeholdt ikke %s-information"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet 'OK'-svar fra IMAP-server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke indl�se sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen blev �delagt og genskabt p� serveren."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "S�ger efter �ndrede beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Denne besked er ikke tilg�ngelig"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformation for nye beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "S�ger efter nye beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedens indhold i FETCH-svar."
 
@@ -8223,34 +8785,85 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For l�sning og lagring af e-post p� IMAP-servere."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Adgangskode"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
-"Dette valg vil lade dig koble til en IMAP-server ved at bruge en "
-"klartekst-adgangskode."
+"Dette valg vil lade dig koble til en IMAP-server ved at bruge en klartekst-"
+"adgangskode."
+
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP-server %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s-tjeneste for %s p� %s"
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Tilkobling afbrudt"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Kunne ikke koble til %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Kunne ikke koble til POP-server.\n"
+"Fejl under oversending af brugernavn: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operationen er ikke underst�ttet"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Godkendelse mislykkedes."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-server %s underst�tter ikke efterspurgt autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen underst�tte for autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, 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:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8261,69 +8874,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ophavsmappen tillades ikke at have undermapper"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Kan ikke �bne postboks: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "E-postkataloger i MH-format"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "For lagring af lokal e-post i MH-lignende beskedskataloger."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Lokale levering"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "For hentning af lokal e-post fra standard \"spools\" i mbox format"
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Brug filtre for nye beskeder i indbakke"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "E-postmapper i \"Maildir\" format"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "For lagring af lokal e-post i qmail maildir beskedsmapper."
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Standard Unix mbox \"spools\""
-
-#: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
-"For l�sning og lagring af lokal e-post i standard mbox \"spool\"-filer."
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Standard Unix mbox \"spools\""
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
+"For l�sning og lagring af lokal e-post i standard mbox \"spool\"-filer."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrod %s er ikke en absolut sti"
@@ -8349,7 +8981,7 @@ msgstr "Lokalt lager har ikke en indbakke"
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke �ndre navn p� mappe %s til %s: %s"
@@ -8369,33 +9001,31 @@ msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Kunne ikke gemme sammendrag: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke tilf�je besked i sammendraget: ukendt grund"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Besked aflyst"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan ikke tilf�je besked i maildir mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8404,20 +9034,19 @@ msgstr ""
 "Kan ikke hente besked: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Ingen s�dan besked"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Ugyldig beskedsindhold"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8428,13 +9057,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8450,7 +9079,7 @@ msgstr "`%s' er ikke en maildir katalog."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe `%s': %s"
@@ -8459,8 +9088,8 @@ msgstr "Kunne ikke slette mappe `%s': %s"
 msgid "not a maildir directory"
 msgstr "ikke et maildir katalog"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikke s�ge i mappe `%s': %s"
@@ -8481,45 +9110,37 @@ msgstr "Ser efter nye beskeder"
 msgid "Checking for new messages"
 msgstr "S�ger efter nye beskeder"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Gemmer mappe"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikke oprette mappel�s p�: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke �bne postboks: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Tilf�jelse af brev blev aflyst"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke tilf�je besked i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8528,13 +9149,11 @@ msgstr ""
 "Kan ikke hente besked: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ud til at have blevet korrupt og kan ikke repareres."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbygning af besked mislykkedes: Beskadiget postboks?"
 
@@ -8577,149 +9196,149 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen `%s' er ikke tom. Ikke slettet."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunne ikke �bne mappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatal fejl i l�sning af postboksen n�r position %ld i mappe %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikke tjekke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunne ikke �bne fil %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke �bne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Fejl i sammendrag og mappe, selv efter synkronisering"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Fejl under skriving til midlertidig postboks: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Skriving til midlertidig postboks mislykkedes: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke �ndre navn p� mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Fejl i sammendrag og mappe, selv efter synkronisering"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukendt fejl: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Kunne ikke �ndre navn p� mappe: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Fejl under skriving til midlertidig postboks: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Skriving til midlertidig postboks mislykkedes: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Tilf�jet brev er annulleret"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikke tilf�je besked i mh-mappe: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' er ikke et katalog."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikke �bne MH-katalogsti: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Kan ikke tilf�je besked i spool-filen: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Spool-mapper kan ikke omd�bes"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Spool `%s' eksisterer ikke eller er ikke en normal fil"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "Lagerrod %s er ikke et normalt katalog"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen `%s/%s' eksisterer ikke."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool e-post-fil %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Spool-mapper kan ikke omd�bes"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mapper kan ikke omd�bes"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmapper kan ikke blive slettet"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Kunne ikke synkronisere midlertidig mappe %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kunne ikke synkronisere spool-mappe %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8728,25 +9347,6 @@ msgstr ""
 "Kunne ikke synkronisere spool-mappe %s: %s\n"
 "Mappen kan v�re beskadiget, kopi gemt i `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Kunne ikke gemme: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Spool `%s' eksisterer ikke eller er ikke en normal fil"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Send til %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET nyheder"
@@ -8757,12 +9357,22 @@ msgstr ""
 "Dette er en udbyder for l�sning af og postning af indl�g til USENET "
 "nyhedsgrupper."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Kan ikke oprette katalog %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET Nyheder via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8867,7 +9477,7 @@ msgstr "Behold beskeder p� serveren"
 msgid "Delete after %s day(s)"
 msgstr "Slet efter %s dage"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8881,8 +9491,8 @@ msgid ""
 "is the only option supported by many POP servers."
 msgstr ""
 "Dette alternativ lader dig koble til POP-serveren ved brug af adgangskode i "
-"klartekst. Dette er det eneste alternativ som er underst�ttet af mange "
-"POP-servere."
+"klartekst. Dette er det eneste alternativ som er underst�ttet af mange POP-"
+"servere."
 
 #: camel/providers/pop3/camel-pop3-provider.c:81
 msgid ""
@@ -8894,32 +9504,22 @@ msgstr ""
 "adgangskode via APOP-protokollen. Dette vil m�ske ikke virke for alle "
 "brugere selv p� servere som h�vder at underst�tte det."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Kunne ikke koble til POP-server.\n"
 "Fejl under oversending af brugernavn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Operationen er ikke underst�ttet"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Godkendelse mislykkedes."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Kunne ikke koble til POP-server p� %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8927,27 +9527,27 @@ msgstr ""
 "Kunne ikke koble til POP-serveren.\n"
 "Ingen underst�ttelse for forespurgt autenticeringsmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "I/U-fejl"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sIndtast venligst POP3-adgangskode for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8956,13 +9556,13 @@ msgstr ""
 "Kunne ikke koble til POP-server.\n"
 "Fejl ved oversending af adgangskode: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen s�dan mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9125,45 +9725,45 @@ msgstr "Midlertidig autenticeringsfejl"
 msgid "Authentication required"
 msgstr "Autenticering kr�ves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Fejl ved Velkomst-svar: %s: muligvis ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Kunne ikke koble til POP-server.\n"
 "Fejl under oversending af brugernavn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Beskeden ser ikke ud til at v�re rigtig udformet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Tidsafbrud for AUTH-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-server %s underst�tter ikke efterspurgt autenticeringstype %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIndtast venligst SMTP-adgangskode for %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9174,90 +9774,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Sender besked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende besked: ingen modtagere definerte."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan ikke sende besked: ingen modtagere definerte."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Tidsafbrud for HELO-foresp�rgsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Fejl ved HELO-svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP-autenticering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Fejl under opretelse af SASL-autenticeringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsafbrud for AUTH-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH-foresp�rgsel mislykkedes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar p� autenticering fra server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for \"MAIL FROM\"-foresp�rgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Fejl ved \"MAIL FROM\"-foresp�rgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for \"RCPT TO\"-foresp�rgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-foresp�rgsel: %s: besked ikke sendt."
@@ -9265,38 +9865,38 @@ msgstr "Tidsafbrud for DATA-foresp�rgsel: %s: besked ikke sendt."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-send: beskedsterminering: %s: besked ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Ugyldigt svar p� autenticering fra server."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsafbrud for RSET-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Tidsafbrud for QUIT-foresp�rgsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Fejl ved RSET-svar: %s"
@@ -9370,52 +9970,52 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foresl� automatisk visning af bilag"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Klik her for at f� adressebogen op"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Indtast modtagerene for beskeden"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Indtast adresserne som skal modtage en kopi af beskeden"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9428,7 +10028,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Vedl�g en fil"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Kunne ikke oprette PGP signaturkontekst."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9437,34 +10042,34 @@ msgstr ""
 "Fejl under l�sning af fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fejl under gemning af fil: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl under indl�sning af fil: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fejl ved adgang til fil: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente besked fra redigering"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9473,7 +10078,7 @@ msgstr ""
 "Kunne ikke s�ge i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9482,7 +10087,7 @@ msgstr ""
 "Kunne ikke afkorte fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9491,7 +10096,7 @@ msgstr ""
 "Fejl under autogemning af besked: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9499,7 +10104,7 @@ msgstr ""
 "Ximian Evolution har fundet ikke-gemte filer fra en tidligere session.\n"
 "Vil du pr�ve at genoprette dem?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9509,23 +10114,43 @@ msgstr ""
 "\n"
 "Vil du gemme �ndringene?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Advarsel: �ndret besked"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "�bn fil"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Inds�t fil"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Gem signatur"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (forvalgt)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Skriv en besked"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9533,7 +10158,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "adressse-udv�lgelses-kontrol kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9541,6 +10166,12 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "En komponent i HTML tekstbehandler kunne ikke aktiveres."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9601,7 +10232,7 @@ msgstr "Emne indeholder"
 msgid "Subject does not contain"
 msgstr "Emne indeholder ikke"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9746,7 +10377,7 @@ msgstr "time"
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr " sekunder"
 
@@ -9821,7 +10452,7 @@ msgstr " siden"
 msgid "ago"
 msgstr "siden"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
@@ -9833,6 +10464,21 @@ msgstr "<klik her for at v�lge en dato>"
 msgid "Filter Rules"
 msgstr "Filterregler"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Stilnavn:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Spool `%s' eksisterer ikke eller er ikke en normal fil"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "V�lg en handling"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9851,7 +10497,7 @@ msgstr ""
 "Venligst g� tilbage og specificer en gyldig mappe for levering af e-post."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "V�lg mappe"
 
@@ -9864,7 +10510,11 @@ msgstr ""
 "Fejl i regul�rt udtryk '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
@@ -9894,7 +10544,7 @@ msgstr "hvis alle kriterier er m�dt"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "hvis et kriterie er m�dt"
 
 #: filter/filter-rule.c:780
@@ -9973,194 +10623,204 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Firma"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "indeholder"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Dato modtaget"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Slettet"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "indeholder ikke"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "slutter ikke med"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "eksisterer ikke"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "ligner ikke"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "starter ikke med"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Eksisterer ikke"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Skitse"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "slutter med"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Eksisterer"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "eksisterer"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Udtryk"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Vigtig"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "var efter"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "var f�r"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "M�rket"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "er st�rre end"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "er mindre end"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "er ikke"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "M�rket"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Beskedskrop"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Beskedshoved"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Flyt til mappe"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Afspil lyd:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "L�s"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Modtagere"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Tr�ffer p� regul�rt udtryk"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Svaret til"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Point"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Afsender"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "S�t status"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "St�rrelse (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "lyder som"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Specifik header"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "starter med"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Emne"
 
@@ -10215,7 +10875,8 @@ msgid "Scanning %s"
 msgstr "S�ger i %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Post"
 
@@ -10231,10 +10892,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Adressebog"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10284,7 +10941,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Affald"
 
@@ -10420,31 +11079,31 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Mappe som indeholder e-post"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Virtuelt affald"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Virtuel affaldsmappe"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Denne mappe kan ikke indeholde beskeder."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Egenskaber ..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "�ndr denne mappes egenskaber"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10452,237 +11111,246 @@ msgstr ""
 "Nogen af dine indstillinger for e-post ser ud til at v�re beskadiget. "
 "Venligst tjek at alt er i orden."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke sat en transportmetode for e-post"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Advarsel: �ndret besked"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Ny e-post besked"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "Send _besked"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikke initiere Evolutions konfigurationskomponent for e-post."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Kobler til server..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring med skallen"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaber for \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke oprette midlertidigt katalog: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d nye"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d skjulte"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d valgte"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendte"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d sendte"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Opret _virtuel mappe fra besked"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "Virtuel mappe for e_mnet"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "Virtuel mappe for afse_nder"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "Virtuel mappe for modtage_re"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "Virtuel mappe p� e-post_liste"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filtr�r p� em_ne"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filtr�r p� afsen_der"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filtr�r p� modta_gere"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filtr�r p� e-_postliste"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "R_edig�r som ny besked..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "S_kriv ud"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Fuldf�rt"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "T�m"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_k�r som l�st"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Mark�r som _ul�st"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Mark�r som v_igtig"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Mark�r som uv_igtig"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Fortryd sletning"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "K_opi�r til mappe..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "Laurel"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Tilf�j sender i adressebog"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "P�f�r filtre"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Opret rege_l fra besked"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Virtuel mappe p� e-postliste"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr�r efter e-postliste (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Virtuel mappe p� e-postliste (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "_Forvalgt"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Henter mappeinformation"
 
@@ -10737,7 +11405,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikke udfyldt al n�dvendig information."
 
@@ -10747,83 +11415,111 @@ msgid "Evolution News Editor"
 msgstr "Evolution nyhedsredigerer"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_V�rt:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Br_ugernavn:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Radio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke oprette to konti med samme navn."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker p� at du vil slette denne konto?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Slet ikke"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Vil du virkelig slette kontoen?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Aktiver"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker p� at du vil slette denne nyhedsgruppekonto?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Konton_avn:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Send til %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Emne er %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "E-post fra %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "%s e-postliste"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Tilf�j filterregel"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"F�lgende vFolder(e):\n"
+"%sBrugte fjernet mappe:\n"
+"    '%s'\n"
+"Og er blevet opdateret."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10835,7 +11531,7 @@ msgstr ""
 "modtage eller skrive beskeder.\n"
 "Vil du konfigurere den nu?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10843,7 +11539,7 @@ msgstr ""
 "Du skal konfigurere en identitet\n"
 "f�r du kan skrive e-post."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10852,7 +11548,7 @@ msgstr ""
 "f�r du kan skrive e-post."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10860,11 +11556,11 @@ msgstr ""
 "Du sender en besked i HTML-format, men f�lgende modtageres �nsker ikke at "
 "modtage beskeder i HTML-format:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Send alligevel?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10872,7 +11568,7 @@ msgstr ""
 "Denne besked har ikke et emne.\n"
 "Send alligevel?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10880,11 +11576,11 @@ msgstr ""
 "Siden kontaktlisten du sender til er konfigureret til at skjule listens "
 "adresser vil denne besked kun indeholde Bcc-modtagere."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Denne besked indeholder kun Bcc-modtagere."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10894,15 +11590,15 @@ msgstr ""
 "\"Apparently-To\" header.\n"
 "Send alligevel?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 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:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Du skal konfigurere en konto f�r du kan sende denne besked."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10910,28 +11606,28 @@ msgstr ""
 "Kunne ikke �bne skitse-mappen for denne konto.\n"
 "Vil du bruge standard skitse-mappe?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "en ukendt afsender"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Flyt beskeder til"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopi�r beskeder til"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker p� at du vil redigere alle %d beskeder?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10939,7 +11635,7 @@ msgstr ""
 "Du kan kun redigere beskeder gemt\n"
 "i Skitser-kataloget."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10947,39 +11643,39 @@ msgstr ""
 "Du kan kun sende beskeder igen\n"
 "som er gemt i sendt-kataloget."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker p� at du vil sende alle %d beskederne igen?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Ingen besked valgt"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Gem besked som..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Vis n�ste ul�ste besked"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10991,7 +11687,7 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse beskeder?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11000,32 +11696,68 @@ msgstr ""
 "Fejl under indl�sning af filter-information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-letter"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Fejl under udskrift af besked"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker p� at du vil �bne alle %d beskeder i separate vinduer?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Inegn beskrivelse"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Kontakt uden navn:"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Sendt"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Tilf�j kriterie"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Gem signatur"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11079,195 +11811,177 @@ msgstr ""
 "nedenunder. Dette navn bliver kun brugt for visning p� sk�rmen."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "efter"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"Kunne ikke finde indbakke for nyt postlager:\n"
-"%s\n"
-"Ingen genvej vil blive oprettet."
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Konto"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Tjekker tjeneste"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Kobler til server..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Kontakt uden navn:"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "R_edig�r"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Ny"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_S�g efter underst�ttede typer"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL er ikke underst�ttet i denne version af evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL er ikke underst�ttet i denne version af evolution)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Krypt�r altid til mig selv ved sending af krypteret e-post."
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "H�ndtering af konti"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Aflys operation"
+msgid "Add Sc_ript"
+msgstr "Tilf�j kriterie"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "Arkansas"
+msgid "Add new signature..."
+msgstr "Gem signatur"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Krypt�r altid til mig selv ved sending af krypteret e-post."
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Altid _sign�r udg�ende beskeder n�r denne konto bruges"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "Arica"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Vedl�g en fil til beskeden"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilag"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autenticering"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Hent beskeder _automatisk hver(t)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Ukendt tegns�t: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_Luk"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Ser efter nye beskeder"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Farve for opgaver som g�r ud i dag"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "Skriv en besked"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11283,56 +11997,47 @@ msgstr ""
 "\n"
 "Klik p� \"Fuldf�r\" for at gemme dine indstillinger"
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "Bari"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Standard tegnkoding: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Digitale IDer..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Kan ikke �bne besked"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "F�rdig"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Skitsemappe:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "A_ktiv�r"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11353,40 +12058,35 @@ msgstr "E-post-adresse:"
 msgid "Empty _trash folders on exit"
 msgstr "T�m affalds_kurven ved afslutning"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Udf�r handlinger"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "slutter med"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Egenskaber"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Videresendte beskeder"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Hent digital ID..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "M_ark�r citering med"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Honolulu"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
@@ -11440,70 +12140,66 @@ msgstr "Mikronesien"
 msgid "NNTP Server:"
 msgstr "NNTP-server:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "E-post-konfiguration"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "_Nyhedstjenester"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Yderligere information"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organisat_ion:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP-n�gle _ID:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "V�lg en farve"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Sp�rg ved sending af beskeder med kun _Bcc-modtagere defineret"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Udskriv valgte kontakter"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Kan ikke �bne besked"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citeret"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "H_usk denne adgangskode"
@@ -11538,117 +12234,120 @@ msgstr "Sikkerhed"
 
 #: mail/mail-config.glade.h:104
 #, fuzzy
-msgid "Same as text"
-msgstr "Somerset"
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "V�lg PGP-bin�rfil"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Signaturfil:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Slet alt undtaget signatur"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Udg�ende e-post"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _beskeder:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Sendte beskeder og skisser"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Server kr�ver _autenticering"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Server_type: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Genveje"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Gem signatur"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Gem signatur"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Kilde"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Kildeinformation"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stilnavn:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "_HTML-signatur:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11658,145 +12357,138 @@ msgstr ""
 "\n"
 "Klik \"N�ste\" for at begynde. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "�st"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_HTML-signatur:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "_Altid indl�s billeder fra nettet"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Altid sign�r udg�ende beskeder n�r denne konto bruges"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Autenticeringstype: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autenticeringstype: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "Hent beskeder _automatisk hver(t)"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "Hent beskeder _automatisk hver(t)"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Bekr�ft n�r slettede beskeder skal fjernes"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "_HTML-signatur:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Forvalgt"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Filnavn:"
+msgid "_Enable"
+msgstr "Aktiver"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Videresend som"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Fulde navn:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "I HTML e-post"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "_HTML-signatur:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Sprog"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_Indl�s billeder hvis afsender er i adressebogen"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Brug denne som stan_dard konto"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Mark�r beskeder som l�st efter"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "Indl�s aldrig billeder fra _nettet"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "Sti til _PGP-bin�rfil:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Sp�rg ved sending af HTML-beskeder til kontakter som ikke �nsker dem"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Sp�rg ved sending af beskeder uden _emne"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Radio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11837,69 +12529,52 @@ msgstr "_HTML-signatur:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "_HTML-signatur:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Brug sikker forbindelse (_SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_hver"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " farve"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "nyhedsvindue1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Kunne ikke oprette PGP signaturkontekst."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Kunne ikke oprette PGP verificeringskontekst."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Kunne ikke oprette PGP krypteringskontekst."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Kunne ikke oprette PGP dekrypteringskontekst."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Kunne ikke oprette S/MIME signaturkontekst."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Kunne ikke oprette S/MIME \"certsonly\" kontekst."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Kunne ikke oprette S/MIME krypteringskontekst."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Kunne ikke oprette S/MIME \"envelope\" kontekst."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikke oprette S/MIME afkodningskontekst."
 
@@ -11942,100 +12617,135 @@ msgstr "Ekstern visning"
 msgid "Loading message content"
 msgstr "Indl�ser beskedsindhold"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Overskredne opga_ver:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "�bn henvisning i netl�ser"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Kopi�r henvisning"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Gem henvisning som"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Gem billede som..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilag"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke l�se MIME-besked. Viser ren beskedstekst."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Ugyldig e-post-adresse:"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Fra"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "E-postprogram: "
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Gem besked som..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Denne besked er digitalt signeret. For flere informationer, klik p� "
+"l�sikonen."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Kunne ikke oprette PGP verificeringskontekst."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Denne besked er digitalt signeret og er fundet autentisk."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-server (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, 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:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peger til eksterne data (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Lokale mapper"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12044,27 +12754,27 @@ msgstr ""
 "Kan ikke gemme metainformation for mappe; du vil sandsynligvis\n"
 "ikke kunne �bne denne mappe igen: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan ikke gemme metainformation om mappe p�: %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan ikke slette metainformation for mappe %s: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�ndrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s kan m�ske ikke konfigureres igen fordi det ikke er en lokal mappe"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12072,11 +12782,11 @@ msgstr ""
 "Hvis du ikke kan �bne denne postboks igen m�\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan ikke �ndre format p� en ikke-lokal mappe."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigur�r /%s igen"
@@ -12134,81 +12844,73 @@ msgstr "Fejlet p� besked %d af %d"
 msgid "Complete."
 msgstr "Fuldf�rt."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Gemmer besked til mappe"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter beskeder til %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Flytter"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Kopierer"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Videresendte beskeder"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "�bner mappe %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "�bner lager %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Opfrisker mappe"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Fjerner slettede beskeder fra mappe"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter besked %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d beskeder"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gemmer %d beskeder"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12217,7 +12919,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12226,11 +12928,11 @@ msgstr ""
 "Fejl under gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12239,27 +12941,27 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_S�g"
 
@@ -12330,10 +13032,6 @@ msgstr "Opdaterer..."
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Afbrudt."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Operation afbrudt af bruger."
@@ -12347,16 +13045,16 @@ msgstr "Indtast adgangskode for %s"
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Kunne ikke gemme signaturfil."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Gem signatur"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12366,10 +13064,30 @@ msgstr ""
 "\n"
 "Vil du gemme �ndringene?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Navn:"
+
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "Gem signatur"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
 #, fuzzy
-msgid "Signature name:"
-msgstr "Signaturfil:"
+msgid "Hide signature hint"
+msgstr "HTML-signaturfil:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12384,17 +13102,17 @@ msgstr "Videresendt besked"
 msgid "Forwarded Message"
 msgstr "Videresendt besked"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ops�tter vmappe: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Opdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12407,89 +13125,94 @@ msgstr ""
 "    '%s'\n"
 "Og er blevet opdateret."
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "Virtuelle mapper "
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Rediger Virtuel mappe"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pr�ver at redigere en vfolder '%s' som ikke eksisterer."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Ny Virtuel mappe"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Uden emne)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Besked"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Ul�st"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "L�st"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Flere ul�ste beskeder"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "H�jere"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "H�jest"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "I dag %H:%M"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "I g�r %H:%M"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Genererer beskedsliste"
 
@@ -12512,10 +13235,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Oprindelig kontakt:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Modtaget"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "St�rrelse"
 
@@ -17228,5233 +17956,5230 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds og Bradford"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libya"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lissabon"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland-Falster"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "London"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "London/City"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "London/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "London/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "London/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Louisiana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "L�beck-Blankensee"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "Letland"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malm�/Sturup"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto lufthavn"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsuyama lufthavn"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McAll"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu lufthavn"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Mellem�sten"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Miyakejima lufthavn"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Miyazaki lufthavn"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile centrum"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile regionale lufthavn"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo i rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu lufthavn"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "M�nchengladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montaque"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Sucro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montr�al Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montr�al Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montr�al Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Moskva Domodedovo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moskva Sheremetyevo"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosj�en"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "M�nchen"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "M�nster/Osnabr�ck"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki lufthavn"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoya lufthavn"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Naha lufthavn"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu lufthavn"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama lufthavn"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "Naples"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasas rumf�rge"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "Nye Tokyo internationale lufthavn"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK lufthavn"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-C�te d'Azur"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata lufthavn"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "Las Vegas N"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "Myrtle Beach N"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrk�ping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Nordvest-territoriet"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "N�rnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro lufthavn"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocalu"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Odesa"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita lufthavn"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okayama lufthavn"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki lufthavn"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando internationale)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "�rsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Osaka internationale lufthavn"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Oshima lufthavn"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardemoen"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyreneene"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "Folkerepublikken Kina"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpugnan-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozadovsk"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung nord"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung syd"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porte Alegre Apt"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Prag"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Qu�bec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Qu�bec City"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjav�k"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio de Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Rostan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Rom/Ciampino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Rom/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Rom/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russel"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "R�nneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "R�ros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "R�rvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "R�st"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Rusland"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbr�cken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford kommunale lufthavn"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessj�en/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Fransisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jos�"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jos� De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jos� del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jos�-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "St. Petersburg"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "San Jos� Dos Campo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Sendai lufthavn"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O internationale lufthavn"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheik internationale"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport centrum"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport regionale"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "S�nderborg"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "S�rkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "Timbalier syd"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 #, fuzzy
 msgid "Springbok"
 msgstr "Springbog"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St. Louis-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/S�rstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolv�r/Helle"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 #, fuzzy
 msgid "Sympheropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu lufthavn"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talinn"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Tanegashima lufthavn"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Teheran-Mehrabad"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo heliport"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokyi internationale lufthavn"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokyo nye internationale lufthavn"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori lufthavn"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama lufthavn"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Troms�/Langnes"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/V�rnes"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Tsushima lufthavn"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twente"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Ume�"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "De forenede arabiske emirater"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguay"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/S�sterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 #, fuzzy
 msgid "Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vads�"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "V�rl�se"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "V�ster�s"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venedig"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia tekniske lufthavn"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser lufthavn"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakesfield"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai lufthavn"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia obervatorie"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Yamagata lufthavn"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube lufthavn"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao lufthavn"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Jekaterinburg"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeinpyeungdo"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama lufthavn"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Z�rich"
 
@@ -22482,17 +23207,12 @@ msgstr "%l: %M %d %B"
 msgid "No description"
 msgstr "Inegn beskrivelse"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "E-post sammendrag"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "Virtuelle mapper "
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
@@ -22501,57 +23221,47 @@ msgstr "Lokale mapper"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Dagens citater"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Tilf�j nyheds-server"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Indtast URL for nyhedsstedet du vil tilf�je"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Navn:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Fejl under nedhentning af RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Nyhedstjenester"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
+msgid "Add"
 msgstr "_Tilf�j"
 
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr " Fje_rn"
-
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Regnbyger"
@@ -22592,10 +23302,42 @@ msgstr "Udskriv sammendrag"
 msgid "Printing of Summary failed"
 msgstr "Fejl under udskrift af sammendrag"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Executive summary komponent kunne ikke initialisere Bonobo.\n"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "knob"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "km/t"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "USA mil"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometer"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Klar himmel"
@@ -23748,100 +24490,106 @@ msgid "C_elsius"
 msgstr "C_elsius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Alle _nyhedstjenester"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Hvor mange dage skal kalenderen vise om gangen?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Ma_ksimalt antal opf�ringer som vises:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Indstillinger for nyhedstjeneste"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "E_n m�ned"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "_En uge"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "Opdat_eringstid (sekunder):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "Opda_teringstid (sekunder):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "V_is fuld sti for mapper"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Vis _alle opgaver"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Vis _opgaver for i dag"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Vis temperatur i:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Opgaver "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Indstillinger for vejr"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Fem dage"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_E-post"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "_Nyhedstjenester"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_En dag"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Afs�t tid"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Vejr"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Fabrik for Evolution beskedsredigering."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Specielle mapper"
+msgid "Folder Settings"
+msgstr "Indstillinger for e-post"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution skallen."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -23852,6 +24600,37 @@ msgstr "Vis detaljer"
 msgid "Cancel Operation"
 msgstr "Aflys operation"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Kan ikke overf�re mappe:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "V�lg mappe"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Skitser"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Indbakke"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Udboks"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Sendt"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution installation"
@@ -23967,6 +24746,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Bragt til dig af"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Fuldf�rt dato"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Specielle mapper"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Specielle mapper"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Specielle mapper"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Fuldf�rt dato"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -23996,20 +24800,20 @@ msgstr "Kan ikke flytte en mappe til en af dens egne undermapper."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Specific�r en mappe som mappen \"%s\" skal kopieres til:"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Kopi�r mappe"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Specific�r en mappe at flytte mappen \"%s\" til:"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Flyt mappe"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24018,18 +24822,19 @@ msgstr ""
 "Kunne ikke slette mappe:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Slet \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Er du sikker p� at du vil fjerne mappen \"%s\"?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"Kunne ikke slette mappe:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24038,16 +24843,16 @@ msgstr ""
 "Kunne ikke �ndre navn p� mappe:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "�ndr navn p� mappe \"%s\" til:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "�ndr navn p� mappe"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24066,7 +24871,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Opret ny mappe"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -24074,7 +24879,7 @@ msgstr ""
 "Typen for valgt mappe er ikke gyldig for den\n"
 "forespurgte operation."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Ny..."
 
@@ -24126,21 +24931,26 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opf�ring %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "V�lg mappe"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Evolution fejl"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Du kan kun importere til lokale mapper"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24149,11 +24959,11 @@ msgstr ""
 "Ingen importerer som kan h�ndtere\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24162,17 +24972,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Fejl under start af %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Fejl under indl�sning af %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24181,31 +24991,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opf�ring 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "V�lg en fil"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Importer data og indstillinger fra andre programmer"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Importer en enkelt fil"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24213,31 +25023,78 @@ msgstr ""
 "Venligst vent...\n"
 "S�ger efter eksisterende ops�tning"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent importering"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "V�lg mappe"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "V�lg en m�lmappe til at importere data"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import�r"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Fejl under '%s':\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Synkroniserer mappe"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "�bner mappe %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "�bner mappe %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "�bn i %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Kan ikke oprette specificeret katalog:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -24251,8 +25108,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kunne ikke starte postassistent-gr�nsefladen for Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Ny"
@@ -24273,43 +25130,43 @@ msgstr "Et mappenavn kan ikke indeholde et skr�streg (/)."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' og '..' er reserverede mappenavne."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy blev ikke fundet i din $PATH."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke k�res."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Om Ximian Evolution..."
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "G� til mappe..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "V�lg mappen du �nsker at �bne"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Opret en ny genvej"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "V�lg mappen du �nsker genvejen skal pege til:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "_Arbejd tilkoblet"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "Ar_bejd frakoblet"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Arbejd frakoblet"
 
@@ -24342,7 +25199,7 @@ msgid ""
 msgstr ""
 "Ximian Evolution er frakoblet. Klik p� denne knap for at arbejde tilkoblet."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24354,12 +25211,12 @@ msgstr ""
 "Fejlen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke ops�tte lokal lagring -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24370,23 +25227,19 @@ msgstr ""
 "er afsluttet uventet. Du m� afslutte Evolution og genstarte\n"
 "for at f� adgang til disse data igen."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "O.k."
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabase ikke fundet"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Generisk fejl"
 
@@ -24411,95 +25264,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Fjern ikke"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Omd�b genvejsgruppen"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "�ndr valgt genvejsgruppe til:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Sm� ikoner"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Vis genveje som sm� ikoner"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Vis genveje som store ikoner"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Opret en ny genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "Fje_rn denne gruppe..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Fjern denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "_Omd�b denne gruppe..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Omd�b denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "Sk_jul genvejslinjen"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Skjul genvejslinjen"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Omd�b genvej"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Omd�b valgt genvej til:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "�bn mappen som denne genvej henviser til"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "�bn i nyt _vindue"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "�bn mappen som denne genvej henviser til i et nyt vindue"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "Omd�b"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Omd�b denne genvej"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "_Fjern"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne genvej fra genvejslinjen"
 
@@ -24511,10 +25364,6 @@ msgstr "Fejl ved gemning af genveje."
 msgid "Shortcuts"
 msgstr "Genveje"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Indbakke"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -24578,10 +25427,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fuldf�rt)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<klik her for at v�lge en mappe>"
 
@@ -24622,67 +25472,67 @@ msgstr ""
 "Fejlen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "CORBA-fejl"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Afbrudt"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Ugyldige argumenter"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Har en ejer allerede"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Ingen ejer"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Ikke fundet"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "En ikke-underst�ttet type"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Et ikke underst�ttet skema"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "En ikke-underst�ttet handling"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Intern fejl"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Eksisterer"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Har undermapper"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Ingen plads tilbage"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "Tidligere ejer er d�d FIXME"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Filtype:"
@@ -24811,49 +25661,81 @@ msgstr "Sp�rg mig ikke igen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra f�lgende filer:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution afslutter nu..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Sp�rg mig ikke igen"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikke tilg� Ximian Evolution-skallen."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikke initiere Ximian Evolution-skallen: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Deaktiv�r splash"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Starter import"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Starter intelligent importering"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Send fejls�gingsudskrift for alle komponenterne til en fil."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
@@ -24967,11 +25849,11 @@ msgstr "tiden nu"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "H_andlinger"
 
@@ -25093,8 +25975,8 @@ msgstr "Luk denne opf�ring"
 msgid "Delete this item"
 msgstr "Slet denne opf�ring"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Hovedv�rkt�jslinje"
 
@@ -25134,7 +26016,7 @@ msgstr "Gem denne opf�ring p� disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Fil"
 
@@ -25199,19 +26081,19 @@ msgstr "Videresend som i_Calendar"
 msgid "Forward this item via email"
 msgstr "Videresend opf�ring via e-post"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Hent seneste m�deinformation"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "Opdat�r m�de"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "Ops�t _m�de"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Ops�t m�de for denne opf�ring"
 
@@ -25219,10 +26101,6 @@ msgstr "Ops�t m�de for denne opf�ring"
 msgid "Customise My Evolution"
 msgstr "Tilpas min Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Afbryd"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Afbryd aktiv e-postoperation"
@@ -25376,7 +26254,7 @@ msgstr "Beskedsliste med tr�de"
 msgid "_Expunge"
 msgstr "_Fjern slettede beskeder"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "M_appe"
 
@@ -25792,7 +26670,7 @@ msgstr "Forrige besked"
 msgid "_Quoted"
 msgstr "Citeret"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_V�rkt�jer"
 
@@ -25807,12 +26685,12 @@ msgstr "Luk dette vindue"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "L_uk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Vis"
 
@@ -25999,7 +26877,7 @@ msgstr "_�bn..."
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Hj�lp"
 
@@ -26148,111 +27026,120 @@ msgid "Move this folder to another place"
 msgstr "Flyt denne mappe til et andet sted"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Opret _ny mappe..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "�bn i nyt vindue"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "�bn denne mappe i et andet vindue"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Send / modtag"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Send k�lagt e-post og hent ny e-post"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Vis information om Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Indsend fejlrapport"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "Indsen_d fejlrapport"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Indsend en fejlrapport med Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Skift"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Sl� visning af mappelinjen fra/til"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Sl� visning af genvejslinjen fra/til"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Skift til frakoblet arbejdsmodus."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Vis den valgte mappe"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _OSS"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Kopi�r..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_Mappelinje"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_G� til mappe..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Import�r..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Flyt..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "Indstillinger for _h�hdholdt..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Omd�b..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Send / modtag"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Genvej"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "_Genvejslinje"
 
@@ -26337,21 +27224,21 @@ msgstr ""
 "tidszone.\n"
 "Brug h�jre museknap til at zoome ud."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "_Aktiv visning"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Defin�r visninger"
 
@@ -26473,16 +27360,21 @@ msgstr "Redigering af s�gning"
 msgid "Save Search"
 msgstr "Gem s�gning"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Gem s�gning"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Tilf�j i gemte s�gninger"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Avanceret..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Information"
@@ -26504,21 +27396,21 @@ msgstr "Besked"
 msgid "Don't show this message again."
 msgstr "Vis ikke denne besked igen."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Find nu "
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "T�m"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "T�m"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Find nu "
 
@@ -26544,6 +27436,204 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Adressebog-kilder"
+
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "Ugyldig ugennemsigtig sporingsinformation:\n"
+#~ "%s"
+
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolution komponent for kalendersammendrag."
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Fabrik til kalenderens sammendragskomponent."
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Dagen sta_rter:"
+
+#~ msgid "_End of day:"
+#~ msgstr "Dag_en slutter:"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "Anden _organisator"
+
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "\"Clearsigning\" er ikke underst�ttet af dette cipher"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Indtast venligst din %s adgangsfrase for %s"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Indtast venligst din %s adgangsfrase"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Kan ikke signere denne besked: ingen tekst at signere"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Kan ikke signere denne besked: ingen adgangskode opgivet"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Kan ikke signere denne besked: kunne ikke oprette kanal til GPG/PGP: %s"
+
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Kan ikke signere denne besked: ingen tekst for \"clearsign\""
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Kan ikke verificere denne besked: ingen tekst at verificere"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Kan ikke verificere denne besked: kunne ikke oprette kanal til GPG/PGP: %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Kan ikke kryptere denne besked: ingen tekst at kryptere"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Kan ikke kryptere denne besked: ingen adgangskode opgivet"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Kan ikke kryptere denne besked: kunne ikke oprette kanal til GPG/PGP: %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "Kan ikke dekryptere denne besked: ingen ciphertekst at dekryptere"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Kan ikke dekryptere denne besked: ingen adgangskode opgivet"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Kan ikke dekryptere denne besked: kunne ikke oprette kanal til GPG/PGP: %s"
+
+#~ msgid "%s server %s"
+#~ msgstr "%s-server %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(ukendt v�rt)"
+
+#~ msgid "No such message: %s"
+#~ msgstr "Ingen s�dan besked: %s"
+
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Du kan ikke kopiere beskeder fra dette affalds-katalog."
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Kan ikke tilf�je besked i spool-filen: %s: %s"
+
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Kunne ikke gemme: %s: %s"
+
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Spool `%s' eksisterer ikke eller er ikke en normal fil"
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Radio"
+
+#~ msgid ""
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
+#~ msgstr ""
+#~ "Kunne ikke finde indbakke for nyt postlager:\n"
+#~ "%s\n"
+#~ "Ingen genvej vil blive oprettet."
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "R_edig�r"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Ny"
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Aflys operation"
+
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "Arkansas"
+
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "Arica"
+
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "Bari"
+
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Honolulu"
+
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "Somerset"
+
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Signaturfil:"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Slet alt undtaget signatur"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "_HTML-signatur:"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Filnavn:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "_HTML-signatur:"
+
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Sprog"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Radio"
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Kunne ikke oprette PGP krypteringskontekst."
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Kunne ikke oprette PGP dekrypteringskontekst."
+
+#~ msgid "Moving"
+#~ msgstr "Flytter"
+
+#~ msgid "Copying"
+#~ msgstr "Kopierer"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Signaturfil:"
+
+#~ msgid "Riga"
+#~ msgstr "Riga"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_Tilf�j"
+
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr " Fje_rn"
+
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Er du sikker p� at du vil fjerne mappen \"%s\"?"
+
 #~ msgid "Card: "
 #~ msgstr "Kort: "
 
@@ -26815,15 +27905,15 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Denne information kr�ves ikke for de fleste LDAP-servere."
 
 #~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
 #~ msgstr ""
-#~ "Denne information bruges af din LDAP-server til at specificere hvilke noder "
-#~ "bruges i en s�gning. Kontakt din administrator for mere information."
+#~ "Denne information bruges af din LDAP-server til at specificere hvilke "
+#~ "noder bruges i en s�gning. Kontakt din administrator for mere information."
 
 #~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
 #~ msgstr ""
 #~ "Dette er basisnoden for alle dine s�gninger p� LDAP-serveren. Kontakt din "
 #~ "administrator for mere information."
@@ -26837,15 +27927,9 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "_My server requires authentication"
 #~ msgstr "_Min server kr�ver autenticering"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Andre kontakter"
-
 #~ msgid "Name contains"
 #~ msgstr "Navn indeholder"
 
-#~ msgid "(none)"
-#~ msgstr "(ingen)"
-
 #~ msgid "C_ontaining:"
 #~ msgstr "Indeh_older:"
 
@@ -26858,13 +27942,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "_Message Recipients:"
 #~ msgstr "_Beskedsmodtagere:"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "Er du sikker p� at du vil\n"
-#~ "slette denne kontakt?"
-
 #~ msgid "British Virgin Islands"
 #~ msgstr "Jomfru�erne (britisk)"
 
@@ -26874,13 +27951,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Republikken Moldova"
 
-# Konteksten er planl�gning af opgaver. Dette er tidspunktet for begyndelsen
-#~ msgid "Starting:"
-#~ msgstr "Begynder:"
-
-#~ msgid "Ending:"
-#~ msgstr "Slutter:"
-
 #~ msgid "Create a new appointment"
 #~ msgstr "Opret en ny aftale"
 
@@ -26899,269 +27969,21 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "_Other"
 #~ msgstr "_Andre"
 
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Klik her for at tilf�je en deltager"
-
 #~ msgid "The journal entry has changed. Send an updated version?"
 #~ msgstr "Journalopf�ringen er �ndret. Send en opdateret version?"
 
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
-
 #~ msgid "_Delete this Task"
 #~ msgstr "Sle_t denne opgave"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "M�de starter: <b>"
-
-#~ msgid "Task begins: <b>"
-#~ msgstr "Opgave starter: <b>"
-
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Ledig/optaget-information starter: <b>"
-
-#~ msgid "Begins: <b>"
-#~ msgstr "Starter: <b>"
-
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "M�de slutter: <b>"
-
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Ledig/optaget-information starter: <b>"
-
-#~ msgid "Ends: <b>"
-#~ msgstr "Slutter: <b>"
-
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Opgave fuldf�rt <b>"
-
-#~ msgid "Task Due: <b>"
-#~ msgstr "Opgave p�begyndes: <b>"
-
-#~ msgid "iCalendar Information"
-#~ msgstr "iCalendar-information"
-
-#~ msgid "iCalendar Error"
-#~ msgstr "iCalendar-fejl"
-
-#~ msgid "An unknown person"
-#~ msgstr "en ukendt afsender"
-
-#~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
-#~ msgstr ""
-#~ "<br>Kontroll�r venligst f�lgende information og v�lg s� en handling fra "
-#~ "menuen nedenfor."
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Ingen</i>"
-
-#~ msgid "Choose an action:"
-#~ msgstr "V�lg en handling"
-
-#~ msgid "Update"
-#~ msgstr "Opgaveopdatering"
-
-#~ msgid "Accept"
-#~ msgstr "Godtaget"
-
-#~ msgid "Tentatively accept"
-#~ msgstr "Foresl�et"
-
-#~ msgid "Decline"
-#~ msgstr "Afsl�et"
-
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Send oplysning om ledig/optaget"
-
-#~ msgid "Update respondent status"
-#~ msgstr "Opdaterer modpartens status"
-
-#~ msgid "Send Latest Information"
-#~ msgstr "Send nyeste oplysninger"
-
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> har offentliggjort m�deoplysning."
-
-#~ msgid "Meeting Information"
-#~ msgstr "M�deinformation"
-
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> beder om din tilstedev�relse i et m�de."
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "M�deforslag"
-
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> �nsker at tilf�je information til et eksisterende m�de."
-
-#~ msgid "Meeting Update"
-#~ msgstr "M�deopdatering"
-
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> �nsker at modtage seneste m�deinformation."
-
-#~ msgid "Meeting Update Request"
-#~ msgstr "Anmodning om m�deopdatering"
-
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> har svaret p� en m�deforesp�rgsel."
-
-#~ msgid "Meeting Reply"
-#~ msgstr "M�desvar"
-
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> har aflyst et m�de."
-
-#~ msgid "Meeting Cancellation"
-#~ msgstr "M�deaflysing"
-
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> har sendt en uforst�elig besked."
-
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Ugyldig m�debesked"
-
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> har offentliggjort information om en opgave."
-
-#~ msgid "Task Information"
-#~ msgstr "Opgaveinformation"
-
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> anmoder om at du udf�rer en opgave."
-
-#~ msgid "Task Proposal"
-#~ msgstr "Forslag om opgave"
-
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> �nsker at tilf�je information til en eksisterende opgave."
-
-#~ msgid "Task Update"
-#~ msgstr "Opgaveopdatering"
-
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> �nsker at modtage den seneste information om opgaven."
-
-#~ msgid "Task Update Request"
-#~ msgstr "Anmodning om opgaveopdatering"
-
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> har svaret p� en opgavetildeling."
-
-#~ msgid "Task Reply"
-#~ msgstr "Svar p� opgave"
-
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> har aflyst en opgave."
-
-#~ msgid "Task Cancellation"
-#~ msgstr "Aflysing af opgave"
-
-#~ msgid "Bad Task Message"
-#~ msgstr "Ugyldig opgavebesked"
-
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> har publiseret ledig/optaget-information."
-
-#~ msgid "Free/Busy Information"
-#~ msgstr "Ugyldig besked om ledig/optaget"
-
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> anmoder om din oplysning om ledig/optaget."
-
-#~ msgid "Free/Busy Request"
-#~ msgstr "Foresp�rgsel om ledig/optaget"
-
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr ""
-#~ "<b>%s</b> har svaret p� en foresp�rgsel efter oplysning om ledig/optaget."
-
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Svar p� ledig/optaget"
-
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Ugyldig besked om ledig/optaget"
-
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Denne besked indeholder foresp�rgsler, som ikke er underst�ttet."
-
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "Bilaget indeholder ikke en gyldig kalender-besked"
-
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "Bilaget har ingen synlige kalender-elementer"
-
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "Kunne ikke finde nogen af dine identiteter i deltagerlisten!\n"
 
-#~ msgid "Event information"
-#~ msgstr "Kalenderinformation"
-
-#~ msgid "Task information"
-#~ msgstr "Opgaveinformation"
-
-#~ msgid "Journal information"
-#~ msgstr "Journalinformation"
-
-#~ msgid "Free/Busy information"
-#~ msgstr "Ledig/optaget-information"
-
-#~ msgid "Calendar information"
-#~ msgstr "Kalenderinformation"
-
 #~ msgid "Free/Busy information (%s to %s)"
 #~ msgstr "Ledig/optaget-information (%s til %s)"
 
 #~ msgid "iCalendar information"
 #~ msgstr "iCalendar-information"
 
-#~ msgid "Task"
-#~ msgstr "Opgave"
-
-#~ msgid "Status: %s"
-#~ msgstr "Status: %s"
-
-#~ msgid "Percent Complete: %i"
-#~ msgstr "F�rdige procenter: %i"
-
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
-
-#~ msgid "Categories: %s"
-#~ msgstr "Kategorier: %s"
-
-#~ msgid "Contacts: "
-#~ msgstr "Kontakter: "
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Ugyldig type i krop-indeholder, forventer streng"
 
@@ -27231,7 +28053,8 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Kunne ikke hente besked fra POP-server %s: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
 #~ msgstr ""
 #~ "Dette lader dig koble til POP-serveren ved at bruge Kerberos 4 som "
 #~ "autenticering."
@@ -27245,9 +28068,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "(Unknown)"
 #~ msgstr "(Ukendt)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Uventet svar fra POP-server: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Kunne ikke finde 'Fra'-adresse i besked"
 
@@ -27302,30 +28122,12 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Mailbox Format"
 #~ msgstr "Format for postboks"
 
-#~ msgid " (default)"
-#~ msgstr " (forvalgt)"
-
-#~ msgid "Mail Settings"
-#~ msgstr "Indstillinger for e-post"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Emne er %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "E-post fra %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "%s e-postliste"
-
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "Denne besked indeholder ugyldige modtagere:"
 
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Indbakke"
 
-#~ msgid "Account"
-#~ msgstr "Konto"
-
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr "Krypt�r altid til mig s_elv ved sending af krypteret e-post."
 
@@ -27335,24 +28137,15 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Default Forward style is: "
 #~ msgstr "Standard videresendingsstil er: "
 
-#~ msgid "Drafts"
-#~ msgstr "Skitser"
-
 #~ msgid "Edit..."
 #~ msgstr "Redig�r..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML-signaturfil:"
-
 #~ msgid "News"
 #~ msgstr "News"
 
 #~ msgid "Select Filter Log file..."
 #~ msgstr "V�lg en logfil for filter..."
 
-#~ msgid "Sent"
-#~ msgstr "Sendt"
-
 #~ msgid "Sources"
 #~ msgstr "Kilder"
 
@@ -27383,22 +28176,9 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "seconds."
 #~ msgstr "sekunder"
 
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "Denne besked er digitalt signeret. For flere informationer, klik p� "
-#~ "l�sikonen."
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Evolution kan ikke genkende denne form for signeret besked."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Denne besked er digitalt signeret og er fundet autentisk."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
-
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "Evolution-komponent for sammendrag."
 
@@ -27411,39 +28191,12 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Regions"
 #~ msgstr "Regioner"
 
-#~ msgid " F"
-#~ msgstr " F"
-
-#~ msgid " C"
-#~ msgstr " C"
-
-#~ msgid "knots"
-#~ msgstr "knob"
-
-#~ msgid "kph"
-#~ msgstr "km/t"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "USA mil"
-
-#~ msgid "kilometers"
-#~ msgstr "kilometer"
-
 #~ msgid "Al_l stations:"
 #~ msgstr "Al_le stationer:"
 
 #~ msgid "All _folders:"
 #~ msgstr "Alle _mapper:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "Alle _nyhedstjenester"
-
 #~ msgid "_Display folders:"
 #~ msgstr "_Vis mapper:"
 
@@ -27453,22 +28206,9 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "_Displayed feeds:"
 #~ msgstr "_Viste tjenester:"
 
-#~ msgid "Outbox"
-#~ msgstr "Udboks"
-
-#~ msgid "Evolution "
-#~ msgstr "Evolution"
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan ikke overf�re mappe:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(Uden navn)"
 
diff --git a/po/de.po b/po/de.po
index e7e55d8379..cf4116154b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1cvs\n"
-"POT-Creation-Date: 2002-05-24 14:44+0200\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-05-22 21:30GMT\n"
 "Last-Translator: Manuel Borchers <webmaster@matronix.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -40,7 +40,7 @@ msgstr "Importiert VCard-Dateien in Evolution."
 msgid "File As"
 msgstr "Einsortieren unter"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Name"
@@ -341,7 +341,7 @@ msgstr "VCard f�r %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -349,7 +349,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Suchen..."
 
@@ -362,31 +362,31 @@ msgstr "Laden..."
 msgid "Error in search expression."
 msgstr "Fehler im Suchausdruck."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Karte zu LDAP-Server hinzuf�gen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Karte von LDAP-Server entfernen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Karte auf LDAP-Server �ndern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Suche wird neu gestartet."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Empfangen von LDAP-Suchergebnissen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 msgid "Error performing search"
 msgstr "Fehler beim Ausf�hren der Suche"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 msgid "Could not parse query string"
 msgstr "Abfragezeichenkette konnte nicht geparst werden"
 
@@ -432,66 +432,54 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Eine beispielhafte Bonobo-Komponente, die ein Adressbuch anzeigt."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Addressbook Settings"
-msgstr "Adressbuch-Einstellungen"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr "Konfigurations-Bedienelement f�r die Evolution Adressbuch-Speicher"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr "Konfigurations-Bedienelement f�r das Evolution Adressbuch"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Control, die eine Evolution-Adressbuch-Minikarte anzeigt."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr "Verzeichnisserver"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Evolution-Komponente f�r Kontaktverwaltung."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fabrik f�r die Adressbuch-Minikarten-Control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Fabrik f�r den Adressanzeiger des Adressbuchs"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Fabrik f�r das Adress-Popup des Adressbuchs"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 "Fabrik f�r die Konfigurations-Bedienelemente des Evolution Adressbuchs."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik f�r die beispielhafte Adressbuch-Kontrolle"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-"Diese Seiten kann verwendet werden, um Adressbucheinstellungen vorzunehmen"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 "Diese Seite kann zur Konfiguration von Verzeichnisservern, die das LDAP "
 "Protokoll verwenden, benutzt werden"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
 #: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
@@ -499,37 +487,69 @@ msgstr ""
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Ordner mit Kontaktinformationen"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP-Server:"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "LDAP-Server mit Kontaktinformationen"
 
-#: addressbook/gui/component/addressbook-component.c:577
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Neu Kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "_Kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:577
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "New Contact List"
-msgstr "Neu Kontaktliste"
+#: addressbook/gui/component/addressbook-config.c:197
+msgid "Failed to connect to LDAP server"
+msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
 
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "Contact _List"
-msgstr "_Kontaktliste"
+#: addressbook/gui/component/addressbook-config.c:216
+msgid "Failed to authenticate with LDAP server"
+msgstr "Legitimation beim IMAP-Server ist fehlgeschlagen"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr "Abfrage auf Root DSE konnte nicht ausgef�hrt werden"
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr "Der Server antwortete mit nicht unterst�tzen Suchbasen"
+
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Dieser Server unterst�tzt keine LDAPv3 Schema-Information"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+msgid "Error retrieving schema information"
+msgstr "Fehler beim Empfangen von Schema-Information"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+msgid "Server did not respond with valid schema information"
+msgstr "Server antwortetet nicht mit einer g�ltigen Schema-Information"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs konnte nicht initialisiert werden"
 
@@ -572,42 +592,42 @@ msgstr ""
 "Dieses Adressbuch konnte nicht ge�ffnet werden. Bitte pr�fen Sie\n"
 "nach, ob der Pfad existiert und ob Sie darauf zugreifen d�rfen."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Passwort f�r %s (Benutzer %s) eingeben"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 msgid "Name begins with"
 msgstr "Name beginnt mit"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 msgid "Email is"
 msgstr "E-Mail ist"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorie ist"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Irgend ein Feld enth�lt"
 
-#: addressbook/gui/component/addressbook.c:773
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Komplex..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
@@ -668,42 +688,6 @@ msgstr "Abfragen deaktivieren"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Abfragen aktivieren (gef�hrlich!)"
 
-#: addressbook/gui/component/addressbook-config.c:198
-msgid "Failed to connect to LDAP server"
-msgstr "Verbindung zum LDAP-Server ist fehlgeschlagen"
-
-#: addressbook/gui/component/addressbook-config.c:217
-msgid "Failed to authenticate with LDAP server"
-msgstr "Legitimation beim IMAP-Server ist fehlgeschlagen"
-
-#: addressbook/gui/component/addressbook-config.c:240
-msgid "Could not perform query on Root DSE"
-msgstr "Abfrage auf Root DSE konnte nicht ausgef�hrt werden"
-
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "The server responded with no supported search bases"
-msgstr "Der Server antwortete mit nicht unterst�tzen Suchbasen"
-
-#: addressbook/gui/component/addressbook-config.c:1153
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Dieser Server unterst�tzt keine LDAPv3 Schema-Information"
-
-#: addressbook/gui/component/addressbook-config.c:1175
-msgid "Error retrieving schema information"
-msgstr "Fehler beim Empfangen von Schema-Information"
-
-#: addressbook/gui/component/addressbook-config.c:1183
-msgid "Server did not respond with valid schema information"
-msgstr "Server antwortetet nicht mit einer g�ltigen Schema-Information"
-
-#: addressbook/gui/component/addressbook-config.c:1628
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
-
-#: addressbook/gui/component/addressbook-config.c:1704
-msgid "Extra Completion folders"
-msgstr "Extra Ordner zur Vervollst�ndigung"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr "  Unterst�tzte Basen _anzeigen"
@@ -760,8 +744,8 @@ msgstr "Attributzuordnungen hinzuf�gen (oder bearbeiten)"
 msgid "Addressbook Sources"
 msgstr "Adressbuch-Quellen"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:55
-#: mail/mail-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "Immer"
 
@@ -852,8 +836,8 @@ msgstr "LDAP-Konfigurationsassistent"
 msgid "Mappings"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:57
-#: mail/mail-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Nie"
 
@@ -1163,7 +1147,7 @@ msgid "Using email address"
 msgstr "E-Mail-Adresse verwenden"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:56 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr "Immer, wenn m�glich"
 
@@ -1171,7 +1155,7 @@ msgstr "Immer, wenn m�glich"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "Hinzuf�gen"
 
@@ -1212,7 +1196,7 @@ msgid "_Download limit:"
 msgstr "_Downloadbegrenzung:"
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1321,7 +1305,7 @@ msgstr "Fabrik f�r die Namenauswahl-Schnittstelle des Adressbuchs"
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:504
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
 #: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Entfernen"
@@ -1461,7 +1445,7 @@ msgid "D_epartment:"
 msgstr "_Abteilung:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Details"
 
@@ -1520,11 +1504,12 @@ msgstr "Will HTML-Mail erhalten"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1703 mail/mail-config.glade.h:147
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:41
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "L�schen"
 
@@ -1553,7 +1538,7 @@ msgid "_Web page address:"
 msgstr "Adresse der _Webseite:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Vereinigte Staaten"
 
@@ -2059,12 +2044,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Lettland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libanon"
 
@@ -2073,7 +2057,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
@@ -2082,12 +2066,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litauen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
@@ -2120,7 +2104,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2145,7 +2129,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexiko"
 
@@ -2170,7 +2154,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marokko"
 
@@ -2195,7 +2179,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Niederlande"
 
@@ -2208,12 +2192,12 @@ msgid "New Caledonia"
 msgstr "Neukaledonien"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Neuseeland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2230,7 +2214,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolkinsel"
 
@@ -2239,17 +2223,17 @@ msgid "Northern Mariana Islands"
 msgstr "N�rdliche Marianen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norwegen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2262,7 +2246,7 @@ msgid "Palestinian Territory"
 msgstr "Pal�stinensisches Autonomiegebiet"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2271,12 +2255,12 @@ msgid "Papua New Guinea"
 msgstr "Papua-Neuguinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2289,22 +2273,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Katar"
 
@@ -2313,7 +2297,7 @@ msgid "Reunion"
 msgstr "Reunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rum�nien"
 
@@ -2350,7 +2334,7 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome und Principe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabien"
 
@@ -2367,17 +2351,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapur"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slowakei"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slowenien"
 
@@ -2390,7 +2374,7 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "S�dafrika"
 
@@ -2399,7 +2383,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "S�dgeorgien und die S�dlichen Sandwichinseln"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Spanien"
 
@@ -2420,7 +2404,7 @@ msgid "Sudan"
 msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -2433,17 +2417,17 @@ msgid "Swaziland"
 msgstr "Swasiland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Schweden"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Schweiz"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
@@ -2480,7 +2464,7 @@ msgid "Tunisia"
 msgstr "Tunesien"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "T�rkei"
 
@@ -2501,7 +2485,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraine"
 
@@ -2510,7 +2494,7 @@ msgid "United Arab Emirates"
 msgstr "Vereinigte Arabische Emirate"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Vereinigtes K�nigreich"
 
@@ -2519,7 +2503,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "Kleinere abseitsliegende Inseln der Vereinigten Staaten"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2532,12 +2516,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2558,12 +2542,12 @@ msgid "Western Sahara"
 msgstr "Westsahara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslawien"
 
@@ -2630,11 +2614,11 @@ msgstr "E-Mail"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "list"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2763,7 +2747,6 @@ msgstr "Adressen _verbergen, when Mail an diese Liste gesendet wird"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
-#: mail/mail-config.glade.h:170
 msgid "_Remove"
 msgstr "_Entfernen"
 
@@ -2860,15 +2843,15 @@ msgid "Error modifying card"
 msgstr "Fehler beim �ndern einer Karte"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Erfolg"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:505 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1114
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -2877,7 +2860,7 @@ msgid "Repository offline"
 msgstr "Repository offline"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
@@ -2896,7 +2879,7 @@ msgstr "Protokoll nicht unterst�tzt"
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2299
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
 #: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
@@ -2944,7 +2927,7 @@ msgstr "Fehler beim Entfernen einer Liste"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:100
 #: addressbook/gui/widgets/e-addressbook-util.c:249
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Fehler beim Entfernen einer Karte"
 
@@ -3042,94 +3025,99 @@ msgstr "Anderes Telefon"
 msgid "Other Address"
 msgstr "Andere Adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Adressbuch"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "New Contact..."
 msgstr "Neuer Kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "New Contact List..."
 msgstr "Neu Kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Go to Folder..."
 msgstr "Gehe zu Ordner..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Import..."
 msgstr "Importieren..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Search for Contacts..."
 msgstr "Nach Kontakten suchen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Addressbook Sources..."
 msgstr "Adressbuch-Quellen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Pilot Settings..."
 msgstr "Pilot-Einstellungen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Kontakt weiterleiten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Nachricht an Kontakt schicken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Drucken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Umschlag drucken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Copy to folder..."
 msgstr "In Ordner kopieren..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Move to folder..."
 msgstr "In Ordner verschieben..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopieren"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Einf�gen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:215 shell/e-shell-folder-commands.c:411
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "L�schen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 msgid "Current View"
 msgstr "Aktuelle Ansicht"
@@ -3138,7 +3126,7 @@ msgstr "Aktuelle Ansicht"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,�,b,c,d,e,f,g,h,i,j,k,l,m,n,o,�,p,q,r,s,t,u,�,v,w,x,y,z"
 
@@ -3146,7 +3134,7 @@ msgstr ",123,a,�,b,c,d,e,f,g,h,i,j,k,l,m,n,o,�,p,q,r,s,t,u,�,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,�,b,c,d,e,f,g,h,i,j,k,l,m,n,o,�,p,q,r,s,t,u,�,v,w,x,y,z"
 
@@ -3294,7 +3282,7 @@ msgstr "R�nder"
 msgid "Number of columns:"
 msgstr "Anzahl Spalten:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Optionen"
 
@@ -3304,7 +3292,7 @@ msgid "Orientation"
 msgstr "Ausrichtung"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Seite"
 
@@ -3378,33 +3366,33 @@ msgstr "Breite:"
 msgid "_Font..."
 msgstr "_Schrift..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Unbenannter Termin"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:416 mail/message-list.c:684
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Hoch"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:417 mail/message-list.c:683
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:682
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Niedrig"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Undefiniert"
 
@@ -3444,42 +3432,34 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Konfigurations-Bedienelementf�r den Evolution Kalender."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Evolutions Chefsesselansichts-Komponente f�r den Kalender."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "iTip-/iMip-Betrachter f�r den Evolution-Kalender"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution-Komponente f�r die Verwaltung des Kalenders."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Fabrik f�r die Kalenderzusammenfassungs-Komponente."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Fabrik f�r den Evolution-Aufgabeneditor."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Fabrik f�r die Kalender-iTip-Ansichts-Control"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Fabrik f�r die beispielhafte Kalender-Control"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Fabrik, die Kalender-Komponenteneditor-Dialoge zentralisiert"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Fabrik, um eine Komponenteneditor-Fabrik zu erzeugen"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 "Diese Seite kann zur Konfiguration der Kalender- und Aufgaben-Einstellungen "
@@ -3549,7 +3529,7 @@ msgstr ""
 "anzeigen."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2636
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Warnung"
@@ -3575,7 +3555,7 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Mich �ber dieses Programm nicht mehr fragen."
 
-#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "GNOME konnte nicht initialisiert werden"
 
@@ -3640,16 +3620,16 @@ msgstr ""
 "ORBit und OAF Einstellungen. "
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:395
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:396
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:394
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "�ffentlich"
 
@@ -3670,32 +3650,32 @@ msgid "W"
 msgstr "W"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:468
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Frei"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:469
-#: calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1099
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Besch�ftigt"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:489 calendar/gui/print.c:2290
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Nicht gestartet"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:490 calendar/gui/print.c:2293
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2296
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Abgeschlossen"
 
@@ -3710,12 +3690,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1665
-#: mail/mail-account-gui.c:1220 mail/mail-account-gui.c:1221
-#: mail/mail-account-gui.c:1818 mail/mail-accounts.c:439
-#: mail/mail-accounts.c:448 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:75 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3730,14 +3710,14 @@ msgstr "Wiederkehrend"
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
-#: calendar/gui/e-meeting-model.c:821
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Nein"
 
@@ -3757,18 +3737,18 @@ msgstr "Wochenansicht"
 msgid "Month View"
 msgstr "Monatsansicht"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:172
-#: shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Ordner mit Terminen und Ereignissen"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/print.c:1777
-#: calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
 #: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
@@ -3776,39 +3756,39 @@ msgstr "Ordner mit Terminen und Ereignissen"
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Ordner mit To-Do-Eintr�gen"
 
-#: calendar/gui/component-factory.c:696
+#: calendar/gui/component-factory.c:704
 msgid "New meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/component-factory.c:696
+#: calendar/gui/component-factory.c:704
 msgid "_Meeting"
 msgstr "_Besprechung"
 
-#: calendar/gui/component-factory.c:700
+#: calendar/gui/component-factory.c:708
 msgid "New task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/component-factory.c:700
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:712
 msgid "New All Day Appointment"
 msgstr "Neuer Ganztags-Termin"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:712
 msgid "All _Day Appointment"
 msgstr "Ganz_tags-Termin"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:716
 msgid "New appointment"
 msgstr "Neuer Termin"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:716
 msgid "_Appointment"
 msgstr "_Termin"
 
@@ -4047,7 +4027,7 @@ msgstr "Ende des Termins"
 msgid "hour(s)"
 msgstr "Stunde(n)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -4075,78 +4055,80 @@ msgstr "30 Minuten"
 msgid "60 minutes"
 msgstr "60 Minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+msgid "Alerts"
+msgstr "Alarme"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Kalender- und Aufgaben-Einstellungen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Farbe f�r �berf�llige Aufgaben"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Farbe f�r heute f�llige Aufgaben"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Tage"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Freitag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Stunden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Montag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "S_o"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Samstag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Sh_ow a reminder"
 msgstr "Standard-Erinnerung _anzeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "_Wochennummern in Datumsnavigator zeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "_Anfang des Tages:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "S_o"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_asks due today:"
 msgstr "Heute f�llige _Aufgaben:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "_Do"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "D_i"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Task List"
 msgstr "Aufgabenliste"
@@ -4174,78 +4156,93 @@ msgid "Tuesday"
 msgstr "Dienstag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Werkwoche"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 Stunden (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 Stunden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "Beim L�schen von Objekten um Best�tigung _anfragen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "Wochenenden in Monatsansicht _komprimieren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Aufgabe beginnt: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Anzeige"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "_Ende des Tages:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_Fr"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:155
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Allgemein"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "Erledigte Aufgaben _verbergen nach"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Mo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Overdue tasks:"
 msgstr "_�berf�llige Aufgaben:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "S_a"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Show appointment end times in week and month views"
 msgstr "_Endzeiten von Aufgaben in Wochen- und Monatsansichten zeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Time divisions:"
 msgstr "Zeit-_Unterteilungen:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "D_i"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_Mi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "vor Terminbeginn"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4337,52 +4334,59 @@ msgstr " (F�llig am "
 msgid "Due "
 msgstr "F�llig am "
 
-#: calendar/gui/dialogs/comp-editor.c:327
+#: calendar/gui/dialogs/comp-editor.c:342
 msgid "Could not update invalid object"
 msgstr "Ung�ltiges Objekt konnte nicht aktualisiert werden"
 
-#: calendar/gui/dialogs/comp-editor.c:330
+#: calendar/gui/dialogs/comp-editor.c:345
 msgid "Object not found, not updated"
 msgstr "Objekt nicht gefunden, wurde nicht aktualisiert"
 
-#: calendar/gui/dialogs/comp-editor.c:333
+#: calendar/gui/dialogs/comp-editor.c:348
 msgid "You don't have permissions to update this object"
 msgstr "Sie haben keine Berechtigung dieses Objekt zu aktualisieren"
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:351
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: calendar/gui/dialogs/comp-editor.c:712
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:720
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:723
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaleintrag - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:737
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/comp-editor.c:1099
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:968
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1251
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Aktuelle Version kann nicht erhalten werden!"
 
@@ -4441,27 +4445,27 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: calendar/gui/dialogs/event-editor.c:190 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Erinnerung"
 
-#: calendar/gui/dialogs/event-editor.c:200
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:265
-#: calendar/gui/dialogs/event-editor.c:370
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Planung"
 
-#: calendar/gui/dialogs/event-editor.c:212
-#: calendar/gui/dialogs/event-editor.c:268
-#: calendar/gui/dialogs/event-editor.c:373 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Besprechung"
 
@@ -4530,19 +4534,19 @@ msgstr "_Endzeit:"
 msgid "_Start time:"
 msgstr "Anfangszeit:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Ein Organisator wird ben�tigt."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Mindestens ein Teilnehmer wird ben�tigt."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Diese Person nimmt schon an der Besprechung teil!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
@@ -4595,7 +4599,7 @@ msgstr "Position"
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
-#: mail/message-list.etspec.h:11
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -4616,14 +4620,10 @@ msgid "_Change Organizer"
 msgstr "Organisator _�ndern"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "Andere einladen..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Anderer Organisator"
-
 # CHECK ME
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
@@ -4811,7 +4811,7 @@ msgid "Progress"
 msgstr "Fortschritt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:782
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4823,19 +4823,19 @@ msgstr "_Priorit�t:"
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Grundlegend"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Arbeitsauftrag"
 
 #: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:40
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Beschreibung:"
 
@@ -4847,66 +4847,77 @@ msgstr "Anfangsdatum:"
 msgid "_Due Date:"
 msgstr "F�llig am:"
 
-#: calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:439
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Ausgew�hlte Objekte werden gel�scht"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
 #: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
 #: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "�_ffnen"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 msgid "_Save as..."
 msgstr "_Speichern unter..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4914,20 +4925,20 @@ msgstr "_Speichern unter..."
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Ausschneiden"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4935,32 +4946,32 @@ msgstr "Kopieren"
 msgid "_Paste"
 msgstr "Einf�gen"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 msgid "_Assign Task"
 msgstr "_Aufgabe zuweisen"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 msgid "_Forward as iCalendar"
 msgstr "Als i_Calendar weiterleiten"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ausgew�hlte Aufgaben als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "Ausgew�hlte Aufgaben _l�schen"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7418
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicken, um eine Aufgabe hinzuzuf�gen"
@@ -4969,8 +4980,8 @@ msgstr "Klicken, um eine Aufgabe hinzuzuf�gen"
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Abgeschlossen"
 
@@ -5137,14 +5148,14 @@ msgid "Delete _All Occurrences"
 msgstr "Jedes _Auftreten l�schen"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:636
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Die GNOME-Pilot-Werkzeuge scheinen auf diesem System nicht installiert zu "
 "sein."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:644
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Fehler beim Ausf�hren von %s."
@@ -5215,26 +5226,26 @@ msgstr "<i>Keine</i>"
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:318
-#: calendar/gui/e-meeting-model.c:341 calendar/gui/e-meeting-model.c:835
-#: calendar/gui/itip-utils.c:323
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:326
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
 msgid "Tentatively Accepted"
 msgstr "Vorl�ufig angenommen"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:320
-#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:836
-#: calendar/gui/itip-utils.c:329 calendar/gui/itip-utils.c:355
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
 msgid "Declined"
 msgstr "Abgelehnt"
 
 #: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:289 calendar/gui/e-meeting-model.c:354
-#: calendar/gui/e-meeting-model.c:793 calendar/gui/e-meeting-model.c:809
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
@@ -5283,8 +5294,8 @@ msgstr "Status des Antwortenden aktualisieren"
 msgid "Send Latest Information"
 msgstr "Neueste Informationen senden"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:343
-#: shell/evolution-shell-component.c:1077 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -5562,92 +5573,92 @@ msgstr "datum-ende"
 msgid "date-start"
 msgstr "datum-anfang"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Vorsitzende"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Ben�tigte Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Optionale Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Nicht-Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533 calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Ressource"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Raum"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Vorsitzender"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535 calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Ben�tigter Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:807
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:808
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543 calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Erfordert Ma�nahme"
 
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Vorl�ufig"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:838
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "In Bearbeitung"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
@@ -5659,63 +5670,63 @@ msgstr "%a, %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Au�er Haus"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Keine Information"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "Optionen"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Nur Arbeitszeit anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Weggezoomt anzeigen"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "Verf�gbarkeit _aktualisieren"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "AutoWahl"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "Alle Leute und Ressourcen"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Alle Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Ben�tigte Leute"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Ben�tigte Leute und eine Ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Anfang der Besprechung:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Ende der Besprechung:"
 
@@ -5735,7 +5746,7 @@ msgid "The method required to load `%s' is not supported"
 msgstr ""
 "Die Methode, die zum Laden von `%s' ben�tigt wird, ist nicht unterst�tzt"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1562
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Sie haben keine Berechtigung den Ordner in `%s' zu �ffnen"
@@ -5760,18 +5771,18 @@ msgstr "Neuer _Termin..."
 msgid "_Delete this Appointment"
 msgstr "Diesen Termin _l�schen"
 
-#: calendar/gui/gnome-cal.c:1540
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Der Ordner in `%s' konnte nicht ge�ffnet werden"
 
-#: calendar/gui/gnome-cal.c:1551
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 "Die Methode, die zum �ffnen von `%s' ben�tigt wird, wird nicht unterst�tzt"
 
-#: calendar/gui/gnome-cal.c:1933
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender bei %s wird ge�ffnet"
@@ -5832,52 +5843,52 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Mindestens ein Teilnehmer wird ben�tigt"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Ein Organisator muss feststehen."
 
-#: calendar/gui/itip-utils.c:295
+#: calendar/gui/itip-utils.c:354
 msgid "Event information"
 msgstr "Ereignisinformationen"
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:356
 msgid "Task information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/itip-utils.c:299
+#: calendar/gui/itip-utils.c:358
 msgid "Journal information"
 msgstr "Journalinformationen"
 
-#: calendar/gui/itip-utils.c:301
+#: calendar/gui/itip-utils.c:360
 msgid "Free/Busy information"
 msgstr "Verf�gbarkeitsinformationen"
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:362
 msgid "Calendar information"
 msgstr "Kalenderinformationen"
 
-#: calendar/gui/itip-utils.c:339
+#: calendar/gui/itip-utils.c:398
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: calendar/gui/itip-utils.c:347
+#: calendar/gui/itip-utils.c:406
 msgid "Refresh"
 msgstr "Aktualisieren"
 
 # CHECK
-#: calendar/gui/itip-utils.c:351
+#: calendar/gui/itip-utils.c:410
 msgid "Counter-proposal"
 msgstr "Gegenvorschlag"
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Sie m�ssen ein Teilnehmer des Ereignisses sein."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "Komponenteneditor-Fabrik konnte nicht angelegt werden"
 
@@ -6104,7 +6115,7 @@ msgid "Print Calendar"
 msgstr "Kalender drucken"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2923
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -6142,8 +6153,8 @@ msgstr ""
 "\n"
 "Aufgaben wirklich entfernen?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2408
-#: mail/mail-callbacks.c:2650
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Mich nicht mehr fragen."
 
@@ -7233,638 +7244,654 @@ msgid "Asia/Macao"
 msgstr "Asien/Macao"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Asien/Macao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Asien/Magadan"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Asien/Magadan"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Asien/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Asien/Muscat"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Asien/Nicosia"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Asien/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Asien/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Asien/Kabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Asien/Phnom_Penh"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Asien/Pontianak"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Asien/Pyongyang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Asien/Katar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Asien/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Asien/Rangoon"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Asien/Riyadh"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Asien/Saigon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Asien/Sakhalin"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Asien/Samarkand"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Asien/Seoul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Asien/Shanghai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Asien/Singapur"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Asien/Taipei"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Asien/Tashkent"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Asien/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Asien/Tehran"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Asien/Thimphu"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Asien/Tokyo"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Asien/Ujung_Pandang"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Asien/Ulaanbaatar"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Asien/Urumqi"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Asien/Vientiane"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Asien/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Asien/Yakutsk"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Asien/Yekaterinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Asien/Yerevan"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azoren"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermudas"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Kanaren"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Kap_Verde"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faeroe"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Mayen"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madeira"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Reykjavik"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/South_Gerorgia"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/St._Helena"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlantik/Stanley"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australien/Adelaid"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australien/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australien/Broken_Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australien/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australien/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australien/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australien/Lord_Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australien/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australien/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australien/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europa/Athen"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrad"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europa/Br�ssel"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukarest"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europa/Kopenhagen"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisabon"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburg"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europa/Moskau"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europa/Prag"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europa/Rom"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Sofia"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europa/Tiran"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikan"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europa/Wien"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europa/Warschau"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Za�orozhye"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europa/Z�rich"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Indisch/Antananarivo"
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Indisch/Chagos"
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Indisch/Christmas"
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Indisch/Cocos"
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indisch/Komoren"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Indisch/Kerguelen"
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indisch/Mahe"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indisch/Malediven"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indisch/Mauritius"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indisch/Mayotte"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indisch/Reunion"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Pazifik/Apia"
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Pazifik/Auckland"
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Pazifik/Chatham"
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Pazifik/Easter"
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Pazifik/Efate"
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Pazifik/Enderbury"
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Pazifik/Fakaofo"
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Pazifik/Fiji"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Pazifik/Funafuti"
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Pazifik/Galapagos"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Pazifik/Gambier"
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Pazifik/Guadalcanal"
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Pazifik/Guam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Pazifik/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Pazifik/Johnston"
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Pazifik/Kiritimati"
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Pazifik/Kosrae"
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Pazifik/Kwajalein"
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Pazifik/Majuro"
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Pazifik/Marquesas"
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Pazifik/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Pazifik/Nauru"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Pazifik/Niue"
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Pazifik/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Pazifik/Noumea"
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Pazifik/Pago_Pago"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Pazifik/Palau"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Pazifik/Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Pazifik/Ponape"
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Pazifik/Port_Moresby"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Pazifik/Rarotonga"
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Pazifik/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Pazifik/Tahiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Pazifik/Tarawa"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Pazifik/Tongatapu"
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Pazifik/Truk"
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Pazifik/Wake"
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Pazifik/Wallis"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Pazifik/Yap"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Signieren wird von dieser Verschl�sselung  nicht unterst�tzt"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Klarsignieren wird von dieser Verschl�sselung nicht unterst�tzt"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Pr�fen wird von dieser Verschl�sselung nicht unterst�tzt"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Verschl�sseln wird von dieser Verschl�sselung nicht unterst�tzt"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Entziffern wird von dieser Verschl�sselung nicht unterst�tzt"
 
@@ -7872,12 +7899,12 @@ msgstr "Entziffern wird von dieser Verschl�sselung nicht unterst�tzt"
 msgid "Unable to create cache path"
 msgstr "Cache-Pfad konnte nicht erstellt werden"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Cache-Eintrag konnte nicht entfernt werden: %s: %s"
 
-#: camel/camel-disco-diary.c:183
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7888,7 +7915,7 @@ msgstr ""
 "Weitere Operationen auf diesem Server werden nicht wiedergegeben\n"
 "werden, wenn Sie die Netzwerkverbindung wiederherstellen."
 
-#: camel/camel-disco-diary.c:246
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7899,7 +7926,7 @@ msgstr ""
 "%s\n"
 "�nderungen an diesem Ordner werden nicht resynchronisiert werden."
 
-#: camel/camel-disco-diary.c:280
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Resynchronisieren mit dem Server"
 
@@ -7916,48 +7943,48 @@ msgstr "Sie m�ssen online arbeiten, um diesen Vorgang zu Ende zu bringen"
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausf�hren des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Der Spool-Ordner kann nicht ge�ffnet werden"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner kann nicht verarbeitet werden"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Nachricht kann nicht ge�ffnet werden"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
@@ -8008,29 +8035,103 @@ msgstr "(match-all) verlangt einen einzelnen Wahrheitswert als Ergebnis"
 msgid "Performing query on unknown header: %s"
 msgstr "Abfrage wird auf unbekannte Kopfzeile ausgef�hrt: %s"
 
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nicht unterst�tzte Operation: Nachricht anh�ngen: f�r %s"
 
-#: camel/camel-folder.c:1043
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nicht unterst�tzte Operation: Suche nach Ausdruck: f�r %s"
 
-#: camel/camel-folder.c:1083
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nicht unterst�tzte Operation: nach UIDs suchen: f�r %s"
 
-#: camel/camel-folder.c:1199
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Nachrichten werden verschoben"
 
-#: camel/camel-folder.c:1199
+#: camel/camel-folder.c:1317
 msgid "Copying messages"
 msgstr "Nachrichten werden kopiert"
 
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Storniert"
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Unerwartete Antwort von POP-Server: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Kein Dateiname angegeben."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Nachricht kann nicht verschl�sselt werden: keine Empf�nger angegeben"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Nachricht %s konnte nicht gecacht werden: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Nachricht %s konnte nicht gecacht werden: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Nachricht konnte nicht dekodiert werden."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+"Nachricht kann nicht verifiziert werden: Pipe zu GPG/PGP konnte nicht gelegt "
+"werden: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8128,93 +8229,23 @@ msgstr "Fehler beim Schreiben der tempor�ren Maildatei: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Fehler beim Kopieren der tempor�ren Maildatei: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Bitte geben Sie Ihre %s-Passphrase f�r %s ein."
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Bitte geben Sie Ihre %s-Passphrase ein."
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Nachricht kann nicht signiert werden: kein signierbarer Klartext"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "Nachricht konnte nicht signiert werden: kein Passwort angegeben"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Nachricht kann nicht signiert werden: Pipe zu GPG/PGP konnte nicht angelegt "
-"werden: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Nachricht kann nicht signiert werden: kein Klartext zum Klarsignieren"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Nachricht kann nicht verifiziert werden: kein verifizierbarer Klartext"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Diese Nachricht kann nicht verifiziert werden: Pipe zu GPG/PGP konnte nicht "
-"angelegt werden: %s"
 
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-"Nachricht kann nicht verifiziert werden: Pipe zu GPG/PGP konnte nicht gelegt "
-"werden: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Nachricht kann nicht verschl�sselt werden: kein signierbarer Klartext"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Nachricht kann nicht verschl�sselt werden: kein Passwort angegeben"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Diese Nachricht kann nicht verschl�sselt werden: Pipe zu GPG/PGP konnte "
-"nicht angelegt werden: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Nachricht kann nicht verschl�sselt werden: keine Empf�nger angegeben"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-"Nachricht kann nicht entschl�sselt werden: kein entschl�sselbarer "
-"chiffrierter Text"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Nachricht kann nicht entschl�sselt werden: kein Passwort angegeben"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
-"Nachricht kann nicht entschl�sselt werden: Pipe zu GPG/PGP konnte nicht "
-"angelegt werden: %s"
 
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Dies ist ein digital signierter Nachrichtenteil"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Anderer Fehler"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -8340,7 +8371,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:842
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Ung�ltige Legitimationsantwort vom Server."
 
@@ -8368,11 +8399,9 @@ msgstr ""
 "Mit dieser Option werden Sie mit einem Windows-basierten Server, der NTLM / "
 "Secure Password Authentication verwendet, verbunden."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:81
-msgid "Password"
-msgstr "Passwort"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -8542,7 +8571,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8555,16 +8584,16 @@ msgstr ""
 "Fingerabdruck:       %s\n"
 "Signatur:                %s"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr "GUT"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr "SCHLECHT"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8584,12 +8613,12 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' konnte nicht geparst werden"
 
-#: camel/camel-vee-folder.c:590
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nachricht %s gibt es in %s nicht"
 
-#: camel/camel-vee-folder.c:737 camel/camel-vee-folder.c:743
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Es kann nicht in virtuelle Ordner kopiert oder verschoben werden"
 
@@ -8616,12 +8645,12 @@ msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2253
+#: camel/providers/imap/camel-imap-store.c:2276
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2256
+#: camel/providers/imap/camel-imap-store.c:2279
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verbindung zum Server unerwartet getrennt: %s"
@@ -8636,54 +8665,54 @@ msgstr "Unerwartete Antwort von IMAP-Server: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-Befehl fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:446
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Antwort des Servers endete zu fr�h."
 
-#: camel/providers/imap/camel-imap-command.c:638
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Antwort des IMAP-Servers enthielt keine %s-Information"
 
-#: camel/providers/imap/camel-imap-command.c:674
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:207
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:226
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Zusammenfassung f�r %s konnte nicht geladen werden"
 
-#: camel/providers/imap/camel-imap-folder.c:292
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Der Ordner wurde zerst�rt und auf dem Server neu erstellt."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:477
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Suchen nach ge�nderten Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1748
-#: camel/providers/imap/camel-imap-folder.c:2226
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzei nicht verf�gbar"
 
-#: camel/providers/imap/camel-imap-folder.c:1905
-#: camel/providers/imap/camel-imap-folder.c:1979
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "�berblickinformation f�r neue Nachrichten wird abgerufen"
 
-#: camel/providers/imap/camel-imap-folder.c:1911
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Suchen nach neuen Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:2263
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
@@ -8736,6 +8765,12 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Zum Lesen und Speichern von Mail auf IMAP-Servern."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Passwort"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -8753,56 +8788,59 @@ msgid "IMAP service for %s on %s"
 msgstr "%s-Dienst f�r %s auf %s"
 
 #: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
 #: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
 #: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 
-#: camel/providers/imap/camel-imap-store.c:603
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Verbindung mit SMTP-Server %s im sicheren Modus ist fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-store.c:604
-#: camel/providers/pop3/camel-pop3-store.c:210
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS Erweiterung nicht unterst�tzt."
 
-#: camel/providers/imap/camel-imap-store.c:635
-#: camel/providers/pop3/camel-pop3-store.c:251
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr "SSL \"Verhandlungen\" fehlgeschlagen"
 
-#: camel/providers/imap/camel-imap-store.c:865
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "IMAP-Server %s unterst�tzt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/imap/camel-imap-store.c:875
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterst�tzung f�r Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sBitte geben Sie das IMAP-Passwort f�r %s@%s ein"
 
-#: camel/providers/imap/camel-imap-store.c:914
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:943
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8813,74 +8851,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1265
-#: camel/providers/imap/camel-imap-store.c:1384
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1644
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Postfach kann nicht ge�ffnet werden: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Mailverzeichnisse im MH-Format"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Zum Speichern lokaler Mail in MH-Mailverzeichnissen"
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Lokale Auslieferung"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Zum Empfangen lokaler Mail aus Spools im Standard-mbox-Format."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Filter auf neue Nachrichten in INBOX anwenden"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Mailverzeichnisse im Maildir-Format"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Zum Speichern lokaler Mail in Maildir-Verzeichnissen."
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Standard-Unix-mbox-Spools"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "Zum Lesen und Speichern lokaler Mail in normalen mbox-Spooldateien."
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr "Verzeichnisbaum einer mbox-Datei"
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Standard-Unix-mbox-Spools"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
-"F�r den Zugriff auf Nachrichten, die in externen B�umen von mbox-Dateien\n"
-"gespeichert sind.\n"
-"Dies erlaubt Ihnen direkt auf pine oder elm Ordner zuzugreifen.\n"
-"HINWEIS: Dieser Anbieter ist immer noch experimentell, Sie sollten also "
-"zuerst Kopien der Ordner anlegen."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "Zum Lesen und Speichern lokaler Mail in normalen mbox-Spooldateien."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Speicherungswurzel %s ist kein absoluter Pfad"
@@ -8906,7 +8957,7 @@ msgstr "Lokale Speicher haben keinen Posteingangsordner"
 msgid "Local mail file %s"
 msgstr "Lokale Maildatei %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ordner %s konnte nicht in %s umbenannt werden: %s"
@@ -8926,13 +8977,12 @@ msgstr "Ordner-Zusammenfassungsdatei `%s' konnte nicht gel�scht werden: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ordner-Indexdatei `%s' konnte nicht gel�scht werden: %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Zusammenfassung konnte nicht gespeichert werden: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 "Nachricht kann nicht zur Zusammenfassung hinzugef�gt werden: Grund unbekannt"
@@ -8949,11 +8999,10 @@ msgstr "Nachricht kann nicht an maildir-Ordner angeh�ngt werden: %s: %s"
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:334
+#: camel/providers/local/camel-mbox-folder.c:348
 #: camel/providers/local/camel-mh-folder.c:201
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:218
-#: camel/providers/local/camel-spool-folder.c:585
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8963,9 +9012,8 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:334
+#: camel/providers/local/camel-mbox-folder.c:348
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-spool-folder.c:585
 msgid "No such message"
 msgstr "Keine solche Nachricht"
 
@@ -8975,7 +9023,7 @@ msgid "Invalid message contents"
 msgstr "Ung�ltiger Inhalt der Nachricht"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8986,13 +9034,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Ordner `%s' existiert nicht."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9008,7 +9056,7 @@ msgstr "`%s' ist kein maildir-Verzeichnis."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ordner `%s' konnte nicht gel�scht werden: %s"
@@ -9017,8 +9065,8 @@ msgstr "Ordner `%s' konnte nicht gel�scht werden: %s"
 msgid "not a maildir directory"
 msgstr "kein maildir-Verzeichnis"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ordner `%s' konnte nicht abgetastet werden: %s"
@@ -9037,45 +9085,37 @@ msgstr "Konsistenz des Ordners wird �berpr�ft"
 msgid "Checking for new messages"
 msgstr "Suchen nach neuen Nachrichten"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Ordner wird gespeichert"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ordnersperre auf %s kann nicht erzeugt werden: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Postfach kann nicht ge�ffnet werden: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Anh�ngen von Mail abgebrochen"
 
-#: camel/providers/local/camel-mbox-folder.c:271
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nachricht kann nicht an mbox-Datei angeh�ngt werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:350
-#: camel/providers/local/camel-mbox-folder.c:382
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:601
-#: camel/providers/local/camel-spool-folder.c:633
-#: camel/providers/local/camel-spool-folder.c:645
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9084,13 +9124,11 @@ msgstr ""
 "Nachricht kann nicht erhalten werden: %s aus Ordner %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:383
-#: camel/providers/local/camel-spool-folder.c:634
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
 
-#: camel/providers/local/camel-mbox-folder.c:395
-#: camel/providers/local/camel-spool-folder.c:646
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nachrichtenerstellung fehlgeschlagen: Defektes Postfach?"
 
@@ -9133,85 +9171,79 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ordner `%s' ist nicht leer. Nicht gel�scht."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ordner konnte nicht ge�ffnet werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fataler Mailparser-Fehler nahe Position %ld in Ordner %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ordner kann nicht gepr�ft werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Datei konnte nicht ge�ffnet werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Tempor�res Postfach konnte nicht angelegt werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-"Zusammenfassungs- und Order-Pr�ffehler, sogar nach einer Synchronisation"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Fehler beim Schreiben auf tempor�res Postfach: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Fehler beim Schreiben auf tempor�res Postfach %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Quellordner %s konnte nicht geschlossen werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Tempor�rer Ordner konnte nicht geschlossen werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
+"Zusammenfassungs- und Order-Pr�ffehler, sogar nach einer Synchronisation"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unbekannter Fehler: %s"
 
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Ordner konnte nicht umbenannt werden: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Fehler beim Schreiben auf tempor�res Postfach: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Fehler beim Schreiben auf tempor�res Postfach %s: %s"
+
 #: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Anh�ngen der Nachricht mit MH abgebrochen"
@@ -9221,62 +9253,68 @@ msgstr "Anh�ngen der Nachricht mit MH abgebrochen"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nachricht kann nicht an mh-Ordner angeh�ngt werden: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ist kein Verzeichnis."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH-Verzeichnispfad kann nicht ge�ffnet werden: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:518
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Nachricht kann nicht an Spool-Datei angeh�ngt werden: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Spool-Ordner k�nnen nicht umbenannt werden"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Spool '%s' existiert nicht oder ist keine regul�re Datei"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "Speicherwurzel `%s' ist kein regul�res Verzeichnis."
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Ordner `%s/%s' existiert nicht."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr "Speicher unterst�tz keinen Eingang"
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool-Maildatei %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Spool-Ordner k�nnen nicht umbenannt werden"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-Ordner k�nnen nicht umbenannt werden"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-Ordner k�nnen nicht gel�scht werden"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Tempor�rer Ordner %s konnte nicht synchronisiert werden: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Spool-Ordner '%s' konnte nicht synchronisiert werden: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -9285,25 +9323,6 @@ msgstr ""
 "Spool-Ordner %s konnte nicht synchronisiert werden: %s\n"
 "Ordner k�nnte besch�digt sein, Kopie in '%s' gespeichert"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Datei konnte nicht werden: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Speicher '%s' existiert nicht oder ist kein Verzeichnis"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr "Speicher unterst�tz keinen Eingang"
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, c-format
-msgid "Mail tree %s"
-msgstr "Nachrichten-Baum %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET-News"
@@ -9313,12 +9332,22 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Dies ist eine Quelle zum Lesen von und zum Posten in USENET-Newsgroups."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-News �ber %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9418,7 +9447,7 @@ msgstr "Mail auf Server belassen"
 msgid "Delete after %s day(s)"
 msgstr "Nach %s Tag(en) l�schen"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:80
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -9444,20 +9473,20 @@ msgstr ""
 "�ber das APO-Protokoll verbinden. Dies funktioniert evtl. nicht f�r alle "
 "Benutzer, sogar auf Servern, die behaupten, es zu unterst�tzen."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Konnte nicht mit Server %s im sicheren Modus verbunden werden: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Verbindung zu POP-Server auf %s konnte nicht hergestellt werden"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -9465,27 +9494,27 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Keine Unterst�tzung f�r den verlangten Legitimationsmechanismus."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "SASL `%s' Login fehlgeschlagen: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr "SASL-Protokollfehler"
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr "E-/A-Fehler: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sBitte geben Sie das POP3-Passwort f�r %s@%s ein"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -9494,13 +9523,13 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Passworts: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9555,7 +9584,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Mailauslieferung �ber das Programm sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:97
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9664,42 +9693,42 @@ msgstr "Zeitweiliger Legitimationsfehlschlag"
 msgid "Authentication required"
 msgstr "Legitimation ben�tigt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Willkommen-Antwortfehler: %s: vielleicht nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Verbindung mit SMTP-Server %s im sicheren Modus ist fehlgeschlagen: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 msgid "server does not appear to support SSL"
 msgstr "Server scheint kein SSL zu unterst�tzen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Zeit�berschreitung bei STARTTLS-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 msgid "STARTTLS response error"
 msgstr "STARTTLS-Antwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "SMTP-Server %s unterst�tzt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sBitte geben Sie das SMTP-Passwort f�r %s@%s ein"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9710,91 +9739,91 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-Server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-Mailauslieferung �ber %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht g�ltig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Nachricht verschicken"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empf�nger angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Nachricht konnte nicht verschickt werden: ein oder mehrere ung�ltige "
 "Empf�nger"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "SMTP-Begr��ung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Zeit�berschreitung bei HELO-Anfrage: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO-Antwortfehler: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP-Legitimation"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zeit�berschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH-Anfrage fehlgeschlagen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Ung�ltige Legitimationsantwort vom Server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Zeit�berschreitung bei MAIL-FROM-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr "MAIL-FROM-Antwortfehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Zeit�berschreitung bei RCPT-TO-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> fehlgeschlagen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Zeit�berschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
@@ -9802,37 +9831,37 @@ msgstr "Zeit�berschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr "DATA-Antwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zeit�berschreitung beim Senden von DATA: Nachrichtenabschluss: %s Mail nicht "
 "verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr "DATA-Terminierungsantwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zeit�berschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr "RSET-Antwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Zeit�berschreitung bei QUIT-Anfrage: %s: nicht fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr "QUIT-Antwort-Fehler"
 
@@ -9905,52 +9934,52 @@ msgstr "MIME-Typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "F�r das Adressbuch hier klicken"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Von:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "An:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Gebe die Empf�nger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Gebe die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9963,7 +9992,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: composer/e-msg-composer.c:728
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "PGP-Signaturkontext konnte nicht angelegt werden."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9972,34 +10006,34 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:977
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Warnung!"
 
-#: composer/e-msg-composer.c:981
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, �berschreiben?"
 
-#: composer/e-msg-composer.c:1003
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:1022
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:1053
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
 
-#: composer/e-msg-composer.c:1068
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10008,7 +10042,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1075
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10017,7 +10051,7 @@ msgstr ""
 "Datei konnte nicht verk�rzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10026,7 +10060,7 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1186
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10035,7 +10069,7 @@ msgstr ""
 "entdeckt.\n"
 "M�chten Sie eine Wiederherstellung versuchen?"
 
-#: composer/e-msg-composer.c:1332
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10045,23 +10079,43 @@ msgstr ""
 "\n"
 "Wollen Sie Ihre �nderungen speichern?"
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Warnung: Ge�nderte Nachricht"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Datei �ffnen"
 
-#: composer/e-msg-composer.c:1520
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Datei einf�gen"
 
-#: composer/e-msg-composer.c:2056 composer/e-msg-composer.c:2669
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Signatur speichern"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr "Vo_rgaben wiederherstellen"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:2686
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10069,7 +10123,7 @@ msgstr ""
 "Erstellungsfenster konnte nicht angelegt werden:\n"
 "Adressw�hler-Control konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:2709 composer/e-msg-composer.c:2764
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10077,7 +10131,7 @@ msgstr ""
 "Es konnte kein Erstellungsfenster angelegt werden:\n"
 "HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:3487
+#: composer/e-msg-composer.c:3665
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be editted.)"
 "<b>"
@@ -10146,7 +10200,7 @@ msgstr "Betreff enth�lt"
 msgid "Subject does not contain"
 msgstr "Betreff enth�lt nicht"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2273
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -10290,7 +10344,7 @@ msgstr "Stunde"
 msgid "minute"
 msgstr "Minute"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:184
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -10365,7 +10419,7 @@ msgstr " in der Vergangenheit"
 msgid "ago"
 msgstr "in der Vergangenheit"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1035
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %H.%M"
 
@@ -10411,7 +10465,7 @@ msgstr ""
 "der Mail."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1641 mail/mail-account-gui.c:1655
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Ordner w�hlen"
 
@@ -10457,7 +10511,8 @@ msgid "if all criteria are met"
 msgstr "wenn alle Kriterien zutreffen"
 
 #: filter/filter-rule.c:769
-msgid "if any criterion are met"
+#, fuzzy
+msgid "if any criteria are met"
 msgstr "wenn irgendwelche Kriterien zutreffen"
 
 #: filter/filter-rule.c:780
@@ -10610,8 +10665,8 @@ msgstr "Ausdruck"
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:74
-#: mail/mail-config.glade.h:58
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Wichtig"
 
@@ -10688,11 +10743,11 @@ msgid "Replied to"
 msgstr "Beantwortet an"
 
 #: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1578
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Absender"
 
@@ -10724,8 +10779,8 @@ msgstr "beginnt mit"
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Betreff"
 
@@ -10781,6 +10836,7 @@ msgstr "%s wird abgetastet"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
 #: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Mail"
 
@@ -10796,10 +10852,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Adressbuch"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10956,11 +11008,11 @@ msgstr "Fabrik f�r die Mailzusammenfassungs-Komponente."
 msgid "Font Preferences"
 msgstr "Schriftart-Vorlieben"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:64
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
 msgid "Mail Accounts"
 msgstr "Mail-Zug�nge"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:66
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
 msgid "Mail Preferences"
 msgstr "Mail-Einstellungen"
 
@@ -11022,42 +11074,51 @@ msgstr ""
 msgid "You have not set a mail transport method"
 msgstr "Sie haben keine Mailtransport-Methode eingestellt"
 
-#: mail/component-factory.c:979
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Warnung: Ge�nderte Nachricht"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Neue Mail-Nachricht"
 
-#: mail/component-factory.c:979 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "Nachricht _verschicken"
 
-#: mail/component-factory.c:1006
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:1015
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "Evolutions Mail-Konfigurations-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:1021
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Evolutions Ordnerinformations-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:1221 mail/component-factory.c:1252
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 msgid "Connecting..."
 msgstr "Verbindung wird hergestellt..."
 
-#: mail/component-factory.c:1262
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenschaften von \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Eigenschaften"
 
@@ -11233,7 +11294,7 @@ msgstr "Filter �ber _Mailingliste (%s)"
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VOrdner �ber M_ailingliste (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:35
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
 msgid "Default"
 msgstr "Vorgabe"
 
@@ -11306,68 +11367,60 @@ msgstr "Evolution-News-Editor"
 msgid "Evolution Account Editor"
 msgstr "Evolution-Accounteditor"
 
-#: mail/mail-account-gui.c:739 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Rechner:"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:124
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: mail/mail-account-gui.c:1224 mail/mail-account-gui.c:1225
-#: mail/mail-account-gui.c:1462 mail/mail-account-gui.c:1467
-#: mail/mail-config.glade.h:90
-msgid "Random"
-msgstr "Zuf�llig"
-
-#: mail/mail-account-gui.c:1294 mail/mail-account-gui.c:1309
-#: mail/mail-composer-prefs.c:239
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1993
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Sie k�nnen keine zwei Zug�nge mit demselben Namen anlegen."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Sind Sie sicher, dass Sie diesen Account l�schen wollen?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Nicht l�schen"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Account wirklich l�schen?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Sind Sie sicher, dass Sie diesen News-Account l�schen wollen?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Zugangsname"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -11410,7 +11463,7 @@ msgstr ""
 "    '%s'\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11422,7 +11475,7 @@ msgstr ""
 "empfangen oder erstellen k�nnen.\n"
 "M�chten Sie ihn jetzt konfigurieren?"
 
-#: mail/mail-callbacks.c:143
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11430,7 +11483,7 @@ msgstr ""
 "Sie m�ssen eine Identit�t einrichten,\n"
 "bevor Sie Mail erstellen k�nnen."
 
-#: mail/mail-callbacks.c:157
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11439,7 +11492,7 @@ msgstr ""
 "bevor Sie Mail erstellen k�nnen."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:195
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11447,11 +11500,11 @@ msgstr ""
 "Sie verschicken eine HTML-formatierte Nachricht, aber die folgenden "
 "Empf�nger wollen keine HTML-formatierte Mail:\n"
 
-#: mail/mail-callbacks.c:210
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Trotzdem verschicken?"
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11459,7 +11512,7 @@ msgstr ""
 "Diese Nachricht hat keinen Betreff.\n"
 "Wirklich verschicken?"
 
-#: mail/mail-callbacks.c:296
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11468,11 +11521,11 @@ msgstr ""
 "der Liste zu verbergen, wird die Nachricht nur BCC-Empf�ngeradressen "
 "enthalten."
 
-#: mail/mail-callbacks.c:300
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Diese Nachricht enth�lt ausschlie�lich BCC-Empf�nger."
 
-#: mail/mail-callbacks.c:304
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11482,16 +11535,16 @@ msgstr ""
 "eine Apparently-To-Kopfzeile hinzuf�gt.\n"
 "Trotzdem verschicken?"
 
-#: mail/mail-callbacks.c:409
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Sie m�ssen Empf�nger angeben, um diese Nachricht zu verschicken."
 
-#: mail/mail-callbacks.c:498
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "Sie m�ssen einen Account einrichten, bevor Sie diese Mail verschicken k�nnen."
 
-#: mail/mail-callbacks.c:641
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11499,28 +11552,28 @@ msgstr ""
 "Der Entw�rfe-Ordner f�r diesen Zugang konnte nicht ge�ffnet werden.\n"
 "M�chten Sie den vorgegebenen Entw�rfe-Ordner verwenden?"
 
-#: mail/mail-callbacks.c:1003
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
-#: mail/mail-callbacks.c:1007
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Am %a, %Y-%m-%d um %H.%M schrieb %%s:"
 
-#: mail/mail-callbacks.c:1459 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:1461 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:2117
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Sind Sie sicher, dass Sie alle %d Nachrichten bearbeiten wollen?"
 
-#: mail/mail-callbacks.c:2142
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11528,7 +11581,7 @@ msgstr ""
 "Sie k�nnen nur im Entw�rfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:2181
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11536,33 +11589,33 @@ msgstr ""
 "Sie k�nnen nur Nachrichten im\n"
 "Verschickt-Ordner neu verschicken."
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle %d Nachrichten nochmals verschicken wollen?"
 
-#: mail/mail-callbacks.c:2221
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Keine Nachricht ausgew�hlt"
 
-#: mail/mail-callbacks.c:2266 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Datei �berschreiben?"
 
-#: mail/mail-callbacks.c:2320
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:2322
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:2393
+#: mail/mail-callbacks.c:2415
 msgid "Go to next folder with unread messages?"
 msgstr "Zum n�chsten Ordner mit ungelesenen Nachrichten gehen?"
 
-#: mail/mail-callbacks.c:2400
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11570,7 +11623,7 @@ msgstr ""
 "Es gibt keine neuen Nachrichten mehr in diesem Ordner.\n"
 "Wollen Sie zum n�chsten Ordner gehen?"
 
-#: mail/mail-callbacks.c:2643
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11583,7 +11636,7 @@ msgstr ""
 "\n"
 "Nachrichten wirklich entfernen?"
 
-#: mail/mail-callbacks.c:2756
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11592,51 +11645,69 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2768
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2811
+#: mail/mail-callbacks.c:2833
 #, c-format
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: mail/mail-callbacks.c:2864
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:2891
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2930
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-callbacks.c:3116 mail/mail-callbacks.c:3156
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle %d Nachrichten in getrennten Fenstern �ffnen "
 "wollen?"
 
-#: mail/mail-composer-prefs.c:253 mail/mail-composer-prefs.c:354
-#: mail/mail-composer-prefs.c:387
-#, fuzzy
-msgid "yes"
-msgstr "Jahre"
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
 
-#: mail/mail-composer-prefs.c:253 mail/mail-composer-prefs.c:354
-#: mail/mail-composer-prefs.c:387
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
 #, fuzzy
-msgid "no"
-msgstr "jetzt"
+msgid " [script]"
+msgstr "Beschreibung"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+msgid "Unnamed"
+msgstr "Namenlose"
 
-#: mail/mail-composer-prefs.c:610
+#: mail/mail-composer-prefs.c:555
 #, fuzzy
 msgid "en"
 msgstr "Verschicken"
 
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Signatur speichern"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Signatur speichern"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11692,31 +11763,31 @@ msgstr ""
 "Dieser Name wird nur f�r die Bildschirmanzeige verwendet."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Zugangsdruide"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:130
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 msgid "Work"
 msgstr "Arbeit"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:82
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Pers�nlich"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:121
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 msgid "To Do"
 msgstr "Zu erledigen"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:62
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr "Sp�ter"
 
-#: mail/mail-config.c:636
+#: mail/mail-config.c:625
 #, c-format
 msgid "Account %d"
 msgstr "Zugang %d"
@@ -11729,14 +11800,6 @@ msgstr "Dienst wird �berpr�ft"
 msgid "Connecting to server..."
 msgstr "Verbindung zu Server..."
 
-#: mail/mail-config.c:2835
-msgid "Unnamed"
-msgstr "Namenlose"
-
-#: mail/mail-config.c:3013
-msgid "Cannot execute signature script"
-msgstr "Signatur-Skript kann nicht ausgef�hrt werden"
-
 #: mail/mail-config.glade.h:1
 msgid " "
 msgstr "."
@@ -11775,71 +11838,90 @@ msgid "Account Management"
 msgstr "Zugangsverwaltung"
 
 #: mail/mail-config.glade.h:10
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr ""
-"Beim Verschicken verschl�sselter Mail _immer f�r mich selber verschl�sseln"
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "Bearbeiten..."
 
 #: mail/mail-config.glade.h:11
-msgid "Alerts"
-msgstr "Alarme"
+#, fuzzy
+msgid "Add new signature..."
+msgstr "Signatur speichern"
 
 #: mail/mail-config.glade.h:12
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr ""
+"Beim Verschicken verschl�sselter Mail _immer f�r mich selber verschl�sseln"
+
+#: mail/mail-config.glade.h:14
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Bei Verwendung dieses Zugangs ausgehende Nachrichten immer _signieren"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Immer _Blindkopie (Bcc) senden an:"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Immer Kopie (Cc) senden an:"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
 msgid "Attach original message"
 msgstr "Originalnachricht anh�ngen"
 
-#: mail/mail-config.glade.h:17 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anlage"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:22
 msgid "Automatically _detect links"
 msgstr "Links automatisch _erkennen"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Zeic_hensatz:"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Farben"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Nach neuer Mail sehen"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "_Farbe f�r fehlerhafte W�rter"
+
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr "Nachrichten erstellen"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11857,318 +11939,324 @@ msgstr ""
 "Klicken Sie auf \"Beenden\", um Ihre Einstellungen zu\n"
 "speichern."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: mail/mail-config.glade.h:34
-#, fuzzy
-msgid "De_fault signature:"
-msgstr "Alles au�er Signatur l�schen"
-
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Vorgabe-Verhalten"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:41
 msgid "Default character _encoding:"
 msgstr "Vorgegebene Zeichen_kodierung:"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:42
 msgid "Deleting Mail"
 msgstr "Mail wird gel�scht"
 
-#: mail/mail-config.glade.h:39
-#, fuzzy
-msgid "Description"
-msgstr "Beschreibung:"
-
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Digitale Kennungen..."
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:45
 msgid "Do not quote original message"
 msgstr "Originalnachricht nicht zitieren"
 
-#: mail/mail-config.glade.h:43 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Fertig"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Drafts _folder:"
 msgstr "_Entw�rfe-Ordner:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Aktivieren"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:50
 msgid "Email Accounts"
 msgstr "E-Mail-Zug�nge"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:51
 msgid "Email _address:"
 msgstr "E-Mail-_Adresse:"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr "M�llordner beim Beenden _leeren"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Befehl ausf�hren..."
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr "_Feste Breite:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr "Schriftart-Eigenschaften"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:57
 msgid "Format messages in _HTML"
 msgstr "Nachrichten in _HTML formatieren"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Digitale Kennung erhalten..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr "Zitate _hervorheben mit"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:57 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identit�t"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "An Ort und Stelle"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr "Etikette und Farben"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr "Bilder laden"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Mailkonfiguration"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:72
 msgid "Message Composer"
 msgstr "Nachrichten-Composer"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:73
 msgid "Message Display"
 msgstr "Nachrichtenanzeige"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:74
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP-Server:"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Mailbenachrichtigung"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:79
 msgid "News Servers"
 msgstr "News-Server"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr "Bildschirmschriftarten"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Optionale Information"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_Schl�sselkennung:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Eine Farbe ausw�hlen"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Beim Abschicken von Nachrichten mit ausschlie�lich _BCC-Empf�ngern nachfragen"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Druckschriftarten"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail-maildir "
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Originalnachricht zitieren"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Umschrieben"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "An dieses Passwort _erinnern"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "A_ntwort an:"
 
-#: mail/mail-config.glade.h:93 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Erhalten von E-Mail"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Empfangs-_Optionen"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Dieses Passwort s_peichern"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Ben�tigte Information"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "Sich_erheit"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "Sichere MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr "HTML Feste-Breite-Schriftart w�hlen"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr "HTML Feste-Breite-Schriftart zum Drucken w�hlen"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr "HTML Variable-Breite-Schriftart w�hlen"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr "HTML Variable-Breite-Schriftart zum Drucken w�hlen"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:109
 msgid "Select PGP program"
 msgstr "PGP-Programm w�hlen"
 
-#: mail/mail-config.glade.h:105 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "E-Mail wird verschickt"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Ordner f�r verschickte _Nachrichten:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Nachrichten in \"Verschickt\" und \"Entw�rfe\""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Server ben�tigt _Legitimation"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Server-Konfiguration"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:117
 msgid "Shortcuts _type:"
 msgstr "Tastenk�rzel-_Typ:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Signature #1"
 msgstr "Signatur"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Signature #2"
 msgstr "Signatur"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Quelle"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Quellinformation"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:122
 msgid "Specify _filename:"
 msgstr "_Dateiname angeben:"
 
-#: mail/mail-config.glade.h:118
-msgid "Spell Checking"
-msgstr "Rechtschreibpr�fung"
-
-#: mail/mail-config.glade.h:119
-msgid "Spell Checking Languages"
+#: mail/mail-config.glade.h:123
+#, fuzzy
+msgid "Spell Checking Language"
 msgstr "Sprachen f�r Rechtschreibpr�fung"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Spell _Checking"
+msgstr "Rechtschreibpr�fung"
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix-mbox"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:134
 msgid "V_ariable-width:"
 msgstr "Variable Breite:"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12178,226 +12266,205 @@ msgstr ""
 "\n"
 "Klicken Sie \"Weiter\" zum Beginnen."
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:140
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:142
 #, fuzzy
-msgid "_Add Script..."
-msgstr "Bearbeiten..."
+msgid "_Add Signature"
+msgstr "_Signaturen"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "Bilder _immer aus dem Netz laden"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Bei Verwendung dieses Zugangs ausgehende Nachrichten _immer signieren"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:146
 msgid "_Authentication type: "
 msgstr "_Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "_Automatisch nach neuer Mail sehen"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automatisch nach neuer Mail sehen"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr "Beep bei Eintreffen von neuer Mail"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "Kennung des _Zertifikats:"
 
-#: mail/mail-config.glade.h:142
-msgid "_Color for misspelled words"
-msgstr "_Farbe f�r fehlerhafte W�rter"
-
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:151
 msgid "_Confirm when expunging a folder"
 msgstr "S�ubern eines Ordners _best�tigen"
 
-#: mail/mail-config.glade.h:144
-#, fuzzy
-msgid "_Create Signature"
-msgstr "_Test-Signatur:"
-
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_Test-Signatur:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:153
 msgid "_Defaults"
 msgstr "_Vorgaben"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Bei Eintreffen neuer Mail nicht benachrichtigen"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Duplicate"
-msgstr "Alicante"
-
-#: mail/mail-config.glade.h:151
-msgid "_Enable spell checking"
-msgstr "_Rechschreibpr�fung aktivieren"
+msgid "_Enable"
+msgstr "Aktivieren"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr "_Feste Breite:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Full name:"
 msgstr "_Voller Name:"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:162
 msgid "_HTML Mail"
 msgstr "_HTML-Mail"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Identity"
 msgstr "_Identit�t"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "Bilder _laden, falls Absender im Adressbuch ist"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Make this my default account"
 msgstr "Dies zu meinem _Vorgabezugang machen"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Name:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "Bilder _nie aus dem Netz laden"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "Pfad zur _PGP-Bin�rdatei:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr "_Klangdatei bei Eintreffen neuer Mail abspielen"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Beim Abschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "_nachfragen"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Beim Abschicken von Nachrichten mit _leerem Betreff nachfragen"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Receiving Mail"
 msgstr "_Erhalten von Mail"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:177
 msgid "_Restore defaults"
 msgstr "Vo_rgaben wiederherstellen"
 
-#: mail/mail-config.glade.h:173 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:178
+msgid "_Script:"
+msgstr "_Skript:"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Sicherheit"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:180
 msgid "_Sending Mail"
 msgstr "_Verschicken von Mail"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:181
 msgid "_Show animated images"
 msgstr "_Animierte Bilder zeigen"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:182
 msgid "_Signatures"
 msgstr "_Signaturen"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:183
 msgid "_Use secure connection (SSL):"
 msgstr "Sichere Verbindung (_SSL) verwenden:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:184
 msgid "_Variable-width:"
 msgstr "_Variable Breite:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_alle"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:186
 msgid "color"
 msgstr "Farbe"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "Beschreibung"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newsfenster1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "PGP-Signaturkontext konnte nicht angelegt werden."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "PGP-�berpr�fungskontext konnte nicht angelegt werden."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "PGP-Verschl�sselungskontext konnte nicht angelegt werden."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "PGP-Entschl�sselungskontext konnte nicht angelegt werden."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "S/MIME-Signaturkontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "S/MIME-certsonly-Kontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "S/MIME-Verschl�sselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME-Entschl�sselungskontext konnte nicht angelegt werden."
 
@@ -12461,109 +12528,115 @@ msgstr "Link speichern unter (FIXME)"
 msgid "Save Image as..."
 msgstr "Bild speichern unter..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "MIME-Nachricht konnte nicht geparst werden. Wird als Quellcode angezeigt."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Ung�ltige Adresse"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Von"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "An"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 msgid "Mailer"
 msgstr "Mailer"
 
-#: mail/mail-format.c:1707
+#: mail/mail-format.c:1736
 msgid "View messages..."
 msgstr "Nachrichten anzeigen..."
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:1832
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Diese Nachricht ist digital unterzeichnet. Klicken Sie f�r weitere "
 "Informationen auf das Schlosssymbol."
 
-#: mail/mail-format.c:1836
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution versteht diesen unterzeichneten Nachrichtentyp nicht."
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "PGP-�berpr�fungskontext konnte nicht angelegt werden."
 
-#: mail/mail-format.c:1844
+#: mail/mail-format.c:1868
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Diese Nachricht ist digital unterzeichnet und wurde als authentisch "
 "nachgewiesen."
 
-#: mail/mail-format.c:1852
+#: mail/mail-format.c:1876
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Diese Nachricht ist digital unterzeichnet, aber konnte nicht als authentisch "
 "nachgewiesen werden."
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Zeiger auf lokale Datei (%s) g�ltig auf Site \"%s\""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf Daten im Netz (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Ung�ltiger external-body-Teil."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Lokale Ordner"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Ordner wird umkonfiguriert"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12572,37 +12645,37 @@ msgstr ""
 "Metainformationen zum Ordner k�nnen nicht gespeichert werden; Sie\n"
 "werden ihn wahrscheinlich nie mehr �ffnen k�nnen: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Metainformationen zum Ordner k�nnen nicht in %s gespeichert werden: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ordner-Metadaten %s k�nnen nicht gel�scht werden: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s kann nicht umkonfiguriert werden, da er kein lokaler Ordner ist"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr "Datei %s konnte nicht geladen werden"
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Sie k�nnen das Format eines nichtlokalen Ordners nicht �ndern."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s neu konfigurieren"
@@ -12848,10 +12921,6 @@ msgstr "Aktualisieren..."
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Storniert"
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
@@ -12865,16 +12934,16 @@ msgstr "Passwort f�r %s eingeben"
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Signaturdatei konnte nicht gespeichert werden: %s"
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Signatur speichern"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12884,9 +12953,30 @@ msgstr ""
 "\n"
 "M�chten Sie Ihre �nderungen speichern?"
 
-#: mail/mail-signature-editor.c:357
-msgid "Signature name:"
-msgstr "Name der Signatur:"
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Name:"
+
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "Signatur"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "HTML-Signaturdatei:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12924,7 +13014,6 @@ msgstr ""
 "   '%s'\n"
 "Und wurden aktualisiert."
 
-#. Make this static, saves having to recompute it each time
 #: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
 #: my-evolution/e-summary-mail.c:733
 msgid "VFolders"
@@ -12957,63 +13046,63 @@ msgstr "(Kein Betreff)"
 msgid "%s - Message"
 msgstr "%s - Nachricht"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Gelesen"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Niedriger"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "H�her"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Am h�chsten"
 
-#: mail/message-list.c:999
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1006
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:1015
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:1027
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1037
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2404
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Erzeugen der Nachrichtenliste"
 
@@ -13034,10 +13123,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Urspr�nglicher Kontakt:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Erhalten"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Gr��e"
 
@@ -18094,5807 +18188,5802 @@ msgstr "Lettland"
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "_Gr��er"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 #, fuzzy
 msgid "La Verne"
 msgstr "Kap Verde"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "Libanon"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 #, fuzzy
 msgid "Learmouth"
 msgstr "Lesotho"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 #, fuzzy
 msgid "Leesburg"
 msgstr "Luxemburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "Chef"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 #, fuzzy
 msgid "Lemmon"
 msgstr "Libanon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "Entfernen"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "Jahre"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 #, fuzzy
 msgid "Lewisburg"
 msgstr "Luxemburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "Lesotho"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 #, fuzzy
 msgid "Lewistown"
 msgstr "Lesotho"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 #, fuzzy
 msgid "Lexington"
 msgstr "Libanon"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Liberal"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Libya"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "Niger"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Lihue"
 msgstr "Niue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limoges"
 msgstr "Am niedrigsten"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "Monat"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Lincoln"
 msgstr "Eingang"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 #, fuzzy
 msgid "Lisboa"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "Nebel"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 #, fuzzy
 msgid "Litchfield"
 msgstr "Leichter Hagel"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "NT-Login"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "Fa."
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "London"
 msgstr "Libanon"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "Honduras"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 #, fuzzy
 msgid "Los Alamos"
 msgstr "Alarme"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 #, fuzzy
 msgid "Lousiana"
 msgstr "Botswana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "Libanon"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "Ausgang"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "Luxemburg"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "Lettland"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "M�rz"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "Macao"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macapa"
 msgstr "Macao"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "Chef"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "Mazedonien"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "Malediven"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "Kanada"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "Chef"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "Chef"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "Malawi"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "Vorgesetzter"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "Malaysia"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "Macao"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manchester"
 msgstr "Passt auf:"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "Mazedonien"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "Nebel"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "Hauptwerkzeugleiste"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 #, fuzzy
 msgid "Maraba"
 msgstr "Mauretanien"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "M�rz"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "Mauretanien"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "Mauretanien"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "Mauretanien"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "R�nder"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 #, fuzzy
 msgid "Marquette"
 msgstr "Martinique"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "Marshall-Inseln"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 #, fuzzy
 msgid "Marshalltown"
 msgstr "Marshall-Inseln"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "Datum"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Als ungelesen markieren"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "R�nder"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "Martinique"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "Irland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "M�rz"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "Mazedonien"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "Komoren"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mattoon"
 msgstr "Chef"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Vorgesetzter"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "Mayotte"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Kasachstan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 #, fuzzy
 msgid "Mazu"
 msgstr "Macao"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "M�rz"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McClellan"
 msgstr "Island"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "Fa."
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "M�rz"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "vor"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 #, fuzzy
 msgid "Mehamn"
 msgstr "Chef"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "Mazedonien"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "Freitag"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 #, fuzzy
 msgid "Merril Field"
 msgstr "_Von-Feld"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "Mexiko"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 #, fuzzy
 msgid "Miami"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middle East"
 msgstr "Mittelname:"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middleton Island"
 msgstr "Salomonen"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "Mittelname:"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "Finnland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "Dateityp:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 #, fuzzy
 msgid "Milford"
 msgstr "f�r"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "Mail an %s"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minatitlan"
 msgstr "Mauretanien"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "Eingang"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 #, fuzzy
 msgid "Minnesota"
 msgstr "Mikronesien"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "ist nicht"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missoula"
 msgstr "Fr�ulein"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Missouri"
 msgstr "Fr�ulein"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitchell"
 msgstr "Passt auf:"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 #, fuzzy
 msgid "Mitilini"
 msgstr "Mailingliste"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "Mo"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "Mobiltelefon"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "Mobil"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Modesto"
 msgstr "M��iger dichter Nebel"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "Verschieben"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "Mobil"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Moldova"
 msgstr "Montag"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 #, fuzzy
 msgid "Molokai"
 msgstr "Malawi"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "Montag"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "Vorgesetzter"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montana"
 msgstr "Monat"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "M��iger Schneefall"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Monatsansicht"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 #, fuzzy
 msgid "Montego Bay"
 msgstr "Mongolei"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 #, fuzzy
 msgid "Monterrey"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 #, fuzzy
 msgid "Montgomery"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "Monatsansicht"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morelia"
 msgstr "Mongolei"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "Prim�r"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "Mobil"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "Monatsansicht"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "S�dost"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Monatsansicht"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 #, fuzzy
 msgid "Mullan"
 msgstr "Chef"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 #, fuzzy
 msgid "Muncie"
 msgstr "Juni"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 #, fuzzy
 msgid "Murcia"
 msgstr "Mauretanien"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "Frl."
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 #, fuzzy
 msgid "Muscatine"
 msgstr "Martinique"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "Knoten"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 #, fuzzy
 msgid "Najran"
 msgstr "Bahrein"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "Warnung"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "Nepal"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "Nachrichten"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Napoli"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "Spitzn."
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "Katar"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natchez"
 msgstr "Passt auf:"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 #, fuzzy
 msgid "Nebraska"
 msgstr "Neue Aufgabe"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "Grenada"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Nevada"
 msgstr "Grenada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "Neue Aufgabe"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bedford"
 msgstr "Nachrichtenkanal"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "Neuer Ordner"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "Newcastle"
 msgstr "Nachrichten"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Neuseeland"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Neuseeland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "Neukaledonien"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Iberia"
 msgstr "Neukaledonien"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "Neue Nachricht"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Mexico"
 msgstr "Mexiko"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "Neuseeland"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "Nord"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "Neuer Ordner"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "Neu"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "New York"
 msgstr "Neuer Ordner"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "Ausma�e:"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "Spanien"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nis"
 msgstr "ist"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "Name"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "Norfolkinsel"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 #, fuzzy
 msgid "Norfolk NAS"
 msgstr "Norfolkinsel"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norrkoping"
 msgstr "In Arbeit"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Adams"
 msgstr "Nordost"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "Nord"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "Norwegen"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "Nordost"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "Nordost"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "Norwegen"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "Franz�sische S�dgebiete"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "Nord"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "Norwegen"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "Notiz"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "Nicht gestartet"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "Thailand"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Jamaika"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Oceanside"
 msgstr "Island"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "One"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Odesa"
 msgstr "One"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "Gelesen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "�ffnen"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "Andere"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 #, fuzzy
 msgid "Ojika Island"
 msgstr "Cook-Inseln"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "Britische Jungferninseln"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "Andere"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 #, fuzzy
 msgid "Olbia"
 msgstr "Albanien"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 #, fuzzy
 msgid "Omaha"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "Ausrichtung"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oostende"
 msgstr "Anwesender"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oran"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "Frankreich"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 #, fuzzy
 msgid "Oregon"
 msgstr "Org"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "Irland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orlando"
 msgstr "Irland"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 #, fuzzy
 msgid "Oruro"
 msgstr "Fehler"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr "Sekunde"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 #, fuzzy
 msgid "Ostrava"
 msgstr "Australien"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "Woche"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 #, fuzzy
 msgid "Oxford"
 msgstr "f�r"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "Seite"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 #, fuzzy
 msgid "Palacios"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "Papier"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 #, fuzzy
 msgid "Palmdale"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "Pager"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "Mail-Einstellungen"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 #, fuzzy
 msgid "Pamplona"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama City"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Storniert"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "Papier"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Paphos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 #, fuzzy
 msgid "Paris"
 msgstr "R�nder"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "Teils Spr�hregen"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "Passwort"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "Starker Sand"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "Klang abspielen:"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "Frage"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "Neu laden"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "Auswahl:"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "Georgien"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "Prim"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philip"
 msgstr "Philippinen"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Philippinen"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 #, fuzzy
 msgid "Phillips"
 msgstr "Philippinen"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "Vorschau"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 #, fuzzy
 msgid "Pisa"
 msgstr "ist"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 #, fuzzy
 msgid "Plymouth"
 msgstr "Monat"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 #, fuzzy
 msgid "Podgorica Titograd"
 msgstr "Teils Tornado"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "Umschlag drucken"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "�bersicht drucken"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Nachricht drucken"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "Filter"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponca City"
 msgstr "Telefonliste"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponce"
 msgstr "Fertig"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "_Kontakt"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "Polen"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Kalender drucken"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "Umschlag drucken"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "Vorschau"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Karte drucken"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Polen"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Portland"
 msgstr "Polen"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto"
 msgstr "_Port:"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "Fortschritt"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "Hochformat"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Hochformat"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "Hochformat"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "Polen"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poza Rica"
 msgstr "Costa Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poznan"
 msgstr "Polen"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Praha"
 msgstr "Paraguay"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "Teils Nieselregen"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Druckvorschau"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Pretoria"
 msgstr "Georgien"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "Vorschau"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Price-Carbon"
 msgstr "Pitcairn"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "Traditionell"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Providence"
 msgstr "_Staat/Bundesland:"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "Vorschau"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "Beruf"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 #, fuzzy
 msgid "Pucallpa"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Puebla"
 msgstr "�ffentlich"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Pueblo"
 msgstr "�ffentlich"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 #, fuzzy
 msgid "Puerto Barrios"
 msgstr "Puerto Rico"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 #, fuzzy
 msgid "Puerto Escondido"
 msgstr "Puerto Rico"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "Puerto Rico"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Puerto Rico"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 #, fuzzy
 msgid "Puerto Maldonado"
 msgstr "Teils Tornado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "Puerto Rico"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "Puerto Rico"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "Zusammenfassung drucken"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pula"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "Polen"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Kalender drucken"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "Frage"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quebec"
 msgstr "Betreff"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 #, fuzzy
 msgid "Rapid City"
 msgstr "Beantwortet an"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Rawlins"
 msgstr "Regen"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Reading"
 msgstr "�berschriften"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Rebun Island"
 msgstr "Bouvet-Insel"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Recife"
 msgstr "Erhalten"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redding"
 msgstr "�berschriften"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "Gelesen"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redmond"
 msgstr "Erinnerung"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "Regionen"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Rennes"
 msgstr "Erinnerungen"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Reno"
 msgstr "Reunion"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "Reunion"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "Regeln"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "Antworten"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reynosa"
 msgstr "Neu laden"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Finnland"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Rhode Island"
 msgstr "Far�er"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 #, fuzzy
 msgid "Riberalta"
 msgstr "Gibraltar"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "Spitzname"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "Haiti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "Position"
 
-#: my-evolution/Locations.h:1881
-#, fuzzy
-msgid "Riga"
-msgstr "Rechts:"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rijeka"
 msgstr "Gelesen"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 #, fuzzy
 msgid "Rimini"
 msgstr "Rum�nien"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rioja"
 msgstr "Funk"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "Nicaragua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "Britische Jungferninseln"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 #, fuzzy
 msgid "Riyadh"
 msgstr "Gelesen"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Roatan"
 msgstr "Kroatien"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 #, fuzzy
 msgid "Robore"
 msgstr "vor"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "Polen"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rodos"
 msgstr "Raum"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Rogers"
 msgstr "Ordner"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "Rum�nien"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "Raum"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 #, fuzzy
 msgid "Rosario"
 msgstr "Funk"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Roseglen"
 msgstr "Position"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "Rechner"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "Wiederholung"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Russia"
 msgstr "�sterreich"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 #, fuzzy
 msgid "Rutland"
 msgstr "Bhutan"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 #, fuzzy
 msgid "Sacramento"
 msgstr "Anlage"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 #, fuzzy
 msgid "Saginaw"
 msgstr "Spanien"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saint Paul"
 msgstr "Saint Lucia"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "Sa"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Salalah"
 msgstr "Windb�en"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salem"
 msgstr "Speichern"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salmon"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "Stopp"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 #, fuzzy
 msgid "Salvador"
 msgstr "El Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samos"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "Sand"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 #, fuzzy
 msgid "Sana'A"
 msgstr "Sand"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 #, fuzzy
 msgid "San Angelo"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "San Carlos"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "Sand"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sandberg"
 msgstr "Absender"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sanderson"
 msgstr "Sandsturm"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 #, fuzzy
 msgid "San Diego"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 #, fuzzy
 msgid "Sand Point"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sanford"
 msgstr "Sand"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 #, fuzzy
 msgid "San Francisco"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "Schattierung"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Joaquin"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "Speichern und schlie�en"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Juan"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 #, fuzzy
 msgid "San Miguel"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 #, fuzzy
 msgid "San Nicholas Island"
 msgstr "Norfolkinsel"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 #, fuzzy
 msgid "San Salvador"
 msgstr "El Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 #, fuzzy
 msgid "San Sebastian"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 #, fuzzy
 msgid "Santa Ana"
 msgstr "Saint Lucia"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 #, fuzzy
 msgid "Santa Maria"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santa Monica"
 msgstr "Saint Lucia"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "Absender"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santarem"
 msgstr "Sandsturm"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 #, fuzzy
 msgid "Santiago"
 msgstr "Saint Lucia"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santorini"
 msgstr "Sandsturm"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "Sandsturm"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 #, fuzzy
 msgid "Sao Luiz"
 msgstr "Saint Lucia"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 #, fuzzy
 msgid "Sarasota"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "Sri Lanka"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "Sand"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "Status"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "Einstellungen"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "Gelesen"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "Import beginnt"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "Suchen"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "Schattierung"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "Suchen"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "Samstag"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "Samstag"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Shearwater"
 msgstr "Anfangsdatum"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "Schweden"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "Auswahl:"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Sheridan"
 msgstr "Sudan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "Gr��e"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Shoreham"
 msgstr "Bewertung"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "Geringf�giger Schneefall"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 #, fuzzy
 msgid "Sidney"
 msgstr "Gr��e"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Silver City"
 msgstr "Sicherheit"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "Speichern"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skopje"
 msgstr "Stopp"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "Verschickt"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "Sand"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "Schauer"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Snowshoe Lake"
 msgstr "Schneeschauer"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Sochi"
 msgstr "S�d"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socorro"
 msgstr "Bewertung"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Socotra"
 msgstr "Bewertung"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 #, fuzzy
 msgid "Soda Springs"
 msgstr "Kornschnee"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sofia"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Soldotna"
 msgstr "Slowenien"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Somerset"
 msgstr "Schauer"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Absender"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "Southampton"
 msgstr "S�dost"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "S�d"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Carolina"
 msgstr "S�dafrika"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "South Dakota"
 msgstr "S�dost"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "S�d"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "Marshall-Inseln"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "Absender"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "list"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "Rauch"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "Vereinfach"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "State College"
 msgstr "Abgeschlossen am:"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "Beginnt:"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "Beginnt:"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "Stopp"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "Stephenville"
 msgstr "Seychellen"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 #, fuzzy
 msgid "St. George"
 msgstr "Sankt Helena"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "Stopp"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 #, fuzzy
 msgid "St Louis"
 msgstr "Saint Lucia"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Sri Lanka"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "Norwegen"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "St Paul"
 msgstr "Status"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "Salomonen"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "Samstag"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "Bewertung"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Luxemburg"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "Zusammenfassung"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 #, fuzzy
 msgid "Sutton"
 msgstr "Stopp"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 #, fuzzy
 msgid "Sympheropol"
 msgstr "Stopp"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Traditionell"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "Aufgabe"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 #, fuzzy
 msgid "Taejon"
 msgstr "Dann"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Taif"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Tainan"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Taiz"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "Taiwan"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 #, fuzzy
 msgid "Tampa"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "Papier"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Taranto"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "Test"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Tarija"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "Traditionell"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "Tokelau"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "Texas"
 msgstr "Test"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 #, fuzzy
 msgid "The Dalles"
 msgstr "Seychellen"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "Titel"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "Donnerstag"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tianjin"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Tijuana"
 msgstr "Litauen"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tirana"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "Zeit"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "Titel"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "Privat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 #, fuzzy
 msgid "Tokunoshima Island"
 msgstr "Weihnachtsinsel"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 #, fuzzy
 msgid "Toledo"
 msgstr "Ein/Aus"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 #, fuzzy
 msgid "Toluca"
 msgstr "Tokelau"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Topeka"
 msgstr "Tokelau"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 #, fuzzy
 msgid "Toronto"
 msgstr "Tornado"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "Oben:"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torrance"
 msgstr "Frankreich"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Torreon"
 msgstr "Koreanisch"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "Import beginnt"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Toulouse"
 msgstr "Schlie�en"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trabzon"
 msgstr "Gabun"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 #, fuzzy
 msgid "Trapani"
 msgstr "Japan"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "Ausrichtung"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "Zur�ck"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 #, fuzzy
 msgid "Trieste"
 msgstr "Test"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 #, fuzzy
 msgid "Trinidad"
 msgstr "Tornado"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "T�rkei"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "Dienstag"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "Dienstag"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "Typ"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turaif"
 msgstr "T�rkisch"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "T�rkisch"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turku"
 msgstr "T�rkei"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 #, fuzzy
 msgid "Twenthe"
 msgstr "Vorl�ufig"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "Jahr"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "Dann"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "Vereinigte Arabische Emirate"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 #, fuzzy
 msgid "Unst"
 msgstr "Ungelesen"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruapan"
 msgstr "Japan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Uruguay"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 #, fuzzy
 msgid "Utah"
 msgstr "."
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vadso"
 msgstr "Funk"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Unbest�ndig"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vagar"
 msgstr "Katar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valencia"
 msgstr "Slowenien"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 #, fuzzy
 msgid "Valentine"
 msgstr "An Ort und Stelle betrachten"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 #, fuzzy
 msgid "Van"
 msgstr "Chef"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "Abbrechen"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 #, fuzzy
 msgid "Varadero"
 msgstr "Barbados"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Varna"
 msgstr "Vanuatu"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "nach"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 #, fuzzy
 msgid "Venezia"
 msgstr "Venezuela"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 #, fuzzy
 msgid "Venice"
 msgstr "Unicode"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vermont"
 msgstr "Monat"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "Allgemein"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 #, fuzzy
 msgid "Vicenza"
 msgstr "Venezuela"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "Dateiname:"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "Australien"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "Irland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volkel"
 msgstr "Tokelau"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 #, fuzzy
 msgid "Volk Field"
 msgstr "_Von-Feld"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 #, fuzzy
 msgid "Voslau"
 msgstr "Tokelau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 #, fuzzy
 msgid "Waco"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 #, fuzzy
 msgid "Wallops Island"
 msgstr "Marshall-Inseln"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "Warnung"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "Wetter"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Waterloo"
 msgstr "Wetter"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "Wetter"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 #, fuzzy
 msgid "Waterville"
 msgstr "Kategorien"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 #, fuzzy
 msgid "Wausau"
 msgstr "Vanuatu"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Webster City"
 msgstr "Website"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "Mi"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Wetter"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 #, fuzzy
 msgid "Wendover"
 msgstr "Absender"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "West Burke"
 msgstr "Westeurop�isch"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "Niederlande"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westfield"
 msgstr "West"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "Besprechung"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "Weihnachtsinsel"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "Spitzn."
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 #, fuzzy
 msgid "Wien"
 msgstr "Mi"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 #, fuzzy
 msgid "Williston"
 msgstr "list"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 #, fuzzy
 msgid "Winchester"
 msgstr "Liechtenstein"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 #, fuzzy
 msgid "Windsor"
 msgstr "Sandsturm"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 #, fuzzy
 msgid "Winslow"
 msgstr "jetzt"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 #, fuzzy
 msgid "Winter Park"
 msgstr "Passwort eingeben"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 #, fuzzy
 msgid "Wisconsin"
 msgstr "Mikronesien"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "ist"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "Hongkong"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "Fu�zeile:"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "f�r immer"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "Polen"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "In Arbeit"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "In Arbeit"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 #, fuzzy
 msgid "Xiamen"
 msgstr "Zeit"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 #, fuzzy
 msgid "Yao Airport"
 msgstr "Nicht importieren"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 #, fuzzy
 msgid "Yenbo"
 msgstr "Eingang"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zadar"
 msgstr "Kalender"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 #, fuzzy
 msgid "Zagreb"
 msgstr "Seite"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zanesville"
 msgstr "Storniert"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 #, fuzzy
 msgid "Zaragoza"
 msgstr "Paraguay"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 #, fuzzy
 msgid "Zurich"
 msgstr "T�rkisch"
@@ -23928,7 +24017,7 @@ msgstr "Beschreibung"
 msgid "Mail summary"
 msgstr "Mail-Zusammenfassung"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:409
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
 #: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Lokale Ordner"
@@ -23938,50 +24027,46 @@ msgstr "Lokale Ordner"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com: Wort des Tages"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Zitate des Tages"
 
-#: my-evolution/e-summary-preferences.c:762
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Einen Kanal hinzuf�gen"
 
-#: my-evolution/e-summary-preferences.c:770
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Geben Sie die Adresse des Kanals ein, den Sie hinzuf�gen wollen"
 
-#: my-evolution/e-summary-preferences.c:774
-msgid "Name:"
-msgstr "Name:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Fehler beim Herunterladen des RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Nachrichtenkanal"
 
-#: my-evolution/e-summary-shown.c:488
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:497
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
 msgid "Add"
 msgstr "_Hinzuf�gen"
 
-#: my-evolution/e-summary-shown.c:512 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Schneefall"
@@ -24023,7 +24108,7 @@ msgstr "Zusammenfassung drucken"
 msgid "Printing of Summary failed"
 msgstr "Drucken der �bersicht fehlgeschlagen"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Chefsesselansichts-Komponente konnte Bonobo nicht initialisieren.\n"
 
@@ -25210,119 +25295,107 @@ msgid "C_elsius"
 msgstr "C_elsius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "_Alle Schlagzeilen:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Wie viele Tage soll der Kalender auf einmal anzeigen?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Ma_ximale Anzahl angezeigter Eintr�ge:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Schleigzeilen-Einstellungen"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Ein _Monat"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "Eine _Woche"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "Aktualisierungs_zeit (Sekunden):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "Aktualisierungs_zeit (Sekunden):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "_Vollen Pfad f�r Ordner anzeigen"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "_Alle Aufgaben anzeigen"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "_Heutige Aufgaben anzeigen"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Temperaturen anzeigen in:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Aufgaben "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Wetter-Einstellungen"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_F�nf Tage"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Mail"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "_Schlagzeilen"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Ein Tag"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Planung"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Wetter"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 #, fuzzy
-msgid "Configuration control for Evolution default folders."
+msgid "Configuration control for Evolution folder settings."
 msgstr "Fabrik f�r den Evolution-Maileditor."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Configuration control for Evolution's offline folders."
-msgstr "Fabrik f�r den Evolution-Maileditor."
+msgid "Folder Settings"
+msgstr "Mail-Einstellungen"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
-#, fuzzy
-msgid "Default Folders"
-msgstr "Besondere Ordner"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-#, fuzzy
-msgid "Offline Folders"
-msgstr "Besondere Ordner"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:5
 msgid "The Evolution shell."
 msgstr "Die Evolution-Shell."
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:6
-#, fuzzy
-msgid "This page can be used to configure default folders"
-msgstr "Einstellungen des Kalenders konfigurieren"
-
-#: shell/GNOME_Evolution_Shell.oaf.in.h:7
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
 #, fuzzy
-msgid ""
-"This page can be used to configure synchronization of folders for offline "
-"usage"
+msgid "This page can be used to configure various folder settings"
 msgstr "Einstellungen des Kalenders konfigurieren"
 
 #: shell/e-activity-handler.c:162
@@ -25342,16 +25415,11 @@ msgstr ""
 "Ordner kann nicht �bertragen werden:\n"
 "%s"
 
-#: shell/e-folder-list.c:245
+#: shell/e-folder-list.c:312
 #, fuzzy
 msgid "Add a Folder"
 msgstr "Ordner w�hlen"
 
-#: shell/e-folder-list.c:303
-#, fuzzy
-msgid "Edit this Folder"
-msgstr "VOrdner bearbeiten"
-
 #: shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Entw�rfe"
@@ -25480,11 +25548,30 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Das Team:"
 
-#: shell/e-shell-config-default-folders.c:134
+#: shell/e-shell-config-autocompletion.c:106
+msgid "Extra Completion folders"
+msgstr "Extra Ordner zur Vervollst�ndigung"
+
+#: shell/e-shell-config-default-folders.c:133
 #, fuzzy
 msgid "Select Default Folder"
 msgstr "Besondere Ordner"
 
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Besondere Ordner"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Besondere Ordner"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Extra Ordner zur Vervollst�ndigung"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -25646,22 +25733,27 @@ msgstr ""
 "Importieren von %s\n"
 "Importiert wird Objekt %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Ordner w�hlen"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datei %s existiert nicht"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution "
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Sie k�nnen nur in lokale Ordner importieren"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25671,11 +25763,11 @@ msgstr ""
 "%s\n"
 "umgehen kann"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importieren"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25684,17 +25776,17 @@ msgstr ""
 "Importieren von %s.\n"
 "Starten von %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Fehler beim Starten von %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25703,31 +25795,31 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Eine Datei w�hlen"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Daten und Einstellungen aus �lteren Programmen importieren"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Eine einzelne Datei importieren"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25735,28 +25827,28 @@ msgstr ""
 "Bitte warten...\n"
 "Suche nach existierenden Einstellungen"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Intelligente Importeure werden gestartet"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Ordner w�hlen"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Geben Sie einen Zielordner f�r das Importieren dieser Daten an"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importieren"
 
-#: shell/e-shell-offline-handler.c:580
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Verbindungen werden geschlossen..."
 
@@ -25850,35 +25942,35 @@ msgstr "Der Fehlermelder kann nicht gefunden werden"
 msgid "Bug buddy could not be run."
 msgstr "Der Fehlermelder kann nicht starten"
 
-#: shell/e-shell-view-menu.c:228
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "�ber Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:471
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Gehe zu Ordner..."
 
-#: shell/e-shell-view-menu.c:472
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "W�hlen Sie den Ordner, den Sie �ffnen wollen"
 
-#: shell/e-shell-view-menu.c:592
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Eine neue Verkn�pfung anlegen"
 
-#: shell/e-shell-view-menu.c:593
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "W�hlen Sie den Ordner, auf den die Verkn�pfung zeigen soll:"
 
-#: shell/e-shell-view-menu.c:760
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: shell/e-shell-view-menu.c:773 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "Offline _arbeiten"
 
-#: shell/e-shell-view-menu.c:786 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
@@ -26187,63 +26279,63 @@ msgstr ""
 "Der Fehler vom Aktivierungssystem ist:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "CORBA-Fehler"
 
-#: shell/evolution-shell-component.c:1081
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Unterbrochen"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Ung�ltiges Argument"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Hat bereits einen Besitzer"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Kein Besitzer"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Nicht unterst�tzter Typ"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Nicht unterst�tztes Schema"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Nicht unterst�tzte Aktion"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Existiert"
 
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "Ung�ltiger URI"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Hat Unterordner"
 
-#: shell/evolution-shell-component.c:1109
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Keine Platz mehr frei"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "Alter Besitzer ist gestorben"
 
@@ -27947,21 +28039,21 @@ msgstr ""
 "heranzuzoomen, und w�hlen Sie eine Zeitzone.\n"
 " Mit der rechten Maustaste k�nnen Sie wegzoomen."
 
-#: widgets/menus/gal-view-menus.c:269
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "Aktuelle Ansicht"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:330
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "Aktuelle Ansicht"
 
-#: widgets/menus/gal-view-menus.c:339
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:352
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Ansichten definieren"
 
@@ -28159,6 +28251,182 @@ msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 
+#~ msgid "Addressbook Settings"
+#~ msgstr "Adressbuch-Einstellungen"
+
+#~ msgid "Configuration control for the Evolution Addressbook."
+#~ msgstr "Konfigurations-Bedienelement f�r das Evolution Adressbuch"
+
+#~ msgid "This page can be used to configure Addressbook Settings"
+#~ msgstr ""
+#~ "Diese Seiten kann verwendet werden, um Adressbucheinstellungen vorzunehmen"
+
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolutions Chefsesselansichts-Komponente f�r den Kalender."
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Fabrik f�r die Kalenderzusammenfassungs-Komponente."
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "_Anfang des Tages:"
+
+#~ msgid "_End of day:"
+#~ msgstr "_Ende des Tages:"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "_Anderer Organisator"
+
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Klarsignieren wird von dieser Verschl�sselung nicht unterst�tzt"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Bitte geben Sie Ihre %s-Passphrase f�r %s ein."
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Bitte geben Sie Ihre %s-Passphrase ein."
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Nachricht kann nicht signiert werden: kein signierbarer Klartext"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Nachricht konnte nicht signiert werden: kein Passwort angegeben"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nachricht kann nicht signiert werden: Pipe zu GPG/PGP konnte nicht "
+#~ "angelegt werden: %s"
+
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr ""
+#~ "Nachricht kann nicht signiert werden: kein Klartext zum Klarsignieren"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr ""
+#~ "Nachricht kann nicht verifiziert werden: kein verifizierbarer Klartext"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Diese Nachricht kann nicht verifiziert werden: Pipe zu GPG/PGP konnte "
+#~ "nicht angelegt werden: %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr ""
+#~ "Nachricht kann nicht verschl�sselt werden: kein signierbarer Klartext"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Nachricht kann nicht verschl�sselt werden: kein Passwort angegeben"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Diese Nachricht kann nicht verschl�sselt werden: Pipe zu GPG/PGP konnte "
+#~ "nicht angelegt werden: %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "Nachricht kann nicht entschl�sselt werden: kein entschl�sselbarer "
+#~ "chiffrierter Text"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Nachricht kann nicht entschl�sselt werden: kein Passwort angegeben"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nachricht kann nicht entschl�sselt werden: Pipe zu GPG/PGP konnte nicht "
+#~ "angelegt werden: %s"
+
+#~ msgid "Directory tree of mbox files"
+#~ msgstr "Verzeichnisbaum einer mbox-Datei"
+
+#~ msgid ""
+#~ "For accessing mail storedin an external tree of mbox files.\n"
+#~ "This will allow you to directly access pine and elm folders.\n"
+#~ "NOTE: This provider is still experimental so ensure you backup any mail "
+#~ "folders first."
+#~ msgstr ""
+#~ "F�r den Zugriff auf Nachrichten, die in externen B�umen von mbox-Dateien\n"
+#~ "gespeichert sind.\n"
+#~ "Dies erlaubt Ihnen direkt auf pine oder elm Ordner zuzugreifen.\n"
+#~ "HINWEIS: Dieser Anbieter ist immer noch experimentell, Sie sollten also "
+#~ "zuerst Kopien der Ordner anlegen."
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Nachricht kann nicht an Spool-Datei angeh�ngt werden: %s: %s"
+
+#~ msgid "Spool `%s' does not exist or is not a regular file"
+#~ msgstr "Spool '%s' existiert nicht oder ist keine regul�re Datei"
+
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Datei konnte nicht werden: %s: %s"
+
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Speicher '%s' existiert nicht oder ist kein Verzeichnis"
+
+#~ msgid "Mail tree %s"
+#~ msgstr "Nachrichten-Baum %s"
+
+#~ msgid "Random"
+#~ msgstr "Zuf�llig"
+
+#, fuzzy
+#~ msgid "yes"
+#~ msgstr "Jahre"
+
+#, fuzzy
+#~ msgid "no"
+#~ msgstr "jetzt"
+
+#~ msgid "Cannot execute signature script"
+#~ msgstr "Signatur-Skript kann nicht ausgef�hrt werden"
+
+#, fuzzy
+#~ msgid "De_fault signature:"
+#~ msgstr "Alles au�er Signatur l�schen"
+
+#, fuzzy
+#~ msgid "Description"
+#~ msgstr "Beschreibung:"
+
+#, fuzzy
+#~ msgid "_Create Signature"
+#~ msgstr "_Test-Signatur:"
+
+#, fuzzy
+#~ msgid "_Duplicate"
+#~ msgstr "Alicante"
+
+#~ msgid "_Enable spell checking"
+#~ msgstr "_Rechschreibpr�fung aktivieren"
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "PGP-Verschl�sselungskontext konnte nicht angelegt werden."
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "PGP-Entschl�sselungskontext konnte nicht angelegt werden."
+
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "Evolution versteht diesen unterzeichneten Nachrichtentyp nicht."
+
+#~ msgid "Signature name:"
+#~ msgstr "Name der Signatur:"
+
+#, fuzzy
+#~ msgid "Riga"
+#~ msgstr "Rechts:"
+
+#, fuzzy
+#~ msgid "Configuration control for Evolution's offline folders."
+#~ msgstr "Fabrik f�r den Evolution-Maileditor."
+
+#, fuzzy
+#~ msgid ""
+#~ "This page can be used to configure synchronization of folders for offline "
+#~ "usage"
+#~ msgstr "Einstellungen des Kalenders konfigurieren"
+
+#, fuzzy
+#~ msgid "Edit this Folder"
+#~ msgstr "VOrdner bearbeiten"
+
 #~ msgid " Edit "
 #~ msgstr " Bearbeiten "
 
@@ -28195,9 +28463,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "_Random"
 #~ msgstr "_Zuf�llig"
 
-#~ msgid "_Script:"
-#~ msgstr "_Skript:"
-
 #~ msgid "<b>Overdue:</b>&nbsp;"
 #~ msgstr "<b>�berf�llig:</b>&nbsp;"
 
@@ -28388,10 +28653,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "Ne_w..."
 #~ msgstr "Neu..."
 
-#, fuzzy
-#~ msgid "Signatures"
-#~ msgstr "Signatur speichern"
-
 #~ msgid "_Organization:"
 #~ msgstr "_Organisation:"
 
@@ -28568,9 +28829,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "Mailbox Format"
 #~ msgstr "Postfach-Format"
 
-#~ msgid "Mail Settings"
-#~ msgstr "Mail-Einstellungen"
-
 #, fuzzy
 #~ msgid "<< S_imple"
 #~ msgstr "Vereinfach"
@@ -28582,10 +28840,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "Ad_vanced >>"
 #~ msgstr "Komplex"
 
-#, fuzzy
-#~ msgid "Add new signature"
-#~ msgstr "Signatur speichern"
-
 #~ msgid "Composer"
 #~ msgstr "Maileditor"
 
@@ -29016,9 +29270,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "(Unknown)"
 #~ msgstr "(Unbekannt)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Unerwartete Antwort von POP-Server: %s"
-
 #~ msgid "RCPT TO response error: %s: mail not sent"
 #~ msgstr "RCPT-TO-Antwortfehler: %s: Mail nicht verschickt."
 
@@ -29055,9 +29306,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "Diese Nachricht enth�lt ung�ltige Empf�nger:"
 
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML-Signaturdatei:"
-
 #~ msgid "Regions"
 #~ msgstr "Regionen"
 
@@ -29067,9 +29315,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "All _folders:"
 #~ msgstr "Alle _Ordner:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "_Alle Schlagzeilen:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "_Ordner anzeigen:"
 
diff --git a/po/el.po b/po/el.po
index 7b269bbb30..0bef595a01 100644
--- a/po/el.po
+++ b/po/el.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0.1.99\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-01-16 19:40GMT\n"
 "Last-Translator: Nick Niktaris(����� ��������) <niktarin@yahoo.com>\n"
 "Language-Team: Greek <nls@hellug.gr>\n"
@@ -47,7 +47,7 @@ msgstr "�������� ������� VCard ��� Evolution."
 msgid "File As"
 msgstr "������������ ��"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "�����"
@@ -58,7 +58,7 @@ msgid "Email"
 msgstr "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "��������"
 
@@ -68,7 +68,7 @@ msgstr "����."
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "������"
@@ -76,8 +76,8 @@ msgstr "������"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "�������"
 
@@ -87,12 +87,12 @@ msgid "Bus"
 msgstr "���."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "�����������"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "��������"
 
@@ -103,8 +103,8 @@ msgstr "�����."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "�����"
 
@@ -119,18 +119,18 @@ msgstr "���."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "������"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "����������"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "��� ��������"
@@ -140,13 +140,13 @@ msgid "Bus Fax"
 msgstr "��� ���."
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "��� ������"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "������� 2"
 
@@ -155,43 +155,43 @@ msgid "Bus 2"
 msgstr "���. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "����� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "����"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "���� ���"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "�����������"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "���������"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "��������"
@@ -203,14 +203,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "Email 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Email 3"
@@ -348,7 +348,7 @@ msgstr "VCard ��� %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -356,7 +356,7 @@ msgid "Could not initialize Bonobo"
 msgstr "��� ���� ������ � ������������ ��� Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "������� ���������..."
 
@@ -369,32 +369,32 @@ msgstr "������� �������..."
 msgid "Error in search expression."
 msgstr "������ ���� ������� ����������."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "�������� ������ ���� ���������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "�������� ������ ��� ��� ���������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "����������� ������ ���� ���������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "������������ ����������."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "���� ������������� ���������� ��� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "������ ��������� ������"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "��� ���� ������ � ��������� ���������: %s"
@@ -443,107 +443,143 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "������ ������� Bonobo ��� ��� ������� ���� ������� �����������"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "����� ������� �����������"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 "�������� ������� ��� ��� ������� ����-������ ��� ������� ����������� ��� "
 "Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "������� ����-������ ��� ������� ����������� ��� Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "�������� ��� Evolution ��� �� ���������� ��� ������."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 "���������� ��� �� �������� ������� ��� ����-������ ��� ������� �����������"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "���������� ��� ��� ������� ��� ������� �����������"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "���������� ��� ��� ���������� ��������� ��� �� ������ �����������"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "���������� ��� �� ������ ��������� ������� ��� ������� �����������"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "������"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "������� ��� �������� ����������� ������"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "����������� LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "����������� LDAP ��� �������� ����������� ������"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "��� ����� ������"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "_����� ������"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "��� �����"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_�����"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "��� ����� ������"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "��� ����� ������ � ������� �� ��� ���������� LDAP."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "_����� ������"
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"��� ���� ������ � ����������� ���� ���������� �MAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "� �������� ��� ���������� ���� ��� �������� ��� ���������� %s"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"������ ���� �� ������� ��� �����������:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "� �������� ��� ���������� ���� ��� �������� ��� ���������� %s"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(�� SSL ��� ������������� �� ���� ��� ������ ��� evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "��� ���� ������ � ������������ ��� gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "������ ������"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "��� ���� ������ �� ������� ��� ������� �����������"
@@ -578,50 +614,59 @@ msgstr ""
 "��� ���� ������ �� ������� ��� ������� �����������.  �������� ������� ��\n"
 "� �������� ������� ��� ��� ����� �� �������� ��������� �� ����."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "���������� ������ ��������� ��� %s (������� %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "�������� ��"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "Email 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "� ��������� �����"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "���� ����� ��������"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "��� �������������..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "���� ���������"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "�� URI ��� �� ��������� � ��������� �������"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(������)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "�������� Email"
 
@@ -667,104 +712,59 @@ msgstr "�������������� �������� ����������"
 msgid "Enable Queries (Dangerous!)"
 msgstr "������������ �������� ���������� (����������!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "��� ����� ������ � ������� �� ��� ���������� LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"��� ���� ������ � ����������� ���� ���������� �MAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr "��� ���� ������ � ��������� ��� sendmail: %s: �� ������ ��� ��������"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "� �������� ��� ���������� ���� ��� �������� ��� ���������� %s"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(�� SSL ��� ������������� �� ���� ��� ������ ��� evolution)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "���������� �����������"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "_������� ��� ��� ��������������� ������ "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "��������"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr " _��������"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr " _��������"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "��������"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -773,8 +773,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "����� ������� �����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "������������"
@@ -871,8 +871,8 @@ msgstr "���������"
 msgid "Mappings"
 msgstr "���������"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_����"
@@ -1054,14 +1054,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1084,8 +1084,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1117,7 +1117,7 @@ msgid "Using email address"
 msgstr "_���� ����� � ��������� ������������"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1125,7 +1125,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_��������"
 
@@ -1172,7 +1172,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1290,10 +1290,12 @@ msgstr "���������� �������� �������� ��� ������� ����������� ��� Evolution."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "���������� ��� �� ���������� �������� �������� ��� ������� �����������"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "��������"
 
@@ -1430,7 +1432,7 @@ msgstr "����������"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "������������ ������"
 
@@ -1440,7 +1442,7 @@ msgid "D_epartment:"
 msgstr "_�����:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "������������"
 
@@ -1504,11 +1506,12 @@ msgstr "�������� ��� �������� ��������� _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "��_������"
 
@@ -1537,7 +1540,7 @@ msgid "_Web page address:"
 msgstr "_��������� �����������:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "�������� ���������"
 
@@ -2083,12 +2086,11 @@ msgid "Laos"
 msgstr "����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "�������"
 
@@ -2098,7 +2100,7 @@ msgid "Lesotho"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "�������"
 
@@ -2108,12 +2110,12 @@ msgid "Liechtenstein"
 msgstr "�����������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "������������"
 
@@ -2152,7 +2154,7 @@ msgid "Mali"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "�����"
 
@@ -2181,7 +2183,7 @@ msgid "Mayotte"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "������"
 
@@ -2211,7 +2213,7 @@ msgid "Montserrat"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "������"
 
@@ -2238,7 +2240,7 @@ msgid "Nepal"
 msgstr "�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "��������"
 
@@ -2252,12 +2254,12 @@ msgid "New Caledonia"
 msgstr "��� �����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "��� ��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "����������"
 
@@ -2277,7 +2279,7 @@ msgid "Niue"
 msgstr "�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "����� �������"
 
@@ -2286,17 +2288,17 @@ msgid "Northern Mariana Islands"
 msgstr "����� ������� ���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "��������"
 
@@ -2310,7 +2312,7 @@ msgid "Palestinian Territory"
 msgstr "������������ �����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "�������"
 
@@ -2319,12 +2321,12 @@ msgid "Papua New Guinea"
 msgstr "������-��� �������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "�����"
 
@@ -2339,22 +2341,22 @@ msgid "Pitcairn"
 msgstr "�������� ������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "�������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "����������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "������� ����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "�����"
 
@@ -2364,7 +2366,7 @@ msgid "Reunion"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "��������"
 
@@ -2404,7 +2406,7 @@ msgid "Sao Tome And Principe"
 msgstr "��� ���� ��� ���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "�������� ������"
 
@@ -2422,17 +2424,17 @@ msgid "Sierra Leone"
 msgstr "������ �����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "����������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "��������"
 
@@ -2447,7 +2449,7 @@ msgid "Somalia"
 msgstr "�������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "����� ������"
 
@@ -2456,7 +2458,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "����� ������� ��� ����� ���� ���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "�������"
 
@@ -2480,7 +2482,7 @@ msgid "Sudan"
 msgstr "�������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "��������"
 
@@ -2493,17 +2495,17 @@ msgid "Swaziland"
 msgstr "�����������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "�������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "�������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "������"
 
@@ -2545,7 +2547,7 @@ msgid "Tunisia"
 msgstr "�������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "�������"
 
@@ -2566,7 +2568,7 @@ msgid "Uganda"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "��������"
 
@@ -2576,7 +2578,7 @@ msgid "United Arab Emirates"
 msgstr "������� ������� �������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "������� ��������"
 
@@ -2585,7 +2587,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "����� ����������� ����� �������� ���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "����������"
 
@@ -2599,12 +2601,12 @@ msgid "Vanuatu"
 msgstr "���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "����������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "�������"
 
@@ -2627,12 +2629,12 @@ msgid "Western Sahara"
 msgstr "������ ������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "�������������"
 
@@ -2645,26 +2647,34 @@ msgid "Zimbabwe"
 msgstr "����������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"����� ������� ��� ������\n"
+"�� ��������� � �����;"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "�������� ������;"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "� ������������ ���������� ��� ����� ����������."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "���� � ����� ������ ���� ����������:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "���������� ������ �� VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�� ������� ��������� ��� �� �����: `%s'"
@@ -2691,11 +2701,11 @@ msgstr "E-mail"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "�����"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2831,11 +2841,11 @@ msgid "contact-list-editor"
 msgstr "������������-������-������"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "������������ ������ ������"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "���������� ������ �� Vcard"
 
@@ -2913,21 +2923,21 @@ msgid "Error getting book view"
 msgstr "������ ���� ��� �������� ��� %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "������ ������������ ������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "��������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "������� ������"
 
@@ -2936,7 +2946,7 @@ msgid "Repository offline"
 msgstr "������ ������� ����� �������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "��� ����������� � ��������"
 
@@ -2954,55 +2964,70 @@ msgstr "��� ������������� �� ����������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "���������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "� ����������� �������."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "���������� �����������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "���� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "������ �� ������������ ��� �������;"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "������ ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "������ ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "������ ������������ ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "������ ���������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "������ ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -3010,22 +3035,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "����� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "����� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "����� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "����� �����"
@@ -3090,102 +3115,108 @@ msgstr "���� ��������"
 msgid "Other Address"
 msgstr "���� ���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "������ �����������"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "���������� �� (VCard)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "��� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "��� ����� ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_�������� ���� ������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_��������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_����� ������� �����������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "��������� ���������� _�������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "�������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "�������� ��������� ��� �����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "�������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "��������� ��� ������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_���������� ��� ������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "���������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3195,7 +3226,7 @@ msgstr "_�������� �������"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3203,7 +3234,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3355,7 +3386,7 @@ msgstr "���������"
 msgid "Number of columns:"
 msgstr "������� ������:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "��������"
 
@@ -3365,7 +3396,7 @@ msgid "Orientation"
 msgstr "���������������"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "������"
 
@@ -3439,29 +3470,33 @@ msgstr "������:"
 msgid "_Font..."
 msgstr "_�������������..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "�������� ����� �����"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "�����"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "��������"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "������"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "�������"
 
@@ -3506,42 +3541,34 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "���������� ��� ��� ����������� ��� Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "��������� ������������ ��������� ����������� Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "������� iTip/iMip ����������� Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "��������� ��� Evolution ��� ��� ������ ��� �����������."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "���������� ��� �� ��������� ��������� �����������."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "���������� ��� �� ��������� �������� Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "��������� ��� �� ��������� �������� iTip �����������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "���������� ��� �� ��������� ��������� �����������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "���������� ��� ��� ����������� ��� ���������� �������� ��� �����������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "���������� ��� ��� ���������� ���������� ����������� �����������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3553,10 +3580,25 @@ msgstr "�������� ����������� �����������"
 msgid "Factory for the alarm notification service"
 msgstr "���������� ��� ��� �������� ����������� �����������"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "���������"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "����������:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "��-������ ���"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution "
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3596,7 +3638,7 @@ msgstr ""
 "�������� �� ��� �������� ����������."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�������������"
@@ -3623,15 +3665,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "�� ��� ��������� � �������."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "��� ���� ������ ������������ ��� GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "��� ���� ������ � ���������� ��� ��������� �����������"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "��� ���� ������ � ���������� ��� ����������� ��� ��������� �����������"
 
@@ -3647,7 +3689,7 @@ msgstr "� ��������� ��������"
 msgid "Comment contains"
 msgstr "�� ������ ��������"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "����������"
 
@@ -3688,14 +3730,16 @@ msgstr ""
 "����������� ��� ORBit and OAF"
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "��������"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "������������"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "�������"
 
@@ -3716,27 +3760,32 @@ msgid "W"
 msgstr "�"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "������������"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "��� ���� ���������"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "�� �������"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "������������"
 
@@ -3751,11 +3800,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3770,12 +3820,14 @@ msgstr "���������"
 msgid "Assigned"
 msgstr "�������"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "���"
 
@@ -3795,62 +3847,64 @@ msgstr "������� ���������"
 msgid "Month View"
 msgstr "������� ����"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "����������"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "������� ��� �������� �������� ��� ��������"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "��������"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "������� ��� �������� �������� ����-���������"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "��������� ����������� ��������"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "���������"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "��� �������"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_�������"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "��� ��������"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "��� �_��������"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "��� ��������"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "��������"
@@ -4062,7 +4116,7 @@ msgstr "������������"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "��������:"
 
@@ -4091,7 +4145,7 @@ msgstr "����� ��� ��������"
 msgid "hour(s)"
 msgstr "���(��)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "�����(�)"
 
@@ -4119,79 +4173,81 @@ msgstr "30 �����"
 msgid "60 minutes"
 msgstr "60 �����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "�������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "��������� ����������� ��� ��������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "����� ��� ��� �������� ��� ����� ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "����� ��� ��� �������� ��� ������ ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "���������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "�����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "_���"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "�������� ������� ��������� ���� ��������� �����������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "��_�� ������:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "_���"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "������������ ��� ������ ������:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "_����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "�_����"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4220,81 +4276,96 @@ msgid "Tuesday"
 msgstr "�����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "�������� ��������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "12 ���� (��/��)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_������� ����������� ��� �� �������� ��� ������������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "�������� ��������������� ���� ������� �������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "� ������� ������� ���� : <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_��������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "_����� ������:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_�������� ������������� �������� ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "�������� ��� ����� ����:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "�������� ������ ������ �������� ���� �������� ��������� ��� ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "_���������� ����:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "�_����"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "���� ��� ��� ���� ��� ��������"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4384,40 +4455,61 @@ msgstr "(����"
 msgid "Due "
 msgstr "���� "
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "��� ���� ������ � ��������� ��� ������������!"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
 msgstr "��� ���� ������ � ��������� ��� ������������!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "����������� ��������"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "�������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "������������ ���������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "����� ��������"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "���������� ��..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "��� ���� ������ �� ��������� � �������� ������!"
 
@@ -4476,27 +4568,27 @@ msgstr "������������� ��:"
 msgid "Enter Delegate"
 msgstr "�������� ������������"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "��������"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "����������"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "������������"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "���������"
 
@@ -4546,7 +4638,7 @@ msgid "Pu_blic"
 msgstr "�������"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "�������� ���� ��"
 
@@ -4568,19 +4660,19 @@ msgstr "_������ �����:"
 msgid "_Start time:"
 msgstr "������ �_������:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "���������� ���� �����������."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "���������� ����������� ���� ���������������."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "���� �� ����� ����� ��� �� ���������!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_������������� ��..."
 
@@ -4591,49 +4683,55 @@ msgstr "���������������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "����� �����"
+msgid "Click here to add an attendee"
+msgstr "����� ���� ��� ��� �� ���������� ���� ��������������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "���������������� ���"
+msgid "Common Name"
+msgstr "����� �����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "������������� ��"
+msgid "Delegated From"
+msgstr "���������������� ���"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "������"
+msgid "Delegated To"
+msgstr "������������� ��"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "�����"
+msgid "Language"
+msgstr "������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "�����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "�����"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "���������"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "�����"
@@ -4648,14 +4746,10 @@ msgid "_Change Organizer"
 msgstr "������� ����������"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_��������� �����..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "����� �����������"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4850,7 +4944,7 @@ msgid "Progress"
 msgstr "�������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4862,19 +4956,19 @@ msgstr "_�������������"
 msgid "_Status:"
 msgstr "_���������:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "�������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "���������:"
 
@@ -4886,23 +4980,78 @@ msgstr "���������� �_������:"
 msgid "_Due Date:"
 msgstr "���������� _�����:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, fuzzy, c-format
+msgid "100%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "�������� ����������� ������������"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_�������"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "���������� ��..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4910,20 +5059,20 @@ msgstr "���������� ��..."
 msgid "_Print..."
 msgstr "_��������..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_�������"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "���������"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4931,35 +5080,36 @@ msgstr "���������"
 msgid "_Paste"
 msgstr "����������"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "������� ��������"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "�������� �� i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_�������� �� ������������"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_�������� �������� �� �������������"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_�������� ����������� ��������"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "���������� ������������"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "���� ��� ��� �������� ��������"
 
@@ -4967,47 +5117,48 @@ msgstr "���� ��� ��� �������� ��������"
 msgid "Alarms"
 msgstr "������������"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "������������"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "���������� �����������"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "���������� �����"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "���������� �����"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "���������� ����"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "�������������"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "���������� �������"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "��������"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "���������� ��������"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -5055,11 +5206,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "��"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "��"
 
@@ -5099,7 +5252,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "����_������ ����������� ��������������"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "���������� ���� � /%s"
@@ -5110,7 +5263,7 @@ msgid "_Configure Pilot..."
 msgstr "���������� ���� � /%s"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "�_��������� ��..."
 
@@ -5137,78 +5290,400 @@ msgid "Delete _All Occurrences"
 msgstr "�������� �_��� ��� ����������"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "�� �������� GNOME Pilot �������� �� ��� ����� ������������� �' ���� �� "
 "�������."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "������ ���� ��� �������� ���%s."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "� ��������� �������: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "� ������� ������� ���� : <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "����������� ���������/������������� ������ �������: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "������� ����:<b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "� ��������� ��������� ����: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "�� ����������� �������������� ���������� ����: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "���������� ����:<b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "� ������� ������������: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "���� ��������: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "����������� iCalendar"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "������ iCalendar"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "��� ������� �����"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> �������� �������� ��� �������� �����������, ��� �������� ���� ��� "
+"�������� ��� �� �������� �����."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>������</i>"
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "_���������:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "�������"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "����������� �������"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "������ ���������"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "��� ���� ������ �� ���������\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "�������� ��� ��������:"
+
+#: calendar/gui/e-itip-control.c:972
+#, fuzzy
+msgid "Update"
+msgstr "��������"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "��"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "�������"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "����������� �������"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "��������"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "�������� ����������� ��������������"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "�������� ���������� ���������"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "�������� ���������� �����������"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "�����"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> ���� ����������� ����������� ����������."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "����������� ����������"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> ��������� ��� �������� ��� �� ��� ���������."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "������� ����������"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> �� ����� �� ��������� �� ��� ��������� ���������."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "�������� ����������"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> �� ����� �� ��������� ��� ���������� ����������� ����������."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "����_�� ��������� ����������"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> ���� ��������� �� ��� ��������� �� ���������."
+
+#: calendar/gui/e-itip-control.c:1157
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "�������� ����������"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> ������� ��� ���������."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "������� ����������"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "�/� <b>%s</b> ������� ��� ���������� ������."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "��������� ������ ����������"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> ���� ����������� ����������� ��������."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "����������� ��������"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> ��� ���� ������� �� ���������� ��� �������"
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "������� ��������"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> �� ����� �� ��������� �� ��� ��������� �������."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "�������� ��������"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> �� ����� ��� ��������� ���������� ��������."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "������ _�������� ��������"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> �������� �� ��� ������� ��������"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "�������� ��������"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> ���� �������� ��� �������."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "������� ��������"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr " ������ ��������"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> ���� ���������� ����������� ��������������"
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "����������� ��������������"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "�/� <b>%s</b> ���� ����������� ��������������."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "������ ��������������"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "�/� <b>%s</b> �������� ���� ������ ��������������."
+
+#: calendar/gui/e-itip-control.c:1270
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "������ ��������������"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "��������� ������ ��������������"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "� ������� �������� �� ���� ������������ �����."
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "�� ������ �������� ���� �������� ��� ��� ��������������"
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "�� �������������� ������ ��� �������� ������ ������ �����������"
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+"�� �������������� ������ �������� �������� ��� ��� ������� �� ����������"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "��� ���� ������ � �������� ��� ���������!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "� �������� ������������\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "��� ���� ������ �� ���������\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "��� ���� ������ � �������� ��� ���������� ��������������� ������ �� �������� "
 "��� ������� �����"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "��� ���� ������ � ��������� ��� ���������� ��������������� ���� ���� �� "
 "������� ����������\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "��� ���� ������ � �������� ��� ���������� ���������������\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "� ��������� ��������������� ����������\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "��� ���� ������ � �������� ��� ���������� ���������������\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "� �������� ������������"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "�� �������� ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "��� ���� ������ � �������� ��� ���������!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "������� �������"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "������� �������"
@@ -5250,93 +5725,92 @@ msgstr "���������� ������"
 msgid "date-start"
 msgstr "���������� �������"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "����� ����������"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "����������� �������������"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "������������ �������������"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "��-�������������"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "�����"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "�����"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "�����"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "�������"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "����������� ����������"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "������������ ����������"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "��-����������"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "������� ��������"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "�������"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "������ ���������"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "�����������"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "���������������"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "�� �������"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5348,63 +5822,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "����� ��������"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "����� �����������"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_��������"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "�������� _���� ��� ���� ��������"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "�������� ����������"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "���_����� ��������������"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_�������� �������"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "��� _�� ����� ��� �� �����"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "��� �� ����� ��� ���� _�����"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "����������� �����"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "����������� ����� ��� ���� �����"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "������ �_������ ����������:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "������ _��������� ����������:"
 
@@ -5423,17 +5897,22 @@ msgstr "������� � ������� ��������� ��� `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "� ������� ��� ���������� ��� ��� ������� ��� '%s' ��� �������������"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "������� �� ������� ������� ��� `%s'"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "���������� �����������"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "�������� ����������� ������������"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "����������� � �������"
@@ -5446,17 +5925,17 @@ msgstr "��� �_�������..."
 msgid "_Delete this Appointment"
 msgstr "_�������� ����� ��� ��������"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "������� �� ������� ������� ��� `%s'"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "� ������� ��� ���������� ��� ��� ������� ��� '%s' ��� �������������"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "������� ����������� ��� %s"
@@ -5517,19 +5996,53 @@ msgstr "���������"
 msgid "September"
 msgstr "�����������"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "���������� ����������� ���� ���������������"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "������ �� ������� ���� ����������."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr "����������� ���������"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "����������� ��������"
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr "����������� �����������"
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr "���������� ��������������"
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr "����������� �����������"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "��������"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "�������� ������"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "������ �� ����� ��������������� ��� ���� �� �������."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "��� ���� ������ � ���������� ��� ����������� ������������ ����������"
 
@@ -5718,12 +6231,46 @@ msgstr "����������� ����� (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "����������� ������ (%Y)"
 
+#: calendar/gui/print.c:2249
+#, fuzzy
+msgid "Task"
+msgstr "_�������"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "_���������: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_�������������"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "%i ������������"
+
+#: calendar/gui/print.c:2350
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "����������: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "������: "
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "�������� �����������"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5761,8 +6308,8 @@ msgstr ""
 "\n"
 "����� ������� ��� ��� �������� ��� ���������;"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "�� ��� ��������� � �������."
 
@@ -5828,6 +6375,11 @@ msgstr "�������� ������� VCard ��� Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "�������� ������� VCard ��� Evolution."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "����������"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5924,8 +6476,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -6852,638 +7404,654 @@ msgid "Asia/Macao"
 msgstr "����/�����"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "����/�����"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "����/���������"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "����/���������"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "����/������"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "����/�������"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "����/��������"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "����/������������"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "����/����"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "����/�������"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "����/���� ����"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "����/���������"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "����/������ ������"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "����/�����"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "����/����"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "����/��������"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "����/�����"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "����/�������"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "����/��������"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "����/����������"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "����/�����"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "����/������"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "����/����������"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "����/������"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "����/��������"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "����/�������"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "����/��������"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "����/������"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "����/�����"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "����/��������� ��������"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "����/����� ������"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "����/��������"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "����/���������"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "����/�����������"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "����/���������"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "����/����������������"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "����/������"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "����������/������"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "����������/���������"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "����������/�������� �����"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "����������/������� ���������"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "����������/������"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "����������/���� �����"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "����������/������"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "����������/���������"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "����������/����� ��������"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "����������/����� �����"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "����������/�������"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "���������/��������"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "���������/����������"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "���������/������� ���"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "���������/���������"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "���������/�������"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "���������/��������"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "���������/����� ����"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "���������/���������"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "���������/����"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "���������/������"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "������/����������"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "������/�������"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "������/�����"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "������/��������"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "������/���������"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "������/��������"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "������/�����������"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "������/��������"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "������/�����������"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "������/����������"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "������/��������"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "������/���������"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "������/��������"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "������/���������"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "������/�������"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "������/����������������"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "������/������������"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "������/�����"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "������/��������"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "������/�����������"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "������/�������"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "������/������������"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "������/�������"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "������/�����"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "������/�����"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "������/������"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "������/�����"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "������/��������"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "������/����"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "������/������"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "������/�����"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "������/����"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "������/����"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "������/������"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "������/����� �������"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "������/���������"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "������/����������"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "������/������"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "������/�����"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "������/���������"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "������/�����"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "������/������"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "������/����������"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "������/�������"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "������/��������"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "������/������"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "������/��������"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "������/��������"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "������/��������"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "������/���������"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "������/������"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "�������/������������"
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "�������/�������"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "�������/��������"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "�������/���������"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "�������/������"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "�������/��������"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "���������/����� ��������"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "���������/�����"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "���������/�������"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "� �������� ��� ������������� ��� ���� �� cipher"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr ""
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "� ���������� ��� ������������� ��� ���� �� cipher"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "� ������������� ��� ������������� ��� ���� �� cipher"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "� ���������������� ��� ������������� ��� ���� �� cipher"
 
@@ -7494,12 +8062,12 @@ msgstr ""
 "��� ����� ������ � ���������� ��� ������� ������: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "��� ���� ������ � ���������� ��� ��������� %s: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7510,7 +8078,7 @@ msgstr ""
 "�� ��������� �������� �' ����� ��� ���������� ��� �� ������������\n"
 "���� �������������� ��� ������."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7521,11 +8089,16 @@ msgstr ""
 "%s\n"
 "�� ������� �� ����� ��� ������ ��� �� �����������������."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "���������������� �� ��� ����������"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "������������ � ������� '%s'"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr ""
 "������ �� ����� ���������� ��� ������ ��� �� ����������� ���� � ����������"
@@ -7534,57 +8107,68 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "������������ �������"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "������ ���� ������� �������: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ���� �������� �������: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "���� ��������� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "��� ���� ������ �� ������� ��� ���������"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "�������� ��� ������ %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "������������ �������"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "���� ��������� %d ��� %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "�������� ��� ������ %d ��� %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "�������� ���� ��� ��������������� ��� ���������."
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "��� ���� ������ � ���������� ��� ��������� %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "��� ���� ������ � ���������� ��� ���������� ������ ��������� %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "������ ���� �������� ���������� �������: %s: %s"
@@ -7614,26 +8198,106 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr "������� ��������� �� ������� �����������: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "�� �������������� ���������� : ������� ���������: ���  %s"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "�� �������������� ����������: ��������� ����� ��������: ��� %s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "�� �������������� ����������: ��������� ����� ���������� ������: ��� %s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "���������� ���������"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "��������� ��������� ��� %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "���������."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "���������� �������� ��� ��� ���������� ���: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "��� ����� ����� ����� �������."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr ""
+"��� ���� ������ � ������������� ��� ���������: ��� ����� ������� ����������"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "�������� ��� ������ %d"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "�������� ��� ������ %d"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "�������� ���� ��� ��������������� ��� ���������."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+"��� ���� ������ � ���������� ��� ���������: ��� ���� ������ � ���������� "
+"���������� ������: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7731,101 +8395,23 @@ msgstr "������ ���� ��� ������� ��� ��������� ��� �������� ������: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "������ ���� ��� ��������� ��� ��������� ��� �������� ������: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr ""
-"��� ���� ������ � �������� ��� ���������: ��� ������� ���� ������� ��� "
-"��������"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr ""
-"��� ���� ������ � �������� ��� ���������: ��� ���� ����� ������� ���������"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"��� ���� ������ � �������� ��� ���������: �������� ����������� ��������� �� "
-"�� GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
-"��� ���� ������ � ���������� ��� ���������: ��� ������� ���� ������� ��� "
-"����������"
 
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"��� ���� ������ � ���������� ��� ���������: �������� ����������� ��������� "
-"�� �� GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-"��� ���� ������ � ���������� ��� ���������: ��� ���� ������ � ���������� "
-"���������� ������: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr ""
-"��� ���� ������ � ������������� ��� ���������: ��� ������� ���� ������� ��� "
-"�������������"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "��� ���� ������ � ������������� ��� ���������: ��� ������ �������"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"��� ���� ������ � ������������� ��� ���������: �������� ����������� "
-"��������� �� �� GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr ""
-"��� ���� ������ � ������������� ��� ���������: ��� ����� ������� ����������"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-"��� ���� ������ � ���������������� ��� ���������:  ��� ������� ciphertext "
-"��� ����������������"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "��� ���� ������ � ���������������� ��� ���������: ��� ������ �������"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"��� ���� ������ � ���������������� ��� ���������: �������� ����������� "
-"��������� �� �� GPG/PGP: %s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "���� �� ������ ��� ��������� ����� ������� �������������"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "���� ������"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7845,43 +8431,6 @@ msgstr ""
 "��� ���� ������ �� �������� �� %s: ��� ������� ������� ������������� ��� "
 "�������."
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s ����������� %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s �������� ��� %s ��� %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "� ������� ���������"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "��� ���� ������ � ������� ��� %s (���� %d) : %s"
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr ""
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "� ���������� ���������"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "����������� ���������� ��� ����������: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "�������"
@@ -7984,7 +8533,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "��������� �������� ������������ ��� ��� ����������"
 
@@ -8015,11 +8564,9 @@ msgstr ""
 "�� ��� ������� ���� �� �������� ���� ���������� �� ��� ����������� Kerberos "
 "4."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "������� ���������"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -8048,52 +8595,52 @@ msgstr "��� ���� ��� SMTP ������������� �� ����� ��-pop �����"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "� ����������� ��������� '%s'���������� ��� ��������� �������� ������"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "� ����������� ��������� '%s' ���������� ��� ��������� �����"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "�������� ���������� �����������: %s: ������������ ��� �������"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "�������� ���������� �����������: %s: �������� �����"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "���������� � ������� %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "�������� ���������� �����������: %s: ������������ ��� �������"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "�������� ���������� �����������: %s: �������� �����"
@@ -8157,12 +8704,12 @@ msgstr "�������� ���� ��� ��������������� ��� ���������."
 msgid "Failed to verify certificates."
 msgstr "�������� ���� ��� ���������� ��� ��������������."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "��� ����� ������ �� ����� � ���� ��� �������: �� ������ �� ���� ��� �������"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "��� ����� ������ �� ������������ � �������: �� ������ �� ���� ��� �������"
@@ -8191,7 +8738,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8200,16 +8747,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8229,15 +8776,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "������ ������ ������ %s ��� %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "������ ������ ������ %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "������� ��� ��� �������� �� ����� ���� ��������"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8260,68 +8807,77 @@ msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
 "��� ���� ������ � ����������� ��� ������� %s: ��� ������� ������� �������"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "��� �������� �� ����������� �������� ��� ����� ��� ���� ������������."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "� ���������� ���������"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "����������� ���������� ��� ����������: %s"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "����������� �������� ��� ��� ���������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "� ������ IMAP �������: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "� ����������� ��� ��� ���������� ������������ ��� �����."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "� �������� ��� ���������� ���� ��� �������� ��� ���������� %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "����������� �������� �� ��� ��� ���������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "��� ���� ������ � ���������� ��� ��������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "��� ���� ������ � ������� ��� ��������� ���  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "� ������� ������������ ��� ����������������� ���� ����������."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "������� ������ ��� ��������� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "�� ������ ��� ����� ��������� ���� ��� ������"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "���� ����������� ��������� ��� ��� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "������� ������ ��� ��� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8375,35 +8931,86 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "��� �������� ��� ���������� ��������� �� ����������� IMAP."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "������� ���������"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "�� ��� ������� ���� �� ����� ������� ���� ���������� IMAP �� ����� ������� "
 "����� ��������."
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "����������� SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s �������� ��� %s ��� %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "� ������� ���������"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "��� ���� ������ � ������� ��� %s (���� %d) : %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"��� ���� ������ � ������� �� ��� ���������� POP.\n"
+"������ ���� ��� �������� ��� �������� ������: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "� ���������� ��� �������������"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "� ����������� �������."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "� ����������� IMAP %s ��� ����������� ��� ��������� ���� ������������ %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "�� ��������������� ����� ������������ %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s�������� �������� ��� ������ IMAP ��� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "��� ����� ������� ������ ���������."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8414,68 +9021,85 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "��� ������� ������� ������� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "��� ����� ������ �� ������� ��� mailbox: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "��������� �� ����� ��"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "��� ��� ���������� ��������� �� ���������� ��������� ��� ��."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "������ ��������"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "�������� ������� ��� ��� �������� ��� �����������"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "��������� ��������� �� ����� Maildir"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "��� ��� ���������� ������� ��������� �� ���������� maildir"
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+msgid "Standard Unix mbox spool or directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "� ������� ��� root %s ��� ����� ������� ����"
@@ -8501,7 +9125,7 @@ msgstr "�� ������� �������� ��� ����� �����������"
 msgid "Local mail file %s"
 msgstr "������ ������ ��������� %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "��� ���� ������ � ����������� ��� ������� %s ��� %s: %s"
@@ -8522,33 +9146,31 @@ msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 "��� ���� ������ � �������� ��� ������� ������������ ��� ������� `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "��� ���� ������ � ���������� ��� ���������:%s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "��� ���� ������ � �������� ��� ��������� ���� �������� : ������� �����"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "��������� � ������� ��������� Maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "��� ����� ������ � �������� ��������� ���� ������ maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8557,20 +9179,19 @@ msgstr ""
 "��� ������ �� ����� � ���� ��� ���������: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "��� ������� ������ ������"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "�� ������ ����������� ��� ������"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8581,13 +9202,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "� ������� `%s' ��� �������."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8603,7 +9224,7 @@ msgstr "�� `%s' ��� ����� ��������� maildir."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "��� ���� ������ � �������� ��� ������� `%s': %s"
@@ -8612,8 +9233,8 @@ msgstr "��� ���� ������ � �������� ��� ������� `%s': %s"
 msgid "not a maildir directory"
 msgstr "��� ����� ��������� maildir"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "��� ���� ������ � ������ ��� ������� `%s': %s"
@@ -8634,45 +9255,37 @@ msgstr "������� ��� ��� ��������"
 msgid "Checking for new messages"
 msgstr "������� ������ ��� ��� ��������"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "������� �����������"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "��� ���� ������ �� �������� ��� ������� ��� %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "��� ����� ������ �� ������� ��� mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "������� ��������� ���������"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "��� ����� ������ � �������� ��� ��������� ��� ������ mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8681,13 +9294,11 @@ msgstr ""
 "��� ����� ������ � ���� ��� ���������: %s ��� ��� ������ %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "� ������� �������� �� ���� ������������ �����."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "�������� ����������� ���������: �������������  mailbox;"
 
@@ -8730,174 +9341,155 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "� ������� `%s' ��� ����� ������. ��� ����� � ��������."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "��� ���� ������ �� ������� ��� �������: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "��� ����� ������ �� �������� � �������: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "��� ����� ������ �� ������� ��� �������: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "��� ����� ������ �� ������� ��� ���������� mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "��������� ��������� ��� �������, ����� ��� ���� ��� �����������"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "������ ���� ��� ������� ��� ���������� mailbox: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "� ������� ��� ���������� mailbox �������: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "��� ���� ������ �� �������� ��� ������� ����� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "��� ���� ������ �� �������� ��� ���������� �������:%s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "��� ���� ������ � ����������� ��� ������� : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "��������� ��������� ��� �������, ����� ��� ���� ��� �����������"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "������� ������: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "��� ���� ������ � ����������� ��� ������� : %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "������ ���� ��� ������� ��� ���������� mailbox: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "� ������� ��� ���������� mailbox �������: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "� �������� ��������� �� ���������"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "��� ����� ������ � �������� ��������� ���� mh ������: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ��� ����� ���������"
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "��� ����� ������ �� ������ � ���� ��������� ��� ��: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
-msgid "Cannot append message to spool file: %s: %s"
+msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr ""
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "� ������� ��� root %s ��� ����� ��������� ���������"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "� �������`%s/%s' ��� �������."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "������������ � ������� '%s'"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "��� ���� ������ �� ������������ � ���������� ������� %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "��� ���� ������ � ������������: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "� ������� ��� root %s ��� ����� ��������� ���������"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "������ ��� ���/��� %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "�������� USENET"
@@ -8908,12 +9500,22 @@ msgstr ""
 "����� ����� ���� �������� ��� ��� �������� ��� ���������� ��������� �� "
 "������ �������� USENET"
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "��� ���� ������ � ���������� ��� ��������� %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "�������� USENET ���� %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9018,7 +9620,7 @@ msgstr "��������� ���� ����������"
 msgid "Delete after %s day(s)"
 msgstr "�������� ���� ��� %s �����(��)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -9045,32 +9647,22 @@ msgstr ""
 "���������������� ������� ���������. ���� ������ �� ��� ���������� ��� ����� "
 "��� �������, ����� ��� �� �� ����������� ������������ �� ��������."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "��� ���� ������ � ������� �� ��� ���������� POP.\n"
 "������ ���� ��� �������� ��� �������� ������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "� ���������� ��� �������������"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "� ����������� �������."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "��� ���� ������ � ������� �� ��� ���������� POP ��� :%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -9078,27 +9670,27 @@ msgstr ""
 "��� ���� ������ � ������� �� ��� ���������� POP.\n"
 "��� ������������� � ���������� ������������."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "� ������ IMAP �������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "������ �/�"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s�������� �������� ��� ������ ��������� POP3 ��� %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -9107,13 +9699,13 @@ msgstr ""
 "��� ���� ������ � ������� �� ��� ���������� POP.\n"
 "������ ���� ��� �������� ������� ��������� %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "��� ������� � ������� `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9286,46 +9878,46 @@ msgstr "��������� �������� ������������"
 msgid "Authentication required"
 msgstr "���������� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "������ ��������� �����������:%s: ������� ��-�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "��� ���� ������ � ������� �� ��� ���������� POP.\n"
 "������ ���� ��� �������� ��� �������� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "�� ������ ������� �� ��� ���� ���������� �����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "������ ������������ ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "� ����������� SMTP %s ��� ����������� ��� ���� ������������ %s ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s�������� �������� ��� ������ ��������� SMTP ��� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9336,94 +9928,94 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "����������� SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "�������� ��������� ���� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "��� ����� ������ � �������� ��� ���������: � ��������� ��������� ��� ����� "
 "������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "������� �������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 "��� ����� ������ � �������� ��� ���������: ��� ������������ ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "��� ����� ������ � �������� ��� ���������: ��� ������������ ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "����������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "������ HELO ����� ������:%s: ��-�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "������ ���� �������� HELO:%s: ��-�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "����������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "������ ���� ��� ���������� ��� ������������ ������������ SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "������ ������������ ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "� ������ ������������ �������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "��������� �������� ������������ ��� ��� �����������.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "������ MAIL FROM ����� ������: %s: �� ������ ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "������ ��������� MAIL FROM: %s:�� ������ ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "������ RCPT TO ����� ������: %s:�� ������ ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "������ DATA ����� ������: %s:�� ������ ��� ��������"
@@ -9431,40 +10023,40 @@ msgstr "������ DATA ����� ������: %s:�� ������ ��� ��������"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "����� ������ � �������� DATA: ����������� ���������:  %s: �� ������ ��� "
 "��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "��������� �������� ������������ ��� ��� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "������ RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "������ QUIT ����� ������:%s: ��-�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "������ ��������� RSET: %s"
@@ -9538,52 +10130,52 @@ msgstr "����� MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "������� ��� �������� ������� ��� ����������"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "���� ��� ��� �� ������� �����������"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "���:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "�������� ��:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "�������� ���� ���������� ��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "���������:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�������� ��� ����������� ���� �� ������ ��������� ��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "��������� �����������:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9596,7 +10188,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "��������� �������"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "��� ���� ������ � ���������� ������������ ��������� PGP."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9605,34 +10202,34 @@ msgstr ""
 "������ ���� ��� �������� ��� ������� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "�������������!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "�� ������ �������, �� ����� ���������;"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "������ ���� ��� ���������� ��� �������: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ ���� �� ������� ��� �������: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "������ ���� ��� ���������� ��� �������: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "������� � �������� ��� ��������� ��� ��� �����������"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9641,14 +10238,14 @@ msgstr ""
 "������� � ��������� ��� ������: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9657,7 +10254,7 @@ msgstr ""
 "������ ���� ��� �������� ���������� ��� ���������: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9666,7 +10263,7 @@ msgstr ""
 "����������� ��������.\n"
 "������ �� ����� ���������� �������� ����;"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9676,23 +10273,43 @@ msgstr ""
 "\n"
 "������ �� ������������ ��� �������;"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "�������������: ������������� ������"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "������� �������"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "�������� �������"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "���������� ���������"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (��' �������)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "�������� ���� ���������"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9700,7 +10317,7 @@ msgstr ""
 "��� ���� ������ � ���������� ��� ��������� ��� �����������:\n"
 "������� � ������������ ��� ���������� ������� ��� �������� �����������."
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9708,6 +10325,12 @@ msgstr ""
 "��� ���� ������ � ���������� ��� ��������� ��� �����������:\n"
 "������� � ������������ ��� ���������� ��� ����������� HTML."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9768,7 +10391,7 @@ msgstr "���� ��������"
 msgid "Subject does not contain"
 msgstr "���� ��� ��������"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9914,7 +10537,7 @@ msgstr "���"
 msgid "minute"
 msgstr "�����"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "������������"
 
@@ -9989,7 +10612,7 @@ msgstr " ����"
 msgid "ago"
 msgstr "����"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -10001,6 +10624,21 @@ msgstr "<����� ���� ��� ��� �� ��������� ����������>"
 msgid "Filter Rules"
 msgstr "������� �������"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "����� ����:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "� ������� ��� root %s ��� ����� ��������� ���������"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "�������� ��� ��������:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -10019,7 +10657,7 @@ msgstr ""
 "��������� ���� ��� ������ ���� ������ ������ ��� ��� �������� ��� ���������."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "������� �������"
 
@@ -10030,7 +10668,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "������"
 
@@ -10060,7 +10702,7 @@ msgstr "�� ������������� ��� �� ��������"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "�� ������������� ������ ��� �� ��������"
 
 #: filter/filter-rule.c:780
@@ -10138,194 +10780,204 @@ msgid "Beep"
 msgstr "������"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "��������"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "��������� �� ������"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "��� ��������"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "��� ��������� ��"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "��� �������"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "��� �������� �� �����"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "��� ������ ��"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "��� �������"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "�������� ��"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "�����"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "���� ����"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "���� ����"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "����� ���������� ���"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "����� ��������� ���"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "��� �����"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "_����������"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "����� ������������"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "���� ���������"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "����������� ���������"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "���������� �� ������"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "�������� ����:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "���������� �����"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "������� ����������"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "������� (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "�������� �� �����"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "������� �����������"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "������� �����������"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "������ ��"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "����������� ������������"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "����"
 
@@ -10380,7 +11032,8 @@ msgid "Scanning %s"
 msgstr "������� ������ ��� %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "��������"
 
@@ -10396,10 +11049,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "������ �����������"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10449,7 +11098,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "�� Evolution ������� �� ������ ��� �������� Netscape"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "�����������"
 
@@ -10585,31 +11236,31 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "������� ��� �������� ��������"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "�������� �����������"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "��������� ������� ������������"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "����� � ������� ��� ������ �� �������� ��������."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "���������..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "������ ��� ��������� ��� �������"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10617,242 +11268,251 @@ msgstr ""
 "������� ��� ��� ��������� ��� ������������ ��� �������� �� ����� "
 "��������������, �������� ������� ��� ��� ����� �����."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "��� ����� ������ ����� �������� ��� ���������"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "�������������: ������������� ������"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "��� ������ ������������"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_�������� ���������"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 "��� ����� ������ � ������������ ��� ���������� ��������� ��� Evolution."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "��� ����� ������ � ������������ ��� ���������� �������� ��������� ��� "
 "Evolution."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "��� ����� ������ � ������������ ��� ���������� ����������� ������� ��� "
 "Evolution."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "������� ���� ����������..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "��� ����� ������ �� ����� ���������� ����������� �� �������"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "��������� ��� \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "���������"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "��� ����� ������ � ���������� ��� ���������� ���������: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d ���"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d ��������"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d ����������"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d �� �����������"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d �����������"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d ��������"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "���������� ��������� ������� ��� �� ������"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "�������� ��� _����"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "�������� ���� _���������"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "�������� ����� ����������"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "�������� ���� ����� _������������"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "������ ��� ����"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "������ ���� ���������"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "������ ����� ����������"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "������ ���� ����� ������������"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_����������� �� ��� ������..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_��������"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_�������� ���� ���������"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "�������� ��� _�����"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "�������� �� _�����"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_��������"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "������������"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "����������"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "������� _�� �����������"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "������� _�� �� �����������"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "������� _�� ���������"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "������� _�� �� ���������"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "�_������ ���������"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_���������� ��� ������..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "��������� ��� ������..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "_����������"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "�������� ��������� ��� ������ �����������"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "�������� �������"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "���������� ������ ��� �� ������"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "�������� ���� ����� ������������"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "������ ���� ����� ������������ (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "�������� ���� ����� ������������ (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "�� �������"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "���� ����������� �������"
 
@@ -10907,7 +11567,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "��� ����� ����������� ��� ��� ������������ �����������."
 
@@ -10917,83 +11577,111 @@ msgid "Evolution News Editor"
 msgstr "������������ �������� Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "������������ ����������� Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "_����� ������:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_����:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "���������"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "��� ����������� �� ������������� ��� ������������ �� �� ���� �����."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "����� ������� ��� ��� �������� ����� ��� �����������;"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "�� ��� ���������"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "�� ��������� � �����������;"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "��������������"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "������������"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "����� ������� ��� ��� �������� ��� ����������� ��������;"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "������������"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "����� _�����������:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "������� ����"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "������ ��� ���/��� %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "�� ���� ����� %s"
+
+#: mail/mail-autofilter.c:239
+#, fuzzy, c-format
+msgid "Mail from %s"
+msgstr "������ ��� ���/��� %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "%s ����� ������������"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "�������� ������ �������"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"�� �������� ��������(��):\n"
+"%s������ ����� ��� ������������ �������:\n"
+"    '%s'\n"
+"��� ���� ���������."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11005,7 +11693,7 @@ msgstr ""
 "� �������� ���������\n"
 "������ �� ������ ��� ������� ����;"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11013,7 +11701,7 @@ msgstr ""
 "������ �� ��������� ��� ���������\n"
 "���� ��� ��� �������� ���������"
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11022,7 +11710,7 @@ msgstr ""
 "���� ��� ��� �������� ���������"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11030,11 +11718,11 @@ msgstr ""
 "�� �������� ������ �� ����� HTML, ���� � �������� ���������� ��� ��������� "
 "�������� �� ����� HTML:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "�� ������ ����� � �����;"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11042,7 +11730,7 @@ msgstr ""
 "���� �� ������ ��� ���� ����.\n"
 "�� ������;"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11051,12 +11739,12 @@ msgstr ""
 "�����������, ���� �� ������ �� �������� ���� ���������� ���� ��������� "
 "�����������(Bcc)."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr ""
 "���� �� ������ �������� ���� ���������� ��� ���������� ������������Bcc)."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11066,17 +11754,17 @@ msgstr ""
 "�������� ��� ������ ����������� ����.\n"
 "�� ������ ����� � �����;"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "������ �� ������� ���������� ����������� �� �������� ���� �� ������."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "������ �� ��������� ���� ���������� ��� �� ��������� �� �������� ���� �� "
 "������."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11085,28 +11773,28 @@ msgstr ""
 "����������.\n"
 "������ �� ������ ����� ��� ��' ������� ���������� �������;"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "���� �������� ����������"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "��� %a, %d-%m-%Y ���� %H:%M, �/� %%s ������:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "���������� ���������(��) ���"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "��������� ���������(��) ���"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "����� ������� ��� ������ �� �������������� ��� �� %d ��������;"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11114,7 +11802,7 @@ msgstr ""
 "����������� �� �������������� ���� ��\n"
 "�������� ���� �������� ������."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11122,39 +11810,39 @@ msgstr ""
 "����������� �� ������������ ���� ��\n"
 "�������� ��� ��� ������ �����������."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "����� ������� ��� ������ �� ������������ ��� �� %d ��������;"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "��� ���� �������� ������"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "��������� �������;"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "���������� ��������� ��..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "���������� ��������� ��..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "�������� �������� �� ������������ ���������"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11166,7 +11854,7 @@ msgstr ""
 "\n"
 "����� ������� ��� ��� �������� ��� ���������;"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11175,41 +11863,77 @@ msgstr ""
 "������ ���� �� ������� ��� �����������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "������"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "���� ��������� %d ��� %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "�������� ���������"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "���������� US-Letter"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "������� � �������� ��� ���������"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "����� ������� ��� ������ �� �������� ��� �� %d �������� �� ���� ��������;"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "����� ���������"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "����� ����� �����"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "�����������"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "�������� ���������"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "���������� ���������"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in,\n"
 "unless you wish to include this information in email you send."
 msgstr ""
-"�������� �������� �� ����� ��� ��� ��� ����������� ��� ��������� "
-"��\"�����������\" ����� ��� ������������ ��������\n"
+"�������� �������� �� ����� ��� ��� ��� ����������� ��� ��������� ��"
+"\"�����������\" ����� ��� ������������ ��������\n"
 "��� ����� ���������� �� ������������ ����� �� ������ �� ������������� ����� "
 "��� ����������� ���� �������� ��������."
 
@@ -11255,120 +11979,99 @@ msgstr ""
 "�� ����� ����� ���� ��� �� �������� ��� ����������."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "������ ����������� Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "���������"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "������"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "�����"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "����"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"��� ���� ������ � ���� ��� ������������ ��� ������� �������� ������������:\n"
-"%s\n"
-"��� �� ������������ ����������"
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "�����������"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "������� ������� ���������"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "������� ���� ����������..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "����� ����� �����"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "_�����������"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "���"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_������� ��� ��� ��������������� ������ "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(�� SSL ��� ������������� �� ���� ��� ������ ��� evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(�� SSL ��� ������������� �� ���� ��� ������ ��� evolution)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 "�� ������� ����� ������������� ���� ����� ��� ���� ��� �������� "
 "���������������� ���������"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "����������� %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "����������� �����������"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "���������� �����������"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "������� �����������"
+msgid "Add Sc_ript"
+msgstr "�������� ���������"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "������/�������"
+msgid "Add new signature..."
+msgstr "���������� ���������"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
@@ -11377,77 +12080,80 @@ msgstr ""
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "�������"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "�� ������������ ����� �� �������� ���� ����� ����� ��� �����������"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "�������"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "��������� ������� ��� ������"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "�����������"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_��������� ������� ��� ��� ��������"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "������� ������ ����������: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_��������"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "������� ��� ��� ��������"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "����� ��� ��� �������� ��� ������ ������"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "�������� ���� ���������"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11463,55 +12169,46 @@ msgstr ""
 "\n"
 "�������� \"�����������\" ��� �� ������������ ��� ��������� ���."
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "��������"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "�� �������"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "� ��' ������� ������������ ���������� �����: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "���� ���������"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "�������� ����������..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "��� ���� ������ �� ������� ��� ���������"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "������� _���������:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_������������"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11532,40 +12229,35 @@ msgstr "��������� Email:"
 msgid "Empty _trash folders on exit"
 msgstr "�������� ��� ������� _������������ ���� �����"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "�������� ���������"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "�������� ��"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "���������� ��������"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "���� �������� ����������..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_���������� ���������� ��"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "��' �������"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11619,72 +12311,68 @@ msgstr "��������"
 msgid "NNTP Server:"
 msgstr "����������� NNTP:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "��������� ������������"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "���������� _��������"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "������������ �����������"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "������_����:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _Key ID:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "�������� �����"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "������� ���� �������� ��������� ���� ����� ������� ���� ���������� ���� "
 "��������� _����������� (Bcc)"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "�������� ����������� ������"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "��� ���� ������ �� ������� ��� ���������"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "�� �������"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_������������� ����� ��� ������� ���������"
@@ -11719,117 +12407,120 @@ msgstr "��������"
 
 #: mail/mail-config.glade.h:104
 #, fuzzy
-msgid "Same as text"
-msgstr "���������"
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "������� MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "�������� �� ���������� PGP"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "������ ���������:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "�������� ���� ����� ��� ���������"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "������������� �� ��������"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "������� _������������ ���������:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "����������� ��� �������� ��������"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "� _����������� ������� �����������"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "��������� ����������"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "����� _����������: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "������������"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "���������� ���������"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "���������� ���������"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "����"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "����������� �����"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "����� ����:"
 
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
+msgstr ""
+
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
 #: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+msgid "Standard Unix mbox"
 msgstr ""
 
 #: mail/mail-config.glade.h:126
-msgid "Standard Unix mbox"
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "_�������� HTML:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11839,145 +12530,138 @@ msgstr ""
 "\n"
 "�������� \"�������\" ��� �� ����������. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_�������� HTML:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "�� ������� _����� ������� ��� ������� ��� �� �������"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "�� _������������ ����� �� �������� ���� ����� ����� ��� �����������"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "����� _������������: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "����� _������������: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "_��������� ������� ��� ��� ��������"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_��������� ������� ��� ��� ��������"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_����������� ����������:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "����������� ���� �������� ��� ���� ������"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "_�������� HTML:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "��' �������"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "����� �������:"
+msgid "_Enable"
+msgstr "������������"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "�������� ��"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "_������ �����:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "�� �������� HTML"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "_�������� HTML:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "������"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_������� ������� �� � ���������� ������� ��� ������ �����������"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "����� ����� � _��' ������� �����������"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_������� ��������� �� ����������� ���� ���"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_�����:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_�� ��� ����������� ���� ������� ��� �� ������"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "���� ����������� _PGP:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "������� ���� �������� ��������� HTML �� ������ ��� ��� �� ������"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "������� ���� �������� ��������� �� �_���� ����"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "���������"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -12018,69 +12702,52 @@ msgstr "_�������� HTML:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "_�������� HTML:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "����� �������� �������� (SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_����"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " �����"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "������������1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "��� ���� ������ � ���������� ������������ ��������� PGP."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "��� ���� ������ � ���������� ������������ ����������� PGP."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "��� ���� ������ � ���������� ������������ ������������� PGP."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "��� ���� ������ � ���������� ������������ ���������������� PGP."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "��� ���� ������ � ���������� ������������ ��������� S/MIME."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "��� ���� ������ � ���������� ������������ ������������� S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "��� ���� ������ � ���������� ������������ ������� S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "��� ���� ������ � ���������� ������������ ���������������� S/MIME."
 
@@ -12123,100 +12790,138 @@ msgstr "��������� ��������� ��������"
 msgid "Loading message content"
 msgstr "������� ����������� ���������"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "�������� ��� ����� ����:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "������� ��������� ���� ���������"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "��������� ����� �����������"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "���������� ������� ��..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr " %s ���������"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "��� ���� ������ � ������� ��� ��������� MIME. ������� �� ����."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����������"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "��������� ���������"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "���"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "�������� ��"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "���������:"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "��������� �����������"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "������������ ������������: "
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "���������� ��������� ��..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"���� �� ������ ����� ������� �������������. ����� ���� ��� ��������� �� �� "
+"������� ��� ������������ �����������."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "��� ���� ������ � ���������� ������������ ����������� PGP."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+"���� �� ������ ����� ������� ������������� ��� ������� �� ����� ���������."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"���� �� ������ ����� ������� ������������� ��� ��� ������� �� ����� "
+"���������."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "������� �� ������ FTP (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "������� �� ������ ������ (%s) ������ ���� ������ \"%s\""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "������� �� ������ ������ (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "������� �� ������������� �������� (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "������� �� ������� ��������� �������� (����� \"%s\")"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "��������������� ��������� ����� ���������."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "������� �������"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "������������ �������"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12225,27 +12930,27 @@ msgstr ""
 "��� ����� ������ �� ����������� � ������� metainfo, ������ �� ������������\n"
 "��� ��� �������� �� �������� ����� ����� ��� ������: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "��� ����� ������ �� ����������� � ������� metainfo ��� %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "��� ���� ������ �� ��������� � ������� metadata %s: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "������� ������ ��� ������� \"%s\" �� ����� \"%s\""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s ��� ����� ������ �� ��������� ���� ����� ��� ����� ������� �������"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12253,11 +12958,11 @@ msgstr ""
 "�� ��� �������� �� �������� ����� ���� �� maibox, ����\n"
 "�� ������ �� �� ����������� ����� ���."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "��� �������� �� �������� �� ����� ���� ��-������� �������."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "���������� ���� � /%s"
@@ -12315,81 +13020,73 @@ msgstr "�������� ��� ������ %d ��� %d"
 msgid "Complete."
 msgstr "������������."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "���������� ��������� ���� ������"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "���������� ��������� ��� %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "��������� ��������� ��� %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "����������"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "���������"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "������ ������� ��� \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "���������� ��������"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "������� ������� %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "������� �������� %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "���������� � ������� %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "������������ � ������� '%s'"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "����������� � �������"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "����������� � �������"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "�������������� �� ������ %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "��������������� %d ������(��)"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "����������� %d ������(��)"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12398,7 +13095,7 @@ msgstr ""
 "��� ����� ������ � ���������� ��� ������� ������: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12407,11 +13104,11 @@ msgstr ""
 "������ ���� ��� ���������� ��������� ��� %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "���������� ����������"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12420,27 +13117,27 @@ msgstr ""
 "��� ����� ������ � ���������� ������� ������: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "��� ���� ������ � ������� ���������:%s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "���������� ��� �� %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "������������ ��� %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_���������"
 
@@ -12511,10 +13208,6 @@ msgstr "��������..."
 msgid "Waiting..."
 msgstr "�������..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "���������."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "� ������� ������� ��� ����������."
@@ -12528,16 +13221,16 @@ msgstr "�������� ������ ��������� ��� %s"
 msgid "Enter Password"
 msgstr "�������� ������ ���������"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "��� ���� ������ � ���������� ��� ������� ���������"
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "���������� ���������"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12547,10 +13240,30 @@ msgstr ""
 "\n"
 "������ �� ������������ ��� ������� ����;"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "�����:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "������ ���������:"
+msgid "Signature hint"
+msgstr "���������� ���������"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "������ ��������� HTML:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12565,17 +13278,17 @@ msgstr "���������� ������"
 msgid "Forwarded Message"
 msgstr "���������� ������"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "������� ��������: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "���������� �������� ��� �� uri: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12588,89 +13301,94 @@ msgstr ""
 "    '%s'\n"
 "��� ���� ���������."
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "��������"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "��������"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "����������� ��������"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "���������� ������������ �������� '%s' ��� ��� �������."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "���� ��������"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(����� ����)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - ������"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "����������"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "�������� ��������"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "����������"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "������"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "�����"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "���������"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "������ %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%l:%M %p %a"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "���������� ������ ���������"
 
@@ -12693,10 +13411,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "������ �����:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "������"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "�������"
 
@@ -17915,5836 +18638,5831 @@ msgstr "��������"
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "_����������"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 #, fuzzy
 msgid "La Verne"
 msgstr "������� ���������"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 #, fuzzy
 msgid "Learmouth"
 msgstr "������"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 #, fuzzy
 msgid "Leesburg"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 #, fuzzy
 msgid "Lemmon"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "������"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 #, fuzzy
 msgid "Lewisburg"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "������"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 #, fuzzy
 msgid "Lewistown"
 msgstr "������"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 #, fuzzy
 msgid "Lexington"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Liberal"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Libya"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Lihue"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "����"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limoges"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Lincoln"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 #, fuzzy
 msgid "Lisboa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 #, fuzzy
 msgid "Litchfield"
 msgstr "������ ������"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 #, fuzzy
 msgid "Ljubljana"
 msgstr "������/�����������"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "���������� ��"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "London"
 msgstr "������/�������"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 #, fuzzy
 msgid "Los Alamos"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 #, fuzzy
 msgid "Los Angeles"
 msgstr "�������/��� ��������"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 #, fuzzy
 msgid "Louisville"
 msgstr "�������/��������"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 #, fuzzy
 msgid "Lousiana"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macapa"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "����� �������������� ���������� ��� ���������� (����)"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "����� �������������� ���������� ��� ���������� (����)"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "����/���������"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manchester"
 msgstr "��������� ��:"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "�������� ������ ���������"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "������"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 #, fuzzy
 msgid "Maraba"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "����"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 #, fuzzy
 msgid "Marquette"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 #, fuzzy
 msgid "Marshalltown"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "������� _�� �� �����������"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "����� �������������� ���������� ��� ���������� (����)"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mattoon"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "������"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 #, fuzzy
 msgid "Mazu"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "����"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McClellan"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "����"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 #, fuzzy
 msgid "Mehamn"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 #, fuzzy
 msgid "Melbourne"
 msgstr "���������/���������"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "�������/�������"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 #, fuzzy
 msgid "Menominee"
 msgstr "�������/��������"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 #, fuzzy
 msgid "Merril Field"
 msgstr "����� _���"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "������"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 #, fuzzy
 msgid "Miami"
 msgstr "����"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middle East"
 msgstr "_������:"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middleton Island"
 msgstr "����� ����������"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "_������:"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 #, fuzzy
 msgid "Milano/Malpensa"
 msgstr "�������/��������"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "����� �������:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 #, fuzzy
 msgid "Milford"
 msgstr "���"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "������ ����/���� %s"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minatitlan"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 #, fuzzy
 msgid "Minnesota"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missoula"
 msgstr "���"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Missouri"
 msgstr "���"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitchell"
 msgstr "��������� ��:"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 #, fuzzy
 msgid "Mitilini"
 msgstr "����� ������������"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "��"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "������ ��������"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "������"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Modesto"
 msgstr "������ ������"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "������"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Moldova"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 #, fuzzy
 msgid "Molokai"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "������"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "������"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "������"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montana"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "������ ����������"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 #, fuzzy
 msgid "Montego Bay"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 #, fuzzy
 msgid "Monterrey"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 #, fuzzy
 msgid "Montgomery"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "������"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morelia"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "������"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "���������������"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 #, fuzzy
 msgid "Mullan"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 #, fuzzy
 msgid "Muncie"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 #, fuzzy
 msgid "Murcia"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "���."
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 #, fuzzy
 msgid "Muscatine"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "������"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 #, fuzzy
 msgid "Najran"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Napoli"
 msgstr "����"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "����."
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 #, fuzzy
 msgid "Nassau"
 msgstr "�������/�������"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "������"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natchez"
 msgstr "��������� ��:"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 #, fuzzy
 msgid "Nebraska"
 msgstr "��� �������"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Nevada"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "��� �������"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bedford"
 msgstr "���������� ��������"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "��� ��������"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "Newcastle"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "��� ��������"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "Newfoundland"
 msgstr "��� ��������"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "��� ���������"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Iberia"
 msgstr "��� ���������"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "��� ������"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Mexico"
 msgstr "������"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "���� ��������"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "���"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "New York"
 msgstr "���� ��������"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "����������:"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nis"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 #, fuzzy
 msgid "Norfolk NAS"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norrkoping"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Adams"
 msgstr "����������������"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "����������������"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "����������������"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "�������� ������ ��������"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 #, fuzzy
 msgid "Novosibirsk"
 msgstr "����/������������"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "��� ���� ���������"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 #, fuzzy
 msgid "Oaxaca"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Oceanside"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "���"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Odesa"
 msgstr "���"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "����"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 #, fuzzy
 msgid "Ojika Island"
 msgstr "����� ����"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "���������� �������� �����"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "����"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 #, fuzzy
 msgid "Olbia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 #, fuzzy
 msgid "Omaha"
 msgstr "����"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "����"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 #, fuzzy
 msgid "Omsk"
 msgstr "����/����"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "���������������"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oostende"
 msgstr "���������������"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oran"
 msgstr "����"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "���."
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 #, fuzzy
 msgid "Oregon"
 msgstr "���."
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orlando"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 #, fuzzy
 msgid "Oruro"
 msgstr "������"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 #, fuzzy
 msgid "Ostrava"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 #, fuzzy
 msgid "Oxford"
 msgstr "���"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "������"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 #, fuzzy
 msgid "Palacios"
 msgstr "������"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 #, fuzzy
 msgid "Palmdale"
 msgstr "������"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "��������� ���������"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 #, fuzzy
 msgid "Pamplona"
 msgstr "������"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama City"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Paphos"
 msgstr "����"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 #, fuzzy
 msgid "Paris"
 msgstr "����."
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "������� �������"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "������� ���������"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "������ �����"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "�������� ����:"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "�������:"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 #, fuzzy
 msgid "Pereira/Matecana"
 msgstr "�������/��������"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "����."
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philip"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Philipsburg"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 #, fuzzy
 msgid "Phillips"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 #, fuzzy
 msgid "Phoenix"
 msgstr "�������/������"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 #, fuzzy
 msgid "Pietersburg"
 msgstr "����/����������������"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 #, fuzzy
 msgid "Pisa"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 #, fuzzy
 msgid "Plymouth"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 #, fuzzy
 msgid "Podgorica Titograd"
 msgstr "������ ������"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "�������� �������"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "�������� ���������"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "�������� ���������"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponca City"
 msgstr "����� ���������"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponce"
 msgstr "������"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "������"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Port Alexander"
 msgstr "�������� �����������"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "�������� �������"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 #, fuzzy
 msgid "Port-Au-Prince"
 msgstr "�������/����-�-�����"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hardy"
 msgstr "�������� ������"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Portland"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto"
 msgstr "_����:"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 #, fuzzy
 msgid "Porto Velho"
 msgstr "�������/����� ����"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poza Rica"
 msgstr "����� ����"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poznan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Praha"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "������ ���������"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "������������� ���������"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Pretoria"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Price-Carbon"
 msgstr "����� ��������"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Providence"
 msgstr "_��������/�������:"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "�����."
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 #, fuzzy
 msgid "Pucallpa"
 msgstr "������"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Puebla"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Pueblo"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 #, fuzzy
 msgid "Puerto Barrios"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 #, fuzzy
 msgid "Puerto Escondido"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 #, fuzzy
 msgid "Puerto Maldonado"
 msgstr "������ ������"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "������� ����"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "�������� ���������"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pula"
 msgstr "������"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 #, fuzzy
 msgid "Punta Cana"
 msgstr "�������� �����������"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 #, fuzzy
 msgid "Pyongyang"
 msgstr "����/������ ������"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quebec"
 msgstr "����"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 #, fuzzy
 msgid "Rapid City"
 msgstr "���������� �����"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Rawlins"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Reading"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Rebun Island"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Recife"
 msgstr "������"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redding"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redmond"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Rennes"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Reno"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "������"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 #, fuzzy
 msgid "Reykjavik"
 msgstr "����������/���������"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reynosa"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Rhode Island"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 #, fuzzy
 msgid "Riberalta"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "����"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1881
-#, fuzzy
-msgid "Riga"
-msgstr "�����:"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rijeka"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 #, fuzzy
 msgid "Rimini"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rioja"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "���������� �������� �����"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 #, fuzzy
 msgid "Riyadh"
 msgstr "����/�����"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Roatan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 #, fuzzy
 msgid "Robore"
 msgstr "����"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rodos"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Rogers"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 #, fuzzy
 msgid "Rosario"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Roseglen"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Russia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 #, fuzzy
 msgid "Rutland"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 #, fuzzy
 msgid "Sacramento"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 #, fuzzy
 msgid "Saginaw"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saint Paul"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Salalah"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salem"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salmon"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salta"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "_���"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 #, fuzzy
 msgid "Salvador"
 msgstr "�� ��������"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samos"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "_���"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 #, fuzzy
 msgid "Sana'A"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 #, fuzzy
 msgid "San Angelo"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "San Carlos"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sandberg"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sanderson"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 #, fuzzy
 msgid "San Diego"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 #, fuzzy
 msgid "Sand Point"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sanford"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 #, fuzzy
 msgid "San Francisco"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "������"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Joaquin"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "���������� ��� ��������"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Juan"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 #, fuzzy
 msgid "San Miguel"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 #, fuzzy
 msgid "San Nicholas Island"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 #, fuzzy
 msgid "San Salvador"
 msgstr "�� ��������"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 #, fuzzy
 msgid "San Sebastian"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 #, fuzzy
 msgid "Santa Ana"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 #, fuzzy
 msgid "Santa Maria"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santa Monica"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santarem"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 #, fuzzy
 msgid "Santiago"
 msgstr "�������/���������"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santorini"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 #, fuzzy
 msgid "Sao Luiz"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 #, fuzzy
 msgid "Sao Paulo"
 msgstr "�������/��� �����"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 #, fuzzy
 msgid "Sarajevo"
 msgstr "������/���������"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 #, fuzzy
 msgid "Sarasota"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "_���"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 #, fuzzy
 msgid "Seattle"
 msgstr "���������� US-Letter"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "�������� ���������"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "����/������"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Shearwater"
 msgstr "���������� �������"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "�������:"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Sheridan"
 msgstr "������"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "������� ����������"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 #, fuzzy
 msgid "Sidney"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Silver City"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skopje"
 msgstr "������/������"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Snowshoe Lake"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Sochi"
 msgstr "������"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 #, fuzzy
 msgid "Soda Springs"
 msgstr "�������� �����"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sofia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Soldotna"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Somerset"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "Southampton"
 msgstr "���������������"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "������"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Carolina"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "South Dakota"
 msgstr "���������������"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "������"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "������������"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "State College"
 msgstr "������������ ���:"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "������:"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "������:"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "Stephenville"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 #, fuzzy
 msgid "St. George"
 msgstr "���� �����"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 #, fuzzy
 msgid "St Louis"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "St Paul"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "����� ����������"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "����"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumburgh"
 msgstr "������������"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 #, fuzzy
 msgid "Sungshan/Taipei"
 msgstr "����/������"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 #, fuzzy
 msgid "Sutton"
 msgstr "_���"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 #, fuzzy
 msgid "Swift Current"
 msgstr "�������/������ �������"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 #, fuzzy
 msgid "Sympheropol"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 #, fuzzy
 msgid "Taejon"
 msgstr "����"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Taif"
 msgstr "������"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Tainan"
 msgstr "������"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr "������"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Taiz"
 msgstr "������"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr "������"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "������"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "������"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 #, fuzzy
 msgid "Tampa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "����"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 #, fuzzy
 msgid "Taoyuan"
 msgstr "������"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Taranto"
 msgstr "������"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Tarija"
 msgstr "������"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 #, fuzzy
 msgid "Tegucigalpa"
 msgstr "�������/��������������"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "Texas"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 #, fuzzy
 msgid "The Dalles"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "������"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "������"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tianjin"
 msgstr "������"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Tijuana"
 msgstr "�������/��������"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tirana"
 msgstr "������"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "������"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 #, fuzzy
 msgid "Tokunoshima Island"
 msgstr "����� �������������"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 #, fuzzy
 msgid "Toledo"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 #, fuzzy
 msgid "Toluca"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Topeka"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 #, fuzzy
 msgid "Toronto"
 msgstr "������"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "������:"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torrance"
 msgstr "������"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Torreon"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "�������� ���������"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Toulouse"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trabzon"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 #, fuzzy
 msgid "Trapani"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "���������������"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 #, fuzzy
 msgid "Trieste"
 msgstr "������"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 #, fuzzy
 msgid "Trinidad"
 msgstr "������"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 #, fuzzy
 msgid "Tripoli"
 msgstr "������/�������"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "�_����"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turaif"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turku"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 #, fuzzy
 msgid "Twenthe"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "�_����"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "������� ������� �������"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruapan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 #, fuzzy
 msgid "Urumqi"
 msgstr "����/��������"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 #, fuzzy
 msgid "Utah"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 #, fuzzy
 msgid "Uzhgorod"
 msgstr "������/����������"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vadso"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vagar"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valencia"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 #, fuzzy
 msgid "Valentine"
 msgstr "����/���������"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 #, fuzzy
 msgid "Van"
 msgstr "�����."
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 #, fuzzy
 msgid "Vancouver"
 msgstr "�������/���������"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 #, fuzzy
 msgid "Varadero"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Varna"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "����"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 #, fuzzy
 msgid "Venezia"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 #, fuzzy
 msgid "Venice"
 msgstr "Unicode"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vermont"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "������"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 #, fuzzy
 msgid "Vicenza"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "����� �������:"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 #, fuzzy
 msgid "Vilnius"
 msgstr "������/��������"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 #, fuzzy
 msgid "Vladivostok"
 msgstr "����/�����������"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volkel"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 #, fuzzy
 msgid "Volk Field"
 msgstr "����� _���"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 #, fuzzy
 msgid "Voslau"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 #, fuzzy
 msgid "Waco"
 msgstr "������"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 #, fuzzy
 msgid "Wallops Island"
 msgstr "����� �������"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "�������������"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "������"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Waterloo"
 msgstr "������"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "������"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 #, fuzzy
 msgid "Waterville"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 #, fuzzy
 msgid "Wausau"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Webster City"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "��"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "������"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 #, fuzzy
 msgid "Wendover"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "West Burke"
 msgstr "������� �������"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westfield"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "����� �������������"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "����."
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 #, fuzzy
 msgid "Wien"
 msgstr "��"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 #, fuzzy
 msgid "Williston"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 #, fuzzy
 msgid "Winchester"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 #, fuzzy
 msgid "Windsor"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 #, fuzzy
 msgid "Winnipeg"
 msgstr "�������/�����������"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 #, fuzzy
 msgid "Winslow"
 msgstr "����"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 #, fuzzy
 msgid "Winter Park"
 msgstr "�������� ������ ���������"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 #, fuzzy
 msgid "Wisconsin"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "��"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "����� �����"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "���������:"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "��� �����"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 #, fuzzy
 msgid "Xiamen"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 #, fuzzy
 msgid "Yakutat"
 msgstr "�������/���������"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 #, fuzzy
 msgid "Yakutsk"
 msgstr "����/���������"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 #, fuzzy
 msgid "Yao Airport"
 msgstr "��� ��������"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 #, fuzzy
 msgid "Yekaterinburg"
 msgstr "����/����������������"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 #, fuzzy
 msgid "Yellowknife"
 msgstr "�������/�����������"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 #, fuzzy
 msgid "Yenbo"
 msgstr "������"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zadar"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 #, fuzzy
 msgid "Zagreb"
 msgstr "������/��������"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zanesville"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 #, fuzzy
 msgid "Zaragoza"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 #, fuzzy
 msgid "Zurich"
 msgstr "������/������"
@@ -23773,17 +24491,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "����� ���������"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "������ ���������"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "��������"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "������� �������"
 
@@ -23792,56 +24505,46 @@ msgstr "������� �������"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Word of the Day"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "������� ������"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "�������� ����������� ��������"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "��������� ��� ����������� ��������� ��� ���� ��� ������ �� ����������"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "�����:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "������ ���� ��� ���� ��� RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "���������� ��������"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
+msgid "Add"
 msgstr "_��������"
 
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr " _��������"
-
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "�������"
@@ -23883,11 +24586,47 @@ msgstr "�������� ���������"
 msgid "Printing of Summary failed"
 msgstr "� �������� ��������� �������"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 "�� �������� ������������ ������� ��� ������� �� ������������ �� Bonobo.\n"
 
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " F"
+msgstr ", "
+
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " C"
+msgstr ", "
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "������"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "�����"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "����������"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "������� �������"
@@ -25039,100 +25778,106 @@ msgid "C_elsius"
 msgstr "_�������"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "���� �� ����������� _��������:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "����� ������ �� ��������� �� ���������� ���� ����;"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "�������� ������� ��������� ��� �� ������������:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "��������� ����������� ��������"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "���� �����"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "��� _��������"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "������ _��������� (������������):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "_������ ��������� (������������):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "_�������� ��������� ����� ��� �������"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "�������� ���� ��� _��������"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "�������� _��������� ��������"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "�������� ������������ ��:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "��������"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "��������� ������"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_��������"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_����� ������"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_�����������"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "���������� _��������"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_��� �����"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_���������������"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_������"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "���������� ��� ��� ����������� ��� Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "������� �������"
+msgid "Folder Settings"
+msgstr "��������� ���������"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "�� ���������� Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -25143,6 +25888,37 @@ msgstr "�������� ������������"
 msgid "Cancel Operation"
 msgstr "������� �����������"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"������� � �������� ��� �������:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "������� �������"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "��������"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "�����������"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "����������"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "�����������"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "����������� ��� Evolution"
@@ -25258,6 +26034,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "�������������"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "���������� �����������"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "������� �������"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "������� �������"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "������� �������"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "���������� �����������"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -25287,20 +26088,20 @@ msgstr ""
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "�������� ���� ������ ��� �� ���������� � ������� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "��������� �������"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "�������� ���� ������ ��� �� ���������� � ������� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "���������� �������"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25309,18 +26110,19 @@ msgstr ""
 "��� ���� ������ � �������� ��� �������:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "�������� \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "����� ������� ��� ��� �������� ��� ������� \"%s\";"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"��� ���� ������ � �������� ��� �������:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25329,16 +26131,16 @@ msgstr ""
 "��� ���� ������ � ����������� ��� ������� :\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "����������� ������� \"%s\" ��:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "����������� �������"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -25357,7 +26159,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - ���������� ���� �������"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -25365,7 +26167,7 @@ msgstr ""
 "� ����� ��� ����������� ������� ��� ����� ������� ���\n"
 "��� ��� ���������� ����������."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "���..."
 
@@ -25417,21 +26219,26 @@ msgstr ""
 "��������� �� %s\n"
 "��������� �� ��������%d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "������� �������"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "�� ������ %s ��� �������"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "������ Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "�������� �� �������� ���� �������� ��������"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25440,11 +26247,11 @@ msgstr ""
 "��� ������� ���������� ��� �� ������ �� ��������� ��\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "���������"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25453,17 +26260,17 @@ msgstr ""
 "��������� �� %s.\n"
 "������ �� %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "������ ���� ��� �������� ��� %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "������ ���� �� ������� ��� %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25472,31 +26279,31 @@ msgstr ""
 "��������� �� %s\n"
 "��������� �� �������� 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "��������"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "����� �������:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "�������� ��� ������"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "����� �������:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "�������� ��������� ��� ��������� ��� ���������� �����������"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "�������� ��������� �������"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25504,31 +26311,78 @@ msgstr ""
 "�������� ����������...\n"
 "������� ������ ��� ���������� �������������"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "�������� ��� ������� ����������"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "��� %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "������� �������"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "�������� ���� ������ ���������� ��� ��� �������� ����� ��� ���������"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "��������"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "�������� ���������..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"������ ���� '%s':\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "������������ �������"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "������� ������� %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "������� ������� %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "������� �� %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"��� ���� ������ � ���������� ��� ������������� �������:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -25545,8 +26399,8 @@ msgstr ""
 "��� ����� ������ � ������������ ��� �������� ��� ������ ������������ ��� "
 "Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "���"
@@ -25567,43 +26421,43 @@ msgstr "�� ����� ��� ������� ��� ������ �� �������� ��������."
 msgid "'.' and '..' are reserved folder names."
 msgstr "�� '.' and '..' ����� ��������� ������� �������."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "�� Bug buddy ��� ������� ��� $PATH ���."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "��� ���� ������ � �������� ��� Bug buddy"
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "���� ��� Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "�������� ��� ������..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "�������� ��� ������ ��� ������ �� ��������"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "���������� ���� �����������"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "�������� ��� ������ ��� �� �������� �� ��� ����������:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "������� �_���� �������"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "������� �_���� �������"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "����� ����� �������"
 
@@ -25638,7 +26492,7 @@ msgstr ""
 "�� Ximian Evolution ����� ����� �������. ����� ���� ��� ������� ��� �� "
 "����������."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25650,12 +26504,12 @@ msgstr ""
 "�� ������ ��� �� ������� ������������� �����:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "��� ���� ������ � ���������� ������� ����������� -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25666,23 +26520,19 @@ msgstr ""
 "������������� ����������. �� ��������� �� ������������ �� Evolution ���\n"
 "�� �� ���������� ���� ��� �� ����� ���� �������� ��� ��������."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "��"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "�� ������ ����������"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "��� ���� ������ � ������� ��� OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "��� ������� � ���� ��������� ���������"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "������ ������"
 
@@ -25707,95 +26557,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "�� ��� ���������"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "����������� ����� �����������"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "����������� ��� ����������� ������ ������������ ��:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "����� ���������"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "�������� ��� ������������ �� ����� ���������"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "������ ���������"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "�������� ��� ������������ �� ������ ���������"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_��� �����..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "���������� ���� ������ ������������"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "_�������� ����� ��� ������..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "�������� ����� ��� ������ ������������"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "_����������� ��� ������..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "����������� ������ ������������"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "�_������� ������� ������������"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "�������� ������� ������������"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "����������� �����������"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "����������� ����������� ����������� ��:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "������� ��� ������� ��������� �� ���� ��� ����������"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "������� �� _��� ��������"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "������� ��� ������� ��������� �� ���� ��� ���������� �� ��� ��������"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_�����������"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "����������� �����������"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "_��������"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "�������� ����� ��� ����������� ��� ��� ������ ������������"
 
@@ -25807,10 +26657,6 @@ msgstr "������ ���� ��� ���������� ��� ������������."
 msgid "Shortcuts"
 msgstr "������������"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "�����������"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -25876,10 +26722,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ���� �����������)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<����� ���� ��� ��� �� ��������� ������>"
 
@@ -25920,67 +26767,67 @@ msgstr ""
 "�� ������ ��� �� ������� ������������� �����:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "������ CORBA"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "����� �������"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "�� ������ ����������"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "���� ��� ���������"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "����� ���������"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "��� �������"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "� ����� ��� �������������"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "� ���������� ��� �������������"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "��������� ������"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "����������"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "�� ������ URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "���� �����������"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "��� ���� ������ ��������� �����"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "� ������� ���������� ���� �������"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "����� �������:"
@@ -26114,51 +26961,83 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 "��� ���� ������ ��� �� Evolution �� ������� �������� ��� �� �������� ������:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "�� Evolution ���� ������������..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "�� ��� ��������� � �������"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "��� ���� ������ � �������� ��� ���������� ��� Ximian Evolution."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 "��� ���� ������ � ������������ ��� ������������� ��� Ximian Evolution: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "�������������� ������ �����������"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "�������� ���������"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "�������� ��� ������� ����������"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "�������� ���� ��� ������������ ��������� ��� ��� �� ��������� �� ������."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "��� ���� ������ � ������������ ��� ���������� ���������� Bonobo"
 
@@ -26272,11 +27151,11 @@ msgstr "� �������� ���"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "�_��������"
 
@@ -26398,8 +27277,8 @@ msgstr "�������� ����� ��� ���������"
 msgid "Delete this item"
 msgstr "�������� ����� ��� ���������"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "�������� ������ ���������"
 
@@ -26439,7 +27318,7 @@ msgstr "����������� ����� ��� ��������� ���� �����"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_������"
 
@@ -26504,19 +27383,19 @@ msgstr "�������� �� i_Calendar"
 msgid "Forward this item via email"
 msgstr "�������� ����� ��� ��������� ���� email"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "��������� ��� ���������� ����������� ��� ��� �����������"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "�_������� ����������"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "��������������� _����������"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "�������������� ��� ��������� ��� ���� �� ��������"
 
@@ -26524,10 +27403,6 @@ msgstr "�������������� ��� ��������� ��� ���� �� ��������"
 msgid "Customise My Evolution"
 msgstr "������������� ��� ����� ��� Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "�����"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "������� ��� ��������� ����������� ������������"
@@ -26688,7 +27563,7 @@ msgstr "����� ��������� ���� ����"
 msgid "_Expunge"
 msgstr "_��������"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_�������"
 
@@ -27105,7 +27980,7 @@ msgstr "����������� ������"
 msgid "_Quoted"
 msgstr "�� �������"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_��������"
 
@@ -27120,12 +27995,12 @@ msgstr "�������� ��� ���������"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_��������"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_�������"
 
@@ -27313,7 +28188,7 @@ msgstr "�_������..."
 msgid "_Reply-To Field"
 msgstr "_����� ���������"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_�������"
 
@@ -27462,111 +28337,120 @@ msgid "Move this folder to another place"
 msgstr "���������� ����� ��� ������� �� ���� ����"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "���������� _���� �������.."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "������� �� ��� ��������"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "������� ����� ��� ������� �� ���� ��������"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "�������� / ����"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "�������� ��������� �� ������� ��� ���� ����"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "�������� ����������� ������� �� �� Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "������� ������� �����������"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "������� _������� �����������"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "������� ��� �������� �� ����� ��� Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "��������"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "�������� ��� ��������� ��� ������� ������������"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "�������� ��� ��������� ��� ������� ������������"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "�������� ��� �������� ��� ������."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "������� ����������� �������"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "������ ��������� ��� �� Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_���� ��� Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_���������..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_������ �������"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_�������� ���� ������..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_��������..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_����������..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_���"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "���� _�������"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "��������� ���������� _�������..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_�����������..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_�������� / ����"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_����������"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "_������ ������������"
 
@@ -27651,21 +28535,21 @@ msgstr ""
 "������� ���� ����� ��� �������� ��� ���� ������� ����:\n"
 "�� �� ���� ������� ��� ��������� ������ ��������� ��� �����."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_�������� �������"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "_�������� �������"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "���������� ��������"
 
@@ -27787,16 +28671,21 @@ msgstr "������������ ����������"
 msgid "Save Search"
 msgstr "���������� ����������"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "���������� ����������"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "������� ���� ������������� �����������"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "��� �������������..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "����������"
@@ -27818,21 +28707,21 @@ msgstr "������"
 msgid "Don't show this message again."
 msgstr "�� ��� �������������� ���� �� ������"
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "������ ����"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "����������"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "����������"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "������ ����"
 
@@ -27858,6 +28747,198 @@ msgstr "init_corba(): ��� ���� ������ � ������������ ��� GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "����� ������� �����������"
+
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "��� ���� ������ � ��������� ��� sendmail: %s: �� ������ ��� ��������"
+
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "��������� ������������ ��������� ����������� Evolution."
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "���������� ��� �� ��������� ��������� �����������."
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "��_�� ������:"
+
+#~ msgid "_End of day:"
+#~ msgstr "_����� ������:"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "����� �����������"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr ""
+#~ "��� ���� ������ � �������� ��� ���������: ��� ������� ���� ������� ��� "
+#~ "��������"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr ""
+#~ "��� ���� ������ � �������� ��� ���������: ��� ���� ����� ������� ���������"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "��� ���� ������ � �������� ��� ���������: �������� ����������� ��������� "
+#~ "�� �� GPG/PGP: %s"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr ""
+#~ "��� ���� ������ � ���������� ��� ���������: ��� ������� ���� ������� ��� "
+#~ "����������"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "��� ���� ������ � ���������� ��� ���������: �������� ����������� "
+#~ "��������� �� �� GPG/PGP: %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr ""
+#~ "��� ���� ������ � ������������� ��� ���������: ��� ������� ���� ������� "
+#~ "��� �������������"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "��� ���� ������ � ������������� ��� ���������: ��� ������ �������"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "��� ���� ������ � ������������� ��� ���������: �������� ����������� "
+#~ "��������� �� �� GPG/PGP: %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "��� ���� ������ � ���������������� ��� ���������:  ��� ������� ciphertext "
+#~ "��� ����������������"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr ""
+#~ "��� ���� ������ � ���������������� ��� ���������: ��� ������ �������"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "��� ���� ������ � ���������������� ��� ���������: �������� ����������� "
+#~ "��������� �� �� GPG/PGP: %s"
+
+#~ msgid "%s server %s"
+#~ msgstr "%s ����������� %s"
+
+#~ msgid "No such message: %s"
+#~ msgstr "������ ������ ������ %s"
+
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr ""
+#~ "��� �������� �� ����������� �������� ��� ����� ��� ���� ������������."
+
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "��� ���� ������ � ������������: %s: %s"
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "���������"
+
+#~ msgid ""
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
+#~ msgstr ""
+#~ "��� ���� ������ � ���� ��� ������������ ��� ������� �������� "
+#~ "������������:\n"
+#~ "%s\n"
+#~ "��� �� ������������ ����������"
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "_�����������"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "���"
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "������� �����������"
+
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "������/�������"
+
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "�������"
+
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "��������"
+
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "��' �������"
+
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "���������"
+
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "������ ���������:"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "�������� ���� ����� ��� ���������"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "_�������� HTML:"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "����� �������:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "_�������� HTML:"
+
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "������"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "���������"
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "��� ���� ������ � ���������� ������������ ������������� PGP."
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "��� ���� ������ � ���������� ������������ ���������������� PGP."
+
+#~ msgid "Moving"
+#~ msgstr "����������"
+
+#~ msgid "Copying"
+#~ msgstr "���������"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "������ ���������:"
+
+#, fuzzy
+#~ msgid "Riga"
+#~ msgstr "�����:"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_��������"
+
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr " _��������"
+
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "����� ������� ��� ��� �������� ��� ������� \"%s\";"
+
 #~ msgid "Card: "
 #~ msgstr "�����:"
 
@@ -28133,19 +29214,20 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ "����������� ldap. "
 
 #~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
 #~ msgstr ""
 #~ "� ����������� ldap ������������ ����� ��� ���������� ��� �� ������ ����� "
-#~ "������ ���������������� �� ��� ���������. ������������� �� ��� ����������� "
-#~ "������� ��� ������������ �����������."
+#~ "������ ���������������� �� ��� ���������. ������������� �� ��� "
+#~ "����������� ������� ��� ������������ �����������."
 
 #~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
 #~ msgstr ""
 #~ "����� ����� � ������� ������ ��� ���� ��� ����������� ��� ���� ���������� "
-#~ "ldap. ������������� �� ��� ����������� ������� ��� ������������ �����������."
+#~ "ldap. ������������� �� ��� ����������� ������� ��� ������������ "
+#~ "�����������."
 
 #~ msgid "This is the name of the server where your addressbook is located."
 #~ msgstr ""
@@ -28262,7 +29344,8 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgstr "��� ����� ������ � ���� ��� ��������� ��� ��� ���������� POP %s: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
 #~ msgstr ""
 #~ "�� ������� ���� �� ����� ������� ���� ���������� ��� �� ��� ����� "
 #~ "������������ Kerberos 4."
@@ -28276,9 +29359,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "(Unknown)"
 #~ msgstr "(�������)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "���������� �������� ��� ��� ���������� ���: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "��� ���� ������ � ������ ��� ������ '���' ���� ���������"
 
@@ -28364,10 +29444,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgstr "��������� ��� �� ���������� ��������� ���������."
 
 #, fuzzy
-#~ msgid "Update now"
-#~ msgstr "��������"
-
-#, fuzzy
 #~ msgid "Update every "
 #~ msgstr "���_����� ��������������"
 
@@ -28391,34 +29467,18 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgstr "���������� �������� ��� ��� ���������"
 
 #, fuzzy
-#~ msgid "Mark as Needing Reply"
-#~ msgstr "�������� ����������"
-
-#, fuzzy
 #~ msgid "Mark as Not Needing Reply"
 #~ msgstr "�������� ����������"
 
 #~ msgid "Filter on Mailing List"
 #~ msgstr "������ ���� ����� ������������"
 
-#~ msgid "Indexing:"
-#~ msgstr "����������:"
-
 #~ msgid "Mailbox Format"
 #~ msgstr "����� Mailbox"
 
-#~ msgid " (default)"
-#~ msgstr " (��' �������)"
-
-#~ msgid "Mail Settings"
-#~ msgstr "��������� ���������"
-
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "���� �� ������ ��� �������� �������� ����������:"
 
-#~ msgid "Account"
-#~ msgstr "�����������"
-
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr ""
 #~ "�� ������� ����� ������������� ���� ����� ��� ���� ��� �������� "
@@ -28433,24 +29493,15 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "Display"
 #~ msgstr "�������"
 
-#~ msgid "Drafts"
-#~ msgstr "��������"
-
 #~ msgid "Edit..."
 #~ msgstr "�����������..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "������ ��������� HTML:"
-
 #~ msgid "News"
 #~ msgstr "��������"
 
 #~ msgid "Select Filter Log file..."
 #~ msgstr "�������� ������ ����������� �������"
 
-#~ msgid "Sent"
-#~ msgstr "�����������"
-
 #~ msgid "Sources"
 #~ msgstr "�����"
 
@@ -28499,9 +29550,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "All _folders:"
 #~ msgstr "���� �� _�������"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "���� �� ����������� _��������:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "_�������� �������:"
 
@@ -28519,19 +29567,9 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "Factory for the Notes control"
 #~ msgstr "���������� ��� �� ��������� �������� Evolution"
 
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "������� � �������� ��� �������:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(����� �����)"
 
@@ -28564,7 +29602,8 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr ""
-#~ "������������ � �������������� ������������ ������������ ��� ����� �����������"
+#~ "������������ � �������������� ������������ ������������ ��� ����� "
+#~ "�����������"
 
 #~ msgid "New Message"
 #~ msgstr "��� ������"
@@ -28602,12 +29641,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "Sear_ch"
 #~ msgstr "���_������"
 
-#~ msgid "Other Contacts"
-#~ msgstr "������ ������"
-
-#~ msgid "(none)"
-#~ msgstr "(������)"
-
 #~ msgid "Co_ntacts:"
 #~ msgstr "_������:"
 
@@ -28629,260 +29662,20 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "_Mobile"
 #~ msgstr "_������"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "����� ������� ��� ������\n"
-#~ "�� ��������� � �����;"
-
 #~ msgid "Republic Of Korea"
 #~ msgstr "�����"
 
 #~ msgid "Republic Of Moldova"
 #~ msgstr "��������"
 
-#~ msgid "Click here to add an attendee"
-#~ msgstr "����� ���� ��� ��� �� ���������� ���� ��������������"
-
 #~ msgid "The journal entry has changed. Send an updated version?"
 #~ msgstr ""
-#~ "� ���������� ��� ����������� ���� �������. �� ��������� ����������� ������;"
-
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
-
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "� ��������� �������: <b>"
-
-#~ msgid "Task begins: <b>"
-#~ msgstr "� ������� ������� ���� : <b>"
-
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "����������� ���������/������������� ������ �������: <b>"
-
-#~ msgid "Begins: <b>"
-#~ msgstr "������� ����:<b>"
-
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "� ��������� ��������� ����: <b>"
-
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "�� ����������� �������������� ���������� ����: <b>"
-
-#~ msgid "Ends: <b>"
-#~ msgstr "���������� ����:<b>"
-
-#~ msgid "Task Completed: <b>"
-#~ msgstr "� ������� ������������: <b>"
-
-#~ msgid "Task Due: <b>"
-#~ msgstr "���� ��������: <b>"
-
-#~ msgid "iCalendar Information"
-#~ msgstr "����������� iCalendar"
-
-#~ msgid "iCalendar Error"
-#~ msgstr "������ iCalendar"
-
-#~ msgid "An unknown person"
-#~ msgstr "��� ������� �����"
-
-#~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
-#~ msgstr ""
-#~ "<br> �������� �������� ��� �������� �����������, ��� �������� ���� ��� "
-#~ "�������� ��� �� �������� �����."
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>������</i>"
-
-#~ msgid "Choose an action:"
-#~ msgstr "�������� ��� ��������:"
-
-#~ msgid "Accept"
-#~ msgstr "�������"
-
-#~ msgid "Tentatively accept"
-#~ msgstr "����������� �������"
-
-#~ msgid "Decline"
-#~ msgstr "��������"
-
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "�������� ����������� ��������������"
-
-#~ msgid "Update respondent status"
-#~ msgstr "�������� ���������� ���������"
-
-#~ msgid "Send Latest Information"
-#~ msgstr "�������� ���������� �����������"
-
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> ���� ����������� ����������� ����������."
-
-#~ msgid "Meeting Information"
-#~ msgstr "����������� ����������"
-
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> ��������� ��� �������� ��� �� ��� ���������."
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "������� ����������"
-
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> �� ����� �� ��������� �� ��� ��������� ���������."
-
-#~ msgid "Meeting Update"
-#~ msgstr "�������� ����������"
-
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr ""
-#~ "<b>%s</b> �� ����� �� ��������� ��� ���������� ����������� ����������."
-
-#~ msgid "Meeting Update Request"
-#~ msgstr "����_�� ��������� ����������"
-
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> ���� ��������� �� ��� ��������� �� ���������."
-
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> ������� ��� ���������."
-
-#~ msgid "Meeting Cancellation"
-#~ msgstr "������� ����������"
-
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "�/� <b>%s</b> ������� ��� ���������� ������."
-
-#~ msgid "Bad Meeting Message"
-#~ msgstr "��������� ������ ����������"
-
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> ���� ����������� ����������� ��������."
-
-#~ msgid "Task Information"
-#~ msgstr "����������� ��������"
-
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> ��� ���� ������� �� ���������� ��� �������"
-
-#~ msgid "Task Proposal"
-#~ msgstr "������� ��������"
-
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> �� ����� �� ��������� �� ��� ��������� �������."
-
-#~ msgid "Task Update"
-#~ msgstr "�������� ��������"
-
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> �� ����� ��� ��������� ���������� ��������."
-
-#~ msgid "Task Update Request"
-#~ msgstr "������ _�������� ��������"
-
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> �������� �� ��� ������� ��������"
-
-#~ msgid "Task Reply"
-#~ msgstr "�������� ��������"
-
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> ���� �������� ��� �������."
-
-#~ msgid "Task Cancellation"
-#~ msgstr "������� ��������"
-
-#~ msgid "Bad Task Message"
-#~ msgstr " ������ ��������"
-
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> ���� ���������� ����������� ��������������"
-
-#~ msgid "Free/Busy Information"
-#~ msgstr "����������� ��������������"
-
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "�/� <b>%s</b> ���� ����������� ��������������."
-
-#~ msgid "Free/Busy Request"
-#~ msgstr "������ ��������������"
-
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "�/� <b>%s</b> �������� ���� ������ ��������������."
-
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "��������� ������ ��������������"
-
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "�� ������ �������� ���� �������� ��� ��� ��������������"
-
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "�� �������������� ������ ��� �������� ������ ������ �����������"
-
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr ""
-#~ "�� �������������� ������ �������� �������� ��� ��� ������� �� ����������"
-
-#~ msgid "Event information"
-#~ msgstr "����������� ���������"
-
-#~ msgid "Task information"
-#~ msgstr "����������� ��������"
-
-#~ msgid "Journal information"
-#~ msgstr "����������� �����������"
-
-#~ msgid "Free/Busy information"
-#~ msgstr "���������� ��������������"
-
-#~ msgid "Calendar information"
-#~ msgstr "����������� �����������"
+#~ "� ���������� ��� ����������� ���� �������. �� ��������� ����������� "
+#~ "������;"
 
 #~ msgid "iCalendar information"
 #~ msgstr "����������� iCalendar"
 
-#~ msgid "Status: %s"
-#~ msgstr "_���������: %s"
-
-#~ msgid "Percent Complete: %i"
-#~ msgstr "%i ������������"
-
-#~ msgid "Categories: %s"
-#~ msgstr "����������: %s"
-
-#~ msgid "Contacts: "
-#~ msgstr "������: "
-
 #~ msgid "This is an encrypted message part"
 #~ msgstr "���� �� ������ ��� ��������� ����� ���������������"
 
@@ -28919,36 +29712,14 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "Message was sent"
 #~ msgstr "�� ������ ��������"
 
-#~ msgid "Subject is %s"
-#~ msgstr "�� ���� ����� %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "%s ����� ������������"
-
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: �����������"
 
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "���� �� ������ ����� ������� �������������. ����� ���� ��� ��������� �� �� "
-#~ "������� ��� ������������ �����������."
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr ""
 #~ "�� Evolution ��� ������ �� ����������� ����� ��� ���� �������������� "
 #~ "���������."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr ""
-#~ "���� �� ������ ����� ������� ������������� ��� ������� �� ����� ���������."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "���� �� ������ ����� ������� ������������� ��� ��� ������� �� ����� "
-#~ "���������."
-
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>��� ���� ������ � ������� �� ��� ���������� ������</b></dd>"
 
@@ -28957,18 +29728,3 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 
 #~ msgid "�C"
 #~ msgstr "�C"
-
-#~ msgid "kph"
-#~ msgstr "kph"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "kilometers"
-#~ msgstr "����������"
-
-#~ msgid "Outbox"
-#~ msgstr "����������"
diff --git a/po/en_AU.po b/po/en_AU.po
index c2a3b38a34..18ba28ad56 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr ""
@@ -45,7 +45,7 @@ msgid "Email"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr ""
 
@@ -55,7 +55,7 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr ""
@@ -63,8 +63,8 @@ msgstr ""
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr ""
 
@@ -74,12 +74,12 @@ msgid "Bus"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr ""
 
@@ -90,8 +90,8 @@ msgstr ""
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr ""
 
@@ -106,18 +106,18 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr ""
@@ -127,13 +127,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr ""
 
@@ -142,43 +142,43 @@ msgid "Bus 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr ""
@@ -190,14 +190,14 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr ""
@@ -335,7 +335,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr ""
 
@@ -356,31 +356,31 @@ msgstr ""
 msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 msgid "Error performing search"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 msgid "Could not parse query string"
 msgstr ""
 
@@ -426,102 +426,129 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
+#: addressbook/gui/component/addressbook-config.c:197
+msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "Contact _List"
+#: addressbook/gui/component/addressbook-config.c:216
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1174
+msgid "Error retrieving schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1182
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1638
+msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Could not initialise gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+#, fuzzy
+msgid "Other Contacts"
+msgstr "_Other Organiser"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr ""
@@ -547,48 +574,57 @@ msgid ""
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 msgid "Email is"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr ""
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr ""
 
@@ -634,88 +670,52 @@ msgstr ""
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:197
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:215
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-msgid "Could not query for schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1169
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1613
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1689
-msgid "Extra Completion folders"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-msgid "<< Fewer Options"
+msgid "1234"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:3
-msgid "<- _Remove"
+msgid "1:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1234"
+msgid "2:30"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:5
-msgid "1:00"
+msgid "3268"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
+msgid "380"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
-msgid "3268"
+msgid "389"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:8
-msgid "380"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "389"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "5:00"
+msgid "666"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "636"
+msgid "<- _Remove"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "666"
+msgid "<< Fewer Options"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:13
@@ -726,8 +726,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr ""
 
@@ -810,8 +810,8 @@ msgstr ""
 msgid "Mappings"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr ""
 
@@ -985,14 +985,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1012,8 +1012,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1044,7 +1044,7 @@ msgid "Using email address"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1052,7 +1052,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr ""
 
@@ -1093,7 +1093,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1198,10 +1198,12 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr ""
 
@@ -1318,7 +1320,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr ""
 
@@ -1327,7 +1329,7 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr ""
 
@@ -1384,11 +1386,12 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr ""
 
@@ -1417,7 +1420,7 @@ msgid "_Web page address:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr ""
 
@@ -1922,12 +1925,11 @@ msgid "Laos"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
@@ -1936,7 +1938,7 @@ msgid "Lesotho"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr ""
 
@@ -1945,12 +1947,12 @@ msgid "Liechtenstein"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr ""
 
@@ -1983,7 +1985,7 @@ msgid "Mali"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr ""
 
@@ -2008,7 +2010,7 @@ msgid "Mayotte"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr ""
 
@@ -2033,7 +2035,7 @@ msgid "Montserrat"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr ""
 
@@ -2058,7 +2060,7 @@ msgid "Nepal"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr ""
 
@@ -2071,12 +2073,12 @@ msgid "New Caledonia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr ""
 
@@ -2093,7 +2095,7 @@ msgid "Niue"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr ""
 
@@ -2102,17 +2104,17 @@ msgid "Northern Mariana Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr ""
 
@@ -2125,7 +2127,7 @@ msgid "Palestinian Territory"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr ""
 
@@ -2134,12 +2136,12 @@ msgid "Papua New Guinea"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr ""
 
@@ -2152,22 +2154,22 @@ msgid "Pitcairn"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr ""
 
@@ -2176,7 +2178,7 @@ msgid "Reunion"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr ""
 
@@ -2213,7 +2215,7 @@ msgid "Sao Tome And Principe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr ""
 
@@ -2230,17 +2232,17 @@ msgid "Sierra Leone"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr ""
 
@@ -2253,7 +2255,7 @@ msgid "Somalia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr ""
 
@@ -2262,7 +2264,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr ""
 
@@ -2283,7 +2285,7 @@ msgid "Sudan"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr ""
 
@@ -2296,17 +2298,17 @@ msgid "Swaziland"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr ""
 
@@ -2343,7 +2345,7 @@ msgid "Tunisia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr ""
 
@@ -2364,7 +2366,7 @@ msgid "Uganda"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr ""
 
@@ -2373,7 +2375,7 @@ msgid "United Arab Emirates"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr ""
 
@@ -2382,7 +2384,7 @@ msgid "United States Minor Outlying Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr ""
 
@@ -2395,12 +2397,12 @@ msgid "Vanuatu"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr ""
 
@@ -2421,12 +2423,12 @@ msgid "Western Sahara"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr ""
 
@@ -2439,26 +2441,32 @@ msgid "Zimbabwe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2485,11 +2493,11 @@ msgstr ""
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2622,11 +2630,11 @@ msgid "contact-list-editor"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2699,21 +2707,21 @@ msgid "Error getting book view"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr ""
 
@@ -2722,7 +2730,7 @@ msgid "Repository offline"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr ""
 
@@ -2740,53 +2748,66 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+msgid "Authentication Failed"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+msgid "Authentication Required"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 msgid "Display Cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2794,19 +2815,19 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 msgid "Move card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Copy card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 msgid "Move cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 msgid "Copy cards to"
 msgstr ""
 
@@ -2870,93 +2891,99 @@ msgstr ""
 msgid "Other Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Addressbook Sources..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Copy to folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Move to folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 msgid "Current View"
 msgstr ""
@@ -2965,7 +2992,7 @@ msgstr ""
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -2973,7 +3000,7 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3113,7 +3140,7 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr ""
 
@@ -3123,7 +3150,7 @@ msgid "Orientation"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr ""
 
@@ -3197,29 +3224,33 @@ msgstr ""
 msgid "_Font..."
 msgstr ""
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr ""
 
@@ -3259,43 +3290,35 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3307,10 +3330,23 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr ""
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Cannot initialise Evolution's mail component."
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3346,7 +3382,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr ""
@@ -3366,15 +3402,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Could not initialise GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3390,7 +3426,7 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr ""
 
@@ -3429,14 +3465,16 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr ""
 
@@ -3457,27 +3495,32 @@ msgid "W"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr ""
 
@@ -3489,11 +3532,12 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3508,12 +3552,14 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr ""
 
@@ -3533,56 +3579,58 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "_Meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 msgid "New All Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "_Appointment"
 msgstr ""
 
@@ -3789,7 +3837,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -3818,7 +3866,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr ""
 
@@ -3846,77 +3894,77 @@ msgstr ""
 msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Calendar and Tasks Settings"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+msgid "Alerts"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Color for overdue tasks"
+msgid "Calendar and Tasks Settings"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Color for tasks due today"
-msgstr "Colours for display"
+msgid "Color for overdue tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Days"
-msgstr ""
+msgid "Color for tasks due today"
+msgstr "Colours for display"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/dialogs/recurrence-page.c:1125
-msgid "Friday"
+msgid "Day _ends:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Hours"
+msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Minutes"
+#: calendar/gui/dialogs/recurrence-page.c:1125
+msgid "Friday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.c:1121
-msgid "Monday"
+msgid "Hours"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/recurrence-page.c:1126
-msgid "Saturday"
+msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/recurrence-page.c:1121
+msgid "Monday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Show week _numbers in date navigator"
+msgid "S_un"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
+#: calendar/gui/dialogs/recurrence-page.c:1126
+msgid "Saturday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
+msgid "Sh_ow a reminder"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Show week _numbers in date navigator"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Colours for display"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "T_hu"
-msgstr ""
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
+msgid "T_hu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
@@ -3946,78 +3994,90 @@ msgid "Tuesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/recurrence-page.c:1123
-msgid "Wednesday"
+msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: ui/evolution-calendar.xml.h:24
-msgid "Work Week"
+#: calendar/gui/dialogs/recurrence-page.c:1123
+msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "_12 hour (AM/PM)"
+#: ui/evolution-calendar.xml.h:24
+msgid "Work Week"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "_24 hour"
+msgid "Work days:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "_Ask for confirmation when deleting items"
+msgid "_12 hour (AM/PM)"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "_Compress weekends in month view"
+msgid "_24 hour"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "_Display"
+msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
+msgid "_Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "_Fri"
+msgid "_Day begins:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
-msgid "_General"
+msgid "_Display"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "_Hide completed tasks after"
+msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Mon"
+#: mail/mail-config.glade.h:161
+msgid "_General"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "_Overdue tasks:"
+msgid "_Hide completed tasks after"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Sat"
+msgid "_Mon"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "_Show appointment end times in week and month views"
+msgid "_Overdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Time divisions:"
+msgid "_Sat"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "_Wed"
+msgid "_Show appointment end times in week and month views"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+msgid "_Time divisions:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "_Tue"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "_Wed"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "before every appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4100,40 +4160,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4191,27 +4272,27 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
@@ -4258,7 +4339,7 @@ msgid "Pu_blic"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr ""
 
@@ -4280,19 +4361,19 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4303,49 +4384,55 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
+msgid "Click here to add an attendee"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
+msgid "Common Name"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
+msgid "Delegated From"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
+msgid "Delegated To"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
+msgid "Language"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
+msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "Role"
+msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
-msgid "Status"
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -4360,14 +4447,10 @@ msgid "_Change Organizer"
 msgstr "_Change Organiser"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Other Organiser"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4547,7 +4630,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr ""
 
@@ -4559,19 +4642,19 @@ msgstr ""
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr ""
 
@@ -4583,22 +4666,77 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 msgid "_Save as..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4606,20 +4744,20 @@ msgstr ""
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4627,32 +4765,33 @@ msgstr ""
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
 
@@ -4660,47 +4799,48 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr ""
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr ""
 
@@ -4745,11 +4885,13 @@ msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr ""
 
@@ -4788,7 +4930,7 @@ msgid "_Publish Free/Busy Information"
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 msgid "_Configure..."
 msgstr ""
 
@@ -4797,7 +4939,7 @@ msgid "_Configure Pilot..."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr ""
 
@@ -4822,71 +4964,383 @@ msgid "Delete _All Occurrences"
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr ""
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr ""
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:903
+msgid "Status:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1354
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+msgid "Object could not be found\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 msgid "Select Calendar Folder"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 msgid "Select Tasks Folder"
 msgstr ""
 
@@ -4927,93 +5381,92 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
-msgid "Needs Action"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr ""
-
 #: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
+msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr ""
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5025,63 +5478,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr ""
 
@@ -5100,15 +5553,20 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Could not close temporary folder: %s"
+
+#: calendar/gui/e-tasks.c:558
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 msgid "Expunging"
 msgstr ""
 
@@ -5120,17 +5578,17 @@ msgstr ""
 msgid "_Delete this Appointment"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
@@ -5191,19 +5649,51 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:398
+msgid "Updated"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:406
+msgid "Refresh"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr ""
 
@@ -5392,12 +5882,45 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr ""
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2324
+#, c-format
+msgid "Priority: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr ""
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr ""
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr ""
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5428,8 +5951,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr ""
 
@@ -5481,6 +6004,10 @@ msgstr ""
 msgid "Imports vCalendar files into Evolution"
 msgstr ""
 
+#: calendar/importers/icalendar-importer.c:424
+msgid "Reminder!!"
+msgstr ""
+
 #: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr ""
@@ -5569,8 +6096,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -6497,639 +7024,651 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
-msgid "Asia/Magadan"
+msgid "Asia/Macau"
 msgstr ""
 
 #: calendar/zones.h:231
-msgid "Asia/Manila"
+msgid "Asia/Magadan"
 msgstr ""
 
 #: calendar/zones.h:232
-msgid "Asia/Muscat"
+msgid "Asia/Makassar"
 msgstr ""
 
 #: calendar/zones.h:233
-msgid "Asia/Nicosia"
+msgid "Asia/Manila"
 msgstr ""
 
 #: calendar/zones.h:234
-msgid "Asia/Novosibirsk"
+msgid "Asia/Muscat"
 msgstr ""
 
 #: calendar/zones.h:235
-msgid "Asia/Omsk"
+msgid "Asia/Nicosia"
 msgstr ""
 
 #: calendar/zones.h:236
-msgid "Asia/Phnom_Penh"
+msgid "Asia/Novosibirsk"
 msgstr ""
 
 #: calendar/zones.h:237
-msgid "Asia/Pontianak"
+msgid "Asia/Omsk"
 msgstr ""
 
 #: calendar/zones.h:238
-msgid "Asia/Pyongyang"
+msgid "Asia/Oral"
 msgstr ""
 
 #: calendar/zones.h:239
-msgid "Asia/Qatar"
+msgid "Asia/Phnom_Penh"
 msgstr ""
 
 #: calendar/zones.h:240
-msgid "Asia/Rangoon"
+msgid "Asia/Pontianak"
 msgstr ""
 
 #: calendar/zones.h:241
-msgid "Asia/Riyadh"
+msgid "Asia/Pyongyang"
 msgstr ""
 
 #: calendar/zones.h:242
-msgid "Asia/Saigon"
+msgid "Asia/Qatar"
 msgstr ""
 
 #: calendar/zones.h:243
-msgid "Asia/Sakhalin"
+msgid "Asia/Qyzylorda"
 msgstr ""
 
 #: calendar/zones.h:244
-msgid "Asia/Samarkand"
+msgid "Asia/Rangoon"
 msgstr ""
 
 #: calendar/zones.h:245
-msgid "Asia/Seoul"
+msgid "Asia/Riyadh"
 msgstr ""
 
 #: calendar/zones.h:246
-msgid "Asia/Shanghai"
+msgid "Asia/Saigon"
 msgstr ""
 
 #: calendar/zones.h:247
-msgid "Asia/Singapore"
+msgid "Asia/Sakhalin"
 msgstr ""
 
 #: calendar/zones.h:248
-msgid "Asia/Taipei"
+msgid "Asia/Samarkand"
 msgstr ""
 
 #: calendar/zones.h:249
-msgid "Asia/Tashkent"
+msgid "Asia/Seoul"
 msgstr ""
 
 #: calendar/zones.h:250
-msgid "Asia/Tbilisi"
+msgid "Asia/Shanghai"
 msgstr ""
 
 #: calendar/zones.h:251
-msgid "Asia/Tehran"
+msgid "Asia/Singapore"
 msgstr ""
 
 #: calendar/zones.h:252
-msgid "Asia/Thimphu"
+msgid "Asia/Taipei"
 msgstr ""
 
 #: calendar/zones.h:253
-msgid "Asia/Tokyo"
+msgid "Asia/Tashkent"
 msgstr ""
 
 #: calendar/zones.h:254
-msgid "Asia/Ujung_Pandang"
+msgid "Asia/Tbilisi"
 msgstr ""
 
 #: calendar/zones.h:255
-msgid "Asia/Ulaanbaatar"
+msgid "Asia/Tehran"
 msgstr ""
 
 #: calendar/zones.h:256
-msgid "Asia/Urumqi"
+msgid "Asia/Thimphu"
 msgstr ""
 
 #: calendar/zones.h:257
-msgid "Asia/Vientiane"
+msgid "Asia/Tokyo"
 msgstr ""
 
 #: calendar/zones.h:258
-msgid "Asia/Vladivostok"
+msgid "Asia/Ujung_Pandang"
 msgstr ""
 
 #: calendar/zones.h:259
-msgid "Asia/Yakutsk"
+msgid "Asia/Ulaanbaatar"
 msgstr ""
 
 #: calendar/zones.h:260
-msgid "Asia/Yekaterinburg"
+msgid "Asia/Urumqi"
 msgstr ""
 
 #: calendar/zones.h:261
-msgid "Asia/Yerevan"
+msgid "Asia/Vientiane"
 msgstr ""
 
 #: calendar/zones.h:262
-msgid "Atlantic/Azores"
+msgid "Asia/Vladivostok"
 msgstr ""
 
 #: calendar/zones.h:263
-msgid "Atlantic/Bermuda"
+msgid "Asia/Yakutsk"
 msgstr ""
 
 #: calendar/zones.h:264
-msgid "Atlantic/Canary"
+msgid "Asia/Yekaterinburg"
 msgstr ""
 
 #: calendar/zones.h:265
-msgid "Atlantic/Cape_Verde"
+msgid "Asia/Yerevan"
 msgstr ""
 
 #: calendar/zones.h:266
-msgid "Atlantic/Faeroe"
+msgid "Atlantic/Azores"
 msgstr ""
 
 #: calendar/zones.h:267
-msgid "Atlantic/Jan_Mayen"
+msgid "Atlantic/Bermuda"
 msgstr ""
 
 #: calendar/zones.h:268
-msgid "Atlantic/Madeira"
+msgid "Atlantic/Canary"
 msgstr ""
 
 #: calendar/zones.h:269
-msgid "Atlantic/Reykjavik"
+msgid "Atlantic/Cape_Verde"
 msgstr ""
 
 #: calendar/zones.h:270
-msgid "Atlantic/South_Georgia"
+msgid "Atlantic/Faeroe"
 msgstr ""
 
 #: calendar/zones.h:271
-msgid "Atlantic/St_Helena"
+msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
 #: calendar/zones.h:272
-msgid "Atlantic/Stanley"
+msgid "Atlantic/Madeira"
 msgstr ""
 
 #: calendar/zones.h:273
-msgid "Australia/Adelaide"
+msgid "Atlantic/Reykjavik"
 msgstr ""
 
 #: calendar/zones.h:274
-msgid "Australia/Brisbane"
+msgid "Atlantic/South_Georgia"
 msgstr ""
 
 #: calendar/zones.h:275
-msgid "Australia/Broken_Hill"
+msgid "Atlantic/St_Helena"
 msgstr ""
 
 #: calendar/zones.h:276
-msgid "Australia/Darwin"
+msgid "Atlantic/Stanley"
 msgstr ""
 
 #: calendar/zones.h:277
-msgid "Australia/Hobart"
+msgid "Australia/Adelaide"
 msgstr ""
 
 #: calendar/zones.h:278
-msgid "Australia/Lindeman"
+msgid "Australia/Brisbane"
 msgstr ""
 
 #: calendar/zones.h:279
-msgid "Australia/Lord_Howe"
+msgid "Australia/Broken_Hill"
 msgstr ""
 
 #: calendar/zones.h:280
-msgid "Australia/Melbourne"
+msgid "Australia/Darwin"
 msgstr ""
 
 #: calendar/zones.h:281
-msgid "Australia/Perth"
+msgid "Australia/Hobart"
 msgstr ""
 
 #: calendar/zones.h:282
-msgid "Australia/Sydney"
+msgid "Australia/Lindeman"
 msgstr ""
 
 #: calendar/zones.h:283
-msgid "Europe/Amsterdam"
+msgid "Australia/Lord_Howe"
 msgstr ""
 
 #: calendar/zones.h:284
-msgid "Europe/Andorra"
+msgid "Australia/Melbourne"
 msgstr ""
 
 #: calendar/zones.h:285
-msgid "Europe/Athens"
+msgid "Australia/Perth"
 msgstr ""
 
 #: calendar/zones.h:286
-msgid "Europe/Belfast"
+msgid "Australia/Sydney"
 msgstr ""
 
 #: calendar/zones.h:287
-msgid "Europe/Belgrade"
+msgid "Europe/Amsterdam"
 msgstr ""
 
 #: calendar/zones.h:288
-msgid "Europe/Berlin"
+msgid "Europe/Andorra"
 msgstr ""
 
 #: calendar/zones.h:289
-msgid "Europe/Bratislava"
+msgid "Europe/Athens"
 msgstr ""
 
 #: calendar/zones.h:290
-msgid "Europe/Brussels"
+msgid "Europe/Belfast"
 msgstr ""
 
 #: calendar/zones.h:291
-msgid "Europe/Bucharest"
+msgid "Europe/Belgrade"
 msgstr ""
 
 #: calendar/zones.h:292
-msgid "Europe/Budapest"
+msgid "Europe/Berlin"
 msgstr ""
 
 #: calendar/zones.h:293
-msgid "Europe/Chisinau"
+msgid "Europe/Bratislava"
 msgstr ""
 
 #: calendar/zones.h:294
-msgid "Europe/Copenhagen"
+msgid "Europe/Brussels"
 msgstr ""
 
 #: calendar/zones.h:295
-msgid "Europe/Dublin"
+msgid "Europe/Bucharest"
 msgstr ""
 
 #: calendar/zones.h:296
-msgid "Europe/Gibraltar"
+msgid "Europe/Budapest"
 msgstr ""
 
 #: calendar/zones.h:297
-msgid "Europe/Helsinki"
+msgid "Europe/Chisinau"
 msgstr ""
 
 #: calendar/zones.h:298
-msgid "Europe/Istanbul"
+msgid "Europe/Copenhagen"
 msgstr ""
 
 #: calendar/zones.h:299
-msgid "Europe/Kaliningrad"
+msgid "Europe/Dublin"
 msgstr ""
 
 #: calendar/zones.h:300
-msgid "Europe/Kiev"
+msgid "Europe/Gibraltar"
 msgstr ""
 
 #: calendar/zones.h:301
-msgid "Europe/Lisbon"
+msgid "Europe/Helsinki"
 msgstr ""
 
 #: calendar/zones.h:302
-msgid "Europe/Ljubljana"
+msgid "Europe/Istanbul"
 msgstr ""
 
 #: calendar/zones.h:303
-msgid "Europe/London"
+msgid "Europe/Kaliningrad"
 msgstr ""
 
 #: calendar/zones.h:304
-msgid "Europe/Luxembourg"
+msgid "Europe/Kiev"
 msgstr ""
 
 #: calendar/zones.h:305
-msgid "Europe/Madrid"
+msgid "Europe/Lisbon"
 msgstr ""
 
 #: calendar/zones.h:306
-msgid "Europe/Malta"
+msgid "Europe/Ljubljana"
 msgstr ""
 
 #: calendar/zones.h:307
-msgid "Europe/Minsk"
+msgid "Europe/London"
 msgstr ""
 
 #: calendar/zones.h:308
-msgid "Europe/Monaco"
+msgid "Europe/Luxembourg"
 msgstr ""
 
 #: calendar/zones.h:309
-msgid "Europe/Moscow"
+msgid "Europe/Madrid"
 msgstr ""
 
 #: calendar/zones.h:310
-msgid "Europe/Nicosia"
+msgid "Europe/Malta"
 msgstr ""
 
 #: calendar/zones.h:311
-msgid "Europe/Oslo"
+msgid "Europe/Minsk"
 msgstr ""
 
 #: calendar/zones.h:312
-msgid "Europe/Paris"
+msgid "Europe/Monaco"
 msgstr ""
 
 #: calendar/zones.h:313
-msgid "Europe/Prague"
+msgid "Europe/Moscow"
 msgstr ""
 
 #: calendar/zones.h:314
-msgid "Europe/Riga"
+msgid "Europe/Nicosia"
 msgstr ""
 
 #: calendar/zones.h:315
-msgid "Europe/Rome"
+msgid "Europe/Oslo"
 msgstr ""
 
 #: calendar/zones.h:316
-msgid "Europe/Samara"
+msgid "Europe/Paris"
 msgstr ""
 
 #: calendar/zones.h:317
-msgid "Europe/San_Marino"
+msgid "Europe/Prague"
 msgstr ""
 
 #: calendar/zones.h:318
-msgid "Europe/Sarajevo"
+msgid "Europe/Riga"
 msgstr ""
 
 #: calendar/zones.h:319
-msgid "Europe/Simferopol"
+msgid "Europe/Rome"
 msgstr ""
 
 #: calendar/zones.h:320
-msgid "Europe/Skopje"
+msgid "Europe/Samara"
 msgstr ""
 
 #: calendar/zones.h:321
-msgid "Europe/Sofia"
+msgid "Europe/San_Marino"
 msgstr ""
 
 #: calendar/zones.h:322
-msgid "Europe/Stockholm"
+msgid "Europe/Sarajevo"
 msgstr ""
 
 #: calendar/zones.h:323
-msgid "Europe/Tallinn"
+msgid "Europe/Simferopol"
 msgstr ""
 
 #: calendar/zones.h:324
-msgid "Europe/Tirane"
+msgid "Europe/Skopje"
 msgstr ""
 
 #: calendar/zones.h:325
-msgid "Europe/Uzhgorod"
+msgid "Europe/Sofia"
 msgstr ""
 
 #: calendar/zones.h:326
-msgid "Europe/Vaduz"
+msgid "Europe/Stockholm"
 msgstr ""
 
 #: calendar/zones.h:327
-msgid "Europe/Vatican"
+msgid "Europe/Tallinn"
 msgstr ""
 
 #: calendar/zones.h:328
-msgid "Europe/Vienna"
+msgid "Europe/Tirane"
 msgstr ""
 
 #: calendar/zones.h:329
-msgid "Europe/Vilnius"
+msgid "Europe/Uzhgorod"
 msgstr ""
 
 #: calendar/zones.h:330
-msgid "Europe/Warsaw"
+msgid "Europe/Vaduz"
 msgstr ""
 
 #: calendar/zones.h:331
-msgid "Europe/Zagreb"
+msgid "Europe/Vatican"
 msgstr ""
 
 #: calendar/zones.h:332
-msgid "Europe/Zaporozhye"
+msgid "Europe/Vienna"
 msgstr ""
 
 #: calendar/zones.h:333
-msgid "Europe/Zurich"
+msgid "Europe/Vilnius"
 msgstr ""
 
 #: calendar/zones.h:334
-msgid "Indian/Antananarivo"
+msgid "Europe/Warsaw"
 msgstr ""
 
 #: calendar/zones.h:335
-msgid "Indian/Chagos"
+msgid "Europe/Zagreb"
 msgstr ""
 
 #: calendar/zones.h:336
-msgid "Indian/Christmas"
+msgid "Europe/Zaporozhye"
 msgstr ""
 
 #: calendar/zones.h:337
-msgid "Indian/Cocos"
+msgid "Europe/Zurich"
 msgstr ""
 
 #: calendar/zones.h:338
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:339
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:340
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:341
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:342
 #, fuzzy
 msgid "Indian/Comoro"
 msgstr "Comoros"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr ""
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr ""
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr ""
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr ""
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr ""
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
@@ -7137,12 +7676,12 @@ msgstr ""
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7150,7 +7689,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7158,11 +7697,16 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -7170,56 +7714,67 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "Synchronising folders"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Can not open message"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Synchronising folder"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -7249,25 +7804,100 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr ""
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Can not open message"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr ""
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:782
+msgid "No data provided"
+msgstr ""
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Can not encrypt this message: no recipients specified"
+
+#: camel/camel-gpg-context.c:1077
+#, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1083
+#, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+msgid "Failed to execute gpg."
+msgstr ""
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Can not verify this message: could not create temporary file: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7363,81 +7993,22 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Can not sign this message: no plaintext to sign"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "Can not sign this message: no password provided"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Can not sign this message: could not create pipe to GPGP/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Can not sign this message: no plaintext to clearsign"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Can not verify this message: no plaintext to verify"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Can not verify this message: could not create pipe to GPGP/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "Can not verify this message: could not create temporary file: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Can not encrypt this message: no plaintext to encrypt"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Can not encrypt this message: no password provided"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Can not encrypt this message: could not create pipe to GPGP/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Can not encrypt this message: no recipients specified"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Can not decrypt this message: no ciphertext to decrypt"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Can not decrypt this message: no password provided"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Can not decrypt this message: could not create pipe to GPGP/PGP: %s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+msgid "parse error"
+msgstr ""
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7453,43 +8024,6 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr ""
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr ""
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr ""
@@ -7583,7 +8117,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -7609,10 +8143,8 @@ msgid ""
 "Password Authentication."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
 msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
@@ -7640,50 +8172,50 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 msgid "Resolving address"
 msgstr ""
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -7744,11 +8276,11 @@ msgstr ""
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Can not get folder: Invalid operation on this store"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Can not create folder: Invalid operation on this store"
 
@@ -7771,7 +8303,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7780,16 +8312,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7804,15 +8336,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr ""
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "You can not copy messages from this rubbish bin."
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -7834,68 +8366,77 @@ msgstr "Can not rename folder: %s: Invalid operation"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Can not rename folder: %s: No such folder"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "You can not copy messages from this rubbish bin."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -7948,32 +8489,79 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr ""
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, c-format
+msgid "IMAP server %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+msgid "SSL/TLS extension not supported."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+msgid "SSL negotiations failed"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -7981,68 +8569,85 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
-msgid "MH-format mail directories"
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, c-format
+msgid "~%s (%s)"
+msgstr ""
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Can not open mailbox: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, c-format
+msgid "%s (%s)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:49
+msgid "MH-format mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
+msgid "Standard Unix mbox spool or directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8068,7 +8673,7 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
@@ -8088,33 +8693,31 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Can not append message to maildir folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8123,20 +8726,19 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8145,13 +8747,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8165,7 +8767,7 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
@@ -8174,8 +8776,8 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -8194,45 +8796,37 @@ msgstr ""
 msgid "Checking for new messages"
 msgstr ""
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Synchronising folder"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Can not create folder lock on %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Can not open mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Can not append message to mbox file: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8241,13 +8835,11 @@ msgstr ""
 "Can not get message: %s from folder %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -8284,174 +8876,155 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Error writing to temporary mailbox: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Writing to temporary mailbox failed: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Error writing to temporary mailbox: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Writing to temporary mailbox failed: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Can not append message to mh folder: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Can not open MH directory path: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Can not append message to spool file: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Spool folders can not be deleted"
 
-#: camel/providers/local/camel-spool-store.c:115
+#: camel/providers/local/camel-spool-store.c:128
 #, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
+msgid "Spool `%s' is not a regular file or directory"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Spool folders can not be deleted"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Spool folders can not be deleted"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, c-format
-msgid "Mail tree %s"
-msgstr ""
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr ""
@@ -8460,12 +9033,22 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8565,7 +9148,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr ""
 
@@ -8586,67 +9169,59 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-msgid "SSL/TLS extension not supported."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-msgid "SSL negotiations failed"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr ""
 
@@ -8806,41 +9381,41 @@ msgstr ""
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
+#: camel/providers/smtp/camel-smtp-transport.c:461
 #, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8848,89 +9423,89 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -8938,35 +9513,35 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr ""
 
@@ -9039,52 +9614,52 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr ""
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9095,102 +9670,131 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Could not close temporary folder: %s"
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+msgid "Signature:"
+msgstr ""
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+msgid "Set as default"
+msgstr ""
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9250,7 +9854,7 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9392,7 +9996,7 @@ msgstr ""
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr ""
 
@@ -9459,7 +10063,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr ""
 
@@ -9471,6 +10075,19 @@ msgstr ""
 msgid "Filter Rules"
 msgstr ""
 
+#: filter/filter-file.c:176
+msgid "You must specify a file name"
+msgstr ""
+
+#: filter/filter-file.c:186
+#, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr ""
+
+#: filter/filter-file.c:286
+msgid "Choose a file"
+msgstr ""
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9487,7 +10104,7 @@ msgid ""
 msgstr ""
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr ""
 
@@ -9498,7 +10115,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr ""
 
@@ -9527,7 +10148,7 @@ msgid "if all criteria are met"
 msgstr ""
 
 #: filter/filter-rule.c:769
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr ""
 
 #: filter/filter-rule.c:780
@@ -9604,189 +10225,197 @@ msgid "Beep"
 msgstr ""
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
+msgid "Command"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Date received"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:10
+msgid "Date received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr ""
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "is before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+msgid "Label"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr ""
 
@@ -9841,7 +10470,8 @@ msgid "Scanning %s"
 msgstr ""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr ""
 
@@ -9855,10 +10485,6 @@ msgstr ""
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr ""
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -9906,7 +10532,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr ""
 
@@ -10033,254 +10661,263 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Can not open message"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Cannot initialise Evolution's mail config component."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Cannot initialise Evolution's folder info component."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 msgid "Cl_ear Flag"
 msgstr ""
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1645
-msgid "Label"
-msgstr ""
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr ""
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr ""
 
@@ -10331,7 +10968,7 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
@@ -10341,79 +10978,104 @@ msgid "Evolution News Editor"
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-msgid "Random"
-msgstr ""
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr ""
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, c-format
+msgid "Mail to %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr ""
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10421,131 +11083,131 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 msgid "Go to next folder with unread messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10553,39 +11215,70 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+msgid " [script]"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+msgid "Unnamed"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:555
+msgid "en"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:861
+msgid "Add script signature"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:862
+msgid "Add Signature"
+msgstr ""
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -10623,172 +11316,162 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr ""
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 msgid "Work"
 msgstr ""
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr ""
 
-#: mail/mail-config.c:2458
+#: mail/mail-config.c:625
 #, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
+msgid "Account %d"
 msgstr ""
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.c:2999
-msgid "Unnamed"
-msgstr ""
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 msgid " "
 msgstr ""
 
 #: mail/mail-config.glade.h:2
-msgid " Edit "
+msgid " _Check for supported types "
 msgstr ""
 
 #: mail/mail-config.glade.h:3
-msgid " New "
+msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid " _Check for supported types "
+msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of Evolution)"
+msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
-msgid "(SSL is not supported in this build of evolution)"
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
 #: mail/mail-config.glade.h:7
-msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Advanced Options"
+#: mail/mail-config.glade.h:10
+msgid "Add Sc_ript"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
-msgid "Afrikaans"
+#: mail/mail-config.glade.h:11
+msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Alerts"
-msgstr ""
-
-#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Automatically _detect links"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "C_lose"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Colours for display"
+
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10798,49 +11481,41 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
-msgid "Dari"
-msgstr ""
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Can not open message"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
-msgid "Drafts _folder:"
-msgstr ""
-
 #: mail/mail-config.glade.h:47
-msgid "E_nable"
+msgid "Drafts _folder:"
 msgstr ""
 
 #: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
+msgid "E_nable"
 msgstr ""
 
 #: mail/mail-config.glade.h:49
@@ -10859,32 +11534,28 @@ msgstr ""
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "Execute Command..."
-msgstr ""
-
 #: mail/mail-config.glade.h:54
-msgid "Fi_xed -width:"
+msgid "Execute Command..."
 msgstr ""
 
 #: mail/mail-config.glade.h:55
-msgid "Font Properties"
+msgid "Fi_xed -width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:56
-msgid "Format messages in _HTML"
+msgid "Font Properties"
 msgstr ""
 
 #: mail/mail-config.glade.h:57
-msgid "Get Digital ID..."
+msgid "Format messages in _HTML"
 msgstr ""
 
 #: mail/mail-config.glade.h:58
-msgid "Highlight _quotations with"
+msgid "Get Digital ID..."
 msgstr ""
 
 #: mail/mail-config.glade.h:59
-msgid "Hulu"
+msgid "Highlight _quotations with"
 msgstr ""
 
 #: mail/mail-config.glade.h:60
@@ -10935,62 +11606,58 @@ msgstr ""
 msgid "NNTP Server:"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "News Servers"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sation:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Can not open message"
 
-#: mail/mail-config.glade.h:93
-msgid "Quoted"
-msgstr ""
-
 #: mail/mail-config.glade.h:95
-msgid "Randomized"
+msgid "Quoted"
 msgstr ""
 
 #: mail/mail-config.glade.h:96
@@ -11022,236 +11689,234 @@ msgid "S_ecurity"
 msgstr ""
 
 #: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Select PGP program"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
-msgid "Select a signature file"
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
 msgstr ""
 
 #: mail/mail-config.glade.h:112
-msgid "Select a signature script"
+msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
+#: mail/mail-config.glade.h:113
+msgid "Sent and Draft Messages"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+msgid "Ser_ver requires authentication"
 msgstr ""
 
 #: mail/mail-config.glade.h:115
-msgid "Sent _messages folder:"
+msgid "Server Configuration"
 msgstr ""
 
 #: mail/mail-config.glade.h:116
-msgid "Sent and Draft Messages"
+msgid "Server _Type: "
 msgstr ""
 
 #: mail/mail-config.glade.h:117
-msgid "Ser_ver requires authentication"
+msgid "Shortcuts _type:"
 msgstr ""
 
 #: mail/mail-config.glade.h:118
-msgid "Server Configuration"
+msgid "Signature #1"
 msgstr ""
 
 #: mail/mail-config.glade.h:119
-msgid "Server _Type: "
+msgid "Signature #2"
 msgstr ""
 
 #: mail/mail-config.glade.h:120
-msgid "Shortcuts _type:"
+msgid "Source"
 msgstr ""
 
 #: mail/mail-config.glade.h:121
-msgid "Signature"
+msgid "Source Information"
 msgstr ""
 
 #: mail/mail-config.glade.h:122
-msgid "Source"
+msgid "Specify _filename:"
 msgstr ""
 
 #: mail/mail-config.glade.h:123
-msgid "Source Information"
+msgid "Spell Checking Language"
 msgstr ""
 
 #: mail/mail-config.glade.h:124
-msgid "Specify _filename:"
+msgid "Spell _Checking"
 msgstr ""
 
 #: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+msgid "Standard Unix mbox"
 msgstr ""
 
 #: mail/mail-config.glade.h:126
-msgid "Standard Unix mbox"
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-msgid "Use _HTML for this signature"
+#: mail/mail-config.glade.h:131
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
-msgid "XEmacs"
-msgstr ""
-
 #: mail/mail-config.glade.h:140
-msgid "_Always load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:141
-msgid "_Always sign outgoing messages when using this account"
+msgid "XEmacs"
 msgstr ""
 
 #: mail/mail-config.glade.h:142
-msgid "_Authentication Type: "
+msgid "_Add Signature"
 msgstr ""
 
 #: mail/mail-config.glade.h:143
-msgid "_Authentication type: "
+msgid "_Always load images off the net"
 msgstr ""
 
 #: mail/mail-config.glade.h:144
-msgid "_Automatically check for new mail"
+msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:145
-msgid "_Beep when new mail arrives"
+msgid "_Authentication Type: "
 msgstr ""
 
 #: mail/mail-config.glade.h:146
-msgid "_Certificate ID:"
+msgid "_Authentication type: "
 msgstr ""
 
 #: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
+msgid "_Automatically check for new mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:148
-msgid "_Confirm when expunging a folder"
+msgid "_Automatically insert smiley images"
 msgstr ""
 
 #: mail/mail-config.glade.h:149
-msgid "_Defaults"
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:150
+msgid "_Certificate ID:"
 msgstr ""
 
 #: mail/mail-config.glade.h:151
-msgid "_Do not notify me when new mail arrives"
+msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
+#: mail/mail-config.glade.h:152
+msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
-msgid "_Filename:"
+#: mail/mail-config.glade.h:153
+msgid "_Defaults"
 msgstr ""
 
 #: mail/mail-config.glade.h:155
-msgid "_Fixed-width:"
+msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
-msgid "_Forward style:"
+#: mail/mail-config.glade.h:157
+msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
-msgid "_Full name:"
+#: mail/mail-config.glade.h:158
+msgid "_Fixed-width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:159
-msgid "_HTML Mail"
+msgid "_Forward style:"
 msgstr ""
 
 #: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
+msgid "_Full name:"
 msgstr ""
 
 #: mail/mail-config.glade.h:162
-msgid "_Identity"
-msgstr ""
-
-#: mail/mail-config.glade.h:163
-msgid "_Language:"
+msgid "_HTML Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:164
-msgid "_Load images if sender is in addressbook"
+msgid "_Identity"
 msgstr ""
 
 #: mail/mail-config.glade.h:165
-msgid "_Make this my default account"
+msgid "_Load images if sender is in addressbook"
 msgstr ""
 
 #: mail/mail-config.glade.h:166
-msgid "_Mark messages as read after"
+msgid "_Make this my default account"
 msgstr ""
 
 #: mail/mail-config.glade.h:167
-msgid "_Name:"
+msgid "_Mark messages as read after"
 msgstr ""
 
 #: mail/mail-config.glade.h:168
-msgid "_Never load images off the net"
+msgid "_Name:"
 msgstr ""
 
 #: mail/mail-config.glade.h:169
-msgid "_PGP binary path:"
+msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
-msgid "_Play sound file when new mail arrives"
+#: mail/mail-config.glade.h:170
+msgid "_PGP binary path:"
 msgstr ""
 
 #: mail/mail-config.glade.h:172
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgid "_Play sound file when new mail arrives"
 msgstr ""
 
 #: mail/mail-config.glade.h:173
-msgid "_Prompt when sending messages with an empty subject line"
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
 #: mail/mail-config.glade.h:174
-msgid "_Random"
+msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
 #: mail/mail-config.glade.h:175
@@ -11287,67 +11952,51 @@ msgid "_Signatures"
 msgstr ""
 
 #: mail/mail-config.glade.h:183
-msgid "_Text Signature:"
-msgstr ""
-
-#: mail/mail-config.glade.h:184
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr ""
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr ""
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
@@ -11390,134 +12039,165 @@ msgstr ""
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1832
-msgid "Open Link in Browser"
+#: mail/mail-display.c:1553
+msgid "Overdue:"
 msgstr ""
 
 #: mail/mail-display.c:1833
+msgid "Open Link in Browser"
+msgstr ""
+
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr ""
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 msgid "Mailer"
 msgstr ""
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+msgid "View messages..."
+msgstr ""
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Synchronising folder failed: %s: %s"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Synchronising \"%s\""
@@ -11571,126 +12251,118 @@ msgstr ""
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr ""
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr ""
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr ""
 
@@ -11761,10 +12433,6 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr ""
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr ""
@@ -11778,24 +12446,43 @@ msgstr ""
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-signature-editor.c:357
-msgid "Signature name:"
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr ""
+
+#: mail/mail-signature-editor.c:397
+msgid "Signature hint"
+msgstr ""
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+msgid "Hide signature hint"
 msgstr ""
 
 #: mail/mail-tools.c:257
@@ -11811,17 +12498,17 @@ msgstr ""
 msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -11830,89 +12517,94 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr ""
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr ""
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr ""
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr ""
 
@@ -11933,10 +12625,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Organisation"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr ""
 
@@ -16657,5234 +17354,5230 @@ msgstr ""
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr ""
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr ""
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr ""
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr ""
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr ""
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr ""
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr ""
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr ""
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr ""
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr ""
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr ""
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr ""
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr ""
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr ""
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr ""
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr ""
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr ""
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr ""
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr ""
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr ""
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr ""
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr ""
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr ""
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr ""
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr ""
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr ""
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr ""
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr ""
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr ""
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr ""
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr ""
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr ""
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr ""
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr ""
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr ""
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr ""
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr ""
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr ""
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr ""
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr ""
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr ""
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr ""
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr ""
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr ""
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr ""
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr ""
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr ""
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr ""
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr ""
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr ""
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr ""
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr ""
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr ""
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr ""
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr ""
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr ""
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr ""
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr ""
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr ""
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr ""
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "Comoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr ""
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr ""
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr ""
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr ""
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr ""
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr ""
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr ""
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr ""
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr ""
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr ""
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr ""
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr ""
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr ""
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr ""
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr ""
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr ""
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr ""
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr ""
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr ""
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr ""
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr ""
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr ""
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr ""
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr ""
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr ""
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr ""
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr ""
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr ""
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr ""
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr ""
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr ""
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr ""
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr ""
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr ""
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr ""
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr ""
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr ""
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr ""
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr ""
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr ""
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr ""
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr ""
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr ""
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr ""
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr ""
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr ""
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr ""
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr ""
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr ""
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr ""
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr ""
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr ""
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr ""
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr ""
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr ""
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr ""
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr ""
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr ""
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr ""
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr ""
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr ""
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr ""
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr ""
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr ""
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr ""
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr ""
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr ""
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr ""
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "Organiser:"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr ""
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr ""
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr ""
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr ""
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr ""
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr ""
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr ""
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr ""
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr ""
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr ""
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr ""
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr ""
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr ""
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr ""
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr ""
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr ""
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr ""
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr ""
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr ""
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr ""
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr ""
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr ""
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr ""
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr ""
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr ""
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr ""
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr ""
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr ""
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr ""
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr ""
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr ""
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr ""
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr ""
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr ""
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr ""
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr ""
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr ""
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr ""
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr ""
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr ""
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr ""
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr ""
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr ""
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr ""
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr ""
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr ""
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr ""
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr ""
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr ""
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr ""
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr ""
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "Chile"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr ""
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr ""
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr ""
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr ""
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr ""
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "Comoros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr ""
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr ""
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr ""
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr ""
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr ""
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr ""
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr ""
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr ""
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr ""
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr ""
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr ""
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr ""
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr ""
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr ""
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr ""
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr ""
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr ""
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr ""
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr ""
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr ""
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr ""
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr ""
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr ""
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr ""
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr ""
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr ""
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr ""
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr ""
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr ""
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr ""
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr ""
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr ""
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr ""
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr ""
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr ""
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "Synchronising folder"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr ""
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr ""
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr ""
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr ""
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr ""
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr ""
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+msgid "Tallinn"
+msgstr ""
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr ""
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr ""
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr ""
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr ""
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr ""
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr ""
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr ""
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr ""
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr ""
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr ""
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr ""
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr ""
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr ""
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr ""
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr ""
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr ""
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr ""
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr ""
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr ""
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr ""
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr ""
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr ""
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr ""
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr ""
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr ""
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr ""
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr ""
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr ""
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr ""
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr ""
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr ""
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr ""
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr ""
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr ""
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr ""
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr ""
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr ""
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr ""
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr ""
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr ""
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr ""
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr ""
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr ""
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr ""
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr ""
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr ""
 
@@ -21912,17 +22605,12 @@ msgstr ""
 msgid "No description"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr ""
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr ""
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr ""
 
@@ -21931,54 +22619,45 @@ msgstr ""
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr ""
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
-msgid "Add ->"
+#: my-evolution/e-summary-shown.c:545
+msgid "Add"
 msgstr ""
 
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-msgid "<- Remove"
-msgstr ""
-
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr ""
 
@@ -22018,10 +22697,43 @@ msgstr ""
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Could not initialise Bonobo.\n"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr ""
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "Chile"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr ""
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr ""
@@ -23173,91 +23885,96 @@ msgid "C_elsius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:4
-msgid "How many days should the calendar display at once?"
+msgid "Delete news feed"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:5
-msgid "Ma_x number of items shown:"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:6
-msgid "News Feed Settings"
+msgid "Ma_x number of items shown:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:7
-msgid "One mont_h"
+msgid "News Feed Settings"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "One w_eek"
+msgid "One mont_h"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-msgid "R_efresh time (seconds):"
+msgid "One w_eek"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "Refresh _time (seconds):"
+msgid "R_efresh time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:11
-msgid "S_how full path for folders"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Show _all tasks"
+msgid "S_how full path for folders"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "Show _today's tasks"
+msgid "Show _all tasks"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "Show temperatures in:"
+msgid "Show _today's tasks"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:15
-msgid "Tasks "
+msgid "Show temperatures in:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:16
-msgid "Weather settings"
+msgid "Tasks "
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "_Fahrenheit"
+msgid "Weather settings"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:18
-msgid "_Five days"
+msgid "_Fahrenheit"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "_Mail"
+msgid "_Five days"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:20
-msgid "_News Feeds"
+msgid "_Mail"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "_One day"
+msgid "_News Feeds"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:22
-msgid "_Schedule"
+msgid "_One day"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:23
+msgid "_Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Cannot initialise Evolution's mail component."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
-msgid "Default Folders"
+msgid "Folder Settings"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
@@ -23265,7 +23982,7 @@ msgid "The Evolution shell."
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -23276,6 +23993,34 @@ msgstr ""
 msgid "Cancel Operation"
 msgstr ""
 
+#: shell/e-folder-dnd-bridge.c:52
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr "Can not get folder: %s: %s"
+
+#: shell/e-folder-list.c:312
+msgid "Add a Folder"
+msgstr ""
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr ""
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr ""
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr ""
@@ -23362,6 +24107,27 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+msgid "Extra Completion folders"
+msgstr ""
+
+#: shell/e-shell-config-default-folders.c:133
+msgid "Select Default Folder"
+msgstr ""
+
+#: shell/e-shell-config-folder-settings.c:71
+msgid "Default Folders"
+msgstr ""
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Synchronising folders"
+
+#: shell/e-shell-config-folder-settings.c:77
+msgid "Autocompletion Folders"
+msgstr ""
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -23389,54 +24155,53 @@ msgstr ""
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
+#: shell/e-shell-folder-commands.c:407
 #, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
+msgid "Really delete folder \"%s\"?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23453,13 +24218,13 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr ""
 
@@ -23501,110 +24266,155 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+msgid "Select importer"
+msgstr ""
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr ""
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr ""
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr ""
 
+#: shell/e-shell-offline-sync.c:161
+#, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Synchronising folder"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "Synchronising folder"
+
+#: shell/e-shell-settings-dialog.c:290
+msgid "Evolution Settings"
+msgstr ""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Synchronising folder"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Synchronising folders"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, c-format
+msgid "in \"%s\" ..."
+msgstr ""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+
 #: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
@@ -23617,8 +24427,8 @@ msgstr "Cannot initialise Evolution's Mail Wizard interface"
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Cannot initialise Evolution's Mail Wizard interface"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr ""
@@ -23639,44 +24449,44 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr ""
 
@@ -23707,7 +24517,7 @@ msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -23715,12 +24525,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23728,23 +24538,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr ""
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr ""
 
@@ -23767,95 +24573,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -23867,10 +24673,6 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr ""
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -23934,10 +24736,11 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -23967,67 +24770,67 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 msgid "Test type"
 msgstr ""
 
@@ -24143,47 +24946,78 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Can not initialise the Ximian Evolution shell."
+
+#: shell/main.c:254
+msgid "Don't tell me again"
+msgstr ""
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:318
+#: shell/main.c:438
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:319
+#: shell/main.c:439
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Can not initialise the Bonobo component system."
 
@@ -24292,11 +25126,11 @@ msgstr ""
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr ""
 
@@ -24417,8 +25251,8 @@ msgstr ""
 msgid "Delete this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr ""
 
@@ -24458,7 +25292,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr ""
 
@@ -24523,19 +25357,19 @@ msgstr ""
 msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr ""
 
@@ -24543,10 +25377,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr ""
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr ""
@@ -24700,7 +25530,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr ""
 
@@ -25092,7 +25922,7 @@ msgstr ""
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr ""
 
@@ -25107,12 +25937,12 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr ""
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr ""
 
@@ -25299,7 +26129,7 @@ msgstr ""
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr ""
 
@@ -25444,110 +26274,118 @@ msgid "Move this folder to another place"
 msgstr ""
 
 #: ui/evolution.xml.h:18
-msgid "Open in New Window"
+msgid "Open Other _User's Folder..."
+msgstr ""
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
 #: ui/evolution.xml.h:20
+msgid "Open in New Window"
+msgstr ""
+
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr ""
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr ""
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr ""
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr ""
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr ""
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr ""
 
@@ -25628,20 +26466,20 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr ""
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 msgid "Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr ""
 
@@ -25762,14 +26600,18 @@ msgstr ""
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 msgid "_Save Search..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 msgid "_Edit Saved Searches..."
 msgstr ""
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+msgid "_Advanced..."
+msgstr ""
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr ""
@@ -25791,19 +26633,19 @@ msgstr ""
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 msgid "_Clear"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr ""
 
@@ -25829,6 +26671,48 @@ msgstr "Could not initialise GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
+#~ msgid "_Other Organizer"
+#~ msgstr "_Other Organiser"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Can not sign this message: no plaintext to sign"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Can not sign this message: no password provided"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Can not sign this message: could not create pipe to GPGP/PGP: %s"
+
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Can not sign this message: no plaintext to clearsign"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Can not verify this message: no plaintext to verify"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Can not verify this message: could not create pipe to GPGP/PGP: %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Can not encrypt this message: no plaintext to encrypt"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Can not encrypt this message: no password provided"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Can not encrypt this message: could not create pipe to GPGP/PGP: %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "Can not decrypt this message: no ciphertext to decrypt"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Can not decrypt this message: no password provided"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Can not decrypt this message: could not create pipe to GPGP/PGP: %s"
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Can not append message to spool file: %s: %s"
+
 #~ msgid ""
 #~ "EMail: %s\n"
 #~ "Common Name: %s\n"
@@ -25862,10 +26746,6 @@ msgstr "Could not initialise Bonobo"
 #~ msgid "KBOS:EGAA:RJTT"
 #~ msgstr "YPAD:YBBN:YSCB:YMML:YPPH:YSSY"
 
-#, fuzzy
-#~ msgid "Synchronizing folder"
-#~ msgstr "Synchronising folder"
-
 #~ msgid "%d/%m/%Y"
 #~ msgstr "%m/%d/%Y"
 
@@ -25906,13 +26786,13 @@ msgstr "Could not initialise Bonobo"
 #~ "Rev\n"
 
 #~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organization, and the name of a file to "
-#~ "read your signature from."
+#~ "Enter your name and email address to be used in outgoing mail. You may "
+#~ "also, optionally, enter the name of your organization, and the name of a "
+#~ "file to read your signature from."
 #~ msgstr ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organisation, and the name of a file to "
-#~ "read your signature from."
+#~ "Enter your name and email address to be used in outgoing mail. You may "
+#~ "also, optionally, enter the name of your organisation, and the name of a "
+#~ "file to read your signature from."
 
 #~ msgid "Querying authorization capabilities of \"%s\""
 #~ msgstr "Querying authorisation capabilities of \"%s\""
diff --git a/po/en_GB.po b/po/en_GB.po
index 17c8146de5..c163808dd5 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr ""
@@ -46,7 +46,7 @@ msgid "Email"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr ""
 
@@ -56,7 +56,7 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr ""
@@ -64,8 +64,8 @@ msgstr ""
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr ""
 
@@ -75,12 +75,12 @@ msgid "Bus"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr ""
 
@@ -92,8 +92,8 @@ msgstr "Colours"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr ""
 
@@ -108,18 +108,18 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr ""
@@ -129,13 +129,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr ""
 
@@ -144,43 +144,43 @@ msgid "Bus 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr ""
@@ -192,14 +192,14 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr ""
@@ -337,7 +337,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -345,7 +345,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr ""
 
@@ -358,31 +358,31 @@ msgstr ""
 msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 msgid "Error performing search"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 msgid "Could not parse query string"
 msgstr ""
 
@@ -428,107 +428,133 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #, fuzzy
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#, fuzzy
-msgid "Configuration control for the Evolution Addressbook."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
+#: addressbook/gui/component/addressbook-config.c:197
+msgid "Failed to connect to LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "Contact _List"
+#: addressbook/gui/component/addressbook-config.c:216
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1174
+msgid "Error retrieving schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1182
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1638
+msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Could not initialise Bonobo"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Organisation:"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr ""
@@ -554,48 +580,57 @@ msgid ""
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 msgid "Email is"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr ""
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr ""
 
@@ -641,89 +676,52 @@ msgstr ""
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:197
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:215
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-msgid "Could not query for schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1169
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1613
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Synchronising \"%s\""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-msgid "<< Fewer Options"
+msgid "1234"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:3
-msgid "<- _Remove"
+msgid "1:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1234"
+msgid "2:30"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:5
-msgid "1:00"
+msgid "3268"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
+msgid "380"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
-msgid "3268"
+msgid "389"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:8
-msgid "380"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "389"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "5:00"
+msgid "666"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "636"
+msgid "<- _Remove"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "666"
+msgid "<< Fewer Options"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:13
@@ -734,8 +732,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr ""
 
@@ -821,8 +819,8 @@ msgstr "Cannot initialise the Evolution shell."
 msgid "Mappings"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr ""
 
@@ -999,14 +997,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1026,8 +1024,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1058,7 +1056,7 @@ msgid "Using email address"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1066,7 +1064,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr ""
 
@@ -1108,7 +1106,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1215,10 +1213,12 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr ""
 
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr ""
 
@@ -1344,7 +1344,7 @@ msgid "D_epartment:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr ""
 
@@ -1402,11 +1402,12 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr ""
 
@@ -1435,7 +1436,7 @@ msgid "_Web page address:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr ""
 
@@ -1943,12 +1944,11 @@ msgid "Laos"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
@@ -1957,7 +1957,7 @@ msgid "Lesotho"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr ""
 
@@ -1966,12 +1966,12 @@ msgid "Liechtenstein"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr ""
 
@@ -2004,7 +2004,7 @@ msgid "Mali"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr ""
 
@@ -2029,7 +2029,7 @@ msgid "Mayotte"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr ""
 
@@ -2054,7 +2054,7 @@ msgid "Montserrat"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr ""
 
@@ -2079,7 +2079,7 @@ msgid "Nepal"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr ""
 
@@ -2092,12 +2092,12 @@ msgid "New Caledonia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr ""
 
@@ -2114,7 +2114,7 @@ msgid "Niue"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr ""
 
@@ -2123,17 +2123,17 @@ msgid "Northern Mariana Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr ""
 
@@ -2146,7 +2146,7 @@ msgid "Palestinian Territory"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr ""
 
@@ -2155,12 +2155,12 @@ msgid "Papua New Guinea"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr ""
 
@@ -2173,22 +2173,22 @@ msgid "Pitcairn"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr ""
 
@@ -2197,7 +2197,7 @@ msgid "Reunion"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr ""
 
@@ -2234,7 +2234,7 @@ msgid "Sao Tome And Principe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr ""
 
@@ -2251,17 +2251,17 @@ msgid "Sierra Leone"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr ""
 
@@ -2274,7 +2274,7 @@ msgid "Somalia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr ""
 
@@ -2283,7 +2283,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr ""
 
@@ -2304,7 +2304,7 @@ msgid "Sudan"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr ""
 
@@ -2317,17 +2317,17 @@ msgid "Swaziland"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr ""
 
@@ -2364,7 +2364,7 @@ msgid "Tunisia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr ""
 
@@ -2385,7 +2385,7 @@ msgid "Uganda"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr ""
 
@@ -2394,7 +2394,7 @@ msgid "United Arab Emirates"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr ""
 
@@ -2403,7 +2403,7 @@ msgid "United States Minor Outlying Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr ""
 
@@ -2416,12 +2416,12 @@ msgid "Vanuatu"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr ""
 
@@ -2442,12 +2442,12 @@ msgid "Western Sahara"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr ""
 
@@ -2460,26 +2460,32 @@ msgid "Zimbabwe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2506,11 +2512,11 @@ msgstr ""
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2643,11 +2649,11 @@ msgid "contact-list-editor"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2720,21 +2726,21 @@ msgid "Error getting book view"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr ""
 
@@ -2743,7 +2749,7 @@ msgid "Repository offline"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr ""
 
@@ -2761,55 +2767,68 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+msgid "Authentication Failed"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+msgid "Authentication Required"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2817,19 +2836,19 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 msgid "Move card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Copy card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 msgid "Move cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 msgid "Copy cards to"
 msgstr ""
 
@@ -2893,95 +2912,101 @@ msgstr ""
 msgid "Other Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Addressbook Sources..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 msgid "Current View"
 msgstr ""
@@ -2990,7 +3015,7 @@ msgstr ""
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -2998,7 +3023,7 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3138,7 +3163,7 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr ""
 
@@ -3149,7 +3174,7 @@ msgid "Orientation"
 msgstr "Organisation"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr ""
 
@@ -3223,29 +3248,33 @@ msgstr ""
 msgid "_Font..."
 msgstr ""
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr ""
 
@@ -3286,49 +3315,39 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Cannot initialise Evolution's mail component."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Cannot initialise Evolution's mail summary component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Calendar Summary component."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 #, fuzzy
 msgid "Factory for the calendar iTip view control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the sample Calendar control"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3340,10 +3359,24 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Synchronise \"%s\""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr ""
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Cannot initialise the Evolution shell."
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3380,7 +3413,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr ""
@@ -3400,17 +3433,17 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 #, fuzzy
 msgid "Could not create the alarm notify service"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3426,7 +3459,7 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr ""
 
@@ -3466,14 +3499,16 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr ""
 
@@ -3494,27 +3529,32 @@ msgid "W"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr ""
 
@@ -3526,11 +3566,12 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3545,12 +3586,14 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr ""
 
@@ -3570,56 +3613,58 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "_Meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 msgid "New All Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "_Appointment"
 msgstr ""
 
@@ -3826,7 +3871,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -3855,7 +3900,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr ""
 
@@ -3883,78 +3928,78 @@ msgstr ""
 msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Calendar and Tasks Settings"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+msgid "Alerts"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Color for overdue tasks"
+msgid "Calendar and Tasks Settings"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "Color for overdue tasks"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
 msgid "Color for tasks due today"
 msgstr "Colours for display"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Days"
-msgstr ""
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/dialogs/recurrence-page.c:1125
-msgid "Friday"
+msgid "Day _ends:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "Hours"
+msgid "Days"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Minutes"
+#: calendar/gui/dialogs/recurrence-page.c:1125
+msgid "Friday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.c:1121
-msgid "Monday"
+msgid "Hours"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/recurrence-page.c:1126
-msgid "Saturday"
+msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/recurrence-page.c:1121
+msgid "Monday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Show week _numbers in date navigator"
+msgid "S_un"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
+#: calendar/gui/dialogs/recurrence-page.c:1126
+msgid "Saturday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
+msgid "Sh_ow a reminder"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Show week _numbers in date navigator"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Colours for display"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "T_hu"
-msgstr ""
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
+msgid "T_hu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
@@ -3984,78 +4029,90 @@ msgid "Tuesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/recurrence-page.c:1123
-msgid "Wednesday"
+msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: ui/evolution-calendar.xml.h:24
-msgid "Work Week"
+#: calendar/gui/dialogs/recurrence-page.c:1123
+msgid "Wednesday"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "_12 hour (AM/PM)"
+#: ui/evolution-calendar.xml.h:24
+msgid "Work Week"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "_24 hour"
+msgid "Work days:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "_Ask for confirmation when deleting items"
+msgid "_12 hour (AM/PM)"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "_Compress weekends in month view"
+msgid "_24 hour"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "_Display"
+msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
+msgid "_Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "_Fri"
+msgid "_Day begins:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
-msgid "_General"
+msgid "_Display"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "_Hide completed tasks after"
+msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Mon"
+#: mail/mail-config.glade.h:161
+msgid "_General"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "_Overdue tasks:"
+msgid "_Hide completed tasks after"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Sat"
+msgid "_Mon"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "_Show appointment end times in week and month views"
+msgid "_Overdue tasks:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Time divisions:"
+msgid "_Sat"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "_Wed"
+msgid "_Show appointment end times in week and month views"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+msgid "_Time divisions:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "_Tue"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "_Wed"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "before every appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4138,40 +4195,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4229,27 +4307,27 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
@@ -4296,7 +4374,7 @@ msgid "Pu_blic"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr ""
 
@@ -4318,19 +4396,19 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4341,49 +4419,55 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
+msgid "Click here to add an attendee"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
+msgid "Common Name"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
+msgid "Delegated From"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
+msgid "Delegated To"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
+msgid "Language"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
+msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "Role"
+msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
-msgid "Status"
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -4400,15 +4484,10 @@ msgid "_Change Organizer"
 msgstr "Organisation:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#, fuzzy
-msgid "_Other Organizer"
-msgstr "Organisation:"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4588,7 +4667,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr ""
 
@@ -4600,19 +4679,19 @@ msgstr ""
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr ""
 
@@ -4624,22 +4703,77 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 msgid "_Save as..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4647,20 +4781,20 @@ msgstr ""
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4668,32 +4802,33 @@ msgstr ""
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
 
@@ -4701,47 +4836,48 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr ""
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr ""
 
@@ -4786,11 +4922,13 @@ msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr ""
 
@@ -4829,7 +4967,7 @@ msgid "_Publish Free/Busy Information"
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 msgid "_Configure..."
 msgstr ""
 
@@ -4838,7 +4976,7 @@ msgid "_Configure Pilot..."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr ""
 
@@ -4863,72 +5001,384 @@ msgid "Delete _All Occurrences"
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr ""
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr ""
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:903
+msgid "Status:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1354
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+msgid "Object could not be found\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Synchronising \"%s\""
@@ -4970,93 +5420,92 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
-msgid "Needs Action"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr ""
-
 #: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
+msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr ""
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5068,63 +5517,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr ""
 
@@ -5143,15 +5592,20 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Synchronising \"%s\""
+
+#: calendar/gui/e-tasks.c:558
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 msgid "Expunging"
 msgstr ""
 
@@ -5163,17 +5617,17 @@ msgstr ""
 msgid "_Delete this Appointment"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
@@ -5234,19 +5688,51 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:398
+msgid "Updated"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:406
+msgid "Refresh"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Cannot initialise Evolution's mail component."
@@ -5436,12 +5922,45 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr ""
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2324
+#, c-format
+msgid "Priority: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr ""
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr ""
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr ""
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5472,8 +5991,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr ""
 
@@ -5528,6 +6047,10 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Cannot initialise Evolution's mail component."
 
+#: calendar/importers/icalendar-importer.c:424
+msgid "Reminder!!"
+msgstr ""
+
 #: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr ""
@@ -5616,8 +6139,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -6544,639 +7067,651 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
-msgid "Asia/Magadan"
+msgid "Asia/Macau"
 msgstr ""
 
 #: calendar/zones.h:231
-msgid "Asia/Manila"
+msgid "Asia/Magadan"
 msgstr ""
 
 #: calendar/zones.h:232
-msgid "Asia/Muscat"
+msgid "Asia/Makassar"
 msgstr ""
 
 #: calendar/zones.h:233
-msgid "Asia/Nicosia"
+msgid "Asia/Manila"
 msgstr ""
 
 #: calendar/zones.h:234
-msgid "Asia/Novosibirsk"
+msgid "Asia/Muscat"
 msgstr ""
 
 #: calendar/zones.h:235
-msgid "Asia/Omsk"
+msgid "Asia/Nicosia"
 msgstr ""
 
 #: calendar/zones.h:236
-msgid "Asia/Phnom_Penh"
+msgid "Asia/Novosibirsk"
 msgstr ""
 
 #: calendar/zones.h:237
-msgid "Asia/Pontianak"
+msgid "Asia/Omsk"
 msgstr ""
 
 #: calendar/zones.h:238
-msgid "Asia/Pyongyang"
+msgid "Asia/Oral"
 msgstr ""
 
 #: calendar/zones.h:239
-msgid "Asia/Qatar"
+msgid "Asia/Phnom_Penh"
 msgstr ""
 
 #: calendar/zones.h:240
-msgid "Asia/Rangoon"
+msgid "Asia/Pontianak"
 msgstr ""
 
 #: calendar/zones.h:241
-msgid "Asia/Riyadh"
+msgid "Asia/Pyongyang"
 msgstr ""
 
 #: calendar/zones.h:242
-msgid "Asia/Saigon"
+msgid "Asia/Qatar"
 msgstr ""
 
 #: calendar/zones.h:243
-msgid "Asia/Sakhalin"
+msgid "Asia/Qyzylorda"
 msgstr ""
 
 #: calendar/zones.h:244
-msgid "Asia/Samarkand"
+msgid "Asia/Rangoon"
 msgstr ""
 
 #: calendar/zones.h:245
-msgid "Asia/Seoul"
+msgid "Asia/Riyadh"
 msgstr ""
 
 #: calendar/zones.h:246
-msgid "Asia/Shanghai"
+msgid "Asia/Saigon"
 msgstr ""
 
 #: calendar/zones.h:247
-msgid "Asia/Singapore"
+msgid "Asia/Sakhalin"
 msgstr ""
 
 #: calendar/zones.h:248
-msgid "Asia/Taipei"
+msgid "Asia/Samarkand"
 msgstr ""
 
 #: calendar/zones.h:249
-msgid "Asia/Tashkent"
+msgid "Asia/Seoul"
 msgstr ""
 
 #: calendar/zones.h:250
-msgid "Asia/Tbilisi"
+msgid "Asia/Shanghai"
 msgstr ""
 
 #: calendar/zones.h:251
-msgid "Asia/Tehran"
+msgid "Asia/Singapore"
 msgstr ""
 
 #: calendar/zones.h:252
-msgid "Asia/Thimphu"
+msgid "Asia/Taipei"
 msgstr ""
 
 #: calendar/zones.h:253
-msgid "Asia/Tokyo"
+msgid "Asia/Tashkent"
 msgstr ""
 
 #: calendar/zones.h:254
-msgid "Asia/Ujung_Pandang"
+msgid "Asia/Tbilisi"
 msgstr ""
 
 #: calendar/zones.h:255
-msgid "Asia/Ulaanbaatar"
+msgid "Asia/Tehran"
 msgstr ""
 
 #: calendar/zones.h:256
-msgid "Asia/Urumqi"
+msgid "Asia/Thimphu"
 msgstr ""
 
 #: calendar/zones.h:257
-msgid "Asia/Vientiane"
+msgid "Asia/Tokyo"
 msgstr ""
 
 #: calendar/zones.h:258
-msgid "Asia/Vladivostok"
+msgid "Asia/Ujung_Pandang"
 msgstr ""
 
 #: calendar/zones.h:259
-msgid "Asia/Yakutsk"
+msgid "Asia/Ulaanbaatar"
 msgstr ""
 
 #: calendar/zones.h:260
-msgid "Asia/Yekaterinburg"
+msgid "Asia/Urumqi"
 msgstr ""
 
 #: calendar/zones.h:261
-msgid "Asia/Yerevan"
+msgid "Asia/Vientiane"
 msgstr ""
 
 #: calendar/zones.h:262
-msgid "Atlantic/Azores"
+msgid "Asia/Vladivostok"
 msgstr ""
 
 #: calendar/zones.h:263
-msgid "Atlantic/Bermuda"
+msgid "Asia/Yakutsk"
 msgstr ""
 
 #: calendar/zones.h:264
-msgid "Atlantic/Canary"
+msgid "Asia/Yekaterinburg"
 msgstr ""
 
 #: calendar/zones.h:265
-msgid "Atlantic/Cape_Verde"
+msgid "Asia/Yerevan"
 msgstr ""
 
 #: calendar/zones.h:266
-msgid "Atlantic/Faeroe"
+msgid "Atlantic/Azores"
 msgstr ""
 
 #: calendar/zones.h:267
-msgid "Atlantic/Jan_Mayen"
+msgid "Atlantic/Bermuda"
 msgstr ""
 
 #: calendar/zones.h:268
-msgid "Atlantic/Madeira"
+msgid "Atlantic/Canary"
 msgstr ""
 
 #: calendar/zones.h:269
-msgid "Atlantic/Reykjavik"
+msgid "Atlantic/Cape_Verde"
 msgstr ""
 
 #: calendar/zones.h:270
-msgid "Atlantic/South_Georgia"
+msgid "Atlantic/Faeroe"
 msgstr ""
 
 #: calendar/zones.h:271
-msgid "Atlantic/St_Helena"
+msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
 #: calendar/zones.h:272
-msgid "Atlantic/Stanley"
+msgid "Atlantic/Madeira"
 msgstr ""
 
 #: calendar/zones.h:273
-msgid "Australia/Adelaide"
+msgid "Atlantic/Reykjavik"
 msgstr ""
 
 #: calendar/zones.h:274
-msgid "Australia/Brisbane"
+msgid "Atlantic/South_Georgia"
 msgstr ""
 
 #: calendar/zones.h:275
-msgid "Australia/Broken_Hill"
+msgid "Atlantic/St_Helena"
 msgstr ""
 
 #: calendar/zones.h:276
-msgid "Australia/Darwin"
+msgid "Atlantic/Stanley"
 msgstr ""
 
 #: calendar/zones.h:277
-msgid "Australia/Hobart"
+msgid "Australia/Adelaide"
 msgstr ""
 
 #: calendar/zones.h:278
-msgid "Australia/Lindeman"
+msgid "Australia/Brisbane"
 msgstr ""
 
 #: calendar/zones.h:279
-msgid "Australia/Lord_Howe"
+msgid "Australia/Broken_Hill"
 msgstr ""
 
 #: calendar/zones.h:280
-msgid "Australia/Melbourne"
+msgid "Australia/Darwin"
 msgstr ""
 
 #: calendar/zones.h:281
-msgid "Australia/Perth"
+msgid "Australia/Hobart"
 msgstr ""
 
 #: calendar/zones.h:282
-msgid "Australia/Sydney"
+msgid "Australia/Lindeman"
 msgstr ""
 
 #: calendar/zones.h:283
-msgid "Europe/Amsterdam"
+msgid "Australia/Lord_Howe"
 msgstr ""
 
 #: calendar/zones.h:284
-msgid "Europe/Andorra"
+msgid "Australia/Melbourne"
 msgstr ""
 
 #: calendar/zones.h:285
-msgid "Europe/Athens"
+msgid "Australia/Perth"
 msgstr ""
 
 #: calendar/zones.h:286
-msgid "Europe/Belfast"
+msgid "Australia/Sydney"
 msgstr ""
 
 #: calendar/zones.h:287
-msgid "Europe/Belgrade"
+msgid "Europe/Amsterdam"
 msgstr ""
 
 #: calendar/zones.h:288
-msgid "Europe/Berlin"
+msgid "Europe/Andorra"
 msgstr ""
 
 #: calendar/zones.h:289
-msgid "Europe/Bratislava"
+msgid "Europe/Athens"
 msgstr ""
 
 #: calendar/zones.h:290
-msgid "Europe/Brussels"
+msgid "Europe/Belfast"
 msgstr ""
 
 #: calendar/zones.h:291
-msgid "Europe/Bucharest"
+msgid "Europe/Belgrade"
 msgstr ""
 
 #: calendar/zones.h:292
-msgid "Europe/Budapest"
+msgid "Europe/Berlin"
 msgstr ""
 
 #: calendar/zones.h:293
-msgid "Europe/Chisinau"
+msgid "Europe/Bratislava"
 msgstr ""
 
 #: calendar/zones.h:294
-msgid "Europe/Copenhagen"
+msgid "Europe/Brussels"
 msgstr ""
 
 #: calendar/zones.h:295
-msgid "Europe/Dublin"
+msgid "Europe/Bucharest"
 msgstr ""
 
 #: calendar/zones.h:296
-msgid "Europe/Gibraltar"
+msgid "Europe/Budapest"
 msgstr ""
 
 #: calendar/zones.h:297
-msgid "Europe/Helsinki"
+msgid "Europe/Chisinau"
 msgstr ""
 
 #: calendar/zones.h:298
-msgid "Europe/Istanbul"
+msgid "Europe/Copenhagen"
 msgstr ""
 
 #: calendar/zones.h:299
-msgid "Europe/Kaliningrad"
+msgid "Europe/Dublin"
 msgstr ""
 
 #: calendar/zones.h:300
-msgid "Europe/Kiev"
+msgid "Europe/Gibraltar"
 msgstr ""
 
 #: calendar/zones.h:301
-msgid "Europe/Lisbon"
+msgid "Europe/Helsinki"
 msgstr ""
 
 #: calendar/zones.h:302
-msgid "Europe/Ljubljana"
+msgid "Europe/Istanbul"
 msgstr ""
 
 #: calendar/zones.h:303
-msgid "Europe/London"
+msgid "Europe/Kaliningrad"
 msgstr ""
 
 #: calendar/zones.h:304
-msgid "Europe/Luxembourg"
+msgid "Europe/Kiev"
 msgstr ""
 
 #: calendar/zones.h:305
-msgid "Europe/Madrid"
+msgid "Europe/Lisbon"
 msgstr ""
 
 #: calendar/zones.h:306
-msgid "Europe/Malta"
+msgid "Europe/Ljubljana"
 msgstr ""
 
 #: calendar/zones.h:307
-msgid "Europe/Minsk"
+msgid "Europe/London"
 msgstr ""
 
 #: calendar/zones.h:308
-msgid "Europe/Monaco"
+msgid "Europe/Luxembourg"
 msgstr ""
 
 #: calendar/zones.h:309
-msgid "Europe/Moscow"
+msgid "Europe/Madrid"
 msgstr ""
 
 #: calendar/zones.h:310
-msgid "Europe/Nicosia"
+msgid "Europe/Malta"
 msgstr ""
 
 #: calendar/zones.h:311
-msgid "Europe/Oslo"
+msgid "Europe/Minsk"
 msgstr ""
 
 #: calendar/zones.h:312
-msgid "Europe/Paris"
+msgid "Europe/Monaco"
 msgstr ""
 
 #: calendar/zones.h:313
-msgid "Europe/Prague"
+msgid "Europe/Moscow"
 msgstr ""
 
 #: calendar/zones.h:314
-msgid "Europe/Riga"
+msgid "Europe/Nicosia"
 msgstr ""
 
 #: calendar/zones.h:315
-msgid "Europe/Rome"
+msgid "Europe/Oslo"
 msgstr ""
 
 #: calendar/zones.h:316
-msgid "Europe/Samara"
+msgid "Europe/Paris"
 msgstr ""
 
 #: calendar/zones.h:317
-msgid "Europe/San_Marino"
+msgid "Europe/Prague"
 msgstr ""
 
 #: calendar/zones.h:318
-msgid "Europe/Sarajevo"
+msgid "Europe/Riga"
 msgstr ""
 
 #: calendar/zones.h:319
-msgid "Europe/Simferopol"
+msgid "Europe/Rome"
 msgstr ""
 
 #: calendar/zones.h:320
-msgid "Europe/Skopje"
+msgid "Europe/Samara"
 msgstr ""
 
 #: calendar/zones.h:321
-msgid "Europe/Sofia"
+msgid "Europe/San_Marino"
 msgstr ""
 
 #: calendar/zones.h:322
-msgid "Europe/Stockholm"
+msgid "Europe/Sarajevo"
 msgstr ""
 
 #: calendar/zones.h:323
-msgid "Europe/Tallinn"
+msgid "Europe/Simferopol"
 msgstr ""
 
 #: calendar/zones.h:324
-msgid "Europe/Tirane"
+msgid "Europe/Skopje"
 msgstr ""
 
 #: calendar/zones.h:325
-msgid "Europe/Uzhgorod"
+msgid "Europe/Sofia"
 msgstr ""
 
 #: calendar/zones.h:326
-msgid "Europe/Vaduz"
+msgid "Europe/Stockholm"
 msgstr ""
 
 #: calendar/zones.h:327
-msgid "Europe/Vatican"
+msgid "Europe/Tallinn"
 msgstr ""
 
 #: calendar/zones.h:328
-msgid "Europe/Vienna"
+msgid "Europe/Tirane"
 msgstr ""
 
 #: calendar/zones.h:329
-msgid "Europe/Vilnius"
+msgid "Europe/Uzhgorod"
 msgstr ""
 
 #: calendar/zones.h:330
-msgid "Europe/Warsaw"
+msgid "Europe/Vaduz"
 msgstr ""
 
 #: calendar/zones.h:331
-msgid "Europe/Zagreb"
+msgid "Europe/Vatican"
 msgstr ""
 
 #: calendar/zones.h:332
-msgid "Europe/Zaporozhye"
+msgid "Europe/Vienna"
 msgstr ""
 
 #: calendar/zones.h:333
-msgid "Europe/Zurich"
+msgid "Europe/Vilnius"
 msgstr ""
 
 #: calendar/zones.h:334
-msgid "Indian/Antananarivo"
+msgid "Europe/Warsaw"
 msgstr ""
 
 #: calendar/zones.h:335
-msgid "Indian/Chagos"
+msgid "Europe/Zagreb"
 msgstr ""
 
 #: calendar/zones.h:336
-msgid "Indian/Christmas"
+msgid "Europe/Zaporozhye"
 msgstr ""
 
 #: calendar/zones.h:337
-msgid "Indian/Cocos"
+msgid "Europe/Zurich"
 msgstr ""
 
 #: calendar/zones.h:338
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:339
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:340
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:341
+msgid "Indian/Cocos"
+msgstr ""
+
+#: calendar/zones.h:342
 #, fuzzy
 msgid "Indian/Comoro"
 msgstr "Colours"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr ""
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr ""
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr ""
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr ""
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr ""
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
@@ -7184,12 +7719,12 @@ msgstr ""
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7197,7 +7732,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7205,11 +7740,16 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -7218,57 +7758,68 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -7296,25 +7847,98 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr ""
 
+#: camel/camel-folder.c:1317
+msgid "Copying messages"
+msgstr ""
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr ""
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:782
+msgid "No data provided"
+msgstr ""
+
+#: camel/camel-gpg-context.c:827
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr ""
+
+#: camel/camel-gpg-context.c:1077
+#, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1083
+#, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr ""
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+msgid "Failed to execute gpg."
+msgstr ""
+
+#: camel/camel-gpg-context.c:1258
+#, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7410,79 +8034,20 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr ""
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr ""
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr ""
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-signed.c:624
+msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-pgp-mime.c:354
-msgid "This is a digitally signed message part"
+#: camel/camel-multipart-signed.c:678
+msgid "parse error"
 msgstr ""
 
 #: camel/camel-provider.c:131
@@ -7500,43 +8065,6 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr ""
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr ""
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr ""
@@ -7630,7 +8158,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -7656,10 +8184,8 @@ msgid ""
 "Password Authentication."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
 msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
@@ -7687,51 +8213,51 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -7792,12 +8318,12 @@ msgstr ""
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
@@ -7820,7 +8346,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7829,16 +8355,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7853,14 +8379,13 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
 #: camel/camel-vee-store.c:262
@@ -7883,68 +8408,77 @@ msgstr "Synchronising \"%s\""
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -7997,32 +8531,79 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr ""
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, c-format
+msgid "IMAP server %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+msgid "SSL/TLS extension not supported."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+msgid "SSL negotiations failed"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8030,68 +8611,85 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
-msgid "MH-format mail directories"
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, c-format
+msgid "~%s (%s)"
+msgstr ""
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, c-format
+msgid "mailbox:%s (%s)"
+msgstr ""
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, c-format
+msgid "%s (%s)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:49
+msgid "MH-format mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
+msgid "Standard Unix mbox spool or directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8117,7 +8715,7 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
@@ -8137,53 +8735,50 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8192,13 +8787,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8212,7 +8807,7 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
@@ -8221,8 +8816,8 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -8241,59 +8836,49 @@ msgstr ""
 msgid "Checking for new messages"
 msgstr ""
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -8330,174 +8915,155 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
+#, c-format
+msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
-msgid "Error writing to temp mailbox: %s"
+msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
+msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
-#, c-format
-msgid "Could not close source folder %s: %s"
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
-msgid "Could not close temp folder: %s"
+msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/local/camel-mbox-summary.c:973
 #, c-format
-msgid "Could not rename folder: %s"
+msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:990
 #, c-format
-msgid "Unknown error: %s"
+msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-folder.c:515
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
-msgid "Cannot append message to spool file: %s: %s"
+msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:115
+#: camel/providers/local/camel-spool-store.c:128
 #, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
+msgid "Spool `%s' is not a regular file or directory"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, c-format
-msgid "Mail tree %s"
-msgstr ""
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr ""
@@ -8506,12 +9072,22 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8609,7 +9185,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr ""
 
@@ -8630,67 +9206,59 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-msgid "SSL/TLS extension not supported."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-msgid "SSL negotiations failed"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr ""
 
@@ -8850,41 +9418,41 @@ msgstr ""
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
+#: camel/providers/smtp/camel-smtp-transport.c:461
 #, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8892,88 +9460,88 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -8981,35 +9549,35 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr ""
 
@@ -9082,52 +9650,52 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr ""
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9138,102 +9706,131 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Synchronising \"%s\""
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+msgid "Signature:"
+msgstr ""
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+msgid "Set as default"
+msgstr ""
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9294,7 +9891,7 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9444,7 +10041,7 @@ msgstr ""
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr ""
 
@@ -9511,7 +10108,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr ""
 
@@ -9523,6 +10120,19 @@ msgstr ""
 msgid "Filter Rules"
 msgstr ""
 
+#: filter/filter-file.c:176
+msgid "You must specify a file name"
+msgstr ""
+
+#: filter/filter-file.c:186
+#, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr ""
+
+#: filter/filter-file.c:286
+msgid "Choose a file"
+msgstr ""
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9539,7 +10149,7 @@ msgid ""
 msgstr ""
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr ""
 
@@ -9550,7 +10160,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr ""
 
@@ -9579,7 +10193,7 @@ msgid "if all criteria are met"
 msgstr ""
 
 #: filter/filter-rule.c:769
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr ""
 
 #: filter/filter-rule.c:780
@@ -9656,189 +10270,198 @@ msgid "Beep"
 msgstr ""
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Colours"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr ""
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "is before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+msgid "Label"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr ""
 
@@ -9894,7 +10517,8 @@ msgid "Scanning %s"
 msgstr "Synchronise \"%s\""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr ""
 
@@ -9908,10 +10532,6 @@ msgstr ""
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr ""
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -9959,7 +10579,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr ""
 
@@ -10095,257 +10717,266 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr ""
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+msgid "Warning: Unsent Messages"
+msgstr ""
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Colours"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1645
-msgid "Label"
-msgstr ""
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "Synchronising \"%s\""
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr ""
 
@@ -10397,7 +11028,7 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
@@ -10407,79 +11038,104 @@ msgid "Evolution News Editor"
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-msgid "Random"
-msgstr ""
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr ""
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, c-format
+msgid "Mail to %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr ""
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10487,131 +11143,131 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 msgid "Go to next folder with unread messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10619,39 +11275,71 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+msgid " [script]"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+msgid "Unnamed"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Organisation"
+
+#: mail/mail-composer-prefs.c:861
+msgid "Add script signature"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:862
+msgid "Add Signature"
+msgstr ""
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -10689,172 +11377,162 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr ""
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 msgid "Work"
 msgstr ""
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr ""
 
-#: mail/mail-config.c:2458
+#: mail/mail-config.c:625
 #, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
+msgid "Account %d"
 msgstr ""
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.c:2999
-msgid "Unnamed"
-msgstr ""
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 msgid " "
 msgstr ""
 
 #: mail/mail-config.glade.h:2
-msgid " Edit "
+msgid " _Check for supported types "
 msgstr ""
 
 #: mail/mail-config.glade.h:3
-msgid " New "
+msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid " _Check for supported types "
+msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of Evolution)"
+msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
-msgid "(SSL is not supported in this build of evolution)"
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
 #: mail/mail-config.glade.h:7
-msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-msgid "Advanced Options"
+#: mail/mail-config.glade.h:10
+msgid "Add Sc_ript"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
-msgid "Afrikaans"
+#: mail/mail-config.glade.h:11
+msgid "Add new signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Alerts"
-msgstr ""
-
-#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Automatically _detect links"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "Colours"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Colours for display"
+
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10864,49 +11542,41 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
-msgid "Dari"
-msgstr ""
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 msgid "Deleting Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:47
-msgid "E_nable"
-msgstr ""
-
 #: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
+msgid "E_nable"
 msgstr ""
 
 #: mail/mail-config.glade.h:49
@@ -10925,32 +11595,28 @@ msgstr ""
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "Execute Command..."
-msgstr ""
-
 #: mail/mail-config.glade.h:54
-msgid "Fi_xed -width:"
+msgid "Execute Command..."
 msgstr ""
 
 #: mail/mail-config.glade.h:55
-msgid "Font Properties"
+msgid "Fi_xed -width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:56
-msgid "Format messages in _HTML"
+msgid "Font Properties"
 msgstr ""
 
 #: mail/mail-config.glade.h:57
-msgid "Get Digital ID..."
+msgid "Format messages in _HTML"
 msgstr ""
 
 #: mail/mail-config.glade.h:58
-msgid "Highlight _quotations with"
+msgid "Get Digital ID..."
 msgstr ""
 
 #: mail/mail-config.glade.h:59
-msgid "Hulu"
+msgid "Highlight _quotations with"
 msgstr ""
 
 #: mail/mail-config.glade.h:60
@@ -11002,61 +11668,57 @@ msgstr ""
 msgid "NNTP Server:"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "News Servers"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
-msgid "Quoted"
-msgstr ""
-
 #: mail/mail-config.glade.h:95
-msgid "Randomized"
+msgid "Quoted"
 msgstr ""
 
 #: mail/mail-config.glade.h:96
@@ -11089,237 +11751,235 @@ msgid "S_ecurity"
 msgstr ""
 
 #: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Select PGP program"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
-msgid "Select a signature file"
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+msgid "Sending Email"
 msgstr ""
 
 #: mail/mail-config.glade.h:112
-msgid "Select a signature script"
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-config.glade.h:113
+msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
+#: mail/mail-config.glade.h:114
+msgid "Ser_ver requires authentication"
 msgstr ""
 
 #: mail/mail-config.glade.h:115
-#, fuzzy
-msgid "Sent _messages folder:"
-msgstr "Synchronising \"%s\""
+msgid "Server Configuration"
+msgstr ""
 
 #: mail/mail-config.glade.h:116
-msgid "Sent and Draft Messages"
+msgid "Server _Type: "
 msgstr ""
 
 #: mail/mail-config.glade.h:117
-msgid "Ser_ver requires authentication"
+msgid "Shortcuts _type:"
 msgstr ""
 
 #: mail/mail-config.glade.h:118
-msgid "Server Configuration"
+msgid "Signature #1"
 msgstr ""
 
 #: mail/mail-config.glade.h:119
-msgid "Server _Type: "
+msgid "Signature #2"
 msgstr ""
 
 #: mail/mail-config.glade.h:120
-msgid "Shortcuts _type:"
+msgid "Source"
 msgstr ""
 
 #: mail/mail-config.glade.h:121
-msgid "Signature"
+msgid "Source Information"
 msgstr ""
 
 #: mail/mail-config.glade.h:122
-msgid "Source"
+msgid "Specify _filename:"
 msgstr ""
 
 #: mail/mail-config.glade.h:123
-msgid "Source Information"
+msgid "Spell Checking Language"
 msgstr ""
 
 #: mail/mail-config.glade.h:124
-msgid "Specify _filename:"
+msgid "Spell _Checking"
 msgstr ""
 
 #: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+msgid "Standard Unix mbox"
 msgstr ""
 
 #: mail/mail-config.glade.h:126
-msgid "Standard Unix mbox"
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-msgid "Use _HTML for this signature"
+#: mail/mail-config.glade.h:131
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
-msgid "XEmacs"
-msgstr ""
-
 #: mail/mail-config.glade.h:140
-msgid "_Always load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:141
-msgid "_Always sign outgoing messages when using this account"
+msgid "XEmacs"
 msgstr ""
 
 #: mail/mail-config.glade.h:142
-msgid "_Authentication Type: "
+msgid "_Add Signature"
 msgstr ""
 
 #: mail/mail-config.glade.h:143
-msgid "_Authentication type: "
+msgid "_Always load images off the net"
 msgstr ""
 
 #: mail/mail-config.glade.h:144
-msgid "_Automatically check for new mail"
+msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
 #: mail/mail-config.glade.h:145
-msgid "_Beep when new mail arrives"
+msgid "_Authentication Type: "
 msgstr ""
 
 #: mail/mail-config.glade.h:146
-msgid "_Certificate ID:"
+msgid "_Authentication type: "
 msgstr ""
 
 #: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
+msgid "_Automatically check for new mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:148
-msgid "_Confirm when expunging a folder"
+msgid "_Automatically insert smiley images"
 msgstr ""
 
 #: mail/mail-config.glade.h:149
-msgid "_Defaults"
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:150
+msgid "_Certificate ID:"
 msgstr ""
 
 #: mail/mail-config.glade.h:151
-msgid "_Do not notify me when new mail arrives"
+msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
+#: mail/mail-config.glade.h:152
+msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
-msgid "_Filename:"
+#: mail/mail-config.glade.h:153
+msgid "_Defaults"
 msgstr ""
 
 #: mail/mail-config.glade.h:155
-msgid "_Fixed-width:"
+msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
-msgid "_Forward style:"
+#: mail/mail-config.glade.h:157
+msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
-msgid "_Full name:"
+#: mail/mail-config.glade.h:158
+msgid "_Fixed-width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:159
-msgid "_HTML Mail"
+msgid "_Forward style:"
 msgstr ""
 
 #: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
+msgid "_Full name:"
 msgstr ""
 
 #: mail/mail-config.glade.h:162
-msgid "_Identity"
-msgstr ""
-
-#: mail/mail-config.glade.h:163
-msgid "_Language:"
+msgid "_HTML Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:164
-msgid "_Load images if sender is in addressbook"
+msgid "_Identity"
 msgstr ""
 
 #: mail/mail-config.glade.h:165
-msgid "_Make this my default account"
+msgid "_Load images if sender is in addressbook"
 msgstr ""
 
 #: mail/mail-config.glade.h:166
-msgid "_Mark messages as read after"
+msgid "_Make this my default account"
 msgstr ""
 
 #: mail/mail-config.glade.h:167
-msgid "_Name:"
+msgid "_Mark messages as read after"
 msgstr ""
 
 #: mail/mail-config.glade.h:168
-msgid "_Never load images off the net"
+msgid "_Name:"
 msgstr ""
 
 #: mail/mail-config.glade.h:169
-msgid "_PGP binary path:"
+msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
-msgid "_Play sound file when new mail arrives"
+#: mail/mail-config.glade.h:170
+msgid "_PGP binary path:"
 msgstr ""
 
 #: mail/mail-config.glade.h:172
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgid "_Play sound file when new mail arrives"
 msgstr ""
 
 #: mail/mail-config.glade.h:173
-msgid "_Prompt when sending messages with an empty subject line"
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
 #: mail/mail-config.glade.h:174
-msgid "_Random"
+msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
 #: mail/mail-config.glade.h:175
@@ -11355,67 +12015,51 @@ msgid "_Signatures"
 msgstr ""
 
 #: mail/mail-config.glade.h:183
-msgid "_Text Signature:"
-msgstr ""
-
-#: mail/mail-config.glade.h:184
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr ""
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr ""
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
@@ -11458,135 +12102,166 @@ msgstr ""
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1832
-msgid "Open Link in Browser"
+#: mail/mail-display.c:1553
+msgid "Overdue:"
 msgstr ""
 
 #: mail/mail-display.c:1833
+msgid "Open Link in Browser"
+msgstr ""
+
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr ""
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 msgid "Mailer"
 msgstr ""
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+msgid "View messages..."
+msgstr ""
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-local.c:670
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Synchronising \"%s\""
@@ -11641,127 +12316,119 @@ msgstr ""
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr ""
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr ""
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr ""
 
@@ -11832,10 +12499,6 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr ""
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr ""
@@ -11849,24 +12512,43 @@ msgstr ""
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr ""
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-signature-editor.c:357
-msgid "Signature name:"
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr ""
+
+#: mail/mail-signature-editor.c:397
+msgid "Signature hint"
+msgstr ""
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+msgid "Hide signature hint"
 msgstr ""
 
 #: mail/mail-tools.c:257
@@ -11882,17 +12564,17 @@ msgstr ""
 msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -11901,91 +12583,96 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr ""
+
+#: mail/mail-vfolder.c:784
 #, fuzzy
 msgid "vFolders"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr ""
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr ""
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr ""
 
@@ -12006,10 +12693,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Organisation"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr ""
 
@@ -16748,5247 +17440,5244 @@ msgstr ""
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr ""
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr ""
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr ""
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr ""
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr ""
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr ""
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr ""
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr ""
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr ""
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr ""
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr ""
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr ""
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr ""
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr ""
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr ""
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr ""
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr ""
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr ""
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr ""
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr ""
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr ""
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr ""
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr ""
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr ""
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr ""
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr ""
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr ""
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr ""
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr ""
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr ""
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr ""
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr ""
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr ""
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr ""
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr ""
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr ""
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr ""
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr ""
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr ""
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr ""
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr ""
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr ""
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr ""
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr ""
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr ""
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr ""
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr ""
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr ""
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr ""
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr ""
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr ""
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr ""
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr ""
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr ""
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr ""
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr ""
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr ""
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr ""
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr ""
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr ""
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr ""
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr ""
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr ""
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr ""
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr ""
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr ""
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr ""
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr ""
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr ""
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr ""
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr ""
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr ""
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr ""
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr ""
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr ""
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr ""
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr ""
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr ""
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr ""
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr ""
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr ""
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr ""
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr ""
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr ""
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr ""
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr ""
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr ""
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr ""
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr ""
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr ""
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr ""
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "Synchronise \"%s\""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr ""
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr ""
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr ""
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr ""
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr ""
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr ""
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr ""
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr ""
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr ""
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr ""
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr ""
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr ""
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr ""
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr ""
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr ""
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr ""
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr ""
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr ""
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr ""
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr ""
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr ""
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr ""
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr ""
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr ""
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr ""
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr ""
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr ""
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr ""
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr ""
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr ""
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr ""
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr ""
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr ""
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr ""
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr ""
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr ""
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "Organisation:"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr ""
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr ""
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr ""
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr ""
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr ""
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr ""
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr ""
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr ""
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr ""
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr ""
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr ""
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr ""
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr ""
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr ""
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr ""
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr ""
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr ""
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr ""
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr ""
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr ""
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr ""
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr ""
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr ""
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr ""
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr ""
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr ""
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr ""
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr ""
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr ""
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr ""
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr ""
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr ""
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr ""
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr ""
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr ""
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr ""
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr ""
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr ""
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr ""
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr ""
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr ""
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr ""
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr ""
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr ""
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr ""
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr ""
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr ""
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr ""
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr ""
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr ""
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr ""
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr ""
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr ""
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr ""
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr ""
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr ""
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr ""
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr ""
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr ""
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr ""
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr ""
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr ""
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr ""
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr ""
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr ""
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr ""
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr ""
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr ""
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr ""
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr ""
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr ""
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr ""
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr ""
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr ""
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr ""
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr ""
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr ""
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr ""
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr ""
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr ""
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr ""
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr ""
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr ""
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr ""
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr ""
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr ""
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr ""
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr ""
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr ""
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr ""
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "Synchronising \"%s\""
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "Synchronise \"%s\""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr ""
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr ""
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr ""
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr ""
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr ""
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Organisation"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr ""
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr ""
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr ""
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr ""
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr ""
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr ""
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr ""
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr ""
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr ""
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr ""
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr ""
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Toulouse"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr ""
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr ""
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "Organisation"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr ""
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr ""
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr ""
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr ""
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr ""
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr ""
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr ""
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr ""
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr ""
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr ""
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr ""
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr ""
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr ""
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr ""
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr ""
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr ""
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr ""
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr ""
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr ""
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr ""
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr ""
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr ""
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "Colours"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr ""
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr ""
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr ""
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr ""
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr ""
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr ""
 
@@ -22016,17 +22705,12 @@ msgstr ""
 msgid "No description"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr ""
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr ""
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr ""
 
@@ -22035,54 +22719,45 @@ msgstr ""
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr ""
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
-msgid "Add ->"
-msgstr ""
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-msgid "<- Remove"
+#: my-evolution/e-summary-shown.c:545
+msgid "Add"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr ""
 
@@ -22122,11 +22797,44 @@ msgstr ""
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Could not initialise Bonobo"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr ""
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "Colours"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr ""
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr ""
@@ -23278,92 +23986,97 @@ msgid "C_elsius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:4
-msgid "How many days should the calendar display at once?"
+msgid "Delete news feed"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:5
-msgid "Ma_x number of items shown:"
+msgid "How many days should the calendar display at once?"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:6
-msgid "News Feed Settings"
+msgid "Ma_x number of items shown:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:7
-msgid "One mont_h"
+msgid "News Feed Settings"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:8
-msgid "One w_eek"
+msgid "One mont_h"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:9
-msgid "R_efresh time (seconds):"
+msgid "One w_eek"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:10
-msgid "Refresh _time (seconds):"
+msgid "R_efresh time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:11
-msgid "S_how full path for folders"
+msgid "Refresh _time (seconds):"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Show _all tasks"
+msgid "S_how full path for folders"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:13
-msgid "Show _today's tasks"
+msgid "Show _all tasks"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:14
-msgid "Show temperatures in:"
+msgid "Show _today's tasks"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:15
-msgid "Tasks "
+msgid "Show temperatures in:"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:16
-msgid "Weather settings"
+msgid "Tasks "
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "_Fahrenheit"
+msgid "Weather settings"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:18
-msgid "_Five days"
+msgid "_Fahrenheit"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "_Mail"
+msgid "_Five days"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:20
-msgid "_News Feeds"
+msgid "_Mail"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:21
-msgid "_One day"
+msgid "_News Feeds"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:22
-msgid "_Schedule"
+msgid "_One day"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:23
+msgid "_Schedule"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Cannot initialise Evolution's mail component."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
+msgid "Folder Settings"
 msgstr "Synchronising \"%s\""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
@@ -23372,7 +24085,7 @@ msgid "The Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -23383,6 +24096,36 @@ msgstr ""
 msgid "Cancel Operation"
 msgstr ""
 
+#: shell/e-folder-dnd-bridge.c:52
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr ""
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:177
+#, fuzzy
+msgid "Sent"
+msgstr "Synchronising \"%s\""
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr ""
@@ -23469,6 +24212,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Synchronising \"%s\""
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -23496,56 +24264,55 @@ msgstr ""
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 #, fuzzy
 msgid "Copy folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
+#: shell/e-shell-folder-commands.c:407
 #, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
+msgid "Really delete folder \"%s\"?"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23562,13 +24329,13 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr ""
 
@@ -23610,112 +24377,159 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 #, fuzzy
 msgid "Select folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr ""
 
+#: shell/e-shell-offline-sync.c:161
+#, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Synchronising \"%s\""
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, c-format
+msgid "in \"%s\" ..."
+msgstr ""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+
 #: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
@@ -23728,8 +24542,8 @@ msgstr "Cannot initialise Evolution's mail storage hash."
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Cannot initialise Evolution's mail storage hash."
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr ""
@@ -23750,44 +24564,44 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr ""
 
@@ -23818,7 +24632,7 @@ msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -23826,12 +24640,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23839,23 +24653,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr ""
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr ""
 
@@ -23878,95 +24688,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -23978,10 +24788,6 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr ""
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -24045,10 +24851,11 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -24078,68 +24885,68 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Synchronising \"%s\""
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 msgid "Test type"
 msgstr ""
 
@@ -24256,48 +25063,79 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Cannot initialise the Evolution shell."
+
+#: shell/main.c:254
+msgid "Don't tell me again"
+msgstr ""
+
+#: shell/main.c:347
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:318
+#: shell/main.c:438
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:319
+#: shell/main.c:439
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
@@ -24407,11 +25245,11 @@ msgstr ""
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr ""
 
@@ -24534,8 +25372,8 @@ msgstr "Colours"
 msgid "Delete this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr ""
 
@@ -24575,7 +25413,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr ""
 
@@ -24640,19 +25478,19 @@ msgstr ""
 msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr ""
 
@@ -24660,10 +25498,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr ""
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr ""
@@ -24817,7 +25651,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr ""
 
@@ -25209,7 +26043,7 @@ msgstr ""
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr ""
 
@@ -25224,13 +26058,13 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Close"
 msgstr "Colours"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr ""
 
@@ -25417,7 +26251,7 @@ msgstr ""
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr ""
 
@@ -25563,111 +26397,119 @@ msgid "Move this folder to another place"
 msgstr ""
 
 #: ui/evolution.xml.h:18
-msgid "Open in New Window"
+msgid "Open Other _User's Folder..."
+msgstr ""
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
 #: ui/evolution.xml.h:20
+msgid "Open in New Window"
+msgstr ""
+
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Cannot initialise the Evolution shell."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr ""
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr ""
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr ""
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr ""
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr ""
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr ""
 
@@ -25749,20 +26591,20 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr ""
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 msgid "Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr ""
 
@@ -25884,14 +26726,18 @@ msgstr ""
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 msgid "_Save Search..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 msgid "_Edit Saved Searches..."
 msgstr ""
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+msgid "_Advanced..."
+msgstr ""
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr ""
@@ -25913,21 +26759,21 @@ msgstr ""
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Colours"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 #, fuzzy
 msgid "Clear"
 msgstr "Colours"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr ""
 
@@ -25957,6 +26803,22 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
 #, fuzzy
+#~ msgid "Configuration control for the Evolution Addressbook."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Cannot initialise Evolution's mail summary component."
+
+#, fuzzy
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "_Other Organizer"
+#~ msgstr "Organisation:"
+
+#, fuzzy
 #~ msgid "_Organization:"
 #~ msgstr "Organisation:"
 
@@ -25973,12 +26835,6 @@ msgstr "Could not initialise Bonobo"
 #~ msgstr "Synchronising \"%s\""
 
 #, fuzzy
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
 #~ msgid "Summarising folder"
 #~ msgstr "Synchronising \"%s\""
 
@@ -25986,10 +26842,6 @@ msgstr "Could not initialise Bonobo"
 #~ msgid "Cannot initialize Evolution's Executive Summary component."
 #~ msgstr "Cannot initialise Evolution's mail component."
 
-#, fuzzy
-#~ msgid "Synchronizing folder"
-#~ msgstr "Synchronising \"%s\""
-
 #~ msgid "%d/%m/%Y"
 #~ msgstr "%m/%d/%Y"
 
@@ -26034,13 +26886,13 @@ msgstr "Could not initialise Bonobo"
 #~ "Rev\n"
 
 #~ msgid ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organization, and the name of a file to "
-#~ "read your signature from."
+#~ "Enter your name and email address to be used in outgoing mail. You may "
+#~ "also, optionally, enter the name of your organization, and the name of a "
+#~ "file to read your signature from."
 #~ msgstr ""
-#~ "Enter your name and email address to be used in outgoing mail. You may also, "
-#~ "optionally, enter the name of your organisation, and the name of a file to "
-#~ "read your signature from."
+#~ "Enter your name and email address to be used in outgoing mail. You may "
+#~ "also, optionally, enter the name of your organisation, and the name of a "
+#~ "file to read your signature from."
 
 #~ msgid "Querying authorization capabilities of \"%s\""
 #~ msgstr "Querying authorisation capabilities of \"%s\""
diff --git a/po/es.po b/po/es.po
index 6803746884..6168a377e4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-03-03 21:29+0100\n"
 "Last-Translator: H�ctor Garc�a �lvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
@@ -42,7 +42,7 @@ msgstr "Archivar como"
 # src/file-manager/fm-list-view.c:1581
 # src/file-manager/fm-search-list-view.c:140
 # src/nautilus-bookmarks-window.c:172
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nombre"
@@ -53,7 +53,7 @@ msgid "Email"
 msgstr "Correo electr�nico"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Principal"
 
@@ -63,7 +63,7 @@ msgstr "Ppal"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asistente"
@@ -71,8 +71,8 @@ msgstr "Asistente"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Trabajo"
 
@@ -82,12 +82,12 @@ msgid "Bus"
 msgstr "Bus"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Rellamada"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Compa��a"
 
@@ -98,8 +98,8 @@ msgstr "Comp"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Casa"
 
@@ -114,18 +114,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "M�vil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Coche"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax del trabajo"
@@ -135,13 +135,13 @@ msgid "Bus Fax"
 msgstr "Fax de Trab"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax de casa"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Trabajo 2"
 
@@ -150,12 +150,12 @@ msgid "Bus 2"
 msgstr "Trab 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Casa 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "RDSI"
@@ -164,31 +164,31 @@ msgstr "RDSI"
 # src/file-manager/fm-properties-window.c:1560
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Otro"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Otro fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Buscapersonas"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
@@ -200,14 +200,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "Correo electr�nico 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Correo electr�nico 3"
@@ -347,7 +347,7 @@ msgstr "VCard para %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -355,7 +355,7 @@ msgid "Could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Buscando..."
 
@@ -368,32 +368,32 @@ msgstr "Cargando..."
 msgid "Error in search expression."
 msgstr "Error buscando la expresi�n."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "A�adiendo tarjeta al servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Eliminando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Modificando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Reiniciando b�squeda."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Recibiendo los resultados de la b�squeda LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Error eliminando tarjeta"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "No pude analizar la URL `%s'"
@@ -441,104 +441,140 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Un control Bonobo de ejemplo que muestra una agenda."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "Fuentes de la agenda de direcciones"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Control que muestra minitarjetas de direcciones en Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Visor de Minitarjetas de Direcciones de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Componente de Evolution para manejar contactos."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Factor�a para el control de Minitarjetas de Direcciones"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Factor�a para el visualizador de direcciones de la Agenda"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Factor�a para la ventana de direcciones de la Agenda"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Factor�a para el control de ejemplo de la Agenda"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "La carpeta contiene informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "El servidor LDAP contiene informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Nueva lista de contactos"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "Lista de _contactos"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Nuevo contacto"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Nueva lista de contactos"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "No pude conectarme al servidor LDAP."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "Lista de _contactos"
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"No pude autenticarme en el servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "La respuesta del servidor IMAP no conten�a informaci�n de %s"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Error cargando la informaci�n del filtro:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "La respuesta del servidor IMAP no conten�a informaci�n de %s"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL no est� implementado en esta compilaci�n de evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "No se puede inicializar gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Otros contactos"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "No es posible abrir la agenda de direcciones"
@@ -573,50 +609,61 @@ msgstr ""
 "No pudimos abrir esta agenda de direcciones.  Por favor compruebe\n"
 "que existe la ruta y que tiene permisos para acceder a ella."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduzca la contrase�a para %s (usuario %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "finaliza con"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "Correo electr�nico 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categor�a es"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Avanzado..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Cualquier categor�a"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrar� el visor de carpetas"
 
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# components/sample/nautilus-sample-content-view.c:85
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(ninguno)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Correo electr�nico principal"
 
@@ -662,106 +709,59 @@ msgstr "Deshabilitar Consultas"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Habilitar Consultas (�Peligroso!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "No pude conectarme al servidor LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"No pude autenticarme en el servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Informaci�n opaca de seguimiento inv�lida:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "La respuesta del servidor IMAP no conten�a informaci�n de %s"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL no est� implementado en esta compilaci�n de evolution)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Fecha de vencimiento"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "_Comprobar tipos soportados "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Opciones"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "_Quitar"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "_Quitar"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Opciones"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -770,8 +770,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Fuentes de la agenda de direcciones"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Alarmas"
@@ -870,8 +870,8 @@ msgstr "Configuraci�n"
 msgid "Mappings"
 msgstr "M�rgenes"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_cada"
@@ -1056,15 +1056,15 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 "Este es el m�ximo n�mero de tarjetas a descargar.  Si pone este n�mero "
@@ -1092,8 +1092,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1127,7 +1127,7 @@ msgid "Using email address"
 msgstr "Direcci�n de correo:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1135,7 +1135,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_A�adir"
 
@@ -1187,7 +1187,7 @@ msgstr "Descargar"
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-undo-signal-handlers.c:174
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1307,10 +1307,12 @@ msgstr "Factor�a para la interfaz de selecci�n de nombre de la Agenda"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/nautilus-bookmarks-window.c:198 src/nautilus-window-menus.c:588
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -1440,7 +1442,7 @@ msgstr "Colaboraci�n"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -1449,7 +1451,7 @@ msgid "D_epartment:"
 msgstr "_Departamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Detalles"
 
@@ -1509,11 +1511,12 @@ msgstr "Prefiere recibir el correo como _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -1542,7 +1545,7 @@ msgid "_Web page address:"
 msgstr "Direcci�n de la p�gina _web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Estados Unidos"
 
@@ -2048,12 +2051,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Latvia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "L�bano"
 
@@ -2062,7 +2064,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
@@ -2071,12 +2073,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lituania"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
@@ -2109,7 +2111,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2134,7 +2136,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "M�xico"
 
@@ -2160,7 +2162,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marruecos"
 
@@ -2185,7 +2187,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Holanda"
 
@@ -2198,12 +2200,12 @@ msgid "New Caledonia"
 msgstr "Nueva Caledonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nueva Zelanda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2220,7 +2222,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Islas Norfolk"
 
@@ -2229,17 +2231,17 @@ msgid "Northern Mariana Islands"
 msgstr "Islas al Noreste de Mariana"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Noruega"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Om�n"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakist�n"
 
@@ -2252,7 +2254,7 @@ msgid "Palestinian Territory"
 msgstr "Territorios palestinos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panam�"
 
@@ -2261,12 +2263,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Nueva Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Per�"
 
@@ -2279,22 +2281,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
@@ -2303,7 +2305,7 @@ msgid "Reunion"
 msgstr "Reuni�n"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Ruman�a"
 
@@ -2340,7 +2342,7 @@ msgid "Sao Tome And Principe"
 msgstr "Santo Tom� y Pr�ncipe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Arabia Saud�"
 
@@ -2357,17 +2359,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leona"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapur"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Eslovenia"
 
@@ -2380,7 +2382,7 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Sud�frica"
 
@@ -2389,7 +2391,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Georgia del Sur y las Islas Sandwich Meridionales"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Espa�a"
 
@@ -2410,7 +2412,7 @@ msgid "Sudan"
 msgstr "Sud�n"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surin�m"
 
@@ -2423,17 +2425,17 @@ msgid "Swaziland"
 msgstr "Suazilandia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Suecia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Suiza"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
@@ -2471,7 +2473,7 @@ msgid "Tunisia"
 msgstr "T�nez"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turqu�a"
 
@@ -2492,7 +2494,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ucrania"
 
@@ -2501,7 +2503,7 @@ msgid "United Arab Emirates"
 msgstr "Emiratos �rabes Unidos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
@@ -2510,7 +2512,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2523,12 +2525,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2551,12 +2553,12 @@ msgid "Western Sahara"
 msgstr "Sahara Occidental"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Yugoslavia"
 
@@ -2569,26 +2571,34 @@ msgid "Zimbabwe"
 msgstr "Zimbiabue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"�Esta seguro que quiere\n"
+"borrar este contacto?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "�Borrar contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "No hay un editor de categor�as disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto est� en estas categor�as:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Guardar contacto como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "No pude encontrar el widget para el campo: `%s'"
@@ -2615,11 +2625,11 @@ msgstr "Correo electr�nico"
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2754,11 +2764,11 @@ msgid "contact-list-editor"
 msgstr "editor-de-listas-de-contactos"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Guardar lista como VCard"
 
@@ -2840,21 +2850,21 @@ msgid "Error getting book view"
 msgstr "Error al configurar el propietario"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Error modificando tarjeta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "�xito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -2863,7 +2873,7 @@ msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -2881,59 +2891,74 @@ msgstr "Protocolo no implementado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Cancelar"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Fallo en la autenticaci�n."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autenticaci�n requerida"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Otro error"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "�Desea guardar los cambios?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Error a�adiendo lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Error a�adiendo tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Error modificando lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Error eliminando lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Error eliminando tarjeta"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-global-preferences.c:149
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Mostrar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-global-preferences.c:149
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Mostrar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2941,19 +2966,19 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 msgid "Move card to"
 msgstr "Mover tarjeta a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Copy card to"
 msgstr "Copiar tarjeta a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 msgid "Move cards to"
 msgstr "Mover tarjetas a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 msgid "Copy cards to"
 msgstr "Copiar tarjetas a"
 
@@ -3017,105 +3042,111 @@ msgstr "Otro tel�fono"
 msgid "Other Address"
 msgstr "Otra direcci�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Agenda de direcciones"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Guardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Nuevo contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nueva lista de contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "Bu_scar contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Fuentes de la _Agenda..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Configuraci�n del pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Reenviar contacto"
 
 #
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Enviar un mensaje al contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Imprimir cabecera"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Mover a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Pegar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:1865
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Suprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3125,7 +3156,7 @@ msgstr "_Vista actual"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,�,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3133,7 +3164,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,�,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,�,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3283,7 +3314,7 @@ msgstr "M�rgenes"
 msgid "Number of columns:"
 msgstr "N�mero de columnas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opciones"
 
@@ -3293,7 +3324,7 @@ msgid "Orientation"
 msgstr "Orientaci�n"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "P�gina"
 
@@ -3371,29 +3402,33 @@ msgstr "Ancho:"
 msgid "_Font..."
 msgstr "_Tipo de letra..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Cita sin t�tulo"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Baja"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Sin definir"
 
@@ -3435,43 +3470,35 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Factor�a para el compositor de correo de Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Componente de resumen de trabajo de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Visor del calendario iTip/iMip de Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Componente de Evolution para manejar el calendario."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Factor�a para el componente de Resumen de Calendario."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Factor�a para el control de tareas de Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Factor�a para el control de vista de calendario iTip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Factor�a para el control del Calendario de ejemplo"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 "Factor�a para centralizar el componente del editor de di�logos del calendario"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Factor�a para crear el componente del editor"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3483,10 +3510,23 @@ msgstr "Servicio de notificaci�n de alarmas"
 msgid "Factory for the alarm notification service"
 msgstr "Factor�a para la alarma del servicio de notificaci�n"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "Comenzando:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "Finalizando:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "tiempo no v�lido"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution "
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3526,7 +3566,7 @@ msgstr ""
 "Evolution mostrar� un di�logo de recordatorio normal."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advertencia"
@@ -3552,15 +3592,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "No me preguntes otra vez sobre este programa."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "No se puede inicializar GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "No pude crear el servicio de la alarma de notificaci�n"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "No pude crear la factor�a del servicio de la alarma de notificaci�n"
 
@@ -3576,7 +3616,7 @@ msgstr "La descripci�n contiene"
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "No coincidente"
 
@@ -3615,14 +3655,16 @@ msgid ""
 msgstr "No pude mostrar el calendario.  Por favor compruebe su ORBit y su OAF."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privado"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "P�blico"
 
@@ -3643,27 +3685,32 @@ msgid "W"
 msgstr "W"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Ocupado"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Sin comenzar"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "En proceso"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Completado"
 
@@ -3678,11 +3725,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3697,12 +3745,14 @@ msgstr "Recurriendo"
 msgid "Assigned"
 msgstr "Asignado"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "No"
 
@@ -3722,58 +3772,60 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Carpeta conteniendo citas y eventos"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tareas"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Carpeta que contiene elementos por hacer"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "New meeting"
 msgstr "Nueva reuni�n"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "_Meeting"
 msgstr "_Reuni�n"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "New task"
 msgstr "Nueva tarea"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Tarea"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Cit_a"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "New appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "_Appointment"
 msgstr "Cit_a"
 
@@ -3984,7 +4036,7 @@ msgstr "Recordatorios"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -4013,7 +4065,7 @@ msgstr "fin de la cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4041,79 +4093,81 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Configuraci�n del calendario y de las tareas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Color para las tareas fuera de plazo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Color para las tareas para hoy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "D�as"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Viernes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Lunes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "Do_m"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "S�bado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar los _n�meros de las semanas en el navegador de fechas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "Co_mienzo del d�a:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "Do_m"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Ta_reas de plazo hoy:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "Ju_e"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "M_ar"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4142,82 +4196,97 @@ msgid "Tuesday"
 msgstr "Martes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Mi�rcoles"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Semana Laboral"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_aci�n al borrar elementos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir fines de semana en la vista mensual"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "La tarea empieza: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Mostrar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "Fin d_el d�a:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_Vier"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_General"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar tareas completadas tras"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Tareas fuera de pla_zo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_Sab"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr ""
 "Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Di_visiones de tiempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "M_ar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "M_ier"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "antes de comenzar la cita"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4301,40 +4370,61 @@ msgstr " (Falta "
 msgid "Due "
 msgstr "Falta "
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "�No pude actualizar el objeto!"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
 msgstr "�No pude actualizar el objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "�Imposible obtener versi�n actual!"
 
@@ -4392,27 +4482,27 @@ msgstr "Delegado A:"
 msgid "Enter Delegate"
 msgstr "Escribir delegado"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Repetici�n"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Planificaci�n"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Reuni�n"
 
@@ -4459,7 +4549,7 @@ msgid "Pu_blic"
 msgstr "P�_blico"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Mostrar tiempo como"
 
@@ -4481,19 +4571,19 @@ msgstr "Hora de _fin:"
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un asistente."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "�Esa persona ya est� participando en la reuni�n!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Delegado a..."
 
@@ -4504,45 +4594,51 @@ msgstr "Participantes"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Nombre com�n"
+msgid "Click here to add an attendee"
+msgstr "Pulse aqu� para a�adir un contacto"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delegado por"
+msgid "Common Name"
+msgstr "Nombre com�n"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegado a"
+msgid "Delegated From"
+msgstr "Delegado por"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Idioma"
+msgid "Delegated To"
+msgstr "Delegado a"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Miembro"
+msgid "Language"
+msgstr "Idioma"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Miembro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1199
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
@@ -4550,9 +4646,9 @@ msgstr "Estado"
 # libnautilus-private/nautilus-search-bar-criterion.c:44
 # src/file-manager/fm-list-view.c:1593
 # src/file-manager/fm-search-list-view.c:152
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
@@ -4567,14 +4663,10 @@ msgid "_Change Organizer"
 msgstr "_Cambiar organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Invitar a otros..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Otro organizador"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4765,7 +4857,7 @@ msgid "Progress"
 msgstr "Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4779,19 +4871,19 @@ msgstr "E_stado:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-properties-window.c:1031
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "B�sico"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Asignaci�n"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Descripci�n:"
 
@@ -4803,25 +4895,80 @@ msgstr "Fecha de Ini_cio:"
 msgid "_Due Date:"
 msgstr "Fecha _de Fin:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2114
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Guardar como..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4829,20 +4976,20 @@ msgstr "Guardar como..."
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4850,35 +4997,36 @@ msgstr "_Copiar"
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Asignar tarea"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Reenviar como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_Marcar como completo"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas como completas"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Pulse para a�adir una tarea"
 
@@ -4886,47 +5034,48 @@ msgstr "Pulse para a�adir una tarea"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Completo"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Fecha de vencimiento"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Fecha de plazo"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Fecha fin"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Posici�n geogr�fica"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioridad"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Fecha de Inicio"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Resumen"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4974,11 +5123,13 @@ msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -5019,7 +5170,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Publicar la informaci�n de disponibilidad"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Configurar"
@@ -5030,7 +5181,7 @@ msgid "_Configure Pilot..."
 msgstr "Configurar"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
@@ -5057,77 +5208,398 @@ msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las ocurrencias"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Las utilidades GNOME Pilot no aparecen instaladas en este sistema."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Error ejecutando %s."
 
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "La reuni�n empieza: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "La tarea empieza: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "La informaci�n de disponibilidad comienza: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Empieza: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "La reuni�n termina: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "La informaci�n de disponibilidad finaliza: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "Termina: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "Tarea completada: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "Plazo para la tarea: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "Informaci�n del calendario"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "Error de calendario"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "Una persona desconocida"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Por favor revise la siguiente informaci�n, y seleccione una acci�n del "
+"men� de abajo."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Ninguna<i>"
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "E_stado:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Aceptado"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "Aceptar tentativamente"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Rechazado"
+
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-file.c:2936
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "�El archivo del calendario no pudo ser actualizado!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "Elija una acci�n:"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Actualizar"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Aceptar"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "Aceptar"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "Aceptar tentativamente"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "Rechazar"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "Enviar informaci�n de disponibilidad"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "Actualizar el estado del remitente"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "Enviar �ltima informaci�n"
+
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# libnautilus-private/nautilus-program-chooser.c:1262
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> ha publicado informaci�n de reuniones."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Informaci�n  de reuniones"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> solicita su presencia en una reuni�n."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "Propuesta de reuni�n"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> desea apuntarse a una reuni�n existente."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "Actualizaci�n de la reuni�n"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> desea recibir la �ltima actualizaci�n de la reuni�n."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "Petici�n de actualizaci�n de la reuni�n"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> ha contestado a la petici�n de reuni�n."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "Respuesta de reuni�n"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> ha cancelado una reuni�n."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "Cancelaci�n de reuni�n"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Mensaje de reuni�n err�neo"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> ha publicado la informaci�n de la tarea."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Informaci�n de la tarea"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> te pide que realices una tarea."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Propuesta de tarea"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> desea a�adir a una tarea existente."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Actualizaci�n de tarea"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> quiere recibir la �ltima informaci�n de la tarea."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Petici�n de actualizaci�n de tarea"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> ha contestado a una asignaci�n de tarea."
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Respuesta a una tarea"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> ha cancelado una tarea."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Cancelaci�n de tarea"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Mensaje de tarea err�neo"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> ha publicado la informaci�n de disponibilidad."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Informaci�n de disponibilidad"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> pide su informaci�n de disponibilidad."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Petici�n de disponibilidad"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> ha contestado a una petici�n de disponibilidad."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Respuesta sobre disponibilidad"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Mensaje de disponibilidad err�neo"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "La carpeta parece estar corrompida e irrecuperable."
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "Este mensaje solo contiene peticiones no soportadas."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "El adjunto no contiene un calendario de mensaje v�lido"
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "El adjunto no tiene elementos de calendario visibles"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#, fuzzy
+msgid "There was an error on the CORBA system\n"
+msgstr "Lo siento, pero hubo un error al leer %s."
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "�El elemento no puedo ser enviado!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Actualizaci�n completada\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "�El archivo del calendario no pudo ser actualizado!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado de asistencia no puede ser actualizado porque no existe el elemento"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "�El estado de asistencia no pudo ser actualizado a causa de un estado "
 "inv�lido!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "�El estado de asistencia no pudo ser actualizado!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "�El estado de asistencia no pudo ser actualizado!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Borrado completo"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "�Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "�El elemento no puedo ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccionar carpeta"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccionar carpeta"
@@ -5169,93 +5641,92 @@ msgstr "fecha de fin"
 msgid "date-start"
 msgstr "fecha de inicio"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Participantes opcionales"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "No participan"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Habitaci�n"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Silla"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Participantes requeridos"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Participantes opcional"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "No participan"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Necesita acci�n"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Aceptado"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Rechazado"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Delegado"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "En proceso"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5267,63 +5738,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Sin informaci�n"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Opciones"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Mostrar _solo las horas de trabajo"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Mostrar quitando _Zoom"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Actualizar Libre/Ocupado"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Auto seleccionar"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Todas las personas y los recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Todas las _personas y un recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Personas _requeridas"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Hora de _inicio de la reuni�n:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Hora de _fin de la reuni�n:"
 
@@ -5342,17 +5813,22 @@ msgstr "No puedo cargar las tareas en `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "El m�todo necesario para cargar `%s' no est� implementado"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "No puedo abrir la carpeta en `%s'"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Fecha de vencimiento"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Borrando los objetos seleccionados"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "Comprimiendo carpeta"
@@ -5365,17 +5841,17 @@ msgstr "Nueva cit_a..."
 msgid "_Delete this Appointment"
 msgstr "_Borrar esta cita"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "No puedo abrir la carpeta en `%s'"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�todo necesario para abrir `%s' no est� implementado"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abriendo calendario en %s"
@@ -5436,19 +5912,53 @@ msgstr "Octubre"
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Es necesario por lo menos un asistente"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr "Informaci�n del evento"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "Informaci�n de la tarea"
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr "Informaci�n de la entrada de diario"
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr "Informaci�n de disponibilidad"
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr "Informaci�n del calendario"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Actualizar"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Regenerar la lista"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Debes participar en el evento."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "No pude crear la factor�a del componente editor"
 
@@ -5637,12 +6147,45 @@ msgstr "Mes seleccionado (%b de %Y)"
 msgid "Selected year (%Y)"
 msgstr "A�o seleccionado (%Y)"
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "Tarea"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Estado: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioridad:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Porcentaje Completado: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Categor�as: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Contactos: "
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5679,8 +6222,8 @@ msgstr ""
 "\n"
 "�Borrar realmente esos mensajes?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
@@ -5746,6 +6289,11 @@ msgstr "Importa archivos VCard a Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importa archivos VCard a Evolution."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Recordatorio"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5840,8 +6388,8 @@ msgstr "contains? espera que el argumento 2 sea una cadena"
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 "contains? espera que el argumento 1 sea �any�, �summary� � �description�"
 
@@ -6772,638 +7320,654 @@ msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Asia/Macao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Asia/Magadan"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Asia/Kabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Asia/Singapur"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Asia/Tehran"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantico/Azores"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atl�ntico/Bermudas"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlantico/Canarias"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atl�ntico/Cabo Verde"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlantico/Feroe"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantico/Jan_Mayen"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlantico/Madeira"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantico/Reykjavik"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantico/South_Georgia"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlantico/St_Helena"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlantico/Stanley"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaida"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europa/Atenas"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrado"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europa/Berl�n"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europa/Bruselas"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucarest"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europa/Dubl�n"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europa/Estanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrado"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europa/Londres"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburgo"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europa/M�naco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europa/Mosc�"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europa/Par�s"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europa/San Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europa/Stocokolmo"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europa/Vaticana"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europa/Viena"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europa/Warsovia"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europa/Zurich"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "�ndico/Antananarivo"
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "�ndico/Chagos"
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "�ndico/Christmas"
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "�ndico/Cocos"
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "�ndico/Comoros"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "�ndico/Kerguelen"
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "�ndico/Mahe"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "�ndico/Maldivas"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "�ndico/Mauricio"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "�ndico/Mayotte"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "�ndico/Reuni�n"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Pac�fico/Apia"
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Pac�fico/Auckland"
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Pac�fico/Chatham"
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Pac�fico/Easter"
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Pac�fico/Efate"
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Pac�fico/Enderbury"
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Pac�fico/Fakaofo"
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Pac�fico/Fiji"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Pac�fico/Funafuti"
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Pac�fico/Galapagos"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Pac�fico/Gambier"
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Pac�fico/Guadalcanal"
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Pac�fico/Guam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Pac�fico/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Pac�fico/Johnston"
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Pac�fico/Kiritimati"
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Pac�fico/Kosrae"
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Pac�fico/Kwajalein"
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Pac�fico/Majuro"
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Pac�fico/Marquesas"
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Pac�fico/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Pac�fico/Nauru"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Pac�fico/Niue"
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Pac�fico/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Pac�fico/Noumea"
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Pac�fico/Pago_Pago"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Pac�fico/Palau"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Pac�fico/Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Pac�fico/Ponape"
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Pac�fico/Port_Moresby"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Pac�fico/Rarotonga"
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Pac�fico/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Pac�fico/Tahiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Pac�fico/Tarawa"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Pac�fico/Tongatapu"
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Pac�fico/Truk"
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Pac�fico/Wake"
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Pac�fico/Wallis"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Pac�fico/Yap"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Las firmas no est�n implementadas en este cifrado"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Las firmas en claro no est�n implementadas en este cifrado"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "La verificaci�n no est� implementada en este cifrado"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "El cifrado no est� implementada por este cifrado"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "El descifrado no est� implementada por este cifrado"
 
@@ -7412,12 +7976,12 @@ msgstr "El descifrado no est� implementada por este cifrado"
 msgid "Unable to create cache path"
 msgstr "Imposible reemplazar archivo."
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "No puedo abrir directorio de cache: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7428,7 +7992,7 @@ msgstr ""
 "Las siguientes operaciones en este servidor no ser�n respondidas\n"
 "cuando se reconecte a la red."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7439,11 +8003,16 @@ msgstr ""
 "%s\n"
 "Los cambios hechos a esta carpeta no ser�n resincronizados."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Resincronizando con el servidor"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Guardando carpeta '%s'"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar trabajando en l�nea para completar esta operaci�n"
 
@@ -7451,57 +8020,68 @@ msgstr "Debe estar trabajando en l�nea para completar esta operaci�n"
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error analizando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "No pude abrir la carpeta temporal"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "No pude procesar la carpeta temporal"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "No puedo abrir el mensaje"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Error en el mensaje %d de %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Error al decodificar el mensaje."
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Error al cachear el mensaje %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Error al cachear el mensaje %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error ejecutando la b�squeda del filtro: %s: %s"
@@ -7533,25 +8113,102 @@ msgstr "(concordar todas) requiere un �nico resultado booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "Realizando b�squeda en cabecera desconocida: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Operaci�n no implementada: a�adir mensaje: para %s"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Operaci�n no implementada: b�squeda seg�n la expresi�n %s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Operaci�n no implementada: b�squeda por uids: para %s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Moviendo mensajes"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Copiando mensajes a %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Cancelado"
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Respuesta inesperada del servidor IMAP: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "No ha especificado un nombre de archivo."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "No puedo cifrar este mensaje: no hay destinatarios."
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Error al cachear el mensaje %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Error al cachear el mensaje %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Error al decodificar el mensaje."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "No puedo verificar este mensaje: no pude crear archivo temporal: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7647,81 +8304,23 @@ msgstr "Error escribiendo en el archivo temporal de correo: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Error copiando el correo al archivo temporal: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Por favor introduzca su frase de paso%s %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Por favor introduzca su frase de paso %s"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "No puedo firmar este mensaje: no hay texto plano que firmar"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "No puedo firmar este mensaje: no se facilito la contrase�a"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "No puedo firmar este mensaje: no pude comunicar con GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "No puedo firmar este mensaje: no hay texto plano a firmar en claro"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "No puedo verificar este mensaje: no texto plano a verificar"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "No puedo verificar este mensaje: no pude comunicar con GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "No puedo verificar este mensaje: no pude crear archivo temporal: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "No puedo cifrar este mensaje: no hay texto plano a cifrar"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "No puedo cifrar este mensaje: no se facilit� la contrase�a"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "No puedo cifrar este mensaje: no pude comunicar con GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "No puedo cifrar este mensaje: no hay destinatarios."
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "No puedo descifrar este mensaje: no hay texto cifrado a descifrar"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "No puedo descifrar este mensaje: no se facilito la contrase�a"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr ""
 
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "No puedo descifrar este mensaje: no pude comunicar con GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
+msgstr ""
 
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Esta parte del mensaje esta firmada digitalmente"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Otro error"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7738,43 +8337,6 @@ msgstr "No puedo cargar %s: %s"
 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:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s servidor %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s servicio para %s en %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Conexi�n cancelada"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, 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:258
-msgid "(unknown host)"
-msgstr "(servidor desconocido)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Operaci�n cancelada"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "El servidor se desconect� inesperadamente: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "An�nimo"
@@ -7882,7 +8444,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticaci�n err�nea desde el servidor."
 
@@ -7909,11 +8471,9 @@ msgid ""
 "Password Authentication."
 msgstr "Esta opci�n conectar� con el servidor usando autenticaci�n Kerberos 4."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Contrase�a"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7940,52 +8500,52 @@ msgstr "Autenticaci�n POP antes de SMTP usando una fuente no POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fall� la compilaci�n de la expresi�n regular: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "La URL '%s' necesita un componente de usuario"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "La URL '%s' necesita un componente de servidor"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "La URL '%s' necesita un componente de ruta"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolviendo: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Error al resolver: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Error al resolver: %s: servidor no encontrado"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Error al resolver: %s: raz�n desconocida"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Resolviendo: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Error al resolver: %s: servidor no encontrado"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Error al resolver: %s: raz�n desconocida"
@@ -8049,11 +8609,11 @@ msgstr "Error al decodificar el mensaje."
 msgid "Failed to verify certificates."
 msgstr "Error al verificar el certificado."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No puedo obtener la carpeta: Operaci�n no v�lida"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No puedo crear la carpeta: Operaci�n no v�lida"
 
@@ -8083,7 +8643,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8092,17 +8652,17 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 #, fuzzy
 msgid "BAD"
 msgstr "AND"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8122,15 +8682,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "No pude analizar la URL `%s'"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "No existe el mensaje %s en %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "No existe el mensaje: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8152,68 +8712,77 @@ msgstr "No puedo renombrar la carpeta: %s: Operaci�n no v�lida"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No pude cambiarle el nombre a la carpeta: %s: No existe"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "No puede copiar mensajes de esta papelera."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Operaci�n cancelada"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "El servidor se desconect� inesperadamente: %s"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Respuesta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "La respuesta del servidor termin� demasiado pronto."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La respuesta del servidor IMAP no conten�a informaci�n de %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente ha respondido OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No puedo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "La carpeta fue destruida y recreada en el servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Este mensaje no est� disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo informaci�n de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Buscando mensajes nuevos"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -8267,33 +8836,84 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para leer y guardar correo en los servidores IMAP."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Contrase�a"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 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:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Servidor SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s servicio para %s en %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Conexi�n cancelada"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "No pude conectar con %s (puerto %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"No pude conectar con el servidor POP.\n"
+"Error al enviar la contrase�a: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operaci�n no implementada"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Fallo en la autenticaci�n."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "El servidor IMAP %s no implementa el m�todo de autenticaci�n requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "El tipo de autenticaci�n %s no est� implementado"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, 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:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "No escribi� una clave."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8304,68 +8924,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No est� permitido que la carpeta ra�z contenga subcarpetas"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "No puedo abrir el buz�n: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Directorios de correo en formato MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Para guardar el correo local en directorios del tipo MH."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Reparto local"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Para obtener el correo local de archivos mbox est�ndar."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Aplicar filtros a los mensajes nuevos en el buz�n de entrada"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Directorios de correo en formato Maildir"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Para guardar el correo local en directorios del tipo maildir."
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Mbox est�ndar de Unix"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "Para leer y guardar el correo local en directorios est�ndar mbox."
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Mbox est�ndar de Unix"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "Para leer y guardar el correo local en directorios est�ndar mbox."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La direcci�n %s no es absoluta"
@@ -8391,7 +9030,7 @@ msgstr "Los almacenes locales no tienen una carpeta de entrada"
 msgid "Local mail file %s"
 msgstr "Archivo de correo local %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No pude cambiarle el nombre de la carpeta %s a %s: %s"
@@ -8411,33 +9050,31 @@ msgstr "No pude borrar el resumen la carpeta `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No pude borrar el �ndice de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "No puedo guardar el resumen: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "No pude a�adir mensajes al resumen: raz�n desconocida"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Mensaje a�adido al Maildir cancelado"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No pude a�adir el mensaje a la carpeta tipo maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8446,21 +9083,20 @@ msgstr ""
 "No puedo obtener el mensaje; %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "No existe ese mensaje"
 
 #
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Contenido inv�lido en el mensaje"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8471,13 +9107,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no existe."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8493,7 +9129,7 @@ msgstr "`%s' no es un directorio tipo maildir."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "No pude borrar la carpeta `%s': %s"
@@ -8502,8 +9138,8 @@ msgstr "No pude borrar la carpeta `%s': %s"
 msgid "not a maildir directory"
 msgstr "no es un directorio tipo maildir"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "No pude analizar la carpeta `%s': %s"
@@ -8524,45 +9160,37 @@ msgstr "Comprobando si hay correo nuevo"
 msgid "Checking for new messages"
 msgstr "Buscando mensajes nuevos"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Guardando carpeta"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "No puedo crear un bloqueo de carpetas en %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No puedo abrir el buz�n: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Adici�n de mensaje cancelada"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No puedo a�adir el mensaje al archivo mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8571,13 +9199,11 @@ msgstr ""
 "No puedo obtener el mensaje; %s de la carpeta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "La carpeta parece estar corrompida e irrecuperable."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fallo la construcci�n del mensaje: �Buz�n corrompido?"
 
@@ -8620,150 +9246,150 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta `%s' no esta vac�a. No fue borrada."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "No pude abrir la carpeta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "An�lisis err�neo del correo cerca de la posici�n %ld en la carpeta %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "No pude comprobar la carpeta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "No pude abrir el archivo %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "No puedo abrir el archivo de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Resumen y carpeta no concuerdan, incluso despu�s de una sincronizaci�n"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Error la escribir al archivo de correo temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Error la escribir al archivo temporal: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No pude cerrar la carpeta origen %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "No pude cerrar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No pude cambiar el nombre a la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Resumen y carpeta no concuerdan, incluso despu�s de una sincronizaci�n"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconocido: %s"
 
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "No pude cambiar el nombre a la carpeta: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Error la escribir al archivo de correo temporal: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Error la escribir al archivo temporal: %s: %s"
+
 #
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Adici�n de mensaje en el MH cancelada"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "No pude a�adir el mensaje a la carpeta mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' no es un directorio."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "No puedo abrir el directorio MH en la ruta: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "No puedo a�adir el mensaje al archivo: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Las carpetas de correo no pueden ser renombradas"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "`%s' no existe o no es un archivo normal."
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "%s no es un directorio normal"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La carpeta `%s/%s' no existe."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Archivo de cola de correo %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Las carpetas de correo no pueden ser renombradas"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Las carpetas de correo no pueden ser renombradas"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Las carpetas de correo no pueden ser borradas"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "No pude sincronizar la carpeta temporal %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "No pude sincronizar la carpeta de correo %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8772,25 +9398,6 @@ msgstr ""
 "No pude sincronizar la carpeta de correo %s: %s\n"
 "La carpeta puede estar corrupta, copia guardada en `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "No pude archivar %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "`%s' no existe o no es un archivo normal."
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Enviar a %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "noticias USENET"
@@ -8799,12 +9406,22 @@ msgstr "noticias USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Este es un proveedor para leer y enviar noticias a grupos de USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "No puedo crear el directorio %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Noticias USENET v�a %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8906,7 +9523,7 @@ msgstr "Dejar mensajes en el servidor"
 msgid "Delete after %s day(s)"
 msgstr "Borrar tras %s d�a(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8932,32 +9549,22 @@ msgstr ""
 "cifrada por medio del protocolo APOP. Esto no funcionar� para todos los "
 "usuarios ni siquiera en servidores que dicen implementarlo."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "No pude conectar con el servidor POP.\n"
 "Error al enviar la contrase�a: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Operaci�n no implementada"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Fallo en la autenticaci�n."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "No pude conectar con el servidor POP en: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8965,28 +9572,28 @@ msgstr ""
 "No pude conectar con el servidor POP.\n"
 "El sistema de autenticaci�n definido no est� implementado."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 #, fuzzy
 msgid "SASL Protocol error"
 msgstr "Error cr�tico"
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "Error de I/O"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPor favor escriba la contrase�a POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8995,13 +9602,13 @@ msgstr ""
 "No pude conectar con el servidor POP.\n"
 "Error al enviar la contrase�a: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "No existe la carpeta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9165,46 +9772,46 @@ msgstr "Fallo temporal en la autenticaci�n"
 msgid "Authentication required"
 msgstr "Autenticaci�n requerida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, 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:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "No pude conectar con el servidor POP.\n"
 "Error al enviar la contrase�a: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Parece que el mensaje no est� bien construido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Expir� el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "El servidor SMTP %s no implementa el m�todo de autenticaci�n requerido %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, 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:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9215,90 +9822,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Env�o de correo SMTP v�a %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 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:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "No puedo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "No puedo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "Saludo del SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, 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:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, 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:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "Autenticaci�n SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Error al crear el objeto de autenticaci�n SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Expir� el tiempo para AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "Error en la petici�n de AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 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:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, 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:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Respuesta de error a MAIL FROM: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, 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:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Expir� el tiempo para DATA: %s: correo no enviado"
@@ -9306,40 +9913,40 @@ msgstr "Expir� el tiempo para DATA: %s: correo no enviado"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, 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:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Respuesta de autenticaci�n err�nea desde el servidor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Expir� el tiempo para RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, 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:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Respuesta de error a RSET: %s"
@@ -9413,7 +10020,7 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos autom�ticamente"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Presione aqu� para acceder a la agenda"
 
@@ -9422,47 +10029,47 @@ msgstr "Presione aqu� para acceder a la agenda"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Asunto:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/dfos-xfer.c:188
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 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:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9475,7 +10082,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "No pude crear un contexto de firma PGP."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9484,34 +10096,34 @@ msgstr ""
 "Error cargando el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "�Aviso!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, �Sobreescribir?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "No pude obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9520,7 +10132,7 @@ msgstr ""
 "No pude buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9529,7 +10141,7 @@ msgstr ""
 "No pude truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9538,7 +10150,7 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9546,7 +10158,7 @@ msgstr ""
 "Ximian Evolution ha encontrado archivos no guardados de una sesi�n previa.\n"
 "�Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9556,23 +10168,43 @@ msgstr ""
 "\n"
 "�Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Insertar Archivo"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Guardar firma"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (predeterminada)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9580,7 +10212,7 @@ msgstr ""
 "No puedo crear una ventana de composici�n:\n"
 "No puedo activar el control de selecci�n de direcciones."
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9588,6 +10220,12 @@ msgstr ""
 "No pude crear una ventana de composici�n:\n"
 "No puedo activar el componente del editor HTML."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9648,7 +10286,7 @@ msgstr "El asunto contiene"
 msgid "Subject does not contain"
 msgstr "El asunto no contiene"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9793,7 +10431,7 @@ msgstr "hora"
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "segundos"
 
@@ -9868,7 +10506,7 @@ msgstr " hace"
 msgid "ago"
 msgstr "hace"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9880,6 +10518,21 @@ msgstr "<pinche aqu� para a�adir una fecha>"
 msgid "Filter Rules"
 msgstr "Reglas para los filtro"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Nombre del estilo:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "`%s' no existe o no es un archivo normal."
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Elija una acci�n:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9898,7 +10551,7 @@ msgstr ""
 "Vuelva y especifique una carpeta v�lida donde entregar el correo."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -9911,7 +10564,11 @@ msgstr ""
 "Error en la expresi�n regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Prueba"
 
@@ -9941,7 +10598,7 @@ msgstr "si se cumplen todos los criterios"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "si se cumple alg�n criterio"
 
 #: filter/filter-rule.c:780
@@ -10020,194 +10677,204 @@ msgid "Beep"
 msgstr "Belen"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Compa��a"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "contiene"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Fecha de recepci�n"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Fecha de env�o"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Borrado"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "no contiene"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "no acaba en"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "no existe"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "no suena como"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "no comienza por"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "No Existe"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Borrador"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "finaliza con"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr "Ejecutar comando de shell"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Salir"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Expresi�n"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "es"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "estaba despu�s de"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "estaba antes de"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "Marcado"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "es mayor que"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "es menor que"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "no es"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Marcado"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Lista de correo"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Cabecera del mensaje"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Tocar un sonido:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Le�do"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Expresi�n regular"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Remitente"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Poner estado"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Tama�o (Kb)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "suena como"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Fuente de la cuenta"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Cabecera espec�fica"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "comienza por"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Asunto"
 
@@ -10262,7 +10929,8 @@ msgid "Scanning %s"
 msgstr "Guardando %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Correo"
 
@@ -10278,10 +10946,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Agenda de direcciones"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10331,7 +10995,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution est� importando su vieja informaci�n de Netscape"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Papelera"
 
@@ -10467,31 +11133,31 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Carpeta conteniendo correo"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Papelera virtual"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Carpetas de papeleras virtuales"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Esta carpeta no contiene mensajes."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Cambiar las propiedades de esta carpeta"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10499,241 +11165,251 @@ msgstr ""
 "Algunas de tus opciones de correo parece que est�n corruptas, por favor "
 "comprueba que todo est� en orden."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "No ha definido un sistema para enviar el correo"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Aviso: Mensaje modificado"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Nuevo mensaje de correo"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "No puedo inicializar el componente de configuraci�n de correo de Evolution."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "No puedo inicializar el componente de informaci�n sobre carpetas de "
 "Evolution."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando al servidor..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para �%s�"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d nuevos"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d ocultos"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionado"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d sin enviar"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d enviar"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear una Carpeta _Virtual seg�n el mensaje"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "Carpeta virtual seg�n el a_sunto"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "Carpeta virtual seg�n el _remitente"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "Carpeta virtual seg�n los _destinatarios"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual seg�n la _Lista de Correo"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filtrar seg�n el As_unto"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filtrar seg�n el Re_mitente"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filtrar seg�n los Des_tinatarios"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filtrar seg�n la Lista de _Correo"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Resp. a la _Lista"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "_Nombre completo..."
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completado"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpiar"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_car como le�do"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _no le�do"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar como No Im_portante"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "Laurel"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "A�adir Remitente a la Agenda de Direcciones"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Carpeta virtual seg�n la Lista de Correo"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrar seg�n la lista de correo (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Carpeta virtual seg�n la Lista de Correo (%s)"
 
-#: mail/folder-info.c:64
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/file-manager/fm-directory-view.c:1865
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Predeterminado"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Obteniendo informaci�n de la carpeta"
 
@@ -10789,7 +11465,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la informaci�n requerida."
 
@@ -10799,83 +11475,111 @@ msgid "Evolution News Editor"
 msgstr "Editor de Noticias de Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Nombre de _usuario:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Radio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "No puedes crear dos cuentas con el mismo nombre."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "�Esta seguro que quiere borrar esta cuenta?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "No borrar"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "�Realmente quiere borrar realmente la cuenta?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Inhabilitar"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Habilitar"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "�Esta seguro que quiere borrar esta cuenta de noticias?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Habilitada"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Nombre de la cuent_a:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Enviar a %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Asunto es %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Correo de %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "lista de correo %s"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "A�adir Regla de Filtro"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"La(s) siguiente(s) carpeta(s) virtual(es):\n"
+"%sUsaban la carpeta borrada:\n"
+"    '%s'\n"
+"Y han sido actualizadas."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10887,7 +11591,7 @@ msgstr ""
 "recibir o escribir mensajes.\n"
 "�Querr�a configurarlo ahora?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10895,7 +11599,7 @@ msgstr ""
 "Necesita configurar una identidad para\n"
 "poder escribir mensajes de correo."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10904,7 +11608,7 @@ msgstr ""
 "correo para poder enviarlo."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10912,11 +11616,11 @@ msgstr ""
 "Estas enviando un mensaje formateado en HTML, pero los siguientes "
 "destinatarios no indica que quieran recibir mensajes formateados en HTML:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "�Enviar de todos modos?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10924,7 +11628,7 @@ msgstr ""
 "Este mensaje no tiene asunto.\n"
 "�Quiere enviarlo?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10933,11 +11637,11 @@ msgstr ""
 "esconder la lista de direcciones, este mensaje solo contendr� destinatarios "
 "Bcc."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Este mensaje solo contiene destinatarios Bcc."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10947,15 +11651,15 @@ msgstr ""
 "cabecera Apparently-To.\n"
 "�Enviar de todos modos?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Debe configurar una cuenta antes de poder enviar este mensaje."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10963,28 +11667,28 @@ msgstr ""
 "No pude abrir la carpeta de borradores para esta cuenta.\n"
 "�Quiere usar la carpeta de borradores predeterminada?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "El %a, %d-%m-%Y a las %H:%M, %%s escribi�:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�Esta seguro que quiere editar los %d mensajes?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10992,7 +11696,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11000,39 +11704,39 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�Esta seguro que quiere reenviar los %d mensajes?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "�Sobreescribir archivo?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Mostrar el siguiente mensaje no le�do"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11044,7 +11748,7 @@ msgstr ""
 "\n"
 "�Borrar realmente esos mensajes?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11053,32 +11757,68 @@ msgstr ""
 "Error cargando la informaci�n del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%ld de %ld"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresi�n del mensaje"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "�Esta seguro que quiere abrir %d mensajes en ventanas separadas?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Sin descripci�n"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Contactos sin nombre"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Enviado"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "A�adir criterio"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Guardar firma"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11131,197 +11871,177 @@ msgstr ""
 "Este nombre solo se usar� para mostrar informaci�n."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Corcho"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "despu�s de"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"No pude obtener la carpeta de entrada de correo nuevo:\n"
-"%s\n"
-"No se crear�n atajos."
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Cuenta"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Contactos sin nombre"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-undo-signal-handlers.c:174
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "_Editar"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Nuevo"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Comprobar tipos soportados "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL no est� implementado en esta compilaci�n de evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL no est� implementado en esta compilaci�n de evolution)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "S_iempre cifrarme a m� mismo cuando env�e correo cifrado"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Cuenta %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Informaci�n de la cuenta"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gesti�n de la cuenta"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Cancelar operaci�n"
+msgid "Add Sc_ript"
+msgstr "A�adir criterio"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "Arkansas"
+msgid "Add new signature..."
+msgstr "Guardar firma"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "S_iempre cifrarme a m� mismo cuando env�e correo cifrado"
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Firmar _siempre el correo saliente al usar esta cuenta"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "Arica"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Adjuntar un archivo al mensaje"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autenticaci�n"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Comprobar el correo _autom�ticamente"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Juego de caracteres desconocido: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_Cerrar"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Comprobando si hay correo nuevo"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Color para las tareas para hoy"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "Nuevo mensaje"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Configuraci�n"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11337,58 +12057,49 @@ msgstr ""
 "\n"
 "Pulse �Finalizar� para guardar su configuraci�n."
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "Bari"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Predeterminada"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Prioridad por defecto:"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Juego de caracteres predeterminado: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "ID digitales..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "No puedo abrir el mensaje"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1262
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Carpeta de _borradores:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Habilitar"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11409,40 +12120,35 @@ msgstr "Dir_ecci�n de correo:"
 msgid "Empty _trash folders on exit"
 msgstr "Vaciar pap_elera al salir"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Ejecutar comando de shell"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "finaliza con"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propiedades"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Obtener ID digital..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Resaltar citas con"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Honolul�"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11496,70 +12202,66 @@ msgstr "Micronesia"
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Notificaci�n"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "Fuentes de _noticias"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Informaci�n opcional"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zaci�n:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de la _clave PGP:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Elije un color"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Preguntar al mandar mensajes que tan solo tengan definido el _Bcc"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimir los contactos seleccionados"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Maildir estilo Qmail"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "No puedo abrir el mensaje"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Re_cuerda esta contrase�a"
@@ -11594,119 +12296,122 @@ msgstr "Seguridad"
 
 #: mail/mail-config.glade.h:104
 #, fuzzy
-msgid "Same as text"
-msgstr "Somerset"
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Seleccione el binario de PGP"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Archivo de firma:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Borrar todas menos la firma"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Mensajes Enviados y Borradores"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticaci�n"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # components/help/hyperbola-filefmt.c:397
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Configuraci�n del servidor"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Tipo de servidor:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Atajos"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Guardar firma"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Guardar firma"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Fuente"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Informaci�n de la Fuente"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nombre del estilo:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Mailbox est�ndar de Unix"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "Firma en _HTML:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11716,146 +12421,138 @@ msgstr ""
 "\n"
 "Pulse �Siguiente� para comenzar. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Este"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_Archivo de firma:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "C_argar im�genes fuera de la red"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Firm_ar siempre el correo saliente al usar esta cuenta"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "Tipo de _autenticaci�n: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tipo de _autenticaci�n: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "Comprobar el correo _autom�ticamente"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "Comprobar el correo _autom�ticamente"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "ID del _certificado:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Confirmar antes de comprimir una carpeta"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Firma en _HTML:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Predeterminados"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Nombre de archivo:"
+msgid "_Enable"
+msgstr "Habilitar"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "_Reenviar Mensaje"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nombre _completo:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Correo en HTML"
 
-#: mail/mail-config.glade.h:160
-#, fuzzy
-msgid "_HTML Signature:"
-msgstr "Firma en _HTML:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identidad"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Idioma"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "Cargar im�genes si e_l remitente esta el la agenda de direcciones"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Hacer de esta mi cuenta pre_determinada"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensajes como Le�do tras"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_No cargar nunca im�genes desde la red"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "Localizaci�n del binario de _PGP:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Preguntar al mandar mensajes en HTML a contactos que no los quieren"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pr_eguntar al mandar mensajes con el asunto vac�o"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Radio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11896,69 +12593,52 @@ msgstr "_Archivo de firma:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "Firma en _HTML:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "U_se conexiones seguras (SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_cada"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr "color"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "descripci�n"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "No pude crear un contexto de firma PGP."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "No pude crear un contexto de verificaci�n PGP."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "No pude crear un contexto de cifrado PGP."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "No pude crear un contexto de cifrado PGP."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "No pude crear un contexto de firma S/MIME."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "No pude crear un contexto de certificado S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "No pude crear un contexto de cifrado S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "No pude crear un contexto sobre tipo S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "No pude crear un contexto de decodificaci�n S/MIME."
 
@@ -12001,98 +12681,135 @@ msgstr "Visores externos"
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Tareas fuera de pla_zo:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Abrir enlace en el Navegador"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Copiar Direcci�n del enlace"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Guardar enlace como (ARR�GLAME)"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Direcci�n err�nea"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "Correo"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Guardar mensaje como..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Este mensaje est� firmado digitalmente. Pulsa en el icono del candado para "
+"m�s informaci�n."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "No pude crear un contexto de verificaci�n PGP."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Este mensaje est� firmado digitalmente y es aut�ntico."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Este mensaje est� firmado digitalmente pero no se puede verificar su "
+"autenticidad."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) valido en �%s�"
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo �%s�)"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Carpetas locales"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando carpeta"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12101,27 +12818,27 @@ msgstr ""
 "No puedo guardar la meta informaci�n de la carpeta: probablemente\n"
 "no puedas volver a abrir esta carpeta: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "No puedo guardar la meta informaci�n de la carpeta en %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "No puedo borrar la meta informaci�n de la carpeta %s: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta �%s� al formato �%s�"
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s no puede ser reconfigurado porque no es una carpeta local"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12129,11 +12846,11 @@ msgstr ""
 "Si no puede volver a abrir este buz�n, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "No puede cambiar el formato de una carpeta no local."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar /%s"
@@ -12191,85 +12908,73 @@ msgstr "Error en mensaje %d de %d"
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/dfos-xfer.c:702 src/file-manager/dfos-xfer.c:963
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Moviendo"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/dfos-xfer.c:725
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Copiando"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en �%s�"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta '%s'"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Obteniendo %d mensajes(s)"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Guardando %d mensaje(s)"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12278,7 +12983,7 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12287,11 +12992,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12300,27 +13005,27 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Ejecutando el comando de shell: %s"
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -12393,10 +13098,6 @@ msgstr "Actualizando..."
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Cancelado"
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Operaci�n cancelada por el usuario."
@@ -12410,16 +13111,16 @@ msgstr "Introduzca su contrase�a para %s"
 msgid "Enter Password"
 msgstr "Introduzca contrase�a"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "No pude guardar el archivo de firma."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Guardar firma"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12429,10 +13130,30 @@ msgstr ""
 "\n"
 "�Quiere guardar los cambios?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Nombre:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "Archivo de firma:"
+msgid "Signature hint"
+msgstr "Guardar firma"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "Archivo de firma en HTML:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12447,17 +13168,17 @@ msgstr "Mensaje reenviado"
 msgid "Forwarded Message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Configurando vfolder: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Actualizando carpetas virtuales para la uri: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12470,89 +13191,94 @@ msgstr ""
 "    '%s'\n"
 "Y han sido actualizadas."
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "Carpetas virtuales"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Editar carpeta virtual"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tratando de editar una carpeta virtual `%s' que no existe."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Sin asunto)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensaje"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "M�ltiples mensajes sin leer"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "M�ltiples mensajes"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "La m�s baja"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "M�s baja"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "M�s alta"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "La m�s alta"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -12577,6 +13303,11 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Contacto original:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Recibido"
 
@@ -12584,7 +13315,7 @@ msgstr "Recibido"
 # libnautilus-private/nautilus-search-bar-criterion.c:46
 # src/file-manager/fm-list-view.c:1587
 # src/file-manager/fm-search-list-view.c:146
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Tama�o"
 
@@ -17304,5235 +18035,5232 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds y Bradford"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libia"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lithue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisboa"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "Londres"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "Londres/City"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "Londres/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "Londres/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "Londres/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los �lamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Luisiana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "Lubeck-Blankensee"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "Latvia"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Mastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "M�dison"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "M�laga"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malmo/Sturup"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manao"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "M�nchester"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Airport"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Airport"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Airport"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "M�rida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "M�chigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Oriente Medio"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Mil�n/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Mil�n/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Mine�polis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Mine�polis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Mine�polis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Misisipi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Miyakejima Airport"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Airport"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Airport"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montag�e"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Mosc� Domodedovo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Mosc� Sheremetyevo"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "Munchen"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscaline"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Airport"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoya Airport"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Naha Airport"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Airport"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama Airport"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "N�poles"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "Nueva Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "Nueva Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "Nuevo M�xico"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "Nueva Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "Nueva Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "Nueva Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "New Tokyo International Airport"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "Nueva York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Cataratas del Ni�gara"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata Airport"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "Carolina del Norte"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "Dakota del Norte"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nueva Esc�cia"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro Airport"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Odesa"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita Airport"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okayama Airport"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki Airport"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Ciudad de Oklahoma"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Ciudad de Oklahoma-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Ciudad de Oklahoma-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Isla Okushiri"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr ""
 "#-#-#-#-#  evolution-es.po (evolution 1.0)  #-#-#-#-#\n"
 "Orange#-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#\n"
 "Naranja"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oreg�n"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Aeropuerto Internacional de Osaka"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Oshima Airport"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Ciudad de Panam�"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Par�s"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Par�s/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Par�s/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Par�s/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsilvania"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "Rep�blica Popular de China"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Filadelfia"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ciudad de Ponca"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Puerto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Puerto Alegre Apt"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Puerto Santo"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Puerto Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pret�ria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pr�stina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Lim�n"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Qu�ntico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Ciudad de Quebec"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Isla Rebun"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reinosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Isla de Rodas"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "La Rioja"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Isla de Rishiri"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Rusia"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "El Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "Isla de San Nicholas"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebasti�n"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Mar�a"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Sim�n Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa M�nica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AF"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Aeropuerto de Sendai"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Aeropuerto Internacional de Seoul/Kimp'O"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Lago Snowshoe"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sof�a"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "Carolina del Sur"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "Dakota del Sur"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "San Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "San Joseph"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "San Luis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "Esp�ritu de San Luis"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholmo (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholmo (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Lago Storm"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "San Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "San Petersburgo"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "San Petersburgo / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "Isla San Sim�n"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 #, fuzzy
 msgid "Sympheropol"
 msgstr "Sinfon�a"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracusa"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Aeropuerto de Takamatsu"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talinn"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Aeropuerto de Tanegashima"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima, isla de"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori, aeropuerto de"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Tur�n"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "Emiratos �rabes Unidos"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 #, fuzzy
 msgid "Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venecia"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops, isla de"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao, aeropuerto"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "ES"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Zurich"
 
@@ -22560,17 +23288,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Sin descripci�n"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Resumen de correo"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "Carpetas virtuales"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
@@ -22579,59 +23302,47 @@ msgstr "Carpetas locales"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "LEMD:LEVS:LEVC"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Palabra del D�a"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Frase del D�a"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "A�adir una fuente de noticias"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Escriba la URL de la fuente de noticias que quiere a�adir"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Nombre:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Error obteniendo RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Fuentes de noticias"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
-msgstr "_A�adir"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/nautilus-bookmarks-window.c:198 src/nautilus-window-menus.c:588
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "Eliminar"
+msgid "Add"
+msgstr "A�a_dir"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
@@ -22673,10 +23384,42 @@ msgstr "Imprimir resumen"
 msgid "Printing of Summary failed"
 msgstr "Ha fallado la impresi�n del resumen"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "El componente de resumen de trabajo no pudo inicializar Bonobo.\n"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "nudos"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "millas"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kil�metros"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Cielo claro"
@@ -23828,100 +24571,106 @@ msgid "C_elsius"
 msgstr "C_elsius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "A�adir fuente de _noticias"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "�Cuantos mensajes debe mostrar de una vez el calendario?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "N�mero m�_ximo de elementos mostrados:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Configuraci�n de las fuentes de noticias"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Un _mes"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "Una s_emana"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "Ti_empo de actualizaci�n (segundos):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "_Tiempo de actualizaci�n (segundos):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "Mo_strar ruta completa a las carpetas"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Mostrar tod_as las tareas"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Mostrar las _tareas de hoy"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Mostrar temperatura en:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Tareas "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Configuraci�n de tiempo"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Cinco d�as"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Correo"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "Fuentes de _noticias"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Un d�a"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Horario"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Tiempo"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Factor�a para el compositor de correo de Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Seleccionar carpeta"
+msgid "Folder Settings"
+msgstr "Configuraci�n del correo"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "La shell de Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -23932,6 +24681,37 @@ msgstr "Mostrar detalles"
 msgid "Cancel Operation"
 msgstr "Cancelar operaci�n"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"No puedo transferir la carpeta:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Seleccionar carpeta"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Borradores"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Entrada"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Salida"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Enviado"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instalaci�n de Evolution"
@@ -24047,6 +24827,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Producido por"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Fecha de vencimiento"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Seleccionar carpeta"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Seleccionar carpeta"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Seleccionar carpeta"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Fecha de vencimiento"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -24076,20 +24881,20 @@ msgstr "No puedo mover una carpeta a uno de sus descendientes."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Especificar una carpeta en la que copiar la carpeta �%s�:"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Copiar una carpeta"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Especificar una carpeta a la que mover la carpeta �%s�:"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Mover una carpeta"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24098,18 +24903,19 @@ msgstr ""
 "No pude borrar la carpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Borrar �%s�"
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "�Esta seguro que quiere borrar la carpeta �%s�?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"No pude borrar la carpeta:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24118,16 +24924,16 @@ msgstr ""
 "No puedo renombrar la carpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renombrar carpeta �%s� a:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24146,7 +24952,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear nuevas carpetas"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -24154,7 +24960,7 @@ msgstr ""
 "El tipo de carpeta seleccionada no es valido para\n"
 "la operaci�n requerida."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Nuevo..."
 
@@ -24205,21 +25011,26 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Seleccionar carpeta"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "El archivo %s no existe"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Error de Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Solo puedes importar a carpetas locales"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24228,11 +25039,11 @@ msgstr ""
 "No hay ninguna herramienta para importar datos que pueda encargarse de\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24241,17 +25052,17 @@ msgstr ""
 "Importando %s.\n"
 "Comenzando %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24260,31 +25071,31 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Autom�tico"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Nombre de archivo:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Tipo de archivo:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Importa datos y configuraci�n de programas antiguos"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Importar un �nico archivo"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24292,31 +25103,78 @@ msgstr ""
 "Por favor espere...\n"
 "Buscando configuraciones existentes"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Comenzando importadores inteligentes"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Cerrando conexiones..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Error mientras `%s':\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Sincronizando carpeta"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Abriendo carpeta %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Abriendo carpeta %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Abrir en %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"No puedo crear la carpeta especificada:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -24330,8 +25188,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "No pude iniciar la interfaz del Asistente de Correo de Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nuevo"
@@ -24353,43 +25211,43 @@ msgstr "El nombre de la carpeta no puede contener barras (/)."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' y '..' son nombres reservados de carpetas."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No se ha encontrado a bug buddy en su $PATH."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug buddy"
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Acerca de Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Seleccione la carpeta que quiere abrir"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Crear un nuevo atajo"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Seleccione la carpeta a la que quiere que apunte el atajo:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "_Trabajar Desconectado"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
@@ -24424,7 +25282,7 @@ msgstr ""
 "Ximian Evolution est� desconectado.  Pulse este bot�n para trabajar "
 "conectado."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24436,12 +25294,12 @@ msgstr ""
 "El error del sistema de activaci�n es:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24452,23 +25310,19 @@ msgstr ""
 "�%s� ha fallado inesperadamente. Deber� salir de Evolution y volver\n"
 "a entrar para poder acceder otra vez a esa informaci�n."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "Aceptar"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Argumentos inv�lidos"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "No puedo registrarme en OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "No se encontr� la base de datos de configuraci�n"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Error gen�rico"
 
@@ -24493,97 +25347,97 @@ msgstr ""
 msgid "Don't remove"
 msgstr "No quitar"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Renombrar Grupo de Atajos"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Renombrar grupos de atajos seleccionados a:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "Icono_s peque�os"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Mostrar los atajos como iconos peque�os"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "Iconos _grandes"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar los atajos como iconos grandes"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Nuevo grupo..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "_Quitar este Grupo..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Quitar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "Re_nombrar este Grupo..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Renombrar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Renombrar atajo"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Renombrar atajos seleccionados a:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir la carpeta enlazada a este atajo"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Abrir en una Nueva _Ventana"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Abrir la carpeta asociada a este atajo en una nueva ventana"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-icon-view.c:328
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Renombrar este atajo"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "Bo_rrar"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
@@ -24595,10 +25449,6 @@ msgstr "Error guardando atajos."
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Entrada"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -24662,10 +25512,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<pinche aqu� para seleccionar una carpeta>"
 
@@ -24706,67 +25557,67 @@ msgstr ""
 "El error del sistema de activaci�n es:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "Error CORBA"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Interrumpido"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Argumento inv�lido"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Ya tiene un due�o"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Sin due�o"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "No encontrado"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Tipo no soportado"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Schema no soportado"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Operaci�n no soportada"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Error interno"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Salir"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "URI no v�lida"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Tiene subcarpetas"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "No queda sitio"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "El antiguo due�o a muerto"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "tipo de soporte"
@@ -24895,49 +25746,81 @@ msgstr "No me preguntes m�s veces"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution puede importar datos de los siguiente s archivos:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution est� terminando ..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "No me preguntes m�s veces"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No puedo acceder a la shell de Ximian Evolution."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "No puedo inicializar la shell de Ximian Evolution: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Deshabilitar pantalla de entrada"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Comenzando a importar"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Comenzando importadores inteligentes"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar la salida de depurado de todos los componente a un archivo."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
@@ -25058,11 +25941,11 @@ msgstr "la fecha actual"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "A_cciones"
 
@@ -25187,8 +26070,8 @@ msgstr "Cerrar este elemento"
 msgid "Delete this item"
 msgstr "Borrar este elemento"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Barra de herramientas principal"
 
@@ -25230,7 +26113,7 @@ msgstr "Guardar este elemento a disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Archivo"
 
@@ -25297,19 +26180,19 @@ msgstr "Reenviar como i_Calendar"
 msgid "Forward this item via email"
 msgstr "Reenviar este elemento por correo"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Obtener la ultima informaci�n de las reuniones"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "Actualizar Encuentro"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "Concertar un _encuentro"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Concertar un encuentro para este elemento"
 
@@ -25317,12 +26200,6 @@ msgstr "Concertar un encuentro para este elemento"
 msgid "Customise My Evolution"
 msgstr "Personalizar Mi Evolution"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# libnautilus-private/nautilus-program-chooser.c:1262
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancelar la operaci�n de correo actual"
@@ -25481,7 +26358,7 @@ msgstr "Lista de Mensajes Encadenados"
 msgid "_Expunge"
 msgstr "_Comprimir"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Carpeta"
 
@@ -25904,7 +26781,7 @@ msgstr "Mensaje previo"
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Herramientas"
 
@@ -25919,14 +26796,14 @@ msgstr "Cerrar esta ventana"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_Cerrar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-global-preferences.c:222
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Vista"
 
@@ -26117,7 +26994,7 @@ msgstr "Campo _Responder-A"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/nautilus-window-menus.c:1325
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "A_yuda"
 
@@ -26265,117 +27142,126 @@ msgstr "Importar datos de otros programas"
 msgid "Move this folder to another place"
 msgstr "Mueve esta carpeta a otro sitio"
 
+#: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Crear una _Nueva Carpeta..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2126
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Abrir en una ventana nueva"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Abre esta carpeta en una nueva ventana"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar el correo en la cola y obtener el nuevo"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Mostrar informaci�n acerca de Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Enviar reporte de fallo"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "Enviar reporte de _fallo"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un reporte de fallo usando Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Activar"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Activar si se muestra la barra de carpetas"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Activar si se muestra la barra de atajos"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Activar si se estamos trabajando desconectados o no."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Ver la carpeta seleccionada"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ de Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_Acerca de Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "Barra de _carpetas"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nuevo"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2140
 # src/file-manager/fm-directory-view.c:2257
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Nueva carpeta"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "_Configuraci�n del pilot..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "Barra de atajo_s"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "Barra de atajo_s"
 
@@ -26460,22 +27346,22 @@ msgstr ""
 "seleccionar una zona horaria.\n"
 " Use el bot�n derecho del rat�n para salir del zoom."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Vista actual"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "Personalizar"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 #, fuzzy
 msgid "Save Custom View"
 msgstr "Personalizar"
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Definir Vistas"
 
@@ -26601,16 +27487,21 @@ msgstr "Editor de b�squedas"
 msgid "Save Search"
 msgstr "Guardar b�squeda"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Guardar b�squeda"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "A�adir a las b�squedas guardadas"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Avanzado..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informaci�n"
@@ -26632,21 +27523,21 @@ msgstr "Mensaje"
 msgid "Don't show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Buscar ahora"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Limpiar"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Limpiar"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Buscar ahora"
 
@@ -26672,358 +27563,302 @@ msgstr "init_corba(): no pude inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
-#~ msgid "Connecting to LDAP server..."
-#~ msgstr "Conectando al servidor LDAP..."
-
-#~ msgid "Waiting for connection to LDAP server..."
-#~ msgstr "Esperando la conexi�n al servidor LDAP..."
-
-#~ msgid "Edit Addressbook"
-#~ msgstr "Editar agenda de direcciones"
-
 #, fuzzy
-#~ msgid "A_uthenticate with server using:"
-#~ msgstr "Autenticaci�n requerida"
-
-#~ msgid "Account Name"
-#~ msgstr "Nombre de la cuenta"
-
-#~ msgid "Add Addressbook"
-#~ msgstr "A�adir agenda de direcciones"
-
-#~ msgid "Advanced"
-#~ msgstr "Avanzado"
-
-#~ msgid "Base"
-#~ msgstr "Base"
+#~ msgid "Addressbook Settings"
+#~ msgstr "Fuentes de la agenda de direcciones"
 
 #, fuzzy
-#~ msgid "Check this if the server requires you to authenticate."
-#~ msgstr "_Mi servidor requiere autenticaci�n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
-#~ "server"
-#~ msgstr ""
-#~ "Evolution usar� esta direcci�n de correo para autenticarte contra el servidor"
-
-#~ msgid "Server Name"
-#~ msgstr "Nombre del servidor"
-
-#~ msgid "The information below is required in order to add an addressbook.  "
-#~ msgstr "Se requiere la informaci�n de debajo para a�adir una agenda.  "
-
-#~ msgid "This information is not required for most ldap servers. "
-#~ msgstr ""
-#~ "Esta informaci�n no es requerida por la mayor�a de los servidores LDAP."
-
-#~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
-#~ msgstr ""
-#~ "Esta informaci�n la usa su servidor LDAP para especificar que nodos son "
-#~ "usados en una b�squeda. Para m�s informaci�n contacte con el administrador "
-#~ "del servidor."
-
-#~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
-#~ msgstr ""
-#~ "Este es el nodo base de todas sus b�squedas en el servidor LDAP. Para m�s "
-#~ "informaci�n contacte con el administrador del servidor."
-
-#~ msgid "This is the name of the server where your addressbook is located."
-#~ msgstr "Este es el nombre del servidor donde est� su agenda."
-
-#~ msgid "This is the port that your ldap server uses."
-#~ msgstr "Este es el puerto que usa su servidor LDAP."
-
-#~ msgid "Other Contacts"
-#~ msgstr "Otros contactos"
-
-#~ msgid "Name contains"
-#~ msgstr "El nombre contiene"
-
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# components/sample/nautilus-sample-content-view.c:85
-#~ msgid "(none)"
-#~ msgstr "(ninguno)"
-
-#~ msgid "C_ontaining:"
-#~ msgstr "C_onteniendo:"
-
-#~ msgid "Show contacts matching the following criteria:"
-#~ msgstr "Mostrar contactos que concuerden con el siguiente criterio:"
-
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#~ msgid "Could not query for schema information"
 #~ msgstr ""
-#~ "�Esta seguro que quiere\n"
-#~ "borrar este contacto?"
-
-#~ msgid "Starting:"
-#~ msgstr "Comenzando:"
+#~ "Informaci�n opaca de seguimiento inv�lida:\n"
+#~ "%s"
 
-#~ msgid "Ending:"
-#~ msgstr "Finalizando:"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Componente de resumen de trabajo de Evolution."
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Crear una nueva cita con un _recordatorio por defecto"
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Factor�a para el componente de Resumen de Calendario."
 
-#~ msgid "First day of wee_k:"
-#~ msgstr "Primer d�a de la se_mana:"
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Co_mienzo del d�a:"
 
-#~ msgid "_Other"
-#~ msgstr "_Otro"
+#~ msgid "_End of day:"
+#~ msgstr "Fin d_el d�a:"
 
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Pulse aqu� para a�adir un contacto"
+#~ msgid "_Other Organizer"
+#~ msgstr "_Otro organizador"
 
-#~ msgid "0%"
-#~ msgstr "0%"
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Las firmas en claro no est�n implementadas en este cifrado"
 
-#~ msgid "10%"
-#~ msgstr "10%"
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Por favor introduzca su frase de paso%s %s"
 
-#~ msgid "20%"
-#~ msgstr "20%"
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Por favor introduzca su frase de paso %s"
 
-#~ msgid "30%"
-#~ msgstr "30%"
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "No puedo firmar este mensaje: no hay texto plano que firmar"
 
-#~ msgid "40%"
-#~ msgstr "40%"
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "No puedo firmar este mensaje: no se facilito la contrase�a"
 
-#~ msgid "50%"
-#~ msgstr "50%"
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "No puedo firmar este mensaje: no pude comunicar con GPG/PGP: %s"
 
-#~ msgid "60%"
-#~ msgstr "60%"
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "No puedo firmar este mensaje: no hay texto plano a firmar en claro"
 
-#~ msgid "70%"
-#~ msgstr "70%"
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "No puedo verificar este mensaje: no texto plano a verificar"
 
-#~ msgid "80%"
-#~ msgstr "80%"
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "No puedo verificar este mensaje: no pude comunicar con GPG/PGP: %s"
 
-#~ msgid "90%"
-#~ msgstr "90%"
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "No puedo cifrar este mensaje: no hay texto plano a cifrar"
 
-#~ msgid "100%"
-#~ msgstr "100%"
-
-#~ msgid "_Delete this Task"
-#~ msgstr "_Borrar esta tarea"
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "No puedo cifrar este mensaje: no se facilit� la contrase�a"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "La reuni�n empieza: <b>"
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "No puedo cifrar este mensaje: no pude comunicar con GPG/PGP: %s"
 
-#~ msgid "Task begins: <b>"
-#~ msgstr "La tarea empieza: <b>"
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "No puedo descifrar este mensaje: no hay texto cifrado a descifrar"
 
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "La informaci�n de disponibilidad comienza: <b>"
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "No puedo descifrar este mensaje: no se facilito la contrase�a"
 
-#~ msgid "Begins: <b>"
-#~ msgstr "Empieza: <b>"
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "No puedo descifrar este mensaje: no pude comunicar con GPG/PGP: %s"
 
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "La reuni�n termina: <b>"
+#~ msgid "%s server %s"
+#~ msgstr "%s servidor %s"
 
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "La informaci�n de disponibilidad finaliza: <b>"
+#~ msgid "(unknown host)"
+#~ msgstr "(servidor desconocido)"
 
-#~ msgid "Ends: <b>"
-#~ msgstr "Termina: <b>"
+#~ msgid "No such message: %s"
+#~ msgstr "No existe el mensaje: %s"
 
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Tarea completada: <b>"
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "No puede copiar mensajes de esta papelera."
 
-#~ msgid "Task Due: <b>"
-#~ msgstr "Plazo para la tarea: <b>"
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "No puedo a�adir el mensaje al archivo: %s: %s"
 
-#~ msgid "iCalendar Information"
-#~ msgstr "Informaci�n del calendario"
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "No pude archivar %s: %s"
 
-#~ msgid "iCalendar Error"
-#~ msgstr "Error de calendario"
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "`%s' no existe o no es un archivo normal."
 
-#~ msgid "An unknown person"
-#~ msgstr "Una persona desconocida"
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Radio"
 
 #~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
 #~ msgstr ""
-#~ "<br> Por favor revise la siguiente informaci�n, y seleccione una acci�n del "
-#~ "men� de abajo."
+#~ "No pude obtener la carpeta de entrada de correo nuevo:\n"
+#~ "%s\n"
+#~ "No se crear�n atajos."
 
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Ninguna<i>"
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# libnautilus-private/nautilus-undo-signal-handlers.c:174
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "_Editar"
 
 #, fuzzy
-#~ msgid "Status:"
-#~ msgstr "E_stado:"
+#~ msgid " New "
+#~ msgstr "Nuevo"
 
 #, fuzzy
-#~ msgid "Tentatively Accepted"
-#~ msgstr "Aceptar tentativamente"
+#~ msgid "Advanced Options"
+#~ msgstr "Cancelar operaci�n"
 
-#~ msgid "Choose an action:"
-#~ msgstr "Elija una acci�n:"
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "Arkansas"
 
-#~ msgid "Update"
-#~ msgstr "Actualizar"
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "Arica"
 
-#~ msgid "Accept"
-#~ msgstr "Aceptar"
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "Bari"
 
-#~ msgid "Tentatively accept"
-#~ msgstr "Aceptar tentativamente"
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Honolul�"
 
-#~ msgid "Decline"
-#~ msgstr "Rechazar"
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "Somerset"
 
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Enviar informaci�n de disponibilidad"
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Archivo de firma:"
 
-#~ msgid "Update respondent status"
-#~ msgstr "Actualizar el estado del remitente"
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Borrar todas menos la firma"
 
-#~ msgid "Send Latest Information"
-#~ msgstr "Enviar �ltima informaci�n"
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "Firma en _HTML:"
 
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> ha publicado informaci�n de reuniones."
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Nombre de archivo:"
 
-#~ msgid "Meeting Information"
-#~ msgstr "Informaci�n  de reuniones"
+#, fuzzy
+#~ msgid "_HTML Signature:"
+#~ msgstr "Firma en _HTML:"
 
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> solicita su presencia en una reuni�n."
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Idioma"
 
-#~ msgid "Meeting Proposal"
-#~ msgstr "Propuesta de reuni�n"
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Radio"
 
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> desea apuntarse a una reuni�n existente."
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "No pude crear un contexto de cifrado PGP."
 
-#~ msgid "Meeting Update"
-#~ msgstr "Actualizaci�n de la reuni�n"
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "No pude crear un contexto de cifrado PGP."
 
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> desea recibir la �ltima actualizaci�n de la reuni�n."
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/file-manager/dfos-xfer.c:702 src/file-manager/dfos-xfer.c:963
+#~ msgid "Moving"
+#~ msgstr "Moviendo"
 
-#~ msgid "Meeting Update Request"
-#~ msgstr "Petici�n de actualizaci�n de la reuni�n"
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/file-manager/dfos-xfer.c:725
+#~ msgid "Copying"
+#~ msgstr "Copiando"
 
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> ha contestado a la petici�n de reuni�n."
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Archivo de firma:"
 
-#~ msgid "Meeting Reply"
-#~ msgstr "Respuesta de reuni�n"
+#~ msgid "Riga"
+#~ msgstr "Riga"
 
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> ha cancelado una reuni�n."
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_A�adir"
 
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Cancelaci�n de reuni�n"
+# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
+# src/nautilus-bookmarks-window.c:198 src/nautilus-window-menus.c:588
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "Eliminar"
 
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "�Esta seguro que quiere borrar la carpeta �%s�?"
 
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Mensaje de reuni�n err�neo"
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Conectando al servidor LDAP..."
 
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> ha publicado la informaci�n de la tarea."
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Esperando la conexi�n al servidor LDAP..."
 
-#~ msgid "Task Information"
-#~ msgstr "Informaci�n de la tarea"
+#~ msgid "Edit Addressbook"
+#~ msgstr "Editar agenda de direcciones"
 
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> te pide que realices una tarea."
+#, fuzzy
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "Autenticaci�n requerida"
 
-#~ msgid "Task Proposal"
-#~ msgstr "Propuesta de tarea"
+#~ msgid "Account Name"
+#~ msgstr "Nombre de la cuenta"
 
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> desea a�adir a una tarea existente."
+#~ msgid "Add Addressbook"
+#~ msgstr "A�adir agenda de direcciones"
 
-#~ msgid "Task Update"
-#~ msgstr "Actualizaci�n de tarea"
+#~ msgid "Advanced"
+#~ msgstr "Avanzado"
 
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> quiere recibir la �ltima informaci�n de la tarea."
+#~ msgid "Base"
+#~ msgstr "Base"
 
-#~ msgid "Task Update Request"
-#~ msgstr "Petici�n de actualizaci�n de tarea"
+#, fuzzy
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "_Mi servidor requiere autenticaci�n"
 
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> ha contestado a una asignaci�n de tarea."
+#, fuzzy
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with "
+#~ "the server"
+#~ msgstr ""
+#~ "Evolution usar� esta direcci�n de correo para autenticarte contra el "
+#~ "servidor"
 
-#~ msgid "Task Reply"
-#~ msgstr "Respuesta a una tarea"
+#~ msgid "Server Name"
+#~ msgstr "Nombre del servidor"
 
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> ha cancelado una tarea."
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "Se requiere la informaci�n de debajo para a�adir una agenda.  "
 
-#~ msgid "Task Cancellation"
-#~ msgstr "Cancelaci�n de tarea"
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr ""
+#~ "Esta informaci�n no es requerida por la mayor�a de los servidores LDAP."
 
-#~ msgid "Bad Task Message"
-#~ msgstr "Mensaje de tarea err�neo"
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "Esta informaci�n la usa su servidor LDAP para especificar que nodos son "
+#~ "usados en una b�squeda. Para m�s informaci�n contacte con el "
+#~ "administrador del servidor."
 
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> ha publicado la informaci�n de disponibilidad."
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
+#~ msgstr ""
+#~ "Este es el nodo base de todas sus b�squedas en el servidor LDAP. Para m�s "
+#~ "informaci�n contacte con el administrador del servidor."
 
-#~ msgid "Free/Busy Information"
-#~ msgstr "Informaci�n de disponibilidad"
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Este es el nombre del servidor donde est� su agenda."
 
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> pide su informaci�n de disponibilidad."
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Este es el puerto que usa su servidor LDAP."
 
-#~ msgid "Free/Busy Request"
-#~ msgstr "Petici�n de disponibilidad"
+#~ msgid "Name contains"
+#~ msgstr "El nombre contiene"
 
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> ha contestado a una petici�n de disponibilidad."
+#~ msgid "C_ontaining:"
+#~ msgstr "C_onteniendo:"
 
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Respuesta sobre disponibilidad"
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Mostrar contactos que concuerden con el siguiente criterio:"
 
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Mensaje de disponibilidad err�neo"
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Crear una nueva cita con un _recordatorio por defecto"
 
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Este mensaje solo contiene peticiones no soportadas."
+#~ msgid "First day of wee_k:"
+#~ msgstr "Primer d�a de la se_mana:"
 
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "El adjunto no contiene un calendario de mensaje v�lido"
+#~ msgid "_Other"
+#~ msgstr "_Otro"
 
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "El adjunto no tiene elementos de calendario visibles"
+#~ msgid "_Delete this Task"
+#~ msgstr "_Borrar esta tarea"
 
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr ""
-#~ "�No pude encontrar ninguna de tus identidades en la lista de participantes!\n"
-
-#~ msgid "Event information"
-#~ msgstr "Informaci�n del evento"
-
-#~ msgid "Task information"
-#~ msgstr "Informaci�n de la tarea"
-
-#~ msgid "Journal information"
-#~ msgstr "Informaci�n de la entrada de diario"
-
-#~ msgid "Free/Busy information"
-#~ msgstr "Informaci�n de disponibilidad"
-
-#~ msgid "Calendar information"
-#~ msgstr "Informaci�n del calendario"
+#~ "�No pude encontrar ninguna de tus identidades en la lista de "
+#~ "participantes!\n"
 
 #~ msgid "Free/Busy information (%s to %s)"
 #~ msgstr "Informaci�n de disponibilidad (de %s a %s)"
@@ -27031,24 +27866,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "iCalendar information"
 #~ msgstr "Informaci�n de iCalendar"
 
-#~ msgid "Task"
-#~ msgstr "Tarea"
-
-#~ msgid "Status: %s"
-#~ msgstr "Estado: %s"
-
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Porcentaje Completado: %i"
-
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
-
-#~ msgid "Categories: %s"
-#~ msgstr "Categor�as: %s"
-
-#~ msgid "Contacts: "
-#~ msgstr "Contactos: "
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Tipo inv�lido en el contenido del cuerpo, esperando una cadena"
 
@@ -27206,38 +28023,15 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Filter on Mailing List"
 #~ msgstr "Filtrar seg�n la lista de correo"
 
-# #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
-# src/file-manager/fm-directory-view.c:1865
-#~ msgid "Default"
-#~ msgstr "Predeterminado"
-
 #~ msgid "Indexing:"
 #~ msgstr "Indexando:"
 
 #~ msgid "Mailbox Format"
 #~ msgstr "Formato Mailbox"
 
-#~ msgid " (default)"
-#~ msgstr " (predeterminada)"
-
-#~ msgid "Mail Settings"
-#~ msgstr "Configuraci�n del correo"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Asunto es %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Correo de %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "lista de correo %s"
-
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Entrada"
 
-#~ msgid "Account"
-#~ msgstr "Cuenta"
-
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr "Siempre cifrarm_e a m� mismo cuando env�e correo cifrado"
 
@@ -27252,24 +28046,15 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Display"
 #~ msgstr "Mostrar"
 
-#~ msgid "Drafts"
-#~ msgstr "Borradores"
-
 #~ msgid "Edit..."
 #~ msgstr "Editar..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "Archivo de firma en HTML:"
-
 #~ msgid "News"
 #~ msgstr "Noticias"
 
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Seleccione un archivo de actividad para los filtros..."
 
-#~ msgid "Sent"
-#~ msgstr "Enviado"
-
 #~ msgid "Sources"
 #~ msgstr "Fuentes"
 
@@ -27295,24 +28080,9 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "seconds."
 #~ msgstr "segundos."
 
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "Este mensaje est� firmado digitalmente. Pulsa en el icono del candado para "
-#~ "m�s informaci�n."
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Evolution no reconoce este tipo de mensajes firmados."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Este mensaje est� firmado digitalmente y es aut�ntico."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Este mensaje est� firmado digitalmente pero no se puede verificar su "
-#~ "autenticidad."
-
 #, fuzzy
 #~ msgid "Incomplete message written on pipe!"
 #~ msgstr "Mensaje cifrado no mostrado"
@@ -27324,30 +28094,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Cannot initialize Evolution's Summary component."
 #~ msgstr "No puedo inicializar el componente de resumen de Evolution."
 
-#~ msgid " F"
-#~ msgstr " F"
-
-#~ msgid " C"
-#~ msgstr " C"
-
-#~ msgid "knots"
-#~ msgstr "nudos"
-
-#~ msgid "kph"
-#~ msgstr "kph"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "millas"
-
-#~ msgid "kilometers"
-#~ msgstr "kil�metros"
-
 #, fuzzy
 #~ msgid "Factory for the Evolution notes component."
 #~ msgstr "Factor�a para el compositor de correo de Evolution."
@@ -27356,23 +28102,10 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgid "Factory for the Notes control"
 #~ msgstr "Factor�a para el control de tareas de Evolution."
 
-#~ msgid "Outbox"
-#~ msgstr "Salida"
-
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
 #, fuzzy
 #~ msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "No puedo transferir la carpeta:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(Sin nombre)"
 
diff --git a/po/et.po b/po/et.po
index b9ec8025a1..022e4be2c3 100644
--- a/po/et.po
+++ b/po/et.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 1.0.2\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-03-08 19:58+0200\n"
 "Last-Translator: T�ivo Leedj�rv <toivo@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -41,7 +41,7 @@ msgstr "Impordib VKaardi-vormingus failid Evolution'i."
 msgid "File As"
 msgstr "Fail kui"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nimi"
@@ -52,7 +52,7 @@ msgid "Email"
 msgstr "E-post"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Esmane"
 
@@ -62,7 +62,7 @@ msgstr "Esm"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistent"
@@ -70,8 +70,8 @@ msgstr "Assistent"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "�ri"
 
@@ -81,12 +81,12 @@ msgid "Bus"
 msgstr "T��"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Tagasihelistamine"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Firma"
 
@@ -97,8 +97,8 @@ msgstr "Firma"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Kodu"
 
@@ -113,18 +113,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Mobiil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax t��l"
@@ -134,13 +134,13 @@ msgid "Bus Fax"
 msgstr "Fax t��l"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Kodune faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "�ri 2"
 
@@ -149,43 +149,43 @@ msgid "Bus 2"
 msgstr "�ri 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Kodu 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Muu"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Muu faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Piipar"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Raadio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
@@ -197,14 +197,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-post 3"
@@ -342,7 +342,7 @@ msgstr "VKaart %s jaoks"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -350,7 +350,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Ei saa laadida Bonobot"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Otsin..."
 
@@ -363,32 +363,32 @@ msgstr "Laen..."
 msgid "Error in search expression."
 msgstr "Viga otsingu avaldises."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Lisan kaardi LDAP serverisse..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Eemaldan kaardi LDAP serverist..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Muudan kaarti LDAP serveris..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Alustan otsingut uuesti."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "V�tan vastu LDAP otsingu tulemused..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Viga kaardi eemaldamisel"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Ei saa salvestada kokkuv�tet: %s: %s"
@@ -436,104 +436,139 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "A sample Bonobo control which displays an addressbook."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "Aadressiraamatu allikas"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Control that displays an Evolution addressbook minicard."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution Addressbook minicard viewer"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Evolution component for handling contacts."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Factory for the Addressbook Minicard control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Factory for the Addressbook's address displayer"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Factory for the Addressbook's address popup"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory for the sample Addressbook control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontaktid"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Kontaktide infot sisaldav kaust"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP server"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "Kontaktide infot sisaldav LDAP server"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Uus kontaktide nimekiri"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "Kontaktide _nimekiri"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Uus kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Uus kontaktide nimekiri"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Ei saa luua �hendust LDAP serveriga."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "Kontaktide _nimekiri"
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"SMTP serveri jaoks autentimine nurjus.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP serveri vastus ei sisaldanud %s infot"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Viga filtriinfo laadimisel:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP serveri vastus ei sisaldanud %s infot"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Ei saa gnome-vfs initsialiseerida"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Teised kontaktid"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Aadressiraamatu avamine eba�nnestus"
@@ -568,50 +603,59 @@ msgstr ""
 "Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee\n"
 "on �ige ja kas sul on sellele vajalikud ligip��su�igused."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Palun sisesta %s parool (kasutaja %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "l�ppeb"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "E-post 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategooria on"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Suvaline v�li sisaldab"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Edasij�udnutele..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Suvaline kategooria"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, mida kaustalehitseja n�itab"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(puudub)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Peamine e-post"
 
@@ -657,104 +701,59 @@ msgstr "Keela p�ringud"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Luba p�ringud (Ohtlik!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Ei saa luua �hendust LDAP serveriga."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"SMTP serveri jaoks autentimine nurjus.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Sendmail'i haruprotsessi pole v�imalik tekitada: %s: e-post j�i saatmata"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP serveri vastus ei sisaldanud %s infot"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "L�petamise kuup�ev"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "_Tuvasta toetatavad t��bid"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "H��lestus"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr " _Eemalda"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr " _Eemalda"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "H��lestus"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -763,8 +762,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Aadressiraamatu allikas"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Alarmid"
@@ -857,8 +856,8 @@ msgstr "H��lestus"
 msgid "Mappings"
 msgstr "Veerised"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_intervalliga:"
@@ -1039,14 +1038,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1069,8 +1068,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1102,7 +1101,7 @@ msgid "Using email address"
 msgstr "See on e-_postiaadress"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1110,7 +1109,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Lisa"
 
@@ -1157,7 +1156,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1274,10 +1273,12 @@ msgstr "Evolutioni aadressiraamatu nime valiku kasutajaliides."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Eemalda"
 
@@ -1398,7 +1399,7 @@ msgstr "Koost��"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
@@ -1407,7 +1408,7 @@ msgid "D_epartment:"
 msgstr "_Oskaond:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "T�psustused"
 
@@ -1467,11 +1468,12 @@ msgstr "Soovib saada _HTML s�numeid"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Kustuta"
 
@@ -1500,7 +1502,7 @@ msgid "_Web page address:"
 msgstr "Kodulehe aad_ress"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "�hendriigid"
 
@@ -2006,12 +2008,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "L�ti"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Liibanon"
 
@@ -2020,7 +2021,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Libeeria"
 
@@ -2029,12 +2030,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Leedu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
@@ -2067,7 +2068,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2092,7 +2093,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mehhiko"
 
@@ -2118,7 +2119,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Maroko"
 
@@ -2143,7 +2144,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Holland"
 
@@ -2156,12 +2157,12 @@ msgid "New Caledonia"
 msgstr "Uus-Kaledoonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Uus-Meremaa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2178,7 +2179,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolk"
 
@@ -2187,17 +2188,17 @@ msgid "Northern Mariana Islands"
 msgstr "P�hja-Mariaanid"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norra"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Omaan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2210,7 +2211,7 @@ msgid "Palestinian Territory"
 msgstr "Palestiina territoorium"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2219,12 +2220,12 @@ msgid "Papua New Guinea"
 msgstr "Paapua Uus-Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peruu"
 
@@ -2237,22 +2238,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Poola"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Katar"
 
@@ -2261,7 +2262,7 @@ msgid "Reunion"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rumeenia"
 
@@ -2298,7 +2299,7 @@ msgid "Sao Tome And Principe"
 msgstr "S�o Tom� ja Pr�ncipe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudi Araabia"
 
@@ -2315,17 +2316,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapur"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovakkia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Sloveenia"
 
@@ -2338,7 +2339,7 @@ msgid "Somalia"
 msgstr "Somaalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "L�una-Aafrika Vabariik"
 
@@ -2347,7 +2348,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Hispaania"
 
@@ -2368,7 +2369,7 @@ msgid "Sudan"
 msgstr "Sudaan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Suriname"
 
@@ -2381,17 +2382,17 @@ msgid "Swaziland"
 msgstr "Svaasimaa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Rootsi"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "�veits"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taivan"
 
@@ -2429,7 +2430,7 @@ msgid "Tunisia"
 msgstr "Tuneesia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "T�rgi"
 
@@ -2450,7 +2451,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraina"
 
@@ -2459,7 +2460,7 @@ msgid "United Arab Emirates"
 msgstr "Araabia �hendemiraadid"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "�hendkuningriik"
 
@@ -2468,7 +2469,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "�hendriikida hajasaared"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2481,12 +2482,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venetsueela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2509,12 +2510,12 @@ msgid "Western Sahara"
 msgstr "L��ne-Sahara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jeemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslaavia"
 
@@ -2527,26 +2528,34 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Kas sa t�esti tahad\n"
+"kustutada seda kontakti?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Kustutada kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Kategooriaredaktor pole saadaval."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Antud kontakt kuulub j�rgnevatesse kategooriatesse:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Kontakti salvestamine VKaardina"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Ei leidnud vidinat v�ljale: `%s'"
@@ -2573,11 +2582,11 @@ msgstr "E-post"
 msgid "card.vcf"
 msgstr "kaart.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "nimekiri"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2712,11 +2721,11 @@ msgid "contact-list-editor"
 msgstr "kontaktide-nimekirja-redaktor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Kontaktiloendi redaktor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Salvesta nimekiri VKaardina"
 
@@ -2794,21 +2803,21 @@ msgid "Error getting book view"
 msgstr "Viga %s k�ivitamisel"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Viga kaardi muutmisel"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "�nnestus"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
@@ -2817,7 +2826,7 @@ msgid "Repository offline"
 msgstr "Hoidla offlain"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Juurdep��s keelatud"
 
@@ -2835,55 +2844,70 @@ msgstr "Mitte toetatud protokoll"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Katkestatud"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Autentimine eba�nnestus."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autentimine on vajalik"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Muu viga"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Kas soovid muudatused salvestada?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Viga listi lisamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Viga kaardi lisamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Viga listi muutmisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Viga listi eemaldamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Viga kaardi eemaldamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Kuva"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Kuva"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2891,22 +2915,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Kaardid puuduvad"
@@ -2971,102 +2995,108 @@ msgstr "Muu telefon"
 msgid "Other Address"
 msgstr "Muu aadress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Aadressiraamat"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Salvesta VKaardina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Uus kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Uus kontaktide nimekiri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Mine kausta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Impordi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Otsi kontakte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Aadressiraamatu allikad..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot'i s�tted"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Saada kontakt edasi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Saada kontaktile s�num"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tr�ki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Tr�ki �mbrik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Ko_peeri kausta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_T�sta kausta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "L�ika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Aseta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Kustuta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3076,7 +3106,7 @@ msgstr "K�e_solev vaade"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,�,z,t,u,v,w,�,�,�,�,x,y"
 
@@ -3084,7 +3114,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,�,z,t,u,v,w,�,�,�,�,x,y"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,�,z,t,u,v,w,�,�,�,�,x,y"
 
@@ -3236,7 +3266,7 @@ msgstr "Veerised"
 msgid "Number of columns:"
 msgstr "Tulpade arv:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "H��lestus"
 
@@ -3246,7 +3276,7 @@ msgid "Orientation"
 msgstr "Suund"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Lehek�lg"
 
@@ -3320,29 +3350,33 @@ msgstr "Laius:"
 msgid "_Font..."
 msgstr "_Kirjat��p..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Nimetu s�ndmus"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "K�rge"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Keskmine"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Madal"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "M��ramata"
 
@@ -3384,44 +3418,36 @@ msgstr "Kalendri ja �lesannete s�tted"
 msgid "Configuration control for the Evolution Calendar."
 msgstr "Evolution'i kalendrihaldamise komponent."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
 # !PARANDA!
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution'i kalendri iTip/iMip vaataja"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution'i kalendrihaldamise komponent."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3433,10 +3459,23 @@ msgstr "Alarmi teenus"
 msgid "Factory for the alarm notification service"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "Algus:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "L�pp:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "vigane aeg"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution "
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3476,7 +3515,7 @@ msgstr ""
 "meeldetuletusdialoogi."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Hoiatus"
@@ -3503,15 +3542,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Seda k�simust rohkem mitte esitada."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "GNOME l�htestamine nurjus"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "Ei saa tekitada alarmiga m�rguande teenust"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3527,7 +3566,7 @@ msgstr "Kirjeldus sisaldab"
 msgid "Comment contains"
 msgstr "Kommentaar sisaldab"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Puudub"
 
@@ -3566,14 +3605,16 @@ msgid ""
 msgstr "Kalendrivaate loomine nurjus. Kontrolli ORBit'i ja OAF'i seadistusi."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Isiklik"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Salajane"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Avalik"
 
@@ -3594,27 +3635,32 @@ msgid "W"
 msgstr "L�"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Vaba"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Kinni"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Pole alanud"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "T��s"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "L�petatud"
 
@@ -3629,11 +3675,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3648,12 +3695,14 @@ msgstr "Korduv"
 msgid "Assigned"
 msgstr "M��ratud"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Jah"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Ei"
 
@@ -3673,62 +3722,64 @@ msgstr "N�dala vaade"
 msgid "Month View"
 msgstr "Kuu vaade"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Kohtumisi ja s�ndmusi sisaldav kaust"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "�lesanded"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "�lesandeid sisaldav kaust"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "Uudistekanalite seadistused"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "Kohtumine"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "Uus �lesanne"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_�lesanne"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Uus s�ndmus"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Uus _s�ndmus"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "Uus s�ndmus"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "S�ndmus"
@@ -3938,7 +3989,7 @@ msgstr "Meeldetuletajad"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuv�te:"
 
@@ -3967,7 +4018,7 @@ msgstr "s�ndmuse l�ppu"
 msgid "hour(s)"
 msgstr "tund(i)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minuti(t)"
 
@@ -3995,79 +4046,81 @@ msgstr "30 minutit"
 msgid "60 minutes"
 msgstr "60 minutit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Kalendri ja �lesannete s�tted"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Hilinenud �lesannete v�rvus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "T�na l�ppevate �lesannete v�rvus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "P�ev(a)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Reede"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Tund(i)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minut(it)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Esmasp�ev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "_P"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Laup�ev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "_Kuup�eva valikul kuvatakse n�dalate numbreid"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "P�eva _algus:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "_P"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "P�hap�ev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "T�na _l�ppevad �lesanded:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "_N"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "_T"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4096,81 +4149,96 @@ msgid "Tuesday"
 msgstr "Teisip�ev"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Kolmap�ev"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "T��n�dal"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tunnine (EL/PL)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 tunnine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_K�si luba kirjete kustutamisel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_N�dalal�pud kuvatakse kokkusurutud vormis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "�lesande algus: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "N_�ita"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "P�eva l_�pp:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_R"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_�ldine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_Peida l�petatud �lesanded p�rast"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_E"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "_Hilinenud �lesanded:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_L"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "N�ita s�ndmuse _l�puaegu n�dala ja kuu vaadetel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Aja jaotused:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_T"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_K"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "enne s�ndmuse algust"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4256,40 +4324,61 @@ msgstr " (T�htaeg "
 msgid "Due "
 msgstr "T�htaeg "
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Ei saanud uuendada objekti!"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
 msgstr "Ei saanud uuendada objekti!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Muuda s�ndmust"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "S�ndmus - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "�lesanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "P�eviku sissekanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Kokkuv�te puudub"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Salvesta kui..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4347,27 +4436,27 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "S�ndmus"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Meeldetuletaja"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Planeering"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Kohtumine"
 
@@ -4414,7 +4503,7 @@ msgid "Pu_blic"
 msgstr "A_valik"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "N�ita aega kui"
 
@@ -4436,19 +4525,19 @@ msgstr "_L�pp:"
 msgid "_Start time:"
 msgstr "_Algus:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Organiseerija peab olema m��rtud."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "V�hemalt �ks osaleja peab olema m�rgitud."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "See isik on juba osav�tja!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Delegeerida..."
 
@@ -4459,49 +4548,55 @@ msgstr "Osav�tja"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "�hine nimi"
+msgid "Click here to add an attendee"
+msgstr "Osav�tja lisamiseks vajuta siia"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Kust Delegeeritud"
+msgid "Common Name"
+msgstr "�hine nimi"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Kuhu Delegeeritud"
+msgid "Delegated From"
+msgstr "Kust Delegeeritud"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Keel"
+msgid "Delegated To"
+msgstr "Kuhu Delegeeritud"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Liige"
+msgid "Language"
+msgstr "Keel"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Liige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Roll"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "T��p"
@@ -4516,14 +4611,10 @@ msgid "_Change Organizer"
 msgstr "_Muuda organiseerijat:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Kustu teisi..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Teine organiseerija"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4713,7 +4804,7 @@ msgid "Progress"
 msgstr "Edenemine"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4725,19 +4816,19 @@ msgstr "T�_htsus:"
 msgid "_Status:"
 msgstr "_Olek:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "P�hiline"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Kellele m��ratud"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Kirjeldus:"
 
@@ -4749,23 +4840,78 @@ msgstr "_Alguskuup�ev:"
 msgid "_Due Date:"
 msgstr "_T�htaeg:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, fuzzy, c-format
+msgid "100%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "A_va"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Salvesta kui..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4773,20 +4919,20 @@ msgstr "Salvesta kui..."
 msgid "_Print..."
 msgstr "_Tr�ki..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_L�ika"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4794,35 +4940,36 @@ msgstr "_Kopeeri"
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "M��ra �lesanne"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_M�rgi l�petatuks"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_M�rgi �lesanded l�petatuks"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud �lesanded"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "�lesande lisamiseks vajuta siia"
 
@@ -4830,47 +4977,48 @@ msgstr "�lesande lisamiseks vajuta siia"
 msgid "Alarms"
 msgstr "Alarmid"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "L�petatud"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "L�petamise kuup�ev"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "T�htaeg"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "L�peb kuup�eval"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Geograafiline asukoht"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "T�htsus"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Algab kuup�eval"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Kokkuv�te"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "�lesannete sorteerimine"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4918,11 +5066,13 @@ msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pl"
 
@@ -4962,7 +5112,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Publitseeri vaba/h�ivatud infot"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "H��lestus"
@@ -4973,7 +5123,7 @@ msgid "_Configure Pilot..."
 msgstr "H��lestus"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
@@ -5000,73 +5150,396 @@ msgid "Delete _All Occurrences"
 msgstr "Kustuta k_�ik s�ndmused"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vahendid ei paista sellesse s�steemi paigaldatud olevat."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Viga %s k�ivitamisel."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "Kohtumise algus: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "�lesande algus: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "H�ivatuse informatsioon algab: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Algus: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "Kohtumise l�pp: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "H�ivatuse informatsioon l�peb: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "L�pp: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "Valmis: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "�lesande t�htaeg: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "iKalendri informatsioon"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "iKalendri viga"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "Tundmatu isik"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Palun vaata j�rgnev info �le ja vali allpool olevast men��st endale "
+"sobilik tegevus."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Puudub</i>"
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "_Olek:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Vastu v�etud"
+
+# !PARANDA!
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "Proovin�usolek"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Tagasi l�katud"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "Kalendrifaili ei saa uuendada!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "Vali tegevus"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Uuenda"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Olgu"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "N�ustu"
+
+# !PARANDA!
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "Proovin�usolek"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "L�kka tagasi"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "Vaba/h�ivatud info saatmine"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "Saadab v�rskeima informatsiooni"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "T�hista"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> publitseeris kohtumise info."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Kohtumise info"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> soovib saada sinu kohalolekut kohtumisel."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "Ettepanek kohtumiseks"
+
+#: calendar/gui/e-itip-control.c:1127
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> soovib saada v�rskeimat infot kohtumise kohta."
+
+# !PARANDA!
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "Kohtumise info uuendus"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> soovib saada v�rskeimat infot kohtumise kohta."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "Soov muuta kohtumist"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> vastas kohtumise p�ringule."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "Kohtumise vastus"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> t�histas kohtumise."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "Kokkusaamise t�histamine"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, fuzzy, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> t�histas kohtumise."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Vigane kohtmise s�num"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> avalikustas �lesande info."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "�lesande info"
+
+# !PARANDA!
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> soovib, et sa t�idaksid �lesande."
+
+# !PARANDA!
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Ettepanek �lesandeks"
+
+#: calendar/gui/e-itip-control.c:1199
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> soovib saada v�rskeimat infot �lesande kohta."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "�lesande uuendus"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> soovib saada v�rskeimat infot �lesande kohta."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Soov muuta �lesannet"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> vastas �lesande m��ramisele."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "�lesande vastus"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> katkestas �lesande."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "�lesande t�histamine"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Vigane �lesande s�num"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> avalikustas vaba/h�ivatud info."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Vaba/h�ivatud info"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> soovib saada sinu vaba/h�ivatud infot."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Soov saada vaba/h�ivatud infot"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> vastas vaba/h�ivatud p�ringule."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Vaba/h�ivatud vastus"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Vigane vaba/h�ivatud s�num"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "S�num ei tundu olevalt �igesti vormistatud"
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "S�num sisaldab ainult toetamata p�ringuid."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "Manus ei sisalda arusaadavat kalendriteadet"
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Kirje saatmine eba�nnestus!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Uuendamine l�petatud\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Kalendrifaili ei saa uuendada!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Osav�tja olekut ei olnud v�imailk uuendada, kuna objekti enam ei eksisteeri"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Osav�tja olekut ei ole v�imailk uuendada, kuna selle olek on vigane!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "Osav�tja olekut ei ole v�imailk uuendada!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Osav�tja olek uuendatud\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "Osav�tja olekut ei ole v�imailk uuendada!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Eemaldamine l�petatud"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "Kirje saatmine eba�nnestus!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Vali kaust"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vali kaust"
@@ -5108,93 +5581,92 @@ msgstr "l�ppkuup."
 msgid "date-start"
 msgstr "alguskuup."
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Juhid"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Vajalikud osalejad"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "V�imalikud osalejad"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Mitteosalejad"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Individuaalne"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Grupp"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Ressurss"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Ruum"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Juht"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "N�utav osaleja"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "V�imalik osav�tja"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Vajab tegevust"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Vastu v�etud"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Tagasi l�katud"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Katseline"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Delegeeritud"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "T��s"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
@@ -5206,64 +5678,64 @@ msgstr "%a, %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Kontorist v�ljas"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Info puudub"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_H��lestus"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "N�ita tunde _t��p�eva piires"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 #, fuzzy
 msgid "Show _Zoomed Out"
 msgstr "N�ita kontsentreeritult"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_V�rskenda vaba/h�ivatud"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Automaatne valik"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_K�ik inimesed ja ressursid"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "K�ik _inimesed ja �ks ressurss"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "_Vajalikud inimesed"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Vajalikud inimesed ja _�ks ressurss"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Kohtumise _algus:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Kohtumise l_�pp:"
 
@@ -5282,17 +5754,22 @@ msgstr "Ei saa laadida '%s' �lesandeid"
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' laadimiseks vajalik meetod ei ole toetatud."
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Ei saa avada '%s' kausta"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "L�petamise kuup�ev"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "T�hjendan kausta"
@@ -5305,17 +5782,17 @@ msgstr "Uus _s�ndmus..."
 msgid "_Delete this Appointment"
 msgstr "K_ustuta valitud s�ndmus"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' avamiseks vajalik meetod on toetamata"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Avan %s kalendri"
@@ -5376,19 +5853,55 @@ msgstr "Oktoober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Vaja on v�hemalt �hte osav�tjat"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Organiseerija peab olema m��rtud."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr "Teave s�ndmuse kohta"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "Teave �lesande kohta"
+
+# !PARANDA! - siia peaks leidma s�na, mis ei oleks eitav
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "Mittekohustuslik info"
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr "Vaba/H�ivatud informatsioon"
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr "Kalendri info"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Uuenda"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "V�rskenda nimekirja"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema s�ndmusest osav�tja."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr ""
 
@@ -5577,12 +6090,45 @@ msgstr "Valitud kuu (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Valitud aasta (%Y)"
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "�lesanne"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Olek: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "T�_htsus:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Valmis (%): %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Kategooriad: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Kontaktid:"
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Tr�ki kalender"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5620,8 +6166,8 @@ msgstr ""
 "\n"
 "Kas t�esti eemaldame kustutatud s�numid?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Seda k�simust rohkem mitte esitada."
 
@@ -5687,6 +6233,11 @@ msgstr "Impordib VKaardi-vormingus failid Evolution'i."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Impordib VKaardi-vormingus failid Evolution'i."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Meeldetuletaja"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5781,8 +6332,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -6709,639 +7260,654 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Aasia/Manila"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Aasia/Jakarta"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Aasia/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr ""
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Aasia/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Aasia/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Aasia/Kabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr ""
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Aasia/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr ""
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Aasia/Samarkand"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr ""
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Aasia/Shanghai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Aasia/Singapur"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Aasia/Taipei"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Aasia/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Aasia/Tehran"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Aasia/Tokio"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Aasia/Ulaanbaator"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Aasia/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Aasia/Jakuts"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Aasia/Jekaterinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Aasia/Jerevan"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr ""
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr ""
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr ""
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr ""
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr ""
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr ""
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr ""
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr ""
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr ""
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr ""
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr ""
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Austraalia/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Euroopa/Amsterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Euroopa/Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Euroopa/Ateena"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Euroopa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Euroopa/Belgrad"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Euroopa/Berliin"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Euroopa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Euroopa/Br�ssel"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Euroopa/Bukarest"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Euroopa/Budapest"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Euroopa/Kopenhaagen"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Euroopa/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Euroopa/Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Euroopa/Helsingi"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Euroopa/Istanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Euroopa/Kaliningrad"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Euroopa/Kiiev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Euroopa/Lisbon"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Euroopa/Ljubljana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Euroopa/London"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr ""
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Euroopa/Madriid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Euroopa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Euroopa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Euroopa/Monaco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Euroopa/Moskva"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Euroopa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Euroopa/Pariis"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Euroopa/Praha"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Euroopa/Riia"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Euroopa/Rooma"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Euroopa/Samaara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Euroopa/San_Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Euroopa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Euroopa/Simferoopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Euroopa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Euroopa/Sofia"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Euroopa/Stockholm"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Euroopa/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Euroopa/Tirana"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Euroopa/Uzhgorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Euroopa/Vatikan"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Euroopa/Viin"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Euroopa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Euroopa/Varssavi"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Euroopa/Zagreb"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europe/Zaporozie"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Euroopa/Z�rich"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr ""
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr ""
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr ""
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr ""
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr ""
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "See �iffer ei toeta allkirjastamist"
 
-# !PARANDA! - mis on clearsigning'u tegelik vaste?
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "See �iffer ei toeta allkirjastamist"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "See �iffer ei toeta kontrolli"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "See �iffer ei toeta kr�pteerimist"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "See �iffer ei toeta dekr�pteerimist"
 
@@ -7352,12 +7918,12 @@ msgstr ""
 "V�ljundfaili loomine nurjus: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ei suuda avada puhverkataloogi: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7368,7 +7934,7 @@ msgstr ""
 "Tulevased operatsioonid selles serveris j��vad tegemata kui sa\n"
 "taastad �henduse v�rguga."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7379,11 +7945,16 @@ msgstr ""
 "%s\n"
 "Sellesse kausta tehtud muudatused j��vad s�nkroniseerimata."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Taass�nkroniseeritakse serveriga"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "S�ilitan Kausta '%s'"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Selle operatsiooni t�itmiseks pead olema onlainis"
 
@@ -7391,57 +7962,68 @@ msgstr "Selle operatsiooni t�itmiseks pead olema onlainis"
 msgid "Syncing folders"
 msgstr "Kaustade s�nkroniseerimine"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Viga filtri anal��sil: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Viga filtri t�itmisel: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Puhverkausta pole v�imalik avada"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Puhverkausta pole v�imalik t��delda"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "V�etakse vastu teadet %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "S�numi avamine eba�nnestus"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nurjumine teate %d juures"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Kausta s�nkroniseerimine"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "T�mban %d. s�numit %dst"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d. teate juures %d'st tekkis viga"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "S�numi lahtikr�ptimine eba�nnestus."
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "S�numi %s puhverdamine eba�nnestus: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "S�numi %s puhverdamine eba�nnestus: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Viga filtri abil otsimisel %s: %s"
@@ -7474,25 +8056,101 @@ msgstr "(match-all) n�uab �htainust t�ev��rtust��pi tulemust"
 msgid "Performing query on unknown header: %s"
 msgstr "T�idetakse p�ring tundmatul p�isel: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Toetamata operatsioon: lisa s�num: %s"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Toetamata operatsioon: otsimine avaldise j�rgi: %s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Toetamata operatsioon: otsing UID j�rgi: %s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "S�numite liigutamine"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "S�numite liigutamine"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Katkestatud."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Ootamatu vastus POP serverilt: %s"
+
+#: camel/camel-gpg-context.c:782
+msgid "No data provided"
+msgstr ""
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Ei saa kr�ptida s�numit: saajate aadressid on m��ramata."
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "S�numi %s puhverdamine eba�nnestus: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "S�numi %s puhverdamine eba�nnestus: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "S�numi lahtikr�ptimine eba�nnestus."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Ei saa kontrollida s�numit: Ajutise faili loomine eba�nnestus: %s"
+
 #: camel/camel-lock-client.c:111
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7588,84 +8246,23 @@ msgstr "Viga ajutise postifaili kirjutamisel: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Viga ajutise postifaili kopeerimisel: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Palun sisesta oma %s parool %s jaoks"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Palun sisesta oma %s parool"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Seda teadet pole v�imalik allkirjastada: puudub allkirjastatav algtekst."
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "Ei saa allkirjastada s�numit: parool on m��ramata"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Ei saa allkirjastada s�numit: toru loomine GPG/PGPsse eba�nnestus: %s"
-
-# !PARANDA! - mis on clearsigning'u tegelik vaste?
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Seda teadet pole v�imalik allkirjastada: signeeritav algtekst puudub"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Seda teadet pole v�imalik kontrollida: kontrollitav algtekst puudub"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Ei saa kontrollida s�numit: toru loomine GPG/PGPsse eba�nnestus: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "Ei saa kontrollida s�numit: Ajutise faili loomine eba�nnestus: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Seda teadet pole v�imalik kr�pteerida: puudub kr�pteeritav algtekst"
 
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Ei saa kr�ptida s�numit: parool on m��ramata"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Ei saa kr�ptida s�numit: toru loomine GPG/PGPsse eba�nnestus: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Ei saa kr�ptida s�numit: saajate aadressid on m��ramata."
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
-"Seda teadet pole v�imalik dekr�pteerida: puudub dekr�pteeritav algtekst"
 
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Ei saa s�numit lahti kr�ptida: parool on m��ramata"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Ei saa s�numit lahti kr�ptida: toru loomine GPG/PGPsse eba�nnestus: %s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "See on s�numi digitaalselt allkirjastatud osa"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Muu viga"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7681,43 +8278,6 @@ msgstr "Ei saa laadida %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ei saa laadida %s: moodulis puudub initsialiseerimiskood."
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s server %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s teenus %s jaoks %s peal"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "�hendus katkestatud"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Ei saa �henduda %s (port: %d): %s"
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(tundmatu host)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Operatsioon katekstatud"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Server katkestas ootamatult: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anon��mne"
@@ -7821,7 +8381,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Serverilt saadi vigane autentimise vastus."
 
@@ -7849,11 +8409,9 @@ msgid ""
 "Password Authentication."
 msgstr "See valik loob �henduse serverisse kasutades Kerberos 4 autentimist."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Parool"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7880,52 +8438,52 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regulaaravaldise kompileerimine nurjus: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vajab kasutajanime osa"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vajab hosti osa"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vajab kataloogitee osa"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Lahendan: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Viga nime lahendamisel: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Hostinime lahendamine eba�nnestus: %s: ei leia hosti"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Hostinime lahendamine eba�nnestus: %s: p�hjus teadmata"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Lahendan: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Hostinime lahendamine eba�nnestus: %s: ei leia hosti"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Hostinime lahendamine eba�nnestus: %s: p�hjus teadmata"
@@ -7989,11 +8547,11 @@ msgstr "S�numi lahtikr�ptimine eba�nnestus."
 msgid "Failed to verify certificates."
 msgstr "Sertifikaatide kontroll eba�nnestus."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
@@ -8016,7 +8574,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8025,16 +8583,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8049,15 +8607,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "S�numit %s ei leitud"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Kontrolli uusi s�numeid k�ikides kaustades"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8079,68 +8637,77 @@ msgstr "Kausta �mbernimetamine nurjus: %s: vigane operatsioon"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr ""
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Operatsioon katekstatud"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Server katkestas ootamatult: %s"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Ootamatu vastus IMAP serverilt: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAPi k�sk eba�nnestus: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Serveri vastus l�ppes liiga vara."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ootamatu OK vastus IMAP serverilt: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ei saa luua kataloogi %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ei saa laadida %s kokkuv�tet"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Kaust h�vitati ja taasloodi serveris."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Kontrollin muudetud s�numite olemasolu"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "See s�num ei ole hetkel k�ttesaadav"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "V�tan kokkuv�tvat infot uute s�numite kohta"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Kontrollin uute s�numite olemasolu"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Ei leia s�numi sisu FETCH vastuses."
 
@@ -8193,32 +8760,83 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Parool"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP server %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s teenus %s jaoks %s peal"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "�hendus katkestatud"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Ei saa �henduda %s (port: %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Ei saa luua �hendust POP serveriga.\n"
+"Viga kasutajanime saatmisel: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operatsioon ei ole toetatud"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Autentimine eba�nnestus."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s ei toeta k�situd autentimist��pi %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentimist��bi %s tugi puudub"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPalun sisesta IMAP parool %s@%s jaoks"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Sa ei sisestanud parooli."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8226,71 +8844,90 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
-msgid "MH-format mail directories"
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, c-format
+msgid "mailbox:%s (%s)"
+msgstr ""
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:49
+msgid "MH-format mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
 # !PARANDA! - no kuidas siis t�lkida?
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Kohalik postijagaja"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Kohalikku e-posti v�etakse standardsest \"mbox\" vorminguga puhvrist"
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Rakenda filtreid Sisendkasti uutele s�numitele"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "\"Maildir\" vormingus postikataloog"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Kohalikku posti hoitakse maildir vorminguga kataloogides."
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Standardne Unix'i \"mbox\" puhver"
-
-#: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
-"Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga "
-"puhverfailides"
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Standardne Unix'i \"mbox\" puhver"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
+"Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga "
+"puhverfailides"
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8316,7 +8953,7 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr "Kohaliku posti fail %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ei saa muuda kausta %s nime %s-ks: %s"
@@ -8336,33 +8973,31 @@ msgstr "Ei saa kustutada kausta kokkuv�ttefaili '%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ei saa kustutada kausta indeksfaili '%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Ei saa salvestada kokkuv�tet: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "S�numi lisamine maildir kausta nurjus: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8371,20 +9006,19 @@ msgstr ""
 "Ei saa k�tte s�numit: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "S�numit ei leitud"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Vigane s�numi sisu"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8395,13 +9029,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Kausta '%s' ei ole olemas."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8417,7 +9051,7 @@ msgstr "`%s' ei ole maildir vormingus kataloog."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ei saa kustutada kausta '%s': %s"
@@ -8426,8 +9060,8 @@ msgstr "Ei saa kustutada kausta '%s': %s"
 msgid "not a maildir directory"
 msgstr "ei ole maildir vormingus kataloog"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ei saa lugeda kausta '%s': %s"
@@ -8448,45 +9082,37 @@ msgstr "Kontrollin uusi s�numeid"
 msgid "Checking for new messages"
 msgstr "Kontrollin uute s�numite olemasolu"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Kausta s�ilitamine"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s lukustamine nurjus: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8495,13 +9121,11 @@ msgstr ""
 "Ei saa k�tte s�numit %s kaustast %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -8544,174 +9168,155 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Kaust '%s' ei ole t�hi, j�tan kustutamata."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ei saa avada kausta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ei saa kontrollida kausta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ei saa avada faili: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ei saa avada ajutist kirjakasti: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Viga ajutise kirjakasti kirjutamisel: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Ajutisse kirjakasti kirjutamine eba�nnestus: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Ajutise kausta sulgemine eba�nnestus: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kausta �mbernimetamine eba�nnestus: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tundmatu viga: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Kausta �mbernimetamine eba�nnestus: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Viga ajutise kirjakasti kirjutamisel: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Ajutisse kirjakasti kirjutamine eba�nnestus: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "S�numi lisamine mh vormingus kausta nurjus: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "'%s' ei ole kataloog"
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-folder.c:515
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
-msgid "Cannot append message to spool file: %s: %s"
+msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr ""
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "`%s' ei ole maildir vormingus kataloog."
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Kausta '%s/%s' ei ole olemas."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "S�ilitan Kausta '%s'"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Ei saa s�nkroniseerida ajutist kausta %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "'%s' ei ole kataloog"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "S�numi saaja: %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENETi uudised"
@@ -8720,12 +9325,22 @@ msgstr "USENETi uudised"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Ei saa luua kataloogi %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENETi uudised �le %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8828,7 +9443,7 @@ msgstr "J�ta s�numid serverisse"
 msgid "Delete after %s day(s)"
 msgstr "Kustuta %s p�eva m��dumisel"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8849,58 +9464,48 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Ei saa luua �hendust POP serveriga.\n"
 "Viga kasutajanime saatmisel: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Operatsioon ei ole toetatud"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Autentimine eba�nnestus."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "�henduse loomine POP serveriga nurjus: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "IMAPi k�sk eba�nnestus: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "I/O viga"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPalun sisesta %s@%s POP3 parool"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8909,13 +9514,13 @@ msgstr ""
 "Ei saa luua �hendust POP serveriga.\n"
 "Viga parooli saatmisel: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Kausta '%s' ei ole olemas."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9077,45 +9682,45 @@ msgstr "Ajutine autentimine eba�nnestus"
 msgid "Authentication required"
 msgstr "Autentimine on vajalik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Tervituse vastuse viga: %s: v�imalik, et mittefataalne"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Ei saa luua �hendust POP serveriga.\n"
 "Viga kasutajanime saatmisel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "S�num ei tundu olevalt �igesti vormistatud"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP server %s ei toeta k�situd autentimist��pi %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPalun sisesta %s@%s SMTP parool"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9126,90 +9731,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posti saatmine %s kaudu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "Ei saa saata s�numit: saatja aadress on vigane"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "S�numi saatmine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Ei saa saata s�numit: saajate aadressid on m��ramata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ei saa saata s�numit: saajate aadressid on m��ramata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "SMTP tervitus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO p�ring �letas ajalimiidi: %s: mittefataalne"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO vastuse viga: %s: mittefataalne"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP autentimine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Viga SASL autentimisobjekti loomise."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH p�ring nurjus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Halb autentimisvastus serverilt.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM p�ring �letas ajalimiidi: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM vastuse viga: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO p�ring �letas ajalimiidi: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA p�ring �letas ajalimiidi: %s: s�num j�i saatmata"
@@ -9217,39 +9822,39 @@ msgstr "DATA p�ring �letas ajalimiidi: %s: s�num j�i saatmata"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA saatmine �letas ajalimiidi: s�numi t�histamine: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Serverilt saadi vigane autentimise vastus."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT p�ring �letas ajalimiidi: %s: mittefataalne"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET vastuse viga: %s"
@@ -9323,52 +9928,52 @@ msgstr "MIME t��p:"
 msgid "Suggest automatic display of attachment"
 msgstr "Soovita manuse automaatset kuvamist"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu vaatamiseks kliki siia"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Saatja:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Vastus:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Teema:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Adressaat:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Sisesta s�numi adressaadid"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Sisesta aadressid, milledele saadetakse s�numi koopiad"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9379,7 +9984,12 @@ msgstr "Sisesta aadressid, millele saadetakse s�numi pimekoopiad."
 msgid "Attach a file"
 msgstr "Lisab s�numile faili"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Ei saa salvestada allkirjafaili."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9388,48 +9998,48 @@ msgstr ""
 "Viga faili %s lugemisel:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Hoiatus!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Fail on juba olemas. Kirjutada �le?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Viga faili salvestamisel: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Viga faili laadimisel: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9438,7 +10048,7 @@ msgstr ""
 "Viga kirja automaatsel salvestamisel: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9446,7 +10056,7 @@ msgstr ""
 "Ximian Evolution leidis eelmisest sessioonist salvestamata faile.\n"
 "Kas sa soovid �ritada nende taastamist?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9456,29 +10066,49 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Hoiatus: salvestamata s�num"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Ava fail"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Sisesta fail"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Allkirja salvestamine"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (vaikimisi)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "S�numi koostamine"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9486,6 +10116,12 @@ msgstr ""
 "Ei saa luua s�numiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9544,7 +10180,7 @@ msgstr "Teema sisaldab"
 msgid "Subject does not contain"
 msgstr "Teema ei sisalda"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9689,7 +10325,7 @@ msgstr "tund"
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "sekundit"
 
@@ -9763,7 +10399,7 @@ msgstr " tagasi"
 msgid "ago"
 msgstr "tagasi"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %l:%M %p"
 
@@ -9775,6 +10411,21 @@ msgstr "<kuup�eva valimiseks kliki siia>"
 msgid "Filter Rules"
 msgstr "Filtreerimisreeglid"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Stiili nimi:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "'%s' ei ole kataloog"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Vali tegevus"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9794,7 +10445,7 @@ msgstr ""
 "Palun mine tagasi ja vali kaust, kuhu post toimetada."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Vali kaust"
 
@@ -9807,7 +10458,11 @@ msgstr ""
 "Viga regulaaravaldises '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
@@ -9837,7 +10492,7 @@ msgstr "kui k�ik tingimised on t�idetud"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "kui m�ni tingimus on t�idetud"
 
 #: filter/filter-rule.c:780
@@ -9916,194 +10571,204 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Firma"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "sisaldab"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Kopeeri kausta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Vastuv�tmise kuup�ev"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Saatmise kuup�ev"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "ei sisalda"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "ei l�ppe"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "ei ole olemas"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "ei k�la kui"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "ei alga"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Ei ole olemas"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Mustand"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "l�ppeb"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "On olemas"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "on olemas"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Avaldis"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "T�htis"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "on"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "on p�rast"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "on enne"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "T�histatud"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "on suurem kui"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "on v�iksem kui"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "T�histatud"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Postiloend (list)"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "S�numi sisu"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Kirja p�is"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "T�sta kausta"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "M�ngi heli:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Loetud"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Adressaadid"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regulaaravaldis vastab"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Vastatud kellele"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Skoor"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Saatja"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "M��ra olek"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Suurus (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "k�lab kui"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "L�htekonto"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "P�ise erip�ra"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "algab"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Peata t��tlemine"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Teema"
 
@@ -10158,7 +10823,8 @@ msgid "Scanning %s"
 msgstr "Kontrollin %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Post"
 
@@ -10174,10 +10840,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Aadressiraamat"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10227,7 +10889,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution impordib sinu Netscape andmeid"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Pr�gi"
 
@@ -10359,267 +11023,276 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "See kaust ei saa sisaldada s�numeid."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Omadused..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Muudab selle kataloogi omadusi"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Hoiatus: salvestamata s�num"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Uus s�num"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Saada s�num"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "�hendun serverisse..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" omadused"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Omadused"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ajutise kataloogi loomine nurjus: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "uued: %d"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "peidetud: %d"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "valitud: %d"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "saatmata: %d"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "saadetud: %d"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "kokku: %d"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Loo s�numi baasil _Virtuaalne Kaust"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "VKaust _teema j�rgi"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "VKaust _saatja j�rgi"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "VKaust _adressaatide j�rgi"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema j�rgi"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja j�rgi"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide j�rgi"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi j�rgi"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut s�numit..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_Tr�ki"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Vasta k�igile"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Saada edasi"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "L�petatud"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Puhasta"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_M�rgi loetuks"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "M�rgi kui l_ugemata"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "M�rgi t�_htsaks"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "M�rgi v�het_�htsaks"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Taasta"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_T�sta kausta..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "Ko_peeri kausta..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "Laurel"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lisa saatja aadressiraamatusse"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Rakenda filtrid"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Loo s�numi baasil _reegel"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter  p_ostiloendi j�rgi"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "_Vaikimisi"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr ""
 
@@ -10671,7 +11344,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
@@ -10681,83 +11354,107 @@ msgid "Evolution News Editor"
 msgstr "Evolution'i uudiseredaktor"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution'i kontoredaktor"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "_Konto nimi:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Kataloog:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Raadio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua �he nimega kahte kontot."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Oled sa kindel, et soovid seda kontot kustutada?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "�ra kustuta"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Kas t�esti kustutame konto?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Keela"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Luba"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Oled sa kindel, et soovid seda uudistekontot kustutada?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Konto nimi:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "S�numi saaja: %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Teema on %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "S�numi saatja: %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "postiloend %s"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10765,30 +11462,30 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Saata sellegipoolest?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10796,103 +11493,103 @@ msgstr ""
 "Sellel s�numil on teema v�li t�hi.\n"
 "Kas saadame ilma teemata?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%%s kirjutas %a, %d.%m.%Y kell %H:%M:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "T�sta s�num(id) kausta..."
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopeeri s�num(id) kausta..."
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "�htegi s�numit ei ole valitud"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Kirjutada fail �le?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "S�numi salvestamine teise nimega..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "S�numite salvestamine teise nimega..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Kuvab j�rgmise lugemata s�numi"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10904,7 +11601,7 @@ msgstr ""
 "\n"
 "Kas t�esti eemaldame kustutatud s�numid?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10913,32 +11610,68 @@ msgstr ""
 "Viga filtriinfo laadimisel:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtrid"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "T�mban %d. s�numit %dst"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "S�numi tr�kkimine"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "S�numi tr�kkimine nurjus"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Kirjeldus puudub"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Nimetu kontakt"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Saadetud"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Lisa tingimus"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Allkirja salvestamine"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -10988,190 +11721,175 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolution'i kontoassistent"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "p�rast"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Konto"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "�hendun serverisse..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Nimetu kontakt"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "_Redaktor"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Uus"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Tuvasta toetatavad t��bid"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Konto kohta k�iv info:"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Kontohaldus"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Katkesta tegevus"
+msgid "Add Sc_ript"
+msgstr "Lisa tingimus"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "Arkansas"
+msgid "Add new signature..."
+msgstr "Allkirja salvestamine"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "V�ljuvad _s�numid allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "Arica"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Lisa s�numile manus"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autentimine"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Kontrolli uusi s�numeid automaatselt"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Tundmatu m�rgistik: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_Sulge"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Uute s�numite kontroll"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "T�na l�ppevate �lesannete v�rvus"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "S�numi koostamine"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "H��lestus"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11187,56 +11905,47 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"L�peta\"."
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "Bari"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Vaikimisi kodeering: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "E-posti v�tmine"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Diditaalsed ID'd..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "S�numi avamine eba�nnestus"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Mustandite kaust:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Luba"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11257,40 +11966,35 @@ msgstr "E-posti aadress:"
 msgid "Empty _trash folders on exit"
 msgstr "Programmist v�ljumisel _puhasta pr�gikaust"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "K�ivita tegevused"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "l�ppeb"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Omadused"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Edasi saadetud s�numid"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Hangi Digitaalne ID..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_R�huta tsitaate"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Honolulu"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11344,73 +12048,69 @@ msgstr "Mikroneesia"
 msgid "NNTP Server:"
 msgstr "NNTP server:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "E-posti seadistamine"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "_Uudistekanalid"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
 # !PARANDA! - siia peaks leidma s�na, mis ei oleks eitav
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Mittekohustuslik info"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "T_��koht:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _V�tme ID:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Vali v�rvus"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "T�psustus, kui p��takse saata s�numit, millel on kirjeldatud ainult "
 "pimekoopia adressaadid"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Tr�kib valitud kontaktid"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "S�numi avamine eba�nnestus"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_J�ta see parool meelde"
@@ -11445,117 +12145,120 @@ msgstr "Turvalisus"
 
 #: mail/mail-config.glade.h:104
 #, fuzzy
-msgid "Same as text"
-msgstr "Somerset"
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Vali PGP programm"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Allkirjafail"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Kustuta k�ik peale allkirja"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "E-posti saatmine"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Saadetud _s�numite kaust:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Saadetud s�numid ja mustandid"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Serveri seadistused"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Serveri _t��p: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Kiirvalikud"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Allkirja salvestamine"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Allkirja salvestamine"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Allikas"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Allika info"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stiili nimi:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Standardne Unix'i mbox"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "_HTML allkiri:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Muutlik"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11565,145 +12268,138 @@ msgstr ""
 "\n"
 "J�tkamiseks vajuta \"J�rgmine\". "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Idast"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_HTML allkiri:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "L_ae pildid alati v�rgust"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "V�ljuvad s�numid _allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Autentimise t��p: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentimise t��p: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "_Kontrolli uusi s�numeid automaatselt"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_Kontrolli uusi s�numeid automaatselt"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_Sertifikaadi ID:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Kausta puhastamisel k�si kinnitust"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "_HTML allkiri:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Vaikimisi"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Faili nimi:"
+msgid "_Enable"
+msgstr "Luba"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Saada edasi m��ratud kujul"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "_T�isnimi"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML s�numis"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "_HTML allkiri:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteet"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Keel"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_Lae pildid ainult, kui saatja on aadressiraamatus"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "See konto on minu _vaikimisi konto"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_M�rgi s�num loetuks peale"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_�ra lae �htegi pilti v�rgust"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "_PGP programmi asukoht:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "T�psustus, kui p��takse saata HTML s�numit isikule, kes seda ei soovi"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "T�psustus, kui p��takse saata s�numit ilma teemata"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Raadio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11744,69 +12440,52 @@ msgstr "_HTML allkiri:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "_HTML allkiri:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Kasuta turvalist �hendust (_SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Muutlik"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_intervalliga:"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " v�rvusega"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "kirjeldus"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr ""
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
@@ -11849,137 +12528,173 @@ msgstr ""
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "_Hilinenud �lesanded:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Kopeeri viida asukoht"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Salvesta pilt kui..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "\"%s\" t��pi manus"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Kuup�ev"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Kellelt"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kellele"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Koopia"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Pimekoopia"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Postiprogramm:"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "S�numi salvestamine teise nimega..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"See s�num on digitaalselt allkirjastatud. Lisainfo jaoks kliki lukuikoonil."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "�henduse loomine POP serveriga nurjus: %s"
+
+# !PARANDA! - kas on ikka t�pne t�lge?
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "See s�num on digitaalselt allkirjastatud ja autentne."
+
+# !PARANDA! - kas on ikka t�pne t�lge?
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "See s�num on digitaalselt allkirjastatud kuid ei ole autentne."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Kohalikud kaustad"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ei saa salvestada kausta metainfot faili %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kausta %s metaandmete kustutamine nurjus: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Muudan kausta \"%s\" vormingusse \"%s\""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
@@ -12037,81 +12752,73 @@ msgstr ""
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Salvestan s�numi kausta"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "T�stan s�numid %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "T�stan"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Kopeerin"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Kontrollin kaustu \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Edasi saadetud s�numid"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avan kausta %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eemaldan kausta %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "S�ilitan Kausta '%s'"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "V�rskendan kausta"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "T�hjendan kausta"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "V�tan vastu s�numit %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "V�tan vastu %d teadet"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvestan %d s�numit"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12120,45 +12827,45 @@ msgstr ""
 "V�ljundfaili loomine nurjus: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "�hendun lahti: %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taastan �henduse: %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Otsi"
 
@@ -12229,10 +12936,6 @@ msgstr "Uuendan..."
 msgid "Waiting..."
 msgstr "Ootan..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Katkestatud."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas t��."
@@ -12246,16 +12949,16 @@ msgstr "Palun sisesta %s parool"
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Ei saa salvestada allkirjafaili."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Allkirja salvestamine"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12265,10 +12968,30 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Nimi:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "Allkirjafail"
+msgid "Signature hint"
+msgstr "Allkirja salvestamine"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "HTML allkirjafail:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12283,17 +13006,17 @@ msgstr "Edasi saadetud s�num"
 msgid "Forwarded Message"
 msgstr "Edasi saadetud s�num"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12302,89 +13025,94 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "VKaustad"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "vKaustad"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Muuda VKausta"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Proovitake redigeerida olematut vkausta '%s'."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Uus VKaust"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Teema puudub)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - s�num"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "N�gemata"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "N�htud"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Vastatud"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Mitu n�gemata s�numit"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Mitu s�numit"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Madal"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "K�rge"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "K�rgeim"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "T�na %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a, %l:%M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "S�numite nimekirja koostamine"
 
@@ -12407,10 +13135,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Esialgne kontakt:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Vastu v�etud"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Suurus"
 
@@ -17119,5232 +17852,5229 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds ja Bradford"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Liib�a"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lissabon"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "London"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "London/City"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "London/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "London/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "London/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Lousiana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "L��bek-Blankensee"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "L�ti"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Mahhat�kala"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malm�/Sturup"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Lennujaam"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Lennujaam"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Lennujaam"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "L�his-Ida"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineraln�je Vod�"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Miyakejima Lennujaam"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Lennujaam"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regionaalne Lennujaam"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Lennujaam"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "M�nchengladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Moskva Domodedovo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moskva �eremetjevo"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "M�nchen"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Lennujaam"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoya Lennujaam"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Naha Lennujaam"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Lennujaam"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama Lennujaam"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "Naples"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "Tokyo Uus Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York JFK Lennujaam"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata Lennujaam"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Ni�ni Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrk�ping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "P�hja-Carolina"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "P�hja-Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Kirde-Philadelphia"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "N�rnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro Lennujaam"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Odesa"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita Lennujaam"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika saar"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okayama Lennujaam"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki Lennujaam"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri saar"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando Rahvusvaheline)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Osaka Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Oshima Lennujaam"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Pariis/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Pariis/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Pariis/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "Hiina Rahvavabariik"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamt�atski"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Lennujaam"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pihkva"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pj�ngjang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Radu�n�i"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riia"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri saar"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Rooma/Ciampino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Rooma/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Rooma/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov Doni ��res"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Venemaa"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbr�cken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Munitsipaallennujaam"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samaara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholase saar"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saraatov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Sendai Lennujaam"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sot�i"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "L�una-Carolina"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "L�una-Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marshi saar"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simoni saar"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "S�kt�vkar"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 #, fuzzy
 msgid "Sympheropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Lennujaam"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Tallinn"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Tallinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Tanegashima Lennujaam"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Teheran-Mehrabad"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima saar"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokyo Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokyo Uus Rahvusvaheline Lennujaam"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori Lennujaam"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama Lennujaam"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Troms�/Langnes"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Tsushima Lennujaam"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tjumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufaa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Uljanovsk"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Ume�"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "Araabia �hendemiraadid"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 #, fuzzy
 msgid "Uzhgorod"
 msgstr "Euroopa/Uzhgorod"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "V�ster�s"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxj�"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Veneetsia"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tehn. Lennujaam"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Vorone�"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasseri Lennujaam"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Lennujaam"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallopsi saar"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Varssavi"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "L��ne-Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "L��ne-Virginia"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Viin"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow Lennujaam"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatoorium"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Jakutsk"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Yamagata Lennujaam"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube Lennujaam"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao Lennujaam"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Jekaterinburg"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Ju�no-Sahhalinsk"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama Lennuv�li"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Z�rich"
 
@@ -22372,17 +23102,12 @@ msgstr "%l:%M %d. %B"
 msgid "No description"
 msgstr "Kirjeldus puudub"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "S�numite kokkuv�te"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "VKaustad"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
@@ -22391,57 +23116,47 @@ msgstr "Kohalikud kaustad"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "EETN"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "P�eva lause"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Lisa uudistekanal"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Sisesta lisatava uudistekanali URL"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Nimi:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Viga RDF'i allalaadimisel"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
+msgid "Add"
 msgstr "_Lisa"
 
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr " _Eemalda"
-
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Vihmavalingud"
@@ -22482,10 +23197,42 @@ msgstr "Kokkuv�tte tr�kkimine"
 msgid "Printing of Summary failed"
 msgstr "Kokkuv�tte tr�kkimine eba�nnestus"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Bonobo laadimine eba�nnestus.\n"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr "� F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr "� C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "s�lme"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "k/h"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "tolli/Hg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "miili"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilomeetrit"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Selge taevas"
@@ -23637,93 +24384,99 @@ msgid "C_elsius"
 msgstr "_Celsius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "_K�ik uudistekanalid:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Mitu p�eva peaks kalendri kuva korraga n�itama?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Maksimaalne kuvatavate kir_jete arv:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Uudistekanalite seadistused"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "�hte _kuud"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "�hte _n�dalat"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "V_�rskendamise aeg"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "V_�rskendamise vahemik (sekundites):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "_N�ita kaustadele t�ielikku otsinguteed"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "N�ita k_�iki �lesandeid"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "N�ita _t�naseid �lesandeid"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Temperatuuri n�itamise �hikud:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "�lesanded "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Ilmajaama s�tted"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Viite p�eva"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "E-_Post"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "_Uudistekanalid"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_�hte p�eva"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Ajakava"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Ilmateade"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Evolution'i kalendrihaldamise komponent."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Erikaustad"
+msgid "Folder Settings"
+msgstr "S�numite s�tted"
 
 # !PARANDA!
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
@@ -23731,7 +24484,7 @@ msgid "The Evolution shell."
 msgstr "Evolution'i shell"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -23742,6 +24495,37 @@ msgstr "N�ita detaile"
 msgid "Cancel Operation"
 msgstr "Katkesta tegevus"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Kausta �mbernimetamine eba�nnestus:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Vali kaust"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Mustandid"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Sisendkast"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "V�ljundkast"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Saadetud"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolutioni installimine"
@@ -23834,6 +24618,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "L�petamise kuup�ev"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Erikaustad"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Erikaustad"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Erikaustad"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "L�petamise kuup�ev"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -23863,20 +24672,20 @@ msgstr ""
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "M��ra kaust, mille alla tuleb kaust \"%s\" kopeerida:"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Kausta kopeerimine"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "M��ra kaust, mille alla tuleb kaust \"%s\" t�sta:"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Kausta �mbert�stmine"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23885,18 +24694,19 @@ msgstr ""
 "Kausta kustutamine nurjus:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Kustuta \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Kas sa t�esti tahad kustutada kausta \"%s\"?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"Kausta kustutamine nurjus:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23905,16 +24715,16 @@ msgstr ""
 "Kausta �mbernimetamine eba�nnestus:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Kausta nime muutmine"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23933,7 +24743,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Uue kausta loomine"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -23941,7 +24751,7 @@ msgstr ""
 "Valitud kausta t��p ei ole vastavuses\n"
 "k�esoleva tegevusega."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Uus..."
 
@@ -23988,21 +24798,26 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Vali kaust"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Faili %s ei leitud."
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Evolution'i viga "
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24011,11 +24826,11 @@ msgstr ""
 "Puudub importija, mis suudaks hakkama saada failiga\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importimine"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24024,17 +24839,17 @@ msgstr ""
 "Impordin %s.\n"
 "K�ivitan %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Viga %s k�ivitamisel"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Viga %s laadimisel"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24043,32 +24858,32 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Faili nimi:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Vali fail"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Faili t��p:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Impordi teiste programmide andmeid ja s�tted"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Impordi �ksikut faili"
 
 # !PARANDA!
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24076,31 +24891,78 @@ msgstr ""
 "Palun oota...\n"
 "�ritan tuvastada olemasolevaid programme"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Vali kaust, kuhu salvestada imporditavad andmed"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Impordi"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Sulgen �hendused..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Viga tegevusel '%s':\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Kausta s�nkroniseerimine"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Avan kausta %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Avan kausta %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Ava programmiga %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Kirjeldatud kausta loomine nurjus:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -24112,8 +24974,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Uus"
@@ -24134,43 +24996,43 @@ msgstr "Kausta nimi ei tohi sisaldada kaldkriipse."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' on reserveeritud kaustanimed."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Ei leidnud Bug Buddy't sinu $PATH'ist."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolutionist"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Ava kaust..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Vali kaust, mida soovid avada"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Uue kiirvaliku loomine"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vali kaust, millele kiirvalik peab osutama:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "�hendu v_�rku"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
@@ -24205,7 +25067,7 @@ msgstr ""
 "Ximian Evolution on hetkel autonoomses olekus. V�rku �hendumiseks vajuta "
 "seda nuppu."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24213,12 +25075,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24229,23 +25091,19 @@ msgstr ""
 "l�petas ootamatult. Et nendele andmetele uuesti ligi p��seda, pead\n"
 "sa Evolution'i sulgema ja seej�rel taask�ivitama."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "Olgu"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Ei leia h��lestusandmebaasi"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "�ldine viga"
 
@@ -24270,95 +25128,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "�ra eemalda"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Nimeta kiirvalikute grupp �mber"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Nimeta valitud grupp uue nimega:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_V�iksed ikoonid"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "N�ita kiirvalikuid v�ikeste ikoonidega"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "_Suured ikoonid"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "N�itab kiirvalikuid suurte ikoonidena"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Uus grupp"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Loob uue kiirvalikute grupi"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "_Eemalda see grupp..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Eemaldab kiirvalikute grupi"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "_Nimeta see grupp �mber..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Nimeta see kiirvalikute grupp �mber"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "_Peida kiirvalikute riba"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Peidab kiirvalikute riba"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Kiirvalikute �mbernimetamine"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Nimeta valitud kiirvalik uue nimega:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Avab kausta, mis on seotud selle kiirvalikuga"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Ava _uues aknas"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Avab kausta, mis on seotud selle kiirvalikuga, uues aknas"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Nimeta �mber"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Nimeta see kiirvalik �mber"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "_Eemalda"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eemaldab kiirvalikute ribalt selle korralduse"
 
@@ -24370,10 +25228,6 @@ msgstr "Viga kiirvalikute salvestamisel."
 msgid "Shortcuts"
 msgstr "Kiirvalikud"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Sisendkast"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -24437,10 +25291,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<kausta valimiseks kliki siia>"
 
@@ -24473,67 +25328,67 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "CORBA viga"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Katkestatud"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Vigane parameeter"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Omanik puudub"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Ei leitud"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Toetamata t��p"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Toetamata skeem"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Toetamata tegevus"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Sisemine viga"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Olemas"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "Vigane URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Sisaldab alamkaustu"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Vaba ruum on otsas"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Faili t��p:"
@@ -24655,49 +25510,81 @@ msgstr "Seda k�simust mitte rohkem esitada"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution suudab importida andmeid j�rgnevatest failidest:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution l�petab t�� ..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Seda k�simust mitte rohkem esitada"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Keela tiitelkuva"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Impordi alustamine"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Impordi alustamine"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo komponentide s�steemi l�htestamine nurjus"
 
@@ -24811,11 +25698,11 @@ msgstr "k�esoleva hetkega"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Tegevused"
 
@@ -24938,8 +25825,8 @@ msgstr "Sulgeb elemendi"
 msgid "Delete this item"
 msgstr "Kustutab elemendi"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr ""
 
@@ -24979,7 +25866,7 @@ msgstr "Salvestab elemendi kettale"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Fail"
 
@@ -25044,19 +25931,19 @@ msgstr "Edasta i_Kalendrina"
 msgid "Forward this item via email"
 msgstr "Edastab elemendi e-posti kaudu"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "_Ajasta kohtumine"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr ""
 
@@ -25064,10 +25951,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "T�hista"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Katkestab k�imasoleva s�numioperatsiooni"
@@ -25221,7 +26104,7 @@ msgstr "Esitab s�numeid jutul�ngadena"
 msgid "_Expunge"
 msgstr "_Puhasta"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Kaust"
 
@@ -25637,7 +26520,7 @@ msgstr "Eelmisele s�numile"
 msgid "_Quoted"
 msgstr "Tsitaadina"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "T_��riistad"
 
@@ -25652,12 +26535,12 @@ msgstr "Sulgeb akna"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_Sulge"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Vaade"
 
@@ -25844,7 +26727,7 @@ msgstr "_Ava..."
 msgid "_Reply-To Field"
 msgstr "_Vasta-kellele v�li"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Abi"
 
@@ -25993,112 +26876,121 @@ msgid "Move this folder to another place"
 msgstr "T�stab kausta teise kohta"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Loo _uus kaust..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Ava uues aknas"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Avab kausta uues aknas"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Saada / v�ta vastu"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr ""
 "Saadab j�rjekorras olevad v�ljaminevad kirjad ja t�mbab �ra uued kirjad."
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "N�ita infot Ximian Evolutioni kohta"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Saada veateade"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "Saada _veateade"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Saada veateade kasutades Bug Buddy't"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "L�litab kaustade riba sisse v�i v�lja"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "L�litab kiirvkorralduste riba sisse v�i v�lja"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "L�litab autonoomse reziimi sisse v�i v�lja"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "N�itab valitud kausta"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolutioni _KKK"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolutionist..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "Ko_peeri..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_Kaustade riba"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_Mine kausta"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Impordi..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_T�sta mujale..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Uus"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "Uus k_aust"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "_Pilot'i s�tted"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Muuda nime..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Saada / V�ta vastu"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "Kiir_valik"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "Kiir_valikute riba"
 
@@ -26182,21 +27074,21 @@ msgstr ""
 "Vasaku hiirenupuga saab kaarti suurendada ja ajav��ndit valida.\n"
 "Paremat hiirenupuga saab kaarti v�hendada."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "K�e_solev vaade"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "K�e_solev vaade"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Kirjelda vaateid"
 
@@ -26318,16 +27210,21 @@ msgstr "Otsinguredaktor"
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Salvesta otsing"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Lisa salvestatud otsingutesse"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Edasij�udnutele..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Info"
@@ -26349,21 +27246,21 @@ msgstr "S�num"
 msgid "Don't show this message again."
 msgstr "Seda teadet enam mitte n�idata."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Otsi n��d"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Puhasta"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Puhasta"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Otsi n��d"
 
@@ -26389,6 +27286,172 @@ msgstr "init_corba(): GNOME l�htestamine nurjus"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Aadressiraamatu allikas"
+
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "Sendmail'i haruprotsessi pole v�imalik tekitada: %s: e-post j�i saatmata"
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "P�eva _algus:"
+
+#~ msgid "_End of day:"
+#~ msgstr "P�eva l_�pp:"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "_Teine organiseerija"
+
+# !PARANDA! - mis on clearsigning'u tegelik vaste?
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "See �iffer ei toeta allkirjastamist"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Palun sisesta oma %s parool %s jaoks"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Palun sisesta oma %s parool"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr ""
+#~ "Seda teadet pole v�imalik allkirjastada: puudub allkirjastatav algtekst."
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Ei saa allkirjastada s�numit: parool on m��ramata"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Ei saa allkirjastada s�numit: toru loomine GPG/PGPsse eba�nnestus: %s"
+
+# !PARANDA! - mis on clearsigning'u tegelik vaste?
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr ""
+#~ "Seda teadet pole v�imalik allkirjastada: signeeritav algtekst puudub"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Seda teadet pole v�imalik kontrollida: kontrollitav algtekst puudub"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Ei saa kontrollida s�numit: toru loomine GPG/PGPsse eba�nnestus: %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Seda teadet pole v�imalik kr�pteerida: puudub kr�pteeritav algtekst"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Ei saa kr�ptida s�numit: parool on m��ramata"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Ei saa kr�ptida s�numit: toru loomine GPG/PGPsse eba�nnestus: %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "Seda teadet pole v�imalik dekr�pteerida: puudub dekr�pteeritav algtekst"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Ei saa s�numit lahti kr�ptida: parool on m��ramata"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Ei saa s�numit lahti kr�ptida: toru loomine GPG/PGPsse eba�nnestus: %s"
+
+#~ msgid "%s server %s"
+#~ msgstr "%s server %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(tundmatu host)"
+
+#~ msgid "No such message: %s"
+#~ msgstr "S�numit %s ei leitud"
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Raadio"
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "_Redaktor"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Uus"
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Katkesta tegevus"
+
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "Arkansas"
+
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "Arica"
+
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "Bari"
+
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Honolulu"
+
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "Somerset"
+
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Allkirjafail"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Kustuta k�ik peale allkirja"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "_HTML allkiri:"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Faili nimi:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "_HTML allkiri:"
+
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Keel"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Raadio"
+
+#~ msgid "Moving"
+#~ msgstr "T�stan"
+
+#~ msgid "Copying"
+#~ msgstr "Kopeerin"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Allkirjafail"
+
+#~ msgid "Riga"
+#~ msgstr "Riia"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_Lisa"
+
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr " _Eemalda"
+
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Kas sa t�esti tahad kustutada kausta \"%s\"?"
+
 #~ msgid "Card: "
 #~ msgstr "Kaart: "
 
@@ -26660,18 +27723,19 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgstr "See informatsioon ei ole kohustuslik enamiku ldap serverite jaoks,"
 
 #~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
 #~ msgstr ""
-#~ "Seda infot kasutab teie LDAP server otsingus osalevate s�lmede m��ramiseks. "
-#~ "T�psema info saamiseks v�ta �hendust oma serveri administraatoriga."
+#~ "Seda infot kasutab teie LDAP server otsingus osalevate s�lmede "
+#~ "m��ramiseks. T�psema info saamiseks v�ta �hendust oma serveri "
+#~ "administraatoriga."
 
 #~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
 #~ msgstr ""
-#~ "See on baass�lm sinu otsinguteks ldap serveris.T�psema info saamiseks v�ta "
-#~ "�hendust oma serveri administraatoriga. "
+#~ "See on baass�lm sinu otsinguteks ldap serveris.T�psema info saamiseks "
+#~ "v�ta �hendust oma serveri administraatoriga. "
 
 #~ msgid "This is the name of the server where your addressbook is located."
 #~ msgstr "See m��rab serveri nime, kus asub su aadressiraamat."
@@ -26682,15 +27746,9 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "_My server requires authentication"
 #~ msgstr "_Server vajab kasutaja tuvastamist"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Teised kontaktid"
-
 #~ msgid "Name contains"
 #~ msgstr "Nimi sisaldab"
 
-#~ msgid "(none)"
-#~ msgstr "(puudub)"
-
 #~ msgid "C_ontaining:"
 #~ msgstr "_Sisaldab:"
 
@@ -26703,13 +27761,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "_Message Recipients:"
 #~ msgstr "_S�numi adressaadid:"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "Kas sa t�esti tahad\n"
-#~ "kustutada seda kontakti?"
-
 #~ msgid "British Virgin Islands"
 #~ msgstr "Briti Neitsisaared"
 
@@ -26719,12 +27770,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Moldova Vabariik"
 
-#~ msgid "Starting:"
-#~ msgstr "Algus:"
-
-#~ msgid "Ending:"
-#~ msgstr "L�pp:"
-
 #~ msgid "Create a new appointment"
 #~ msgstr "Lisab uue s�ndmuse"
 
@@ -26743,258 +27788,22 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "_Other"
 #~ msgstr "�le_j��nud"
 
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Osav�tja lisamiseks vajuta siia"
-
 #~ msgid "The journal entry has changed. Send an updated version?"
 #~ msgstr ""
 #~ "P�eviku sissekannet on muudetud. Kas soovid saata uuendatud versiooni?"
 
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
-
 #~ msgid "_Delete this Task"
 #~ msgstr "K_ustuta �lesanne"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "Kohtumise algus: <b>"
-
-#~ msgid "Task begins: <b>"
-#~ msgstr "�lesande algus: <b>"
-
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "H�ivatuse informatsioon algab: <b>"
-
-#~ msgid "Begins: <b>"
-#~ msgstr "Algus: <b>"
-
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Kohtumise l�pp: <b>"
-
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "H�ivatuse informatsioon l�peb: <b>"
-
-#~ msgid "Ends: <b>"
-#~ msgstr "L�pp: <b>"
-
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Valmis: <b>"
-
-#~ msgid "Task Due: <b>"
-#~ msgstr "�lesande t�htaeg: <b>"
-
-#~ msgid "iCalendar Information"
-#~ msgstr "iKalendri informatsioon"
-
-#~ msgid "iCalendar Error"
-#~ msgstr "iKalendri viga"
-
-#~ msgid "An unknown person"
-#~ msgstr "Tundmatu isik"
-
-#~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
-#~ msgstr ""
-#~ "<br> Palun vaata j�rgnev info �le ja vali allpool olevast men��st endale "
-#~ "sobilik tegevus."
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Puudub</i>"
-
-#~ msgid "Choose an action:"
-#~ msgstr "Vali tegevus"
-
-#~ msgid "Update"
-#~ msgstr "Uuenda"
-
-#~ msgid "Accept"
-#~ msgstr "N�ustu"
-
-# !PARANDA!
-#~ msgid "Tentatively accept"
-#~ msgstr "Proovin�usolek"
-
-#~ msgid "Decline"
-#~ msgstr "L�kka tagasi"
-
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Vaba/h�ivatud info saatmine"
-
-#~ msgid "Send Latest Information"
-#~ msgstr "Saadab v�rskeima informatsiooni"
-
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> publitseeris kohtumise info."
-
-#~ msgid "Meeting Information"
-#~ msgstr "Kohtumise info"
-
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> soovib saada sinu kohalolekut kohtumisel."
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "Ettepanek kohtumiseks"
-
-# !PARANDA!
-#~ msgid "Meeting Update"
-#~ msgstr "Kohtumise info uuendus"
-
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> soovib saada v�rskeimat infot kohtumise kohta."
-
-#~ msgid "Meeting Update Request"
-#~ msgstr "Soov muuta kohtumist"
-
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> vastas kohtumise p�ringule."
-
-#~ msgid "Meeting Reply"
-#~ msgstr "Kohtumise vastus"
-
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> t�histas kohtumise."
-
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Kokkusaamise t�histamine"
-
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Vigane kohtmise s�num"
-
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> avalikustas �lesande info."
-
-#~ msgid "Task Information"
-#~ msgstr "�lesande info"
-
-# !PARANDA!
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> soovib, et sa t�idaksid �lesande."
-
-# !PARANDA!
-#~ msgid "Task Proposal"
-#~ msgstr "Ettepanek �lesandeks"
-
-#~ msgid "Task Update"
-#~ msgstr "�lesande uuendus"
-
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> soovib saada v�rskeimat infot �lesande kohta."
-
-#~ msgid "Task Update Request"
-#~ msgstr "Soov muuta �lesannet"
-
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> vastas �lesande m��ramisele."
-
-#~ msgid "Task Reply"
-#~ msgstr "�lesande vastus"
-
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> katkestas �lesande."
-
-#~ msgid "Task Cancellation"
-#~ msgstr "�lesande t�histamine"
-
-#~ msgid "Bad Task Message"
-#~ msgstr "Vigane �lesande s�num"
-
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> avalikustas vaba/h�ivatud info."
-
-#~ msgid "Free/Busy Information"
-#~ msgstr "Vaba/h�ivatud info"
-
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> soovib saada sinu vaba/h�ivatud infot."
-
-#~ msgid "Free/Busy Request"
-#~ msgstr "Soov saada vaba/h�ivatud infot"
-
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> vastas vaba/h�ivatud p�ringule."
-
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Vaba/h�ivatud vastus"
-
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Vigane vaba/h�ivatud s�num"
-
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "S�num sisaldab ainult toetamata p�ringuid."
-
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "Manus ei sisalda arusaadavat kalendriteadet"
-
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
-
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "Osav�tjate nimekirjast ei leitud �htegi sinu identiteeti!\n"
 
-#~ msgid "Event information"
-#~ msgstr "Teave s�ndmuse kohta"
-
-#~ msgid "Task information"
-#~ msgstr "Teave �lesande kohta"
-
-#~ msgid "Free/Busy information"
-#~ msgstr "Vaba/H�ivatud informatsioon"
-
-#~ msgid "Calendar information"
-#~ msgstr "Kalendri info"
-
 #~ msgid "Free/Busy information (%s to %s)"
 #~ msgstr "Vaba/H�ivatud informatsioon (%s - %s)"
 
 #~ msgid "iCalendar information"
 #~ msgstr "iKalendri informatsioon"
 
-#~ msgid "Task"
-#~ msgstr "�lesanne"
-
-#~ msgid "Status: %s"
-#~ msgstr "Olek: %s"
-
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Valmis (%): %i"
-
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
-
-#~ msgid "Categories: %s"
-#~ msgstr "Kategooriad: %s"
-
-#~ msgid "Contacts: "
-#~ msgstr "Kontaktid:"
-
 #, fuzzy
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "(body-contains) Vale t��p, oodati stringi"
@@ -27059,9 +27868,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "(Unknown)"
 #~ msgstr "(Tundmatu)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Ootamatu vastus POP serverilt: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Ei suuda leida s�numist 'Kellele' aadressi"
 
@@ -27107,51 +27913,24 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "Mailbox Format"
 #~ msgstr "Postkasti vorming"
 
-#~ msgid " (default)"
-#~ msgstr " (vaikimisi)"
-
-#~ msgid "Mail Settings"
-#~ msgstr "S�numite s�tted"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Teema on %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "S�numi saatja: %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "postiloend %s"
-
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Sisendkast"
 
-#~ msgid "Account"
-#~ msgstr "Konto"
-
 #~ msgid "Composer"
 #~ msgstr "S�numiredaktor"
 
 #~ msgid "Default Forward style is: "
 #~ msgstr "Vaikimisi edasisaatmise moodus on: "
 
-#~ msgid "Drafts"
-#~ msgstr "Mustandid"
-
 #~ msgid "Edit..."
 #~ msgstr "Muuda..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML allkirjafail:"
-
 #~ msgid "News"
 #~ msgstr "Uudised"
 
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Vali filtreerimislogi fail..."
 
-#~ msgid "Sent"
-#~ msgstr "Saadetud"
-
 #~ msgid "Sources"
 #~ msgstr "Allikad"
 
@@ -27179,63 +27958,22 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "seconds."
 #~ msgstr "sekundit."
 
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "See s�num on digitaalselt allkirjastatud. Lisainfo jaoks kliki lukuikoonil."
-
 # !PARANDA! - kas on ikka t�pne t�lge?
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Evolution ei tunne seda t��pi allkirjastatud s�numeid."
 
-# !PARANDA! - kas on ikka t�pne t�lge?
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "See s�num on digitaalselt allkirjastatud ja autentne."
-
-# !PARANDA! - kas on ikka t�pne t�lge?
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr "See s�num on digitaalselt allkirjastatud kuid ei ole autentne."
-
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>Ilmaserveriga �henduse loomine eba�nnestus</b></dd>"
 
 #~ msgid "Regions"
 #~ msgstr "Regioonid"
 
-#~ msgid " F"
-#~ msgstr "� F"
-
-#~ msgid " C"
-#~ msgstr "� C"
-
-#~ msgid "knots"
-#~ msgstr "s�lme"
-
-#~ msgid "kph"
-#~ msgstr "k/h"
-
-#~ msgid "inHg"
-#~ msgstr "tolli/Hg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "miili"
-
-#~ msgid "kilometers"
-#~ msgstr "kilomeetrit"
-
 #~ msgid "Al_l stations:"
 #~ msgstr "_K�ik ilmajaamad:"
 
 #~ msgid "All _folders:"
 #~ msgstr "_K�ik kaustad:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "_K�ik uudistekanalid:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "Ku_vatavad kaustad:"
 
@@ -27245,12 +27983,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "_Displayed feeds:"
 #~ msgstr "Ku_vatavad uudistekanalid"
 
-#~ msgid "Outbox"
-#~ msgstr "V�ljundkast"
-
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
diff --git a/po/eu.po b/po/eu.po
index 6a20d209e4..08bf9c1e14 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1.0\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2001-05-25 13:35+0200\n"
 "Last-Translator: Josu Wali�o <josu@elhuyar.com>\n"
 "Language-Team: Euskara\n"
@@ -34,7 +34,7 @@ msgstr "VCard fitxategiak Evolution-era inportatzen ditu."
 msgid "File As"
 msgstr "Jaso honela"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Izena"
@@ -45,7 +45,7 @@ msgid "Email"
 msgstr "Helb. el."
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Nagusia"
 
@@ -55,7 +55,7 @@ msgstr "Nag"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Laguntzailea"
@@ -63,8 +63,8 @@ msgstr "Laguntzailea"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Lanekoa"
 
@@ -74,12 +74,12 @@ msgid "Bus"
 msgstr "Lan"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Atzeradeia"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Enpresakoa"
 
@@ -90,8 +90,8 @@ msgstr "Enp"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Etxekoa"
 
@@ -106,18 +106,18 @@ msgstr "Erak"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Mugikorra"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Autokoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Laneko faxa"
@@ -127,13 +127,13 @@ msgid "Bus Fax"
 msgstr "Lan fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Etxeko faxa"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Laneko 2.a"
 
@@ -142,43 +142,43 @@ msgid "Bus 2"
 msgstr "Lan 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Etxeko 2.a"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Bestelakoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Beste fax bat"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Bilagailua"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Irrati-telefonoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex-a"
@@ -190,14 +190,14 @@ msgstr "Teletipoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "2. helb. el."
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "3. helb. el."
@@ -335,7 +335,7 @@ msgstr "%s(r)en VCard-a"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Ezin izan da Bonobo hasieratu"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Bilatzen..."
 
@@ -356,32 +356,32 @@ msgstr "Kargatzen..."
 msgid "Error in search expression."
 msgstr "Errorea bilaketa-adierazpenean."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "LDAP zerbitzarian txartela gehitzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "LDAP zerbitzaritik txartela kentzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP zerbitzariko txartela aldatzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Bilaketa berrabiarazten."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "LDAP bilaketaren emaitzak jasotzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Errorea txartela kentzean"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Ezin izan da `%s' URLa analizatu"
@@ -428,103 +428,139 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Helbide-liburua bistaratzen duen mostrako Bonobo kontrola."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "Helbide-liburuaren iturburuak"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Evolution-en helbide-liburuko minitxartela erakusten duen kontrola."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Kontaktuak maneiatzeko Evolution-en osagaia"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Helbide-liburuko minitxartelak kontrolatzeko fabrika"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Helbide-liburuko helbideen bistaratzailearen fabrika"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Helbide-liburuko helbideen pop-up-erako fabrika"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Mostrako helbide-liburuaren kontrolerako fabrika"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontaktuak"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Kontaktuen informazioa duen karpeta"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP zerbitzaria"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "Kontaktuen informazioa duen LDAP zerbitzaria"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Kontaktuen zerrenda berria"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "_Kontaktuen zerrenda"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontaktua"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Kontaktuen zerrenda berria"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Ezin da LDAP zerbitzariarekin konektatu."
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "Contact _List"
-msgstr "_Kontaktuen zerrenda"
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Ezin da IMAP zerbitzarirako autentifikatu.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Errorea iragazki-informazioa kargatzean:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Ezin izan da gnome-vfs hasieratu"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Beste kontaktu batzuk"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Ezin da helbide-liburua ireki"
@@ -559,50 +595,59 @@ msgstr ""
 "Ezin izan dugu helbide-liburu hori ireki.  Egiaztatu bide-izena\n"
 "badagoela eta atzitzeko baimena baduzula. "
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "honela amaitzen da"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "2. helb. el."
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategoria da"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Edozein eremuk hau dauka"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Aurreratua..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Edozein kategoria"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "Karpeta-arakatzaileak bistaratuko duen URIa"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(bat ere ez)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Helb el. nagusia"
 
@@ -648,106 +693,59 @@ msgstr "Desgaitu kontsultak"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Gaitu kontsultak (Arriskutsua!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Ezin da LDAP zerbitzariarekin konektatu."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Ezin da IMAP zerbitzarirako autentifikatu.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Aztarna opakoaren informazio baliogabea:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Egite-data"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "_Begiratu zein mota onartzen diren"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Aukerak"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "_Kendu"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "_Kendu"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Aukerak"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -756,8 +754,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Helbide-liburuaren iturburuak"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Alarmak"
@@ -856,8 +854,8 @@ msgstr "Konfigurazioa"
 msgid "Mappings"
 msgstr "Marjinak"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_dagoen, maiztasun honekin"
@@ -1040,15 +1038,15 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 "Hau, deskargatzeko gehieneko txartel-kopurua da.  Zenbaki handiegia ezartzen "
@@ -1076,8 +1074,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1110,7 +1108,7 @@ msgid "Using email address"
 msgstr "Helbide elektronikoa"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1118,7 +1116,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Gehitu"
 
@@ -1167,7 +1165,7 @@ msgid "_Download limit:"
 msgstr "_Deskarga-muga"
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1285,10 +1283,12 @@ msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Helbide-liburuko izen-hautaketaren interfazerako fabrika"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Kendu"
 
@@ -1419,7 +1419,7 @@ msgstr "Lankidetza"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Kontaktu-editorea"
 
@@ -1428,7 +1428,7 @@ msgid "D_epartment:"
 msgstr "_Saila:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Xehetasunak"
 
@@ -1488,11 +1488,12 @@ msgstr "HT_ML mezuak jaso nahi ditu"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "E_zabatu..."
 
@@ -1521,7 +1522,7 @@ msgid "_Web page address:"
 msgstr "_Web orriaren helbidea:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Estatu Batuak"
 
@@ -2026,12 +2027,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Letonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libano"
 
@@ -2040,7 +2040,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
@@ -2049,12 +2049,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lituania"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxenburgo"
 
@@ -2087,7 +2087,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2112,7 +2112,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexiko"
 
@@ -2137,7 +2137,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Maroko"
 
@@ -2162,7 +2162,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Herbehereak"
 
@@ -2175,12 +2175,12 @@ msgid "New Caledonia"
 msgstr "Kaledonia berria"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Zeelanda Berria"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
@@ -2197,7 +2197,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolk uhartea"
 
@@ -2206,17 +2206,17 @@ msgid "Northern Mariana Islands"
 msgstr "Iparraldeko Mariana uharteak"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norvegia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2229,7 +2229,7 @@ msgid "Palestinian Territory"
 msgstr "Palestinako lurraldea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2238,12 +2238,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Ginea Berria"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguai"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2256,22 +2256,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
@@ -2280,7 +2280,7 @@ msgid "Reunion"
 msgstr "Reunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Errumania"
 
@@ -2317,7 +2317,7 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome eta Principe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
@@ -2334,17 +2334,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leona"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapur"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Eslovakia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Eslovenia"
 
@@ -2357,7 +2357,7 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Hegoafrika"
 
@@ -2366,7 +2366,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Hegoaldeko Georgia eta Hegoaldeko Sandwich uharteak"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Espainia"
 
@@ -2387,7 +2387,7 @@ msgid "Sudan"
 msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -2400,17 +2400,17 @@ msgid "Swaziland"
 msgstr "Swazilandia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Suedia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Suitza"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
@@ -2447,7 +2447,7 @@ msgid "Tunisia"
 msgstr "Tunisia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turkia"
 
@@ -2468,7 +2468,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraina"
 
@@ -2477,7 +2477,7 @@ msgid "United Arab Emirates"
 msgstr "Arabiar Emirerri Batuak"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Erresuma Batua"
 
@@ -2486,7 +2486,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "Estatu Batuetako kanpoaldeko uharte txikiak"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguai"
 
@@ -2499,12 +2499,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2525,12 +2525,12 @@ msgid "Western Sahara"
 msgstr "Mendebaldeko Sahara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslavia"
 
@@ -2543,26 +2543,33 @@ msgid "Zimbabwe"
 msgstr "Zimbawe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Kontaktua ezabatu?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Kategoria-editorea ez dago erabilgarri."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Kontaktu hau kategoria hauetakoa da:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Gorde kontaktua VCard gisa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "Teletipoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Ezin izan da eremu baten trepeta aurkitu: `%s'"
@@ -2589,11 +2596,11 @@ msgstr "Helb. el."
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "zerrenda"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2728,11 +2735,11 @@ msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Kontaktu-zerrendaren editorea"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Gorde zerrenda VCard gisa"
 
@@ -2810,21 +2817,21 @@ msgid "Error getting book view"
 msgstr "Errorea %s abiaraztean"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Errorea txartela aldatzean"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Behar bezala egin da"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
@@ -2833,7 +2840,7 @@ msgid "Repository offline"
 msgstr "Biltegia deskonektatuta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
@@ -2851,53 +2858,68 @@ msgstr "Protokoloa ez da onartzen"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Autentifikazioak huts egin du."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autentifikazioa behar da"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Beste errore bat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Errorea zerrenda gehitzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Errorea txartela gehitzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Errorea zerrenda aldatzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Errorea txartela kentzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 msgid "Display Cards?"
 msgstr "Txartelak bistaratu?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards"
 msgstr "Txartelak bistaratu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2907,19 +2929,19 @@ msgstr ""
 "%d txartel txartelak izatea eskatu duzu. Hori dela-eta %d leiho berri\n"
 "agertuko dira pantailan. Ziur zaude txartel horiek bistaratu nahi dituzula?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 msgid "Move card to"
 msgstr "Eraman txartela hona"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Copy card to"
 msgstr "Kopiatu txartela hemen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 msgid "Move cards to"
 msgstr "Eraman txartelak hona"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 msgid "Copy cards to"
 msgstr "Kopiatu txartelak hemen"
 
@@ -2983,100 +3005,106 @@ msgstr "Beste telefono bat"
 msgid "Other Address"
 msgstr "Beste helbide bat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Helbide-liburua"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Gorde VCard gisa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Kontaktuen zerrenda berria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Joan karpeta honetara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Inportatu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Bilatu kontaktuak"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Helbide-liburuaren iturburuak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot-en ezarpenak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Birbidali kontaktua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Bidali mezua kontaktuari"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Inprimatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Inprimatu gutun-azala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Copy to folder..."
 msgstr "Kopiatu karpeta honetan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Move to folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ebaki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3086,7 +3114,7 @@ msgstr "_Uneko ikuspegia"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3094,7 +3122,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3242,7 +3270,7 @@ msgstr "Marjinak"
 msgid "Number of columns:"
 msgstr "Zutabe-kopurua:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Aukerak"
 
@@ -3252,7 +3280,7 @@ msgid "Orientation"
 msgstr "Orientazioa"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Orrialdea"
 
@@ -3326,29 +3354,33 @@ msgstr "Zabalera:"
 msgid "_Font..."
 msgstr "_Letra-tipoa..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Hitzordu izengabea"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Handia"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normala"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Txikia"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Definitu gabe"
 
@@ -3390,42 +3422,34 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Evolution-en mezu-prestatzailerako fabrika."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution-en egutegiaren laneko laburpenaren osagaia."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Egutegia maneiatzeko Evolution-en osagaia."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Egutegi-laburpenaren osagaiaren fabrika."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Evolution-en Zereginen kontrolerako fabrika."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Egutegiaren iTip ikuspegiaren kontrolerako fabrika"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Mostrako egutegi-kontrolerako fabrika"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Egutegi-osagaien editorearen elkarrizketak zentralizatzeko fabrika"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Osagaien editorearen fabrika sortzeko fabrika"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3437,10 +3461,23 @@ msgstr "Alarma bidezko jakinarazpen-zerbitzua"
 msgid "Factory for the alarm notification service"
 msgstr "Alarma bidezko jakinarazpen-zerbitzurako fabrika"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "Hasi:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "Amaitu:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "baliogabeko ordua"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution "
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3480,7 +3517,7 @@ msgstr ""
 "dago. Oroigarri normala bistaratuko da."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Abisua"
@@ -3506,15 +3543,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ez galdetu programa horri buruz berriro."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Ezin izan da GNOME hasieratu"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "Ezin izan da sortu alarma bidezko jakinarazpen-zerbitzua"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "Ezin izan da sortu alarma bidezko jakinarazpen-zerbitzuaren fabrika"
 
@@ -3530,7 +3567,7 @@ msgstr "Azalpenak hau dauka"
 msgid "Comment contains"
 msgstr "Iruzkinak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Ez dator bat"
 
@@ -3571,14 +3608,16 @@ msgstr ""
 "konfigurazioa."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Pribatua"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Konfidentziala"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Publikoa"
 
@@ -3599,27 +3638,32 @@ msgid "W"
 msgstr "M"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Okupatuta"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Ez da hasi"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Egiten ari da"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Eginda"
 
@@ -3634,11 +3678,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3653,12 +3698,14 @@ msgstr "Errepikatua"
 msgid "Assigned"
 msgstr "Esleitua"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Bai"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Ez"
 
@@ -3678,58 +3725,60 @@ msgstr "Astearen ikuspegia"
 msgid "Month View"
 msgstr "Hilabetearen ikuspegia"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Egutegia"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Hitzorduak eta gertaerak dituen karpeta"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Zereginak"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Egiteko elementuak dauzkan karpeta"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "New meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "_Meeting"
 msgstr "_Bilera"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "New task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Hitzordua"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "New appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "_Appointment"
 msgstr "_Hitzordua"
 
@@ -3939,7 +3988,7 @@ msgstr "Oroigarriak"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Laburpena:"
 
@@ -3968,7 +4017,7 @@ msgstr "hitzordu-amaiera baino"
 msgid "hour(s)"
 msgstr "ordu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minutu"
 
@@ -3996,79 +4045,81 @@ msgstr "30 minutu"
 msgid "60 minutes"
 msgstr "60 minutu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Egutegiaren eta zereginen ezarpenak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Atzeratutako zereginen kolorea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Gaurko zereginen kolorea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "egun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Ostirala"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "ordu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "minutu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Astelehena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "_Ig."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Larunbata"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Erakutsi aste-_zenbakiak data-nabigatzailean"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "Egu_naren hasiera:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "_Ig."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Igandea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Ga_urko zereginak:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "O_g."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "A_r."
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4097,82 +4148,97 @@ msgid "Tuesday"
 msgstr "Asteartea"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Asteazkena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Lan-astea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ordu (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 ordu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Eskatu berrespena elementuak ezabatzeko"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_Konprimitu asteburuak hilabetearen ikuspegian"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Zereginaren hasiera: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Bistaratzea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "Eg_unaren bukaera:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_Or."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Orokorra"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "Ez_kutatu burututako zereginak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Al."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "A_tzeratutako zereginak:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_Lr."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr ""
 "Erakutsi hitzorduen a_maiera-orduak astearen eta hilabetearen ikuspegietan"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Orduen zati_keta:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "A_r."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "A_z."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "hitzordua hasi aurretik"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4256,40 +4322,61 @@ msgstr "(Falta: "
 msgid "Due "
 msgstr "Falta: "
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Ezin izan da objektua eguneratu!"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
 msgstr "Ezin izan da objektua eguneratu!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Editatu hitzordua"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Hitzordua - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Zeregina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Egunkariko sarrera - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Laburpenik ez"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Ezin da uneko bertsioa lortu!"
 
@@ -4347,27 +4434,27 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Hitzordua"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Oroigarria"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Errepikapena"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Antolaketa"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Bilera"
 
@@ -4414,7 +4501,7 @@ msgid "Pu_blic"
 msgstr "_Publikoa"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Erakutsi ordua honela"
 
@@ -4436,19 +4523,19 @@ msgstr "_Amaiera-ordua:"
 msgid "_Start time:"
 msgstr "_Hasiera-ordua:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Antolatzailea behar da."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Pertsona hori lehendik dago bileran!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Delegatu ..."
 
@@ -4459,49 +4546,56 @@ msgstr "Partaidea"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Izen arrunta"
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Egin klik hemen kontaktua gehitzeko *"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delegatzailea"
+msgid "Common Name"
+msgstr "Izen arrunta"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegatua"
+msgid "Delegated From"
+msgstr "Delegatzailea"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Hizkuntza"
+msgid "Delegated To"
+msgstr "Delegatua"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Kidea"
+msgid "Language"
+msgstr "Hizkuntza"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Kidea"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Funtzioa"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Egoera"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Mota"
@@ -4516,14 +4610,10 @@ msgid "_Change Organizer"
 msgstr "_Aldatu antolatzailea"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Gonbidatu beste batzuk..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Beste antolatzaile bat"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4712,7 +4802,7 @@ msgid "Progress"
 msgstr "Lanean"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URLa:"
 
@@ -4724,19 +4814,19 @@ msgstr "_Lehentasuna:"
 msgid "_Status:"
 msgstr "_Egoera:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Esleipena"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Azalpena:"
 
@@ -4748,23 +4838,78 @@ msgstr "Ha_siera-data:"
 msgid "_Due Date:"
 msgstr "_Mugaeguna:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "%0"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "%10"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "%20"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "%30"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "%40"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "%50"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "%60"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "%70"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "%80"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "%90"
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr "%100"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Ireki"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Gorde honela..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4772,20 +4917,20 @@ msgstr "Gorde honela..."
 msgid "_Print..."
 msgstr "_Inprimatu..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "E_baki"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "Ko_piatu"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4793,35 +4938,36 @@ msgstr "Ko_piatu"
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Esleitu zeregina"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ma_rkatu zereginak 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Egin klik zeregina gehitzeko"
 
@@ -4829,47 +4975,48 @@ msgstr "Egin klik zeregina gehitzeko"
 msgid "Alarms"
 msgstr "Alarmak"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Eginda"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Egite-data"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Mugaeguna"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Amaiera-eguna"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Kokaleku geografikoa"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Lehentasuna"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Hasiera-data"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Laburpena"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Zereginen ordena"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URLa"
 
@@ -4917,11 +5064,13 @@ msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -4961,7 +5110,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Argitaratu libre/okupatuta informazioa"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Konfiguratu %s"
@@ -4972,7 +5121,7 @@ msgid "_Configure Pilot..."
 msgstr "Konfiguratu %s"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "_Gorde honela..."
 
@@ -4999,72 +5148,388 @@ msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Ez dirudi GNOME Pilot tresnak instalatuta dauzkazunik sisteman."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Errorea %s exekutatzean."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "Bileraren hasiera: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "Zereginaren hasiera: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "Libre/okupatura informazioaren hasiera: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Hasiera: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "Bileraren amaiera: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "Libre/okupatura informazioaren amaiera: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "Amaiera: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "Zeregina eginda: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "Zeregina egiteko: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "iCalendar informazioa"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "iCalendar errorea"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "Pertsona ezezaguna"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Bat ere ez</i>"
+
+#: calendar/gui/e-itip-control.c:903
+msgid "Status:"
+msgstr "Egoera:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Onartua"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+msgid "Tentatively Accepted"
+msgstr "Oraingoz onartua"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Ukatua"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "Ezin izan da egutegi-fitxategia eguneratu!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "Aukeratu ekintza bat:"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Eguneratu"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Ados"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "Onartu"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "Onartu oraingoz"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "Ukatu"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "Bidali libre/okupatuta informazioa"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "Eguneratu erantzun-emailearen egoera"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "Bidali azken orduko informazioa"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Utzi"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b>(e)k bilera-informazioa argitaratu du."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Bileraren informazioa"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "Bilera-proposamena"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b>(e)k bilera batean sartu nahi du."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "Bilera-eguneratzea"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b>(e)k bilera-informazio berria jaso nahi du."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "Bilera-eguneratzearen eskaera"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b>(e)k bilera-eskaerari erantzun dio."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "Bilera-erantzuna"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b>(e)k bilera bertan behera utzi du."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "Bilera bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b>(e)k mezu ulertezina bidali du."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Bilera-mezu txarra"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b>(e)k zeregin-informazioa argitaratu du."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Zereginaren informazioa"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Zeregin-proposamena"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Zeregin-eguneratzea"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b>(e)k zereginaren informazio berria jaso nahi du."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Zeregin-eguneratzearen eskaera"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b>(e)k zeregin-esleipenari erantzun dio."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Zereginaren erantzuna"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Zeregina bertan behera uztea"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Zeregin-mezu txarra"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b>(e)k libre/okupatuta informazioa argitaratu du."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Libre/okupatuta informazioa"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b>(e)k libre/okupatuta informazioa eskatzen dizu."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Libre/okupatuta eskaera"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b>(e)k libre/okupatuta eskaerari erantzun dio."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Libre/okupatuta erantzuna"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Libre/okupatuta mezu txarra"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "Eranskinak ez du baliozko egutegi-mezurik"
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#, fuzzy
+msgid "There was an error on the CORBA system\n"
+msgstr "Errorea izan da datuak deskargatzean"
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Elementua ezin izan da bidali!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Ezin izan da egutegi-fitxategia eguneratu!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Partaidearen egoera ezin da eguneratu elementua ez dagoelako"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea dagoelako!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "Partaidearen egoera ezin izan da eguneratu\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "Partaidearen egoera ezin izan da eguneratu\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Hautatu karpeta"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Hautatu karpeta"
@@ -5106,93 +5571,92 @@ msgstr "data-amaiera"
 msgid "date-start"
 msgstr "data-hasiera"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Mahaiburuak"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Beharrezko partaideak"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Aukerako partaideak"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Ez-partaideak"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Indibiduala"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Taldea"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Baliabidea"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Gela"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Mahaiburua"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Beharrezko partaidea"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Aukerako partaidea"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Ez-partaidea"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Ekintza behar du"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Onartua"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Ukatua"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Behin-behinekoa"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Delegatua"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "Egiten ari da"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a, %Y/%m/%d"
@@ -5204,63 +5668,63 @@ msgstr "%a, %Y/%m/%d"
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Bulegotik kanpo"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Ez dago informaziorik"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "Au_kerak"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Erakutsi lan-orduak _bakarrik"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Erakutsi _txikiagotuta"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Eguneratu Libre/okupatuta"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "Au_tomatikoki hautatu"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Pertsona eta baliabide guztiak"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Pert_sona guztiak eta baliabide bat"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "_Beharrezko pertsonak"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Beharrezko pertsonak eta ba_liabide bat"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Bilera _hasteko ordua:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Bilera amai_tzeko ordua:"
 
@@ -5279,17 +5743,22 @@ msgstr "Ezin izan dira zereginak kargatu`%s'(e)n"
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s'kargatzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Ezin izan da karpeta ireki`%s'(e)n"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Egite-data"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
@@ -5301,17 +5770,17 @@ msgstr "Hitz_ordu berria..."
 msgid "_Delete this Appointment"
 msgstr "Ezabatu _hitzordu hau"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s'irekitzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s - egutegia irekitzen"
@@ -5372,19 +5841,53 @@ msgstr "urria"
 msgid "September"
 msgstr "iraila"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Partaide bat behar da gutxienez"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Antolatzailea ezarri behar da."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr "Gertaera-informazioa"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "Zereginaren informazioa"
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr "Egunkari-informazioa"
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr "Libre/okupatuta informazioa"
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr "Egutegi-informazioa"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Eguneratu"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Freskatu zerrenda"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Gertaerako partaidea izan behar duzu."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "Ezin izan da sortu osagai-editorearen fabrika"
 
@@ -5573,12 +6076,45 @@ msgstr "Hautatutako hilabetea (%Y %b)"
 msgid "Selected year (%Y)"
 msgstr "Hautatutako urtea (%Y)"
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "Zeregina"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Egoera: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Lehentasuna:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Osatutako ehunekoa: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URLa: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Kategoriak: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Kontaktuak "
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Inprimatu egutegia"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5615,8 +6151,8 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Ez galdetu berriro."
 
@@ -5679,6 +6215,11 @@ msgstr "iCalendar fitxategiak Evolution-era inportatzen ditu"
 msgid "Imports vCalendar files into Evolution"
 msgstr "VCalendar fitxategiak Evolution-era inportatzen ditu"
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Oroigarria"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5772,11 +6313,11 @@ msgstr "'contains?'ek espero du 2 argumentua kate bat izatea"
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
-"'contains?'ek espero du 1 argumentua \"any\", \"summary\", edo "
-"\"description\" izatea"
+"'contains?'ek espero du 1 argumentua \"any\", \"summary\", edo \"description"
+"\" izatea"
 
 #: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
@@ -6704,638 +7245,654 @@ msgid "Asia/Macao"
 msgstr "Asia/Macau"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Asia/Macau"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Asia/Magadan"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Asia/Maskat"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Asia/Nikosia"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Asia/Kabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangun"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Asia/Riad"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Asia/Seul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Asia/Xangai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Asia/Singapur"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Asia/Teheran"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokio"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulan Bator"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumtsi"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientian"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Asia/Jakutsk"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Asia/Erevan"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantikoa/Azoreak"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantikoa/Bermuda"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlantikoa/Kanariak"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantikoa/Cabo Verde"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlantikoa/Faroe"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantikoa/Jan_Mayen"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlantikoa/Madeira"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantikoa/Reykjavik"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantikoa/Hegoaldeko Georgiak"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlantikoa/Santa_Helena"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlantikoa/Stanley"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europa/Atenas"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrad"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europa/Brusela"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukarest"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europa/Kishinev"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europa/Kopenhage"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europa/Londres"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxenburgo"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europa/Madril"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europa/Monako"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europa/Mosku"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europa/Nikosia"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europa/Erroma"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikanoa"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europa/Viena"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europa/Varsovia"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporojie"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europa/Zurich"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Indikoa/Antananarivo"
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Indikoa/Txagos"
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Indikoa/Christmas"
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Indikoa/Cocos"
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indikoa/Komoreak"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Indikoa/Kerguelen"
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indikoa/Mahe"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indikoa/Maldivak"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indikoa/Maurizio"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indikoa/Mayotte"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indikoa/Reunion"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Pazifikoa/Apia"
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Pazifikoa/Auckland"
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Pazifikoa/Chatham"
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Pazifikoa/Pazko uhartea"
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Pazifikoa/Efate"
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Pazifikoa/Enderbury"
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Pazifikoa/Fakaofo"
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Pazifikoa/Fiji"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Pazifikoa/Funafuti"
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Pazifikoa/Galapagoak"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Pazifikoa/Gambier"
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Pazifikoa/Guadalcanal"
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Pazifikoa/Guam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Pazifikoa/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Pazifikoa/Johnston"
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Pazifikoa/Kiritimati"
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Pazifikoa/Kosrae"
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Pazifikoa/Kwajalein"
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Pazifikoa/Majuro"
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Pazifikoa/Markesak"
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Pazifikoa/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Pazifikoa/Nauru"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Pazifikoa/Niue"
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Pazifikoa/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Pazifikoa/Noumea"
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Pazifikoa/Pago_Pago"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Pazifikoa/Palau"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Pazifikoa/Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Pazifikoa/Ponape"
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Pazifikoa/Port_Moresby"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Pazifikoa/Rarotonga"
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Pazifikoa/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Pazifikoa/Tahiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Pazifikoa/Tarawa"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Pazifikoa/Tongatapu"
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Pazifikoa/Truk"
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Pazifikoa/Wake"
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Pazifikoa/Wallis"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Pazifikoa/Yap"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Zifraketa honek ez du sinatzerik onartzen"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Zifraketa honek ez du garbi sinatzerik onartzen"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Zifraketa honek ez du egiaztatzerik onartzen"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Zifraketa honek ez du enkriptatzerik onartzen"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
 
@@ -7343,12 +7900,12 @@ msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
 msgid "Unable to create cache path"
 msgstr "Ezin da cache-bidea sortu"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ezin izan da kendu cache-sarrera: %s: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7359,7 +7916,7 @@ msgstr ""
 "Zerbitzari honetako eragiketa gehiago ez zaizu erantzungo \n"
 "sarera berriz konektatzen zarenean."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7370,11 +7927,16 @@ msgstr ""
 "%s\n"
 "Fitxategi honetan egindako aldaketak ez dira birsinkronizatuko."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Zerbitzariarekin birsinkronizatzen"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "%s karpeta biltegiratzen"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Linean jardun behar duzu lanean eragiketa hau bukatzeko"
 
@@ -7382,56 +7944,67 @@ msgstr "Linean jardun behar duzu lanean eragiketa hau bukatzeko"
 msgid "Syncing folders"
 msgstr "Karpetak sinkronizatzen"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errorea iragazkia analizatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errorea iragazkia exekutatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Ezin da spool-karpeta ireki"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Ezin da spool-karpeta prozesatu"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) mezua lortzen"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Ezin da mezua ireki"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Huts egin du %d mezuan"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Karpeta sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d mezua hartzen"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 msgid "Failed to retrieve message"
 msgstr "Huts egin du mezua berreskuratzean"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errorea iragazki-bilaketa exekutatzean: %s: %s"
@@ -7463,25 +8036,103 @@ msgstr "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
 msgid "Performing query on unknown header: %s"
 msgstr "Kontsulta egiten goiburuko ezezagunean: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Eragiketa hau ez da onartzen: mezua erantsi: %s"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Eragiketa hau ez da onartzen: uid bidezko bilaketa: %s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Mezuak eramaten"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Mezuak %s(e)n kopiatzen"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Bertan behera utzita."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Ustekabeko erantzuna POP zerbitzaritik: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Ez da fitxategi-izenik eman."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Ezin da mezua enkriptatu: ez da hartzailerik zehaztu"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Huts egin du mezua deskodetzean."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+"Ezin da mezua egiaztatu: ezin izan da aldi baterako fitxategia sortu: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7579,87 +8230,24 @@ msgstr "Errorea aldi baterako posta-fitxategia idaztean: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Errorea aldi baterako posta-fitxategia kopiatzean: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Idatzi zure %s pasaesaldia %s(e)rako"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Idatzi %s pasaesaldia"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Ezin da mezua sinatu: ez dago sinatzeko testu soilik"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "Ezin da mezua sinatu: ez da pasahitzik eman."
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Ezin da mezua sinatu: ezin izan da GPG/PGPrako kanalizaziorik sortu: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Ezin da mezua sinatu: ez dago garbi sinatzeko testu soilik"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Ezin da mezua egiaztatu: ez dago testu soilik egiaztatzeko"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Ezin da mezua egiaztatu: ezin izan da GPG/PGPrako kanalizaziorik sortu: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Ezin da mezua egiaztatu: ezin izan da aldi baterako fitxategia sortu: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Ezin da mezua enkriptatu: ez dago testu soilik enkriptatzeko"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Ezin da mezua enkriptatu: ez da pasahitzik eman"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Ezin da mezua enkriptatu: ezin izan da GPG/PGPrako kanalizaziorik sortu: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Ezin da mezua enkriptatu: ez da hartzailerik zehaztu"
 
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Ezin da mezua desenkriptatu: ez dago testu zifraturik desenkriptatzeko"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Ezin da mezua desenkriptatu: ez da pasahitzik eman"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Ezin da mezua desenkriptatu: ezin izan da GPG/PGPrako kanalizaziorik sortu: "
-"%s"
+#: camel/camel-multipart-encrypted.c:325
+#, fuzzy
+msgid "Failed to decrypt MIME part: parse error"
+msgstr "Huts egin du desenkriptatzean: Ezezaguna"
 
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Beste errore bat"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7676,43 +8264,6 @@ msgstr "Ezin izan da %s kargatu: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ezin izan da %s kargatu: Moduluak ez du hasieratze-koderik."
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s zerbitzaria %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s zerbitzua %s(e)rako %s(e)n"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Konexioa etenda"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %s"
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(ostalari ezezaguna)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Eragiketa bertan behera utzi da"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Zerbitzaria deskonektatu egin da ustekabean: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonimoa"
@@ -7822,7 +8373,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
 
@@ -7852,11 +8403,9 @@ msgstr ""
 "Aukera honek zerbitzariarekin konektatuko zaitu Kerberos 4 "
 "autentifikazioaren bidez."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Pasahitza"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7883,52 +8432,52 @@ msgstr "POP Before SMTP auth using a non-pop source"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Adierazpen erregularraren konpilazioak huts egin du: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URLak erabiltzaile-izenaren osagaia behar du"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URLak ostalari-osagaia behar du"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLak bide-izenaren osagaia behar du"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ebazten: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Huts egin du izen-bilaketan: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Ostalari-bilaketak huts egin du: %s: ez da ostalaria aurkitu"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Ebazten: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Ostalari-bilaketak huts egin du: %s: ez da ostalaria aurkitu"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
@@ -7992,11 +8541,11 @@ msgstr "Huts egin du mezua deskodetzean."
 msgid "Failed to verify certificates."
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ezin da karpeta hartu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ezin da karpeta sortu: eragiketa baliogabea biltegi honetarako"
 
@@ -8026,7 +8575,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8039,16 +8588,16 @@ msgstr ""
 "Hatz-marka:        %s\n"
 "Sinadura:          %s"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr "ONA"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr "TXARRA"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8068,15 +8617,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Ezin izan da `%s' URLa analizatu"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s mezurik ez dago %s(e)n"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Halako mezurik ez dago: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8099,68 +8648,77 @@ msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
 "Ezin izan zaio izena aldatu karpetari: %s: ez dago horrelako karpetarik"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Zakarrontzi-karpeta honetatik ezin duzu mezurik kopiatu."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Eragiketa bertan behera utzi da"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Zerbitzaria deskonektatu egin da ustekabean: %s"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Zerbitzariaren erantzuna lasterregi amaitu da."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ustekabeko baiezko erantzuna IMAP zerbitzaritik: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ezin izan da %s(r)en laburpena kargatu"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Karpeta deuseztatu egin da eta berriro sortu zerbitzarian."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Aldatutako mezuen bila eskaneatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Mezu hau orain ez dago erabilgarri "
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Mezu berrien laburpen-informazioa bilatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Mezu berrien bila eskaneatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Ezin izan da mezuaren gorputza aurkitu FETCH erantzunean."
 
@@ -8213,35 +8771,86 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP zerbitzarietan posta irakurri eta gordetzeko."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Pasahitza"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
 "pasahitzaren bidez."
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "%s SMTP zerbitzaria"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s zerbitzua %s(e)rako %s(e)n"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Konexioa etenda"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Ezin da POP zerbitzariarekin konektatu.\n"
+"Errorea erabiltzaile-izena bidaltzean: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Eragiketa ez da onartzen"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Autentifikazioak huts egin du."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "%s IMAP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s motako autentifikazioa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en IMAP pasahitza"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Ez duzu idatzi pasahitza."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8252,73 +8861,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Karpeta gurasoak ez du azpikarpetak edukitzeko baimenik"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Ezin da postontzia ireki: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "MH formatuko posta-direktorioak"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Posta lokala MH gisako posta-direktorioetan gordetzeko."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Banaketa lokala"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Posta lokala berreskuratzeko mbox formatuko spool estandarretatik."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Aplikatu iragazkiak sarrerako ontziko mezu berriei"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Maildir formatuko posta-direktorioak"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Posta lokala gordetzeko maildir direktorioetan."
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Unix mbox spool estandarrak"
-
-#: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
-"Posta lokala irakurri eta gordetzeko mbox spool fitxategi estandarretan."
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr "mbox fitxategien direktorio-zuhaitza"
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Unix mbox spool estandarrak"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"mbox fitxategien kanpo-zuhaitz batean gordetako posta atzitzeko.\n"
-"Honen bidez zuzenean atzituko dituzu pine eta elm karpetak.\n"
-"OHARRA: Hornitzaile hau esperimentala da oraindik, beraz, egin babeskopia "
-"postako karpetei lehenik."
+"Posta lokala irakurri eta gordetzeko mbox spool fitxategi estandarretan."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s gordetze-erroa ez da bide-izen absolutua"
@@ -8344,7 +8968,7 @@ msgstr "Biltegi lokalek ez dute sarrerako ontzirik"
 msgid "Local mail file %s"
 msgstr "%s posta-fitxategi lokala"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ezin izan zaio karpeta-izena aldatu %s --> %s: %s"
@@ -8364,33 +8988,31 @@ msgstr "Ezin izan da karpetaren `%s'laburpen-fitxategia ezabatu: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ezin izan da karpetaren `%s'indize-fitxategia ezabatu: %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Ezin izan da laburpena gorde: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ezin zaio mezua gehitu laburpenari: arrazoi ezezaguna"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Maildir mezua eranstea bertan behera utzi da"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ezin zaio mezua erantsi maildir karpetari: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8399,20 +9021,19 @@ msgstr ""
 "Ezin da mezua hartu: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Ez dago horrelako mezurik"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Mezu-eduki baliogabea"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8423,13 +9044,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "`%s' karpeta ez dago."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8445,7 +9066,7 @@ msgstr "`%s' ez da maildir direktorioa."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
@@ -8454,8 +9075,8 @@ msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
 msgid "not a maildir directory"
 msgstr "ez da maildir direktorioa"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ezin izan da `%s' karpeta eskaneatu: %s"
@@ -8476,45 +9097,37 @@ msgstr "Mezu berririk dagoen begiratzen"
 msgid "Checking for new messages"
 msgstr "Mezu berrien bila eskaneatzen"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Karpeta biltegiratzen"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ezin da karpeta-blokeoa sortu %s(e)n: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ezin da postontzia ireki: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Posta eranstea bertan behera utzi da"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ezin zaio mezua erantsi mbox fitxategiari: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8523,13 +9136,11 @@ msgstr ""
 "Ezin da mezua hartu: %s %s karpetatik\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Mezu-eraikuntzak huts egin du: Postontzia hondatuta?"
 
@@ -8572,151 +9183,151 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' karpeta ez dago hutsik. Ez da ezabatu."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ezin izan da karpeta ireki: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Posta-analizatzailearen ezinbesteko errorea %2$s karpetako %1$ld posiziotik "
 "gertu"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ezin da karpeta egiaztatu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ezin izan da fitxategia ireki: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ezin da aldi baterako postontzia ireki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Sinkronizatu arren, laburpena eta karpeta ez datoz bat"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Errorea aldi baterako postontzian idaztean: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Huts egin du aldi baterako postontzian idaztean: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Ezin izan da itxi %s iturburu-karpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Ezin izan da aldi baterako karpeta itxi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Sinkronizatu arren, laburpena eta karpeta ez datoz bat"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Ezin izan da karpetaren izena aldatu: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Errorea aldi baterako postontzian idaztean: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Huts egin du aldi baterako postontzian idaztean: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "MH mezua eranstea bertan behera utzi da"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ez da direktorioa."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ezin da MH direktorioaren bide-izena ireki: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Ezin zaio mezua erantsi spool fitxategiari: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Spool-karpetei ezin zaie izena aldatu"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "`%s' spool-a ez dago edo ez da fitxategi erregularra"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "%s gordetze-erroa ez da direktorio erregularra"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "`%s/%s' karpetarik ez dago."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "%s spool-eko posta fitxategia"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Spool-karpetei ezin zaie izena aldatu"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-karpetei ezin zaie izena aldatu"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-karpetak ezin dira ezabatu"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Ezin izan da %s aldi baterako karpeta sinkronizatu: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Ezin izan da %s spool-karpeta sinkronizatu: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8725,25 +9336,6 @@ msgstr ""
 "Ezin izan da %s spool-karpeta sinkronizatu: %s\n"
 "Karpeta hondatuta egon liteke, kopia `%s'(e)n gorde da"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Ezin izan da jaso: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "`%s' spool-a ez dago edo ez da fitxategi erregularra"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Mezu-hartzailea: %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET berriak"
@@ -8753,12 +9345,22 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Hau USENET berri-taldeetako mezuak irakurri eta bidaltzeko hornitzailea da."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Ezin izan da %s direktorioa sortu: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET berriak %s bidez"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8858,7 +9460,7 @@ msgstr "Utzi mezuak zerbitzarian"
 msgid "Delete after %s day(s)"
 msgstr "Ezabatu %s egunen ondoren"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8885,32 +9487,22 @@ msgstr ""
 "erabiliz APOP protokoloaren bidez. Beharbada honek ez du erabiltzaile "
 "guztiekin funtzionatuko zerbitzariak onartzen duela adierazten badu ere."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea erabiltzaile-izena bidaltzean: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Eragiketa ez da onartzen"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Autentifikazioak huts egin du."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Ezin izan da POP zerbitzariarekin konektatu %s(e)n."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8918,27 +9510,27 @@ msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Ez du eskatutako autentifikazio-mekanismoa onartzen."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "SASL `%s' saio-hasierak huts egin du: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr "SASL protokolo-errorea"
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr "S/Iko errorea: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en POP pasahitza"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8947,13 +9539,13 @@ msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea pasahitza bidaltzean: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "`%s' karpeta ez dago."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9115,46 +9707,46 @@ msgstr "Aldi baterako autentifikazioak huts egin du"
 msgid "Authentication required"
 msgstr "Autentifikazioa behar da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Ongietorri-erantzunaren errorea: %s: beharbada ez da ezinbestekoa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea erabiltzaile-izena bidaltzean: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Ez dirudi mezua behar bezala osatuta dagoenik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "DATA erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "%s SMTP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en SMTP pasahitza"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9165,88 +9757,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP zerbitzaria"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posta-banaketa %s bidez"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "Ezin da mezua bidali: bidaltzailearen helbidea ez da baliozkoa."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Mezua bidaltzen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ezin da mezua bidali: erabiltzaile bat edo gehiago baliogabeak dira"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "SMTP Agurra"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO eskaera denboraz kanpo: %s: ez da ezinbestekoa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO erantzunaren errorea: %s: ez da ezinbestekoa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Errorea SASL autentifikazio-objektua sortzean."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH eskaerak huts egin du."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCTP TO eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
@@ -9254,36 +9846,36 @@ msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr "DATA erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA bidalketa denboraz kanpo: mezuaren amaiera: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr "DATA amaitze-erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr "RSET erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT eskaera denboraz kanpo: %s: ez da ezinbestekoa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr "QUIT erantzunaren errorea"
 
@@ -9356,52 +9948,52 @@ msgstr "MIME mota:"
 msgid "Suggest automatic display of attachment"
 msgstr "Proposatu eranskina automatikoki bistaratzea"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Egin klik hemen helbide-liburura joateko"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Nork:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Erantzun honi:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Gaia:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Nori: "
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Idatzi mezuaren hartzaileak"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Idatzi mezuaren kopia jasoko dutenen helbideak"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9414,7 +10006,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Erantsi fitxategi bat"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Ezin izan da PGP sinadura-testuingurua sortu."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9423,34 +10020,34 @@ msgstr ""
 "Errorea %s fitxategia irakurtzean:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Kontuz!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Fitxategia badago; gainidatzi?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errorea fitxategia gordetzean: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errorea fitxategia kargatzean: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errorea fitxategia atzitzean: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Ezin da mezua editoretik berreskuratu"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9459,7 +10056,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9468,7 +10065,7 @@ msgstr ""
 "Ezin da fitxategia trunkatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9477,7 +10074,7 @@ msgstr ""
 "Errorea mezua automatikoki gordetzean: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9485,7 +10082,7 @@ msgstr ""
 "Aurreko saioko fitxategi gorde gabeak aurkitu ditu Ximian Evolution-ek.\n"
 "Berreskuratzen saiatu nahi duzu?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9495,23 +10092,43 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Kontuz: mezua aldatu egin da"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Ireki fitxategia"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Txertatu fitxategia"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Gorde sinadura"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr "(lehenetsia)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Prestatu mezua"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9519,7 +10136,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da helbidea hautatzeko kontrola aktibatu."
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9527,6 +10144,12 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9587,7 +10210,7 @@ msgstr "gaiak hau dauka"
 msgid "Subject does not contain"
 msgstr "gaiak ez dauka hau"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9731,7 +10354,7 @@ msgstr "ordu "
 msgid "minute"
 msgstr "minutu "
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "segundo "
 
@@ -9806,7 +10429,7 @@ msgstr "lehenago"
 msgid "ago"
 msgstr "lehenago"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9818,6 +10441,21 @@ msgstr "<egin klik hemen data hautatzeko>"
 msgid "Filter Rules"
 msgstr "Iragazteko arauak"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Zehaztu fitxategi-izena:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "`%s' spool-a ez dago edo ez da fitxategi erregularra"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Aukeratu ekintza bat:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9836,7 +10474,7 @@ msgstr ""
 "Zoaz atzera eta zehaztu posta banatzeko baliozko karpeta bat."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
 
@@ -9849,7 +10487,11 @@ msgstr ""
 "Errorea '%s' adierazpen erregularrean:\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Proba"
 
@@ -9879,7 +10521,7 @@ msgstr "irizpide guztiak betetzen badira"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "irizpideren bat betetzen bada"
 
 #: filter/filter-rule.c:780
@@ -9958,190 +10600,200 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Enpresakoa"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "hau dauka"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Kopiatu karpeta honetan"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Jasotze-data"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Bidaltze-data"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "ez dauka hau"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "ez da honela amaitzen"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "ez dago"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "ez da honen antzekoa"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "ez da honela hasten"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Ez"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Zirriborroa"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "honela amaitzen da"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr "Exekutatu shell komandoa"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Bai"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "badago"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Adierazpena"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr "Jarraitu"
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Garrantzitsua"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "da"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is after"
 msgstr "honen ondorengoa da"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "is before"
 msgstr "honen aurrekoa da"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr "Banderaduna da"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "hau baino handiagoa da"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "hau baino txikiagoa da"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "ez da"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "is not Flagged"
 msgstr "ez da Banderaduna"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Posta-zerrenda"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Mezuaren gorputza"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Mezuaren goiburukoa"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Eraman karpeta honetara"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Jo soinua:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Irakurrita"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Hartzailea"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Adierazpen erregularra"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Erantzunda"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuazioa"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Bidaltzailea"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Ezarri egoera"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Tamaina (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "honen antzekoa da"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Iturburu-kontua"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Goiburuko espezifikoa"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "honela hasten da"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Gelditu prozesatzea"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Gaia"
 
@@ -10196,7 +10848,8 @@ msgid "Scanning %s"
 msgstr "%s eskaneatzen"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Posta"
 
@@ -10212,10 +10865,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Helbide-liburua"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10265,7 +10914,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Netscape-ko datu zaharrak inportatzen ari da Evolution"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Zakarrontzia"
 
@@ -10403,31 +11054,31 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Posta duen karpeta"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Zakarrontzi birtualak"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Zakarrontzi birtualaren karpeta"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Karpeta honek ezin du mezurik eduki."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Propietateak..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Aldatu karpeta honen propietateak"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10435,238 +11086,246 @@ msgstr ""
 "Posta-ezarpen batzuk hondatuta daudela ematen du, begira ezazu dena ondo "
 "dagoen."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Ez duzu ezarri posta garraiatzeko metodorik"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Kontuz: mezua aldatu egin da"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Posta-mezua"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ezin da Evolution-en posta-osagaia hasieratu."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Ezin da Evolution-en posta konfiguratzeko osagaia hasieratu."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Ezin da Evolution-en karpeta-informazioaren osagaia hasieratu."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Ezin da biltegia shell-arekin erregistratu"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" - propietateak"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Propietateak"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d berri"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d ezkutu"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr "%d ikusgarri"
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d hautatuta"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d bidali gabe"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d bidali"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d guztira"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sortu _karpeta birtuala mezutik"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "_Gaiaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "_Hartzailearen araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "G_aiaren araberako iragazkia"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Jarrait_u..."
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Bandera o_satuta"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Garbitu ban_dera"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markatu ez-garra_ntzitsu gisa"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Desezabatu"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "Laurel"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Gehitu bidaltzailea _helbide-liburuan"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplikatu iragazkiak"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Posta-zerrendaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Posta-zerrendaren araberako iragazkia (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Posta-zerrendaren araberako karpeta birtuala (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Lehenetsi"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Karpeta-informazioa hartzen"
 
@@ -10721,7 +11380,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Ez duzu eman eskatu zaizun informazio guztia."
 
@@ -10731,83 +11390,111 @@ msgid "Evolution News Editor"
 msgstr "Evolution-en berri-editorea"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution-en kontu-editorea"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Ostalaria:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "_Erabiltzaile-izena:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Bide-izena:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Irrati-telefonoa"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Ezin dituzu izen bereko bi kontu izan."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Ez ezabatu"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Ziur zaude kontua ezabatu nahi duzula?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Desgaitu"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Gaitu"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Ziur zaude kontu berri hau ezabatu nahi duzula?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Gaituta"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Kontu-izena:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Mezu-hartzailea: %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Gaia: %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Mezu-bidaltzailea: %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "%s posta-zerrenda"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Gehitu iragazkiaren araua"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"kBirtual hauek:\n"
+"%sKendutako karpeta erabiltzen zuten;\n"
+"    '%s'\n"
+"Eta eguneratu egin dira."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10819,7 +11506,7 @@ msgstr ""
 "jaso edo prestatu ahal izateko.\n"
 "Orain konfiguratu nahi duzu?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10827,7 +11514,7 @@ msgstr ""
 "Identitatea konfiguratu behar duzu\n"
 "mezua idatzi ahal izateko."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10836,7 +11523,7 @@ msgstr ""
 "mezua idatzi ahal izateko."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10844,11 +11531,11 @@ msgstr ""
 "HTML formatuko mezua bidaltzera zoaz, baina hartzaile hauek ez dute HTML "
 "formatuko mezurik jaso nahi:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Hala ere bidali nahi duzu?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10856,7 +11543,7 @@ msgstr ""
 "Mezu honek ez du gairik.\n"
 "Ziur zaude bidali nahi duzula?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10864,11 +11551,11 @@ msgstr ""
 "Mezua bidali behar diozun kontaktu-zerrenda helbidea ezkutuan edukitzeko "
 "konfiguratuta dagoenez, Bcc hartzaileak bakarrik izango ditu mezuak."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Mezu honek Bcc hartzaileak bakarrik ditu."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10878,15 +11565,15 @@ msgstr ""
 "goiburukoa gehituz.\n"
 "Hala ere bidali nahi duzu?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Hartzaileak zehaztu behar dituzu mezua bidaltzeko."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Kontua konfiguratu behar duzu mezu hau bidali ahal izateko."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10894,30 +11581,30 @@ msgstr ""
 "Ezin da kontu honetako zirriborroen karpeta ireki.\n"
 "Zirriborroen karpeta lehenetsia erabili nahi duzu?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "bidaltzaile ezezaguna"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 "Jatorrizko mezua:\n"
 "data: %a, %Y-%m-%d %H:%M, egilea: %%s"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Eraman mezua(k) hona"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopiatu mezua(k) hemen"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ziur zaude %d mezuak editatu nahi dituzula?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10925,7 +11612,7 @@ msgstr ""
 "Zirriborroen karpetan gordetako mezuak bakarrik\n"
 "edita ditzakezu."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10933,32 +11620,32 @@ msgstr ""
 "Bidalitako mezuen karpetako mezuak bakarrik\n"
 "bidal ditzakezu berriro."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Ez duzu mezurik hautatu"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Fitxategia gainidatzi?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Gorde mezua honela..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Gorde mezuak honela..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 msgid "Go to next folder with unread messages?"
 msgstr "Irakurri gabeko mezuak dituen hurrengo karpetara joan?"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -10966,7 +11653,7 @@ msgstr ""
 "Karpeta honetan ez dago mezu gehiago.\n"
 "Hurrengo karpetara joan nahi duzu?"
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10978,7 +11665,7 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10987,32 +11674,68 @@ msgstr ""
 "Errorea iragazki-informazioa kargatzean:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Iragazkiak"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d orria"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Huts egin du mezua inprimatzean"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ziur zaude %d mezuak leiho banatan ireki nahi dituzula?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Azalpenik ez"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Kontaktu izengabea"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Bidalita"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Gehitu irizpidea"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Gorde sinadura"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11066,193 +11789,175 @@ msgstr ""
 "bakarrik erabiliko da kontu-izen hori."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolution-eko kontuaren morroia"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "geroago"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"Ezin izan da mezu berriak gordetzeko sarrerako ontzia hartu:\n"
-"%s\n"
-"Ez da lasterbiderik sortuko."
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Kontua"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Zerbitzua egiaztatzen"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Kontaktu izengabea"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "Editatu"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Berria"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Begiratu zein mota onartzen diren"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL ez da onartzen evolution-en bertsio honetan)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "%d kontua"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Kontuaren informazioa"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Kontuaren kudeaketa"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Utzi bertan behera eragiketa"
+msgid "Add Sc_ript"
+msgstr "Gehitu irizpidea"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "Arkansas"
+msgid "Add new signature..."
+msgstr "Gorde sinadura"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Beti _sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Beti bidali _Bcc kopia honi:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Beti bidali Cc kopia honi:"
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "Arica"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Erantsi fitxategi bat mezuari"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Eranskina"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autentifikazioa"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Karaktere-joko ezezaguna: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_Itxi"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Mezu berririk dagoen begiratzen"
 
 #: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Gaurko zereginen kolorea"
+
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr "Mezuak prestatzen"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11268,56 +11973,47 @@ msgstr ""
 "\n"
 "Egin klik \"Amaitu\" botoian, ezarpenak gordetzeko."
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "Bari"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "Le_henetsi"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Lehentasun lehenetsia:"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Karaktere-kodeketa lehenetsia: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Mezuak bilatzen"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "ID digitalak..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Ezin da mezua ireki"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Eginda"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Z_irriborroen karpeta:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Gaitu"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11338,39 +12034,34 @@ msgstr "_Helbide elektronikoa:"
 msgid "Empty _trash folders on exit"
 msgstr "_Hustu zakarrontziko karpetak irtetean"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Exekutatu komandoa..."
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "honela amaitzen da"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propietateak"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Hartu ID digitala..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Aipuak nabarmentzeko erabili "
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Honolulu"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11424,67 +12115,63 @@ msgstr "Mikronesia"
 msgid "NNTP Server:"
 msgstr "NNTP zerbitzaria:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Mezu berrien jakinarazpena"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "Be_rri-iturriak"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Aukerako informazioa"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "E_rakundea:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/_GPG gakoaren IDa:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Aukeratu kolorea"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Inprimatu hautatutako kontaktuak"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Ezin da mezua ireki"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Aipamen gisa"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Gogoratu pasahitz hau"
@@ -11518,117 +12205,120 @@ msgid "S_ecurity"
 msgstr "Segurtasuna"
 
 #: mail/mail-config.glade.h:104
-#, fuzzy
-msgid "Same as text"
-msgstr "Somerset"
-
-#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME segurua (S/MIME)"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Hautatu PGP bitarra"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Sinadura-fitxategia:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Ezabatu dena sinadura izan ezik"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "_Bidalitako mezuen karpeta:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Bidalitako mezuak eta zirriborroak"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Zerbitzariak _autentifikazioa behar du"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Zerbitzariaren konfigurazioa"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Zerbitzari-mota: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Lasterbideak"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Gorde sinadura"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Gorde sinadura"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Iturburua"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Iturburu-informazioa"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Zehaztu fitxategi-izena:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Unix mbox estandarra"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "_HTML sinadura:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Aldakorra"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11638,147 +12328,139 @@ msgstr ""
 "\n"
 "Hasteko, egin klik \"Hurrengoa\"n."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Ekialdea"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_Sinadura-fitxategia:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "_Kargatu beti irudiak saretik kanpo"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Autentifikazio-mota: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 msgid "_Authentication type: "
 msgstr "_Autentifikazio-mota: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_Automatikoki begiratu mezu berririk"
+
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Egin bip mezu berriak iristen direnean"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_Ziurtagiri-IDa:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Berretsi karpeta betiko borratzean"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "_HTML sinadura:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Lehenespenak"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ez jakinarazi mezu berriak iristen direnean"
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Fitxategi-izena:"
+msgid "_Enable"
+msgstr "Gaitu"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Birbidali honela"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 msgid "_Full name:"
 msgstr "_Izen osoa:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML postan"
 
-#: mail/mail-config.glade.h:160
-#, fuzzy
-msgid "_HTML Signature:"
-msgstr "_HTML sinadura:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitatea"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Hizkuntza"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_Kargatu irudiak bidaltzailea helbide-liburuan badago"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Lehenetsi _kontu hau"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Markatu mezuak irakurritako gisa"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Inoiz ez kargatu irudirik saretik kanpo"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "_PGP bide-izen bitarra:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Jo soinua mezu berriak iristean"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Abisatu HTML formaturik nahi ez dutenei HTML mezuak bidali aurretik"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Abisatu mezuak gairik _gabe bidali aurretik"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Irrati-telefonoa"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11819,69 +12501,52 @@ msgstr "_Sinadura-fitxategia:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "_HTML sinadura:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Erabili konexio segurua (_SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Aldakorra"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_dagoen, maiztasun honekin"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr "kolorea"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "azalpena"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Ezin izan da PGP sinadura-testuingurua sortu."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Ezin izan da PGP egiaztapen-testuingurua sortu."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Ezin izan da PGP enkriptatze-testuingurua sortu."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Ezin izan da PGP desenkriptatze-testuingurua sortu."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Ezin izan da S/MIME sinadura-testuingurua sortu."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Ezin izan da S/MIME ziurtagiri-testuingurua sortu."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Ezin izan da S/MIME enkriptatze-testuingurua sortu."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Ezin izan da S/MIME gutun-azal testuingurua sortu."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
 
@@ -11924,98 +12589,134 @@ msgstr "Kanpoko ikustailea"
 msgid "Loading message content"
 msgstr "Mezuaren edukia kargatzen"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "A_tzeratutako zereginak:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Ireki esteka arakatzailean"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Kopiatu estekaren helbidea"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Gorde esteka honela (FIXME) "
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Gorde irudia honela..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s eranskina"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Helbide okerra"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Nork"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Erantzun honi"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Nori"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "Posta"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Gorde mezua honela..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Mezu honek sinadura digitala du.Informazio gehiago ikusteko, egin klik "
+"giltzarrapoaren ikonoan."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Ezin izan da PGP egiaztapen-testuingurua sortu."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Mezu honek sinadura digitala dauka, baina ezin izan da frogatu egiazkoa dela."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP gunerako erakuslea (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "(%s) fitxategi lokalerako erakuslea"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "(%s)urruneko datuetarako erakuslea"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Kanpoko goputz-zatia gaizki osatuta dago."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Karpeta lokalak"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Karpeta birkonfiguratzen"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12024,27 +12725,27 @@ msgstr ""
 "Ezin da gorde karpetaren metainformazioa; beharbada karpeta\n"
 "hau ezingo duzu gehiago ireki: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ezin da karpetaren metainformazioa gorde %s(e)n: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ezin dira %s karpetaren metadatuak ezabatu: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" karpeta\"%s\" formatura aldatzen"
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s ez da birkonfiguratuko ez delako karpeta lokala"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12052,11 +12753,11 @@ msgstr ""
 "Aurrerantzean ezin baduzu postontzi hau ireki,\n"
 "eskuz konpondu beharko duzu."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Ezin duzu aldatu lokala ez den karpeta baten formatua."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Birkonfiguratu /%s"
@@ -12114,81 +12815,73 @@ msgstr "Huts egin du %d/%d mezuan"
 msgid "Complete."
 msgstr "Osatuta."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Mezua karpetan gordetzen"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Lekuz aldatzen"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Kopiatzen"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "%s biltegia irekitzen"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Karpeta freskatzen"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Karpeta betiko borratzen"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s mezua berreskuratzen"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d mezu berreskuratzen"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d mezu gordetzen"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12197,7 +12890,7 @@ msgstr ""
 "Ezin da sortu irteerako fitxategia: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12206,11 +12899,11 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12219,27 +12912,27 @@ msgstr ""
 "Ezin da irteerako fitxategia sortu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s(e)tik deskonektatzen"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Shell komandoa exekutatzen %s"
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Bilatu"
 
@@ -12310,10 +13003,6 @@ msgstr "Eguneratzen..."
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Bertan behera utzita."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
@@ -12327,16 +13016,16 @@ msgstr "Idatzi %s(r)en pasahitza"
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Ezin izan da sinadura-fitxategia gorde."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Gorde sinadura"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12346,10 +13035,30 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Izena:"
+
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "Gorde sinadura"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
 #, fuzzy
-msgid "Signature name:"
-msgstr "Sinadura-fitxategia:"
+msgid "Hide signature hint"
+msgstr "HTML sinaduraren fitxategia:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12364,17 +13073,17 @@ msgstr "Birbidalitako mezua"
 msgid "Forwarded Message"
 msgstr "Birbidalitako mezua"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Karpeta birtuala konfiguratzen: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "uri-aren karpeta birtualak eguneratzen: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12387,89 +13096,94 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "Karpeta birtualak"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Editatu karpeta birtuala"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "'%s' kBirtuala editatu nahian dabil, baina ez dago."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Karpeta birtual berria"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Gairik ez)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mezua"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Ikusita"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Hainbat mezu"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Txikiena"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Txikia"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Handia"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Handiena"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Gaur %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Atzo %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
@@ -12490,10 +13204,15 @@ msgid "Follow Up Flag"
 msgstr "Jarraitu banderari"
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Jatorrizko kontaktua:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Jasotze-data"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Tamaina"
 
@@ -17206,5227 +17925,5224 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds and Bradford"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libia"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisboa"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "Londres"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "Londres/Hiria"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "Londres/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "Londres/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "Londres/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Lousiana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "Lubeck-Blankensee"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr "Lviv"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madril (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madril (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malmo/Sturup"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Airport"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Airport"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Airport"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Ekialde ertaina"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Miyakejima Airport"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Airport"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldavia"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Airport"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Mosku Domodedovo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Mosku Sheremetyevo"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "Munchen"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murtzia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Airport"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoya Airport"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Nagoya Airport"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Airport"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama Airport"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "Brunswick Berria"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Ternua"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "Mexiko Berria"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "New Tokyo International Airport"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata Airport"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "Ipar Carolina"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "Ipar Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Iparmendebaldeko lurraldeak"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Eskozia Berria"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro Airport"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr "Odesa"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita Airport"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okayama Airport"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki Airport"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Osaka International Airport"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Oshima Airport"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Iru�ea"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Paue"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "Txinako Herri Errepublika"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpiny�-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Apt"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praga"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Quebec hiria"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Errioxa"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr "Rivne"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Erroma/Ciampino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Erroma/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Erroma/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Errusia"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "Donostia"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Sendai Airport"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O International Airport"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "Hego Carolina"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "Hego Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr "Sympheropol"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Airport"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talinn"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Tanegashima Airport"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Tehran-Mehrabad"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokio International Airport"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokio New International Airport"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori Airport"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Tolosa"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama Airport"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Tsushima Airport"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "Arabiar Emirerri Batuak "
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr "Uzhgorod"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valentzia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech Airport"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Gasteiz"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser Airport"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Airport"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "Mendebaldeko Virginia"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Yamagata Airport"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube Airport"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao Airport"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Zurich"
 
@@ -22454,17 +23170,12 @@ msgstr "%l:%M %B %d"
 msgid "No description"
 msgstr "Azalpenik ez"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Posta-laburpena"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "Karpeta birtualak"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
 
@@ -22473,57 +23184,47 @@ msgstr "Karpeta lokalak"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com-en Eguneko Hitza"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Eguneko aipuak"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Gehitu berri-iturria"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Idatzi gehitu nahi duzun berri-iturriaren URLa"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Izena:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Errorea RDF deskargatzean"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Berri-iturriak"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
-msgstr "Gehitu"
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "_Kendu"
+msgid "Add"
+msgstr "_Gehitu"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
@@ -22564,10 +23265,42 @@ msgstr "Inprimatu laburpena"
 msgid "Printing of Summary failed"
 msgstr "Huts egin du laburpena inprimatzean"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Laneko laburpena egiteko osagaiak ezin izan du Bonobo hasieratu.\n"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " �F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " �C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "korapilo"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "km/h"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "milia"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometro"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Oskarbi"
@@ -23719,100 +24452,106 @@ msgid "C_elsius"
 msgstr "C_elsius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Berri-i_turri guztiak:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Zenbat egun bistaratu behar ditu batera egutegiak?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Gehienez erakut_si:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Berri-iturriaren ezarpenak"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Hi_labete"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "_Astebete"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "Freskatze-_denbora (segundotan):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "_Freskatze-denbora (segundotan):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "_Erakutsi karpeten bide-izen osoa"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Erakutsi _zeregin guztiak"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Erakutsi _gaurko zereginak"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Tenperatura-eskala:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Zereginak "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Eguraldiaren ezarpenak"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "Bos_t egun"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Posta"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "Be_rri-iturriak"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "E_gun bat"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "An_tolatu"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "Eg_uraldia"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Evolution-en mezu-prestatzailerako fabrika."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Karpeta bereziak"
+msgid "Folder Settings"
+msgstr "Postaren ezarpenak"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution-en shell-a."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -23823,6 +24562,37 @@ msgstr "Erakutsi xehetasunak"
 msgid "Cancel Operation"
 msgstr "Utzi bertan behera eragiketa"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Ezin izan da karpeta transferitu:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Bidalitakoen karpeta gisa"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Zirriborroak"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Sarrerako ontzia"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Irteerako ontzia"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Bidalita"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution-en instalazioa"
@@ -23937,6 +24707,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Hauei esker daukazu:"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Egite-data"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Karpeta bereziak"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Karpeta bereziak"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Karpeta bereziak"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Egite-data"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -23966,20 +24761,20 @@ msgstr "Karpeta bat ezin da bere menpeko karpeta batera eraman."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Adierazi zein karpetatan kopiatu nahi duzun \"%s\" karpeta:"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Kopiatu karpeta"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Adierazi zein karpetatara eraman nahi duzun \"%s\" karpeta:"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Eraman karpeta"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23988,18 +24783,17 @@ msgstr ""
 "Ezin da karpeta ezabatu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Ezabatu \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Ziur zaude \"%s\" karpeta kendu nahi duzula?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr "Ezabatu '%s' karpeta"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24008,16 +24802,16 @@ msgstr ""
 "Ezin izan da karpetaren izena aldatu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Karpetaren izena aldatu"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24036,7 +24830,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Sortu karpeta berria"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -24044,7 +24838,7 @@ msgstr ""
 "Hautatutako karpetaren mota ez da baliozkoa\n"
 "eragiketa honetarako."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Berria..."
 
@@ -24096,21 +24890,26 @@ msgstr ""
 "%s inportatzen\n"
 "%d elementua inportatzen."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Hautatu karpeta"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "'%s' fitxategia ez dago "
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Evolution errorea "
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Fitxategi lokaletara bakarrik inporta dezakezu"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24119,11 +24918,11 @@ msgstr ""
 "Ez dago %s maneiatzeko\n"
 "gai den inportatzailerik"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Inportatzen"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24132,17 +24931,17 @@ msgstr ""
 "%s inportatzen.\n"
 "%s abiarazten"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Errorea %s abiaraztean"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Errorea %s kargatzean"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24151,31 +24950,31 @@ msgstr ""
 "%s inportatzen\n"
 "1. elementua inportatzen."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Fitxategi-izena:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Fitxategi-mota:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Inportatu programa zaharretako datuak eta ezarpenak"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Inportatu fitxategi bakarra"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24183,31 +24982,78 @@ msgstr ""
 "Itxaron...\n"
 "Lehengo instalazio bila eskaneatzen"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Inportatzaile adimendunak abiarazten"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "%s(e)tik:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Aukeratu datu hauek inportatzeko helburu-karpeta"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Inportatu"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Konexioak ixten..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Errorea '%s' saiatu denean:\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Karpeta sinkronizatzen"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "%s karpeta irekitzen"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "%s karpeta irekitzen"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Ireki honekin: %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Ezin da sortu adierazitako karpeta:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -24221,8 +25067,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Ezin izan da Evolution Mailer Assistant interfazea abiarazi\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Berria"
@@ -24243,43 +25089,43 @@ msgstr "Karpeta-izenak ezin du barrarik eduki."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' eta '..' karpeta-izen erreserbatuak dira."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ez da aurkitu zure $BIDE-IZENEAN."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Ezin izan da Bug Buddy exekutatu."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution-i buruz"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Joan karpeta honetara..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Hautatu ireki nahi duzun karpeta"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Sortu lasterbide berria"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Hautatu zein karpeta seinalatu behar duen lasterbideak:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
@@ -24314,7 +25160,7 @@ msgstr ""
 "Ximian Evolution lineaz kanpo dago. Egin klik botoi honetan linean lan "
 "egiteko."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24326,12 +25172,12 @@ msgstr ""
 "Aktibazio-sistemak eman duen errorea:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ezin da biltegi lokala ezarri -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24342,23 +25188,19 @@ msgstr ""
 "ustekabean itxi da. Evolution-etik irten eta berriro sartu beharko \n"
 "duzu datu horiek berriro atzitzeko."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "Ados"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Argumentu baliogabeak"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Ezin da OAFen erregistratu"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Ez da aurkitu konfigurazioko datu-basea"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Errore generikoa"
 
@@ -24383,95 +25225,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Ez kendu"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Aldatu lasterbide-taldearen izena"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Jarri hautatutako lasterbide-taldeari izen hau:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Ikono txikiak"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Erakutsi lasterbideak ikono txiki gisa"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "Ikono _handiak"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Erakutsi lasterbideak ikono handi gisa"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Talde berria..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Sortu lasterbide-talde berria"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "_Kendu talde hau..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Kendu lasterbide-talde hau"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "_Aldatu izena talde honi..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Aldatu izena lasterbide-taldeari"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ezkutatu lasterbide-barra"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Ezkutatu lasterbide-barra"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Aldatu izena lasterbideari"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Jarri hautatutako lasterbideari izen hau:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Ireki lasterbide honekin estekatutako karpeta"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Ireki _leiho berrian"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Ireki leiho berrian lasterbide honekin estekatutako karpeta"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Izena aldatu"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Aldatu izena lasterbide honi"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "_Kendu"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Kendu lasterbide hau lasterbide-barratik"
 
@@ -24483,10 +25325,6 @@ msgstr "Errorea lasterbideak gordetzean."
 msgid "Shortcuts"
 msgstr "Lasterbideak"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Sarrerako ontzia"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -24550,10 +25388,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d osatuta)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<egin klik hemen karpeta hautatzeko>"
 
@@ -24594,67 +25433,67 @@ msgstr ""
 "Aktibazio-sistemak eman duen errorea:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "CORBA errorea"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Etenda"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Argumentu baliogabea"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Badu jabea"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Jaberik ez"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Ez da aurkitu"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Onartzen ez den mota"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Onartzen ez den eskema"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Onartzen ez den eragiketa"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Barne-errorea"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Badago"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "URI baliogabea"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Azpikarpetak ditu"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Ez dago lekurik"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "Jabe zaharra hil egin da"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 msgid "Test type"
 msgstr "Proba-mota:"
 
@@ -24782,40 +25621,87 @@ msgstr "Ez galdetu berriro"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution-ek datu-iturburu hauek aurkitu ditu:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution "
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ixten ari da..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, fuzzy, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"Mila esker Evolution-en talde-lanerako tresnaren probako bertsio hau \n"
+"deskargatzeko denbora hartzeagatik.\n"
+"\n"
+"Evolution oraindik ez dago osatuta. Gutxi falta zaio, baina leku batzuetan "
+"oraindik\n"
+"eginbideak falta dira edo erdizka dabiltza. \n"
+"\n"
+"Akatsik aurkitzen baduzu, eman horien berri bugzilla.ximian.com helbidean.\n"
+"Produktu honek ez du garantiarik eta ez dago\n"
+"erraz haserretzen den jendearentzat eginda.\n"
+"\n"
+"Espero dugu gogokoa izango duzula gure lan gogorraren emaitza,\n"
+"eta atsegin handiz gauzkazu zure ekarpenen zain!\n"
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"Eskerrik asko\n"
+"Evolution Taldea\n"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Ez galdetu berriro"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ezin da Ximian Evolution-en shell-a atzitu."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ezin da Ximian Evolution-en shell-a abiarazi: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Desgaitu splash pantaila"
 
-#: shell/main.c:318
+#: shell/main.c:438
 msgid "Start in offline mode"
 msgstr "Hasi lineaz kanpo"
 
-#: shell/main.c:319
+#: shell/main.c:439
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Bidali osagai guztien arazketa-irteera fitxategi batera."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -24824,7 +25710,7 @@ msgstr ""
 "%s: --online eta --offline ezin dira batera erabili.\n"
 "  Erabili %s --help informazio gehiago lortzeko.\n"
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ezin da Bonobo osagaiaren sistema hasieratu."
 
@@ -24933,11 +25819,11 @@ msgstr "Ikusi uneko kontaktua"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Ekintzak"
 
@@ -25058,8 +25944,8 @@ msgstr "Itxi elementu hau"
 msgid "Delete this item"
 msgstr "Ezabatu elementu hau"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Tresna-barra nagusia"
 
@@ -25099,7 +25985,7 @@ msgstr "Gorde elementu hau diskoan"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "Fi_txategia"
 
@@ -25164,19 +26050,19 @@ msgstr "Birbidali _iCalendar gisa"
 msgid "Forward this item via email"
 msgstr "Birbidali elementu hau posta elektronikoz"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Lortu bilerei buruzko azken informazioa"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "Egu_neratu bilera"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "Antolatu _bilera"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Antolatu elementu honentzako bilera"
 
@@ -25184,10 +26070,6 @@ msgstr "Antolatu elementu honentzako bilera"
 msgid "Customise My Evolution"
 msgstr "Pertsonalizatu Nire Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Utzi"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Bertan behera utzi uneko posta-eragiketa"
@@ -25341,7 +26223,7 @@ msgstr "Hari bateko mezuen zerrenda"
 msgid "_Expunge"
 msgstr "_Borratu betiko"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Karpeta"
 
@@ -25745,7 +26627,7 @@ msgstr "Aurreko mezua"
 msgid "_Quoted"
 msgstr "_Aipamen gisa"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Tresnak"
 
@@ -25760,12 +26642,12 @@ msgstr "Itxi leiho hau"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_Itxi"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "I_kusi"
 
@@ -25952,7 +26834,7 @@ msgstr "_Ireki..."
 msgid "_Reply-To Field"
 msgstr "'Erant_zun honi' eremua"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Laguntza"
 
@@ -26099,111 +26981,120 @@ msgid "Move this folder to another place"
 msgstr "Eraman karpeta hau beste leku batera"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Sortu _karpeta berria...."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Ireki leiho berrian"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Ireki karpeta hau beste leiho batean"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Bidali / Jaso"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Bidali ilarako mezuak eta hartu mezu berriak"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Erakutsi Ximian Evolution-i buruzko informazioa"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Bidali programa-erroreen berri-ematea"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "_Bidali akatsen berri-ematea"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Eman programa-erroreen berri Bug Buddy erabiliz"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Txandakatu"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Erakutsi/ezkutatu karpeta-barra "
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Erakutsi/ezkutatu lasterbide-barra "
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Gaitu/desgaitu lineaz kanpo lanean aritzea."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Bistaratu hautatutako karpeta"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Xiimian Evolution-i buruzko MEGak (FAQ)"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "Ximian E_volution-i buruz..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "Ko_piatu..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_Karpeta-barra"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_Joan karpeta honetara..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Inportatu..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Lekuz aldatu..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "Berr_ia"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "Kar_peta berria"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "_Pilot-en ezarpenak..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "I_zena aldatu..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Bidali / Jaso"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Lasterbidea"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "La_sterbide-barra"
 
@@ -26287,20 +27178,20 @@ msgstr ""
 "ordu-zona.\n"
 " Erabili saguaren eskuineko botoia txikiagotzeko."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Uneko ikuspegia"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 msgid "Custom View"
 msgstr "Ikuspegi pertsonalizatua"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr "Gorde ikuspegi pertsonalizatua"
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Definitu ikuspegiak"
 
@@ -26421,16 +27312,21 @@ msgstr "Bilaketa-editorea"
 msgid "Save Search"
 msgstr "Gorde bilaketa"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Gorde bilaketa"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Gehitu gordetako bilaketei"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Aurreratua..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informazioa"
@@ -26452,21 +27348,21 @@ msgstr "Mezua"
 msgid "Don't show this message again."
 msgstr "Ez erakutsi mezu hau berriro."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Bilatu orain"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Garbitu"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Garbitu"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Bilatu orain"
 
@@ -26492,365 +27388,317 @@ msgstr "init_corba(): ezin izan da GNOME hasieratu"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 
-#~ msgid "Connecting to LDAP server..."
-#~ msgstr "LDAP zerbitzariarekin konektatzen..."
-
-#~ msgid "Waiting for connection to LDAP server..."
-#~ msgstr "LDAP zerbitzariarekin konektatu zain..."
-
-#~ msgid "Edit Addressbook"
-#~ msgstr "Editatu helbide-liburua"
-
-#~ msgid "A_uthenticate with server using:"
-#~ msgstr "Zerbitzariarekin a_utentifikatzeko erabili:"
-
-#~ msgid "Account Name"
-#~ msgstr "Kontuaren izena"
-
-#~ msgid "Add Addressbook"
-#~ msgstr "Gehitu helbide-liburua"
-
-#~ msgid "Advanced"
-#~ msgstr "Aurreratua"
-
-#~ msgid "Base"
-#~ msgstr "Oinarria"
-
-#~ msgid "Check this if the server requires you to authenticate."
-#~ msgstr "Hautatu hau zerbitzariak autentifikazioa eskatzen badu."
-
-#~ msgid ""
-#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
-#~ "server"
-#~ msgstr ""
-#~ "Evolution-ek izen bereizitu (DN) hau erabiliko du zu zerbitzarian "
-#~ "autentifikatzeko"
-
-#~ msgid "Server Name"
-#~ msgstr "Zerbitzari-izena"
-
-#~ msgid "The information below is required in order to add an addressbook.  "
-#~ msgstr "Beheko informazioa beharrezkoa da helbide-liburua gehitzeko. "
-
-#~ msgid "This information is not required for most ldap servers. "
-#~ msgstr "Informazio hau ez da beharrezkoa ldap zerbitzari gehienentzat. "
-
-#~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
-#~ msgstr ""
-#~ "Zure ldap zerbitzariak informazio hau erabiltzen du bilaketan zein nodo "
-#~ "erabiliko den zehazteko.  Informazio gehiago lortzeko, galdetu "
-#~ "zerbitzariaren administratzaileari."
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Helbide-liburuaren iturburuak"
 
-#~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#, fuzzy
+#~ msgid "Could not query for schema information"
 #~ msgstr ""
-#~ "Hau da ldap zerbitzarian egiten dituzun bilaketa guztietarako oinarrizko "
-#~ "nodoa. Informazio gehiago lortzeko, galdetu zerbitzariaren "
-#~ "administratzaileari."
-
-#~ msgid "This is the name of the server where your addressbook is located."
-#~ msgstr "Hau da zure helbide-liburua kokatzen den zerbitzariaren izena."
-
-#~ msgid "This is the port that your ldap server uses."
-#~ msgstr "Hau da zure ldap zerbitzariak erabiltzen duen ataka."
+#~ "Aztarna opakoaren informazio baliogabea:\n"
+#~ "%s"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Beste kontaktu batzuk"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolution-en egutegiaren laneko laburpenaren osagaia."
 
-#~ msgid "Name contains"
-#~ msgstr "Izenak hau dauka"
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Egutegi-laburpenaren osagaiaren fabrika."
 
-#~ msgid "(none)"
-#~ msgstr "(bat ere ez)"
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Egu_naren hasiera:"
 
-#~ msgid "C_ontaining:"
-#~ msgstr "_hau dauka:"
+#~ msgid "_End of day:"
+#~ msgstr "Eg_unaren bukaera:"
 
-#~ msgid "Show contacts matching the following criteria:"
-#~ msgstr "Erakutsi irizpide hauekin bat datozen kontaktuak:"
+#~ msgid "_Other Organizer"
+#~ msgstr "_Beste antolatzaile bat"
 
-#~ msgid "Starting:"
-#~ msgstr "Hasi:"
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Zifraketa honek ez du garbi sinatzerik onartzen"
 
-#~ msgid "Ending:"
-#~ msgstr "Amaitu:"
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Idatzi zure %s pasaesaldia %s(e)rako"
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Sortu hitzordu berria _oroigarri lehenetsiarekin"
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Idatzi %s pasaesaldia"
 
-#~ msgid "First day of wee_k:"
-#~ msgstr "Asteko _lehenengo eguna:"
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Ezin da mezua sinatu: ez dago sinatzeko testu soilik"
 
-#~ msgid "_Other"
-#~ msgstr "Be_stelakoa"
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Ezin da mezua sinatu: ez da pasahitzik eman."
 
-#~ msgid "0%"
-#~ msgstr "%0"
-
-#~ msgid "10%"
-#~ msgstr "%10"
-
-#~ msgid "20%"
-#~ msgstr "%20"
-
-#~ msgid "30%"
-#~ msgstr "%30"
-
-#~ msgid "40%"
-#~ msgstr "%40"
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Ezin da mezua sinatu: ezin izan da GPG/PGPrako kanalizaziorik sortu: %s"
 
-#~ msgid "50%"
-#~ msgstr "%50"
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Ezin da mezua sinatu: ez dago garbi sinatzeko testu soilik"
 
-#~ msgid "60%"
-#~ msgstr "%60"
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Ezin da mezua egiaztatu: ez dago testu soilik egiaztatzeko"
 
-#~ msgid "70%"
-#~ msgstr "%70"
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Ezin da mezua egiaztatu: ezin izan da GPG/PGPrako kanalizaziorik sortu: %s"
 
-#~ msgid "80%"
-#~ msgstr "%80"
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Ezin da mezua enkriptatu: ez dago testu soilik enkriptatzeko"
 
-#~ msgid "90%"
-#~ msgstr "%90"
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Ezin da mezua enkriptatu: ez da pasahitzik eman"
 
-#~ msgid "100%"
-#~ msgstr "%100"
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Ezin da mezua enkriptatu: ezin izan da GPG/PGPrako kanalizaziorik sortu: %"
+#~ "s"
 
-#~ msgid "_Delete this Task"
-#~ msgstr "_Ezabatu zeregin hau"
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "Ezin da mezua desenkriptatu: ez dago testu zifraturik desenkriptatzeko"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "Bileraren hasiera: <b>"
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Ezin da mezua desenkriptatu: ez da pasahitzik eman"
 
-#~ msgid "Task begins: <b>"
-#~ msgstr "Zereginaren hasiera: <b>"
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Ezin da mezua desenkriptatu: ezin izan da GPG/PGPrako kanalizaziorik "
+#~ "sortu: %s"
 
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Libre/okupatura informazioaren hasiera: <b>"
+#~ msgid "%s server %s"
+#~ msgstr "%s zerbitzaria %s"
 
-#~ msgid "Begins: <b>"
-#~ msgstr "Hasiera: <b>"
+#~ msgid "(unknown host)"
+#~ msgstr "(ostalari ezezaguna)"
 
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Bileraren amaiera: <b>"
+#~ msgid "No such message: %s"
+#~ msgstr "Halako mezurik ez dago: %s"
 
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Libre/okupatura informazioaren amaiera: <b>"
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Zakarrontzi-karpeta honetatik ezin duzu mezurik kopiatu."
 
-#~ msgid "Ends: <b>"
-#~ msgstr "Amaiera: <b>"
+#~ msgid "Directory tree of mbox files"
+#~ msgstr "mbox fitxategien direktorio-zuhaitza"
 
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Zeregina eginda: <b>"
+#~ msgid ""
+#~ "For accessing mail storedin an external tree of mbox files.\n"
+#~ "This will allow you to directly access pine and elm folders.\n"
+#~ "NOTE: This provider is still experimental so ensure you backup any mail "
+#~ "folders first."
+#~ msgstr ""
+#~ "mbox fitxategien kanpo-zuhaitz batean gordetako posta atzitzeko.\n"
+#~ "Honen bidez zuzenean atzituko dituzu pine eta elm karpetak.\n"
+#~ "OHARRA: Hornitzaile hau esperimentala da oraindik, beraz, egin babeskopia "
+#~ "postako karpetei lehenik."
 
-#~ msgid "Task Due: <b>"
-#~ msgstr "Zeregina egiteko: <b>"
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Ezin zaio mezua erantsi spool fitxategiari: %s: %s"
 
-#~ msgid "iCalendar Information"
-#~ msgstr "iCalendar informazioa"
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Ezin izan da jaso: %s: %s"
 
-#~ msgid "iCalendar Error"
-#~ msgstr "iCalendar errorea"
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "`%s' spool-a ez dago edo ez da fitxategi erregularra"
 
-#~ msgid "An unknown person"
-#~ msgstr "Pertsona ezezaguna"
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Irrati-telefonoa"
 
 #~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
 #~ msgstr ""
-#~ "<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
+#~ "Ezin izan da mezu berriak gordetzeko sarrerako ontzia hartu:\n"
+#~ "%s\n"
+#~ "Ez da lasterbiderik sortuko."
 
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Bat ere ez</i>"
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "Editatu"
 
-#~ msgid "Status:"
-#~ msgstr "Egoera:"
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Berria"
 
-#~ msgid "Tentatively Accepted"
-#~ msgstr "Oraingoz onartua"
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Utzi bertan behera eragiketa"
 
-#~ msgid "Choose an action:"
-#~ msgstr "Aukeratu ekintza bat:"
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "Arkansas"
 
-#~ msgid "Update"
-#~ msgstr "Eguneratu"
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "Arica"
 
-#~ msgid "Accept"
-#~ msgstr "Onartu"
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "Bari"
 
-#~ msgid "Tentatively accept"
-#~ msgstr "Onartu oraingoz"
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Honolulu"
 
-#~ msgid "Decline"
-#~ msgstr "Ukatu"
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "Somerset"
 
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Bidali libre/okupatuta informazioa"
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Sinadura-fitxategia:"
 
-#~ msgid "Update respondent status"
-#~ msgstr "Eguneratu erantzun-emailearen egoera"
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Ezabatu dena sinadura izan ezik"
 
-#~ msgid "Send Latest Information"
-#~ msgstr "Bidali azken orduko informazioa"
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "_HTML sinadura:"
 
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b>(e)k bilera-informazioa argitaratu du."
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Fitxategi-izena:"
 
-#~ msgid "Meeting Information"
-#~ msgstr "Bileraren informazioa"
+#, fuzzy
+#~ msgid "_HTML Signature:"
+#~ msgstr "_HTML sinadura:"
 
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Hizkuntza"
 
-#~ msgid "Meeting Proposal"
-#~ msgstr "Bilera-proposamena"
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Irrati-telefonoa"
 
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b>(e)k bilera batean sartu nahi du."
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Ezin izan da PGP enkriptatze-testuingurua sortu."
 
-#~ msgid "Meeting Update"
-#~ msgstr "Bilera-eguneratzea"
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Ezin izan da PGP desenkriptatze-testuingurua sortu."
 
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b>(e)k bilera-informazio berria jaso nahi du."
+#~ msgid "Moving"
+#~ msgstr "Lekuz aldatzen"
 
-#~ msgid "Meeting Update Request"
-#~ msgstr "Bilera-eguneratzearen eskaera"
+#~ msgid "Copying"
+#~ msgstr "Kopiatzen"
 
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b>(e)k bilera-eskaerari erantzun dio."
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Sinadura-fitxategia:"
 
-#~ msgid "Meeting Reply"
-#~ msgstr "Bilera-erantzuna"
+#~ msgid "Riga"
+#~ msgstr "Riga"
 
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b>(e)k bilera bertan behera utzi du."
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "Gehitu"
 
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Bilera bertan behera uztea"
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "_Kendu"
 
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b>(e)k mezu ulertezina bidali du."
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Ziur zaude \"%s\" karpeta kendu nahi duzula?"
 
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Bilera-mezu txarra"
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "LDAP zerbitzariarekin konektatzen..."
 
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b>(e)k zeregin-informazioa argitaratu du."
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "LDAP zerbitzariarekin konektatu zain..."
 
-#~ msgid "Task Information"
-#~ msgstr "Zereginaren informazioa"
+#~ msgid "Edit Addressbook"
+#~ msgstr "Editatu helbide-liburua"
 
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "Zerbitzariarekin a_utentifikatzeko erabili:"
 
-#~ msgid "Task Proposal"
-#~ msgstr "Zeregin-proposamena"
+#~ msgid "Account Name"
+#~ msgstr "Kontuaren izena"
 
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du."
+#~ msgid "Add Addressbook"
+#~ msgstr "Gehitu helbide-liburua"
 
-#~ msgid "Task Update"
-#~ msgstr "Zeregin-eguneratzea"
+#~ msgid "Advanced"
+#~ msgstr "Aurreratua"
 
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b>(e)k zereginaren informazio berria jaso nahi du."
+#~ msgid "Base"
+#~ msgstr "Oinarria"
 
-#~ msgid "Task Update Request"
-#~ msgstr "Zeregin-eguneratzearen eskaera"
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Hautatu hau zerbitzariak autentifikazioa eskatzen badu."
 
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b>(e)k zeregin-esleipenari erantzun dio."
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with "
+#~ "the server"
+#~ msgstr ""
+#~ "Evolution-ek izen bereizitu (DN) hau erabiliko du zu zerbitzarian "
+#~ "autentifikatzeko"
 
-#~ msgid "Task Reply"
-#~ msgstr "Zereginaren erantzuna"
+#~ msgid "Server Name"
+#~ msgstr "Zerbitzari-izena"
 
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "Beheko informazioa beharrezkoa da helbide-liburua gehitzeko. "
 
-#~ msgid "Task Cancellation"
-#~ msgstr "Zeregina bertan behera uztea"
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "Informazio hau ez da beharrezkoa ldap zerbitzari gehienentzat. "
 
-#~ msgid "Bad Task Message"
-#~ msgstr "Zeregin-mezu txarra"
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "Zure ldap zerbitzariak informazio hau erabiltzen du bilaketan zein nodo "
+#~ "erabiliko den zehazteko.  Informazio gehiago lortzeko, galdetu "
+#~ "zerbitzariaren administratzaileari."
 
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b>(e)k libre/okupatuta informazioa argitaratu du."
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
+#~ msgstr ""
+#~ "Hau da ldap zerbitzarian egiten dituzun bilaketa guztietarako oinarrizko "
+#~ "nodoa. Informazio gehiago lortzeko, galdetu zerbitzariaren "
+#~ "administratzaileari."
 
-#~ msgid "Free/Busy Information"
-#~ msgstr "Libre/okupatuta informazioa"
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Hau da zure helbide-liburua kokatzen den zerbitzariaren izena."
 
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b>(e)k libre/okupatuta informazioa eskatzen dizu."
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Hau da zure ldap zerbitzariak erabiltzen duen ataka."
 
-#~ msgid "Free/Busy Request"
-#~ msgstr "Libre/okupatuta eskaera"
+#~ msgid "Name contains"
+#~ msgstr "Izenak hau dauka"
 
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b>(e)k libre/okupatuta eskaerari erantzun dio."
+#~ msgid "C_ontaining:"
+#~ msgstr "_hau dauka:"
 
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Libre/okupatuta erantzuna"
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Erakutsi irizpide hauekin bat datozen kontaktuak:"
 
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Libre/okupatuta mezu txarra"
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Sortu hitzordu berria _oroigarri lehenetsiarekin"
 
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
+#~ msgid "First day of wee_k:"
+#~ msgstr "Asteko _lehenengo eguna:"
 
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "Eranskinak ez du baliozko egutegi-mezurik"
+#~ msgid "_Other"
+#~ msgstr "Be_stelakoa"
 
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
+#~ msgid "_Delete this Task"
+#~ msgstr "_Ezabatu zeregin hau"
 
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "Ezin da zure identitaterik aurkitu partaideen zerrendan!\n"
 
-#~ msgid "Event information"
-#~ msgstr "Gertaera-informazioa"
-
-#~ msgid "Task information"
-#~ msgstr "Zereginaren informazioa"
-
-#~ msgid "Journal information"
-#~ msgstr "Egunkari-informazioa"
-
-#~ msgid "Free/Busy information"
-#~ msgstr "Libre/okupatuta informazioa"
-
-#~ msgid "Calendar information"
-#~ msgstr "Egutegi-informazioa"
-
 #~ msgid "Free/Busy information (%s to %s)"
 #~ msgstr "Libre/okupatuta informazioa (%s - %s)"
 
 #~ msgid "iCalendar information"
 #~ msgstr "iCalendar informazioa"
 
-#~ msgid "Task"
-#~ msgstr "Zeregina"
-
-#~ msgid "Status: %s"
-#~ msgstr "Egoera: %s"
-
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Osatutako ehunekoa: %i"
-
-#~ msgid "URL: %s"
-#~ msgstr "URLa: %s"
-
-#~ msgid "Categories: %s"
-#~ msgstr "Kategoriak: %s"
-
-#~ msgid "Contacts: "
-#~ msgstr "Kontaktuak "
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Mota baliogabea gorputzaren edukian, katea espero da"
 
@@ -26880,9 +27728,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Could not encrypt: encoding failed."
 #~ msgstr "Ezin izan da enkriptatu: kodetzeak huts egin du."
 
-#~ msgid "Failed to decrypt: Unknown"
-#~ msgstr "Huts egin du desenkriptatzean: Ezezaguna"
-
 #~ msgid "Please enter the NNTP password for %s@%s"
 #~ msgstr "Idatzi %s@%s(r)en NNTP pasahitza"
 
@@ -27031,36 +27876,15 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Filter on Mailing List"
 #~ msgstr "Posta-zerrendaren araberako iragazkia"
 
-#~ msgid "Default"
-#~ msgstr "Lehenetsi"
-
 #~ msgid "Indexing:"
 #~ msgstr "Indexatzea:"
 
 #~ msgid "Mailbox Format"
 #~ msgstr "Postontziaren formatua"
 
-#~ msgid " (default)"
-#~ msgstr "(lehenetsia)"
-
-#~ msgid "Mail Settings"
-#~ msgstr "Postaren ezarpenak"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Gaia: %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Mezu-bidaltzailea: %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "%s posta-zerrenda"
-
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Sarrerako ontzia"
 
-#~ msgid "Account"
-#~ msgstr "Kontua"
-
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr "_Enkriptatu beti neure buruari posta enkriptatua bidaltzean"
 
@@ -27073,24 +27897,15 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Display"
 #~ msgstr "Bistaratzea"
 
-#~ msgid "Drafts"
-#~ msgstr "Zirriborroak"
-
 #~ msgid "Edit..."
 #~ msgstr "Editatu..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML sinaduraren fitxategia:"
-
 #~ msgid "News"
 #~ msgstr "Berriak"
 
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Hautatu iragazkiaren egunkari-fitxategia..."
 
-#~ msgid "Sent"
-#~ msgstr "Bidalita"
-
 #~ msgid "Sources"
 #~ msgstr "Iturburuak"
 
@@ -27115,23 +27930,9 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "seconds."
 #~ msgstr "segundoren ondoren."
 
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "Mezu honek sinadura digitala du.Informazio gehiago ikusteko, egin klik "
-#~ "giltzarrapoaren ikonoan."
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Evolution-ek ez du ezagutzen mota honetako mezu sinaturik."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Mezu honek sinadura digitala dauka, baina ezin izan da frogatu egiazkoa dela."
-
 #~ msgid "Incomplete message written on pipe!"
 #~ msgstr "Mezu osatu gabea idatzita kanalizazioan!"
 
@@ -27144,52 +27945,15 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Summary Settings"
 #~ msgstr "Laburpen-ezarpenak:"
 
-#~ msgid " F"
-#~ msgstr " �F"
-
-#~ msgid " C"
-#~ msgstr " �C"
-
-#~ msgid "knots"
-#~ msgstr "korapilo"
-
-#~ msgid "kph"
-#~ msgstr "km/h"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "milia"
-
-#~ msgid "kilometers"
-#~ msgstr "kilometro"
-
 #~ msgid "Factory for the Evolution notes component."
 #~ msgstr "Evolution-en ohar-osagairako fabrika."
 
 #~ msgid "Factory for the Notes control"
 #~ msgstr "Ohar-kontrolerako fabrika."
 
-#~ msgid "Outbox"
-#~ msgstr "Irteerako ontzia"
-
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
 #~ msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ezin izan da karpeta transferitu:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(Izenik ez)"
 
@@ -27575,7 +28339,8 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgstr "Ezin izan da mezua berreskuratu %s POP zerbitzaritik: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
 #~ msgstr ""
 #~ "Honek POP zerbitzariarekin konektatuko zaitu eta Kerberos 4 erabiliko du "
 #~ "bertan autentifikatzeko."
@@ -27586,9 +28351,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "(Unknown)"
 #~ msgstr "(Ezezaguna)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Ustekabeko erantzuna POP zerbitzaritik: %s"
-
 #~ msgid "RCPT TO response error: %s: mail not sent"
 #~ msgstr "RCPT TO erantzunaren errorea: %s: posta ez da bidali"
 
@@ -27647,9 +28409,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "All _folders:"
 #~ msgstr "Kar_peta guztiak:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "Berri-i_turri guztiak:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "_Bistaratu karpeta hauek:"
 
@@ -27742,13 +28501,14 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgstr "Alarma-errepikapena"
 
 #~ msgid ""
-#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-#~ "know."
+#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like "
+#~ "to know."
 #~ msgstr "%s da.  Unix ordua: %ld.  Jakin nahiko zenuela pentsatu dugu."
 
 #~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 #~ msgstr ""
-#~ "Lehentasunak 'Handia', 'Normala', 'Txikia' edo 'Definitu gabe' izan behar du"
+#~ "Lehentasunak 'Handia', 'Normala', 'Txikia' edo 'Definitu gabe' izan behar "
+#~ "du"
 
 #~ msgid "_Invite Others"
 #~ msgstr "_Egin gonbita beste batzuei"
@@ -27844,8 +28604,9 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgstr "Ezin da %s(e)rako .newsrc fitxategia ireki edo sortu: %s"
 
 #~ 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."
+#~ "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 zerbitzariekin konektatzeko. Zenbait web posta hornitzailetatik eta "
 #~ "posta-sistema jabedunetatik mezuak berreskuratzeko ere erabil daiteke POP "
@@ -27952,10 +28713,8 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 
 #~ msgid "Please click \"OK\" to install the Evolution user files under"
 #~ msgstr ""
-#~ "Egin klik \"Ados\"en Evolution-en erabiltzaile-fitxategiak hemen instalatzeko"
-
-#~ msgid "Delete folder '%s'"
-#~ msgstr "Ezabatu '%s' karpeta"
+#~ "Egin klik \"Ados\"en Evolution-en erabiltzaile-fitxategiak hemen "
+#~ "instalatzeko"
 
 #~ msgid ""
 #~ "Evolution is a suite of groupware applications\n"
@@ -27982,41 +28741,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "My Evolution"
 #~ msgstr "Nire Evolution"
 
-#~ 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. \n"
-#~ "\n"
-#~ "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
-#~ "This product comes with no warranty and is not intended for\n"
-#~ "individuals prone to violent fits of anger.\n"
-#~ "\n"
-#~ "We hope that you enjoy the results of our hard work, and we\n"
-#~ "eagerly await your contributions!\n"
-#~ msgstr ""
-#~ "Mila esker Evolution-en talde-lanerako tresnaren probako bertsio hau \n"
-#~ "deskargatzeko denbora hartzeagatik.\n"
-#~ "\n"
-#~ "Evolution oraindik ez dago osatuta. Gutxi falta zaio, baina leku batzuetan "
-#~ "oraindik\n"
-#~ "eginbideak falta dira edo erdizka dabiltza. \n"
-#~ "\n"
-#~ "Akatsik aurkitzen baduzu, eman horien berri bugzilla.ximian.com helbidean.\n"
-#~ "Produktu honek ez du garantiarik eta ez dago\n"
-#~ "erraz haserretzen den jendearentzat eginda.\n"
-#~ "\n"
-#~ "Espero dugu gogokoa izango duzula gure lan gogorraren emaitza,\n"
-#~ "eta atsegin handiz gauzkazu zure ekarpenen zain!\n"
-
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Evolution Team\n"
-#~ msgstr ""
-#~ "Eskerrik asko\n"
-#~ "Evolution Taldea\n"
-
 #~ msgid "New contact"
 #~ msgstr "Kontaktu berria"
 
diff --git a/po/fi.po b/po/fi.po
index f38ecb1371..1e74e76ecd 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2001-11-06 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nimi"
@@ -45,7 +45,7 @@ msgid "Email"
 msgstr "S�hk�posti"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Ensisijainen"
 
@@ -55,7 +55,7 @@ msgstr "Ensisij"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr ""
@@ -63,8 +63,8 @@ msgstr ""
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Ty�"
 
@@ -74,12 +74,12 @@ msgid "Bus"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Yritys"
 
@@ -90,8 +90,8 @@ msgstr "Yrit"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Koti"
 
@@ -106,18 +106,18 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Ty�/faksi"
@@ -127,13 +127,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Ty� 2"
 
@@ -142,43 +142,43 @@ msgid "Bus 2"
 msgstr "Ty� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Koti 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Muut"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Muu faksi"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr ""
@@ -190,14 +190,14 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "S�hk�posti 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "S�hk�posti 3"
@@ -335,7 +335,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Etsit��n..."
 
@@ -356,32 +356,32 @@ msgstr "Ladataan..."
 msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Virhe kortin poistossa"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "URL:n `%s' j�sent�minen ep�onnistui"
@@ -429,104 +429,131 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "Osoitekirjal�hteet"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontaktit"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP-palvelin"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Uusi kontaktiluettelo"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Kontaktiluettelo"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Uusi kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Uusi kontaktiluettelo"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Yhdist�minen palvelimeen ep�onnistui."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "_Kontaktiluettelo"
+msgid "Failed to authenticate with LDAP server"
+msgstr "Yhdist�minen palvelimeen ep�onnistui."
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1174
+msgid "Error retrieving schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1182
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1638
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs:n alustus ei onnistunut"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Muut kontaktit"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Osoitekirjaa ei voitu avata"
@@ -552,50 +579,60 @@ msgid ""
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "loppuu merkkijonoon"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "S�hk�posti 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Mik� tahansa kentt� sis�lt��"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Edistyneet..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(Ei nime�)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Ensisijainen s�hk�posti"
 
@@ -641,98 +678,59 @@ msgstr "�l� salli kyselyj�"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Salli kyselyt (Vaarallista!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Yhdist�minen palvelimeen ep�onnistui."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr "Yhdist�minen palvelimeen ep�onnistui."
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-msgid "Could not query for schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1169
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1613
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Kopioi t�m� kansio"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "Tar_kista tuetut tavat"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Asetukset"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "Poista"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Poista"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Asetukset"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -741,8 +739,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Osoitekirjal�hteet"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "p�iv��"
@@ -831,8 +829,8 @@ msgstr "Palvelimen asetukset"
 msgid "Mappings"
 msgstr "Reunukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "Joka"
@@ -1013,14 +1011,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1042,8 +1040,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1075,7 +1073,7 @@ msgid "Using email address"
 msgstr "_T�m� on postitusosoite"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1083,7 +1081,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Lis��"
 
@@ -1129,7 +1127,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1245,10 +1243,12 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Poista"
 
@@ -1372,7 +1372,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Kontaktinhallinta"
 
@@ -1382,7 +1382,7 @@ msgid "D_epartment:"
 msgstr "_Osasto:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
@@ -1443,11 +1443,12 @@ msgstr "Haluaa s�hk�postit HTML-muodossa"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -1476,7 +1477,7 @@ msgid "_Web page address:"
 msgstr "_Kotisivun osoite:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Yhdysvallat"
 
@@ -1982,12 +1983,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Latvia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libanon"
 
@@ -1996,7 +1996,7 @@ msgid "Lesotho"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
@@ -2005,12 +2005,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Liettua"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
@@ -2043,7 +2043,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2068,7 +2068,7 @@ msgid "Mayotte"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Meksiko"
 
@@ -2093,7 +2093,7 @@ msgid "Montserrat"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr ""
 
@@ -2118,7 +2118,7 @@ msgid "Nepal"
 msgstr "Nepali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Alankomaat"
 
@@ -2131,12 +2131,12 @@ msgid "New Caledonia"
 msgstr "Uusi Kaledonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Uusi-Seelanti"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2153,7 +2153,7 @@ msgid "Niue"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr ""
 
@@ -2162,17 +2162,17 @@ msgid "Northern Mariana Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norja"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2185,7 +2185,7 @@ msgid "Palestinian Territory"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2194,12 +2194,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Uusi-Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2212,22 +2212,22 @@ msgid "Pitcairn"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Puola"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
@@ -2236,7 +2236,7 @@ msgid "Reunion"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Romania"
 
@@ -2273,7 +2273,7 @@ msgid "Sao Tome And Principe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
@@ -2290,17 +2290,17 @@ msgid "Sierra Leone"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapore"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovakia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr ""
 
@@ -2313,7 +2313,7 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Etel�-Afrikka"
 
@@ -2322,7 +2322,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Espanja"
 
@@ -2343,7 +2343,7 @@ msgid "Sudan"
 msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -2356,17 +2356,17 @@ msgid "Swaziland"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Ruotsi"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Sveitsi"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
@@ -2403,7 +2403,7 @@ msgid "Tunisia"
 msgstr "Tunisia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turkki"
 
@@ -2424,7 +2424,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraina"
 
@@ -2433,7 +2433,7 @@ msgid "United Arab Emirates"
 msgstr "Yhdistyneet arabiemiirikunnat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Iso-Britannia"
 
@@ -2442,7 +2442,7 @@ msgid "United States Minor Outlying Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2455,12 +2455,12 @@ msgid "Vanuatu"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2483,12 +2483,12 @@ msgid "Western Sahara"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslavia"
 
@@ -2501,26 +2501,34 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa t�m�n kontaktin?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Poista kontakti?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "T�m� kontakti kuuluu n�ihin ryhmiin:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2547,11 +2555,11 @@ msgstr "S�hk�posti"
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2684,11 +2692,11 @@ msgid "contact-list-editor"
 msgstr "kontaktinhallinta"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Kontaktinhallinta"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2762,21 +2770,21 @@ msgid "Error getting book view"
 msgstr "Virhe %s:n k�ynnistyksess�"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -2785,7 +2793,7 @@ msgid "Repository offline"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr ""
 
@@ -2803,55 +2811,70 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Peruutettu"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Todennus ep�onnistui."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Todennus vaaditaan"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Muu virhe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Virhe kortin lis��misess�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Virhe kortin poistossa"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Kirjoita viesti"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Kirjoita viesti"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2859,22 +2882,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Ei kortteja"
@@ -2939,102 +2962,108 @@ msgstr "Muu puhelin"
 msgid "Other Address"
 msgstr "Muu osoite"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Osoitekirja"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Uusi kontakti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Uusi kontaktiluettelo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Siirry kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Etsi kontakteja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Osoitekirjan l�hteet..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_S�hk�postiasetukset..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "L�het� viesti kontaktille"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tulosta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Kopioi kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Siirr� kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopioi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Liit�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Poista"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3044,7 +3073,7 @@ msgstr "_Nykyinen n�kym�"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3052,7 +3081,7 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3192,7 +3221,7 @@ msgstr "Reunukset"
 msgid "Number of columns:"
 msgstr "Sarakkeiden m��r�:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Asetukset"
 
@@ -3202,7 +3231,7 @@ msgid "Orientation"
 msgstr "Suunta"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Sivu"
 
@@ -3276,29 +3305,33 @@ msgstr "Leveys:"
 msgid "_Font..."
 msgstr "_Kirjasin..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Korkea"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Matala"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "M��rittelem�t�n"
 
@@ -3340,42 +3373,34 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3387,10 +3412,25 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Asetukset"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Varjostus"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "ep�kelpo aika"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3426,7 +3466,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varoitus"
@@ -3447,15 +3487,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "�l� kysy t�t� en�� uudelleen"
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "GNOMEn alustus ei onnistunut"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3472,7 +3512,7 @@ msgstr "Kuvaus:"
 msgid "Comment contains"
 msgstr "Kommentti sis�lt��"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr ""
 
@@ -3514,14 +3554,16 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Henkil�kohtainen"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Julkinen"
 
@@ -3542,28 +3584,33 @@ msgid "W"
 msgstr "L"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
 msgstr "Pe"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr ""
 
@@ -3575,11 +3622,12 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3594,12 +3642,14 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Kyll�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Ei"
 
@@ -3623,62 +3673,64 @@ msgstr "Viikko"
 msgid "Month View"
 msgstr "Kuukausi"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Teht�v�t"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "Uusi teht�v�"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Teht�v�"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Uusi t_apaaminen"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "Tapaaminen"
@@ -3900,7 +3952,7 @@ msgstr "Muistutukset"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kuvaus:"
 
@@ -3930,7 +3982,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "tunti(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minuutti"
 
@@ -3958,87 +4010,86 @@ msgstr "30 minuuttia"
 msgid "60 minutes"
 msgstr "60 minuuttia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Kansiot"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
 msgid "Calendar and Tasks Settings"
 msgstr "_Kalenterin asetukset..."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "Days"
 msgstr "p�iv��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Perjantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #, fuzzy
 msgid "Hours"
 msgstr "tuntia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
 msgid "Minutes"
 msgstr "minuutti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Maanantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "Su"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #, fuzzy
 msgid "Show week _numbers in date navigator"
 msgstr "N�yt� viikkonumerot"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#, fuzzy
-msgid "Sta_rt of day:"
-msgstr "P�iv�n alku:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, fuzzy
-msgid "Su_n"
-msgstr "Su"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_asks due today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "T_hu"
 msgstr "To"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#, fuzzy
-msgid "T_ue"
-msgstr "Ti"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4070,93 +4121,106 @@ msgid "Tuesday"
 msgstr "Tiistai"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Work Week"
 msgstr "Ty�viikk_o"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #, fuzzy
 msgid "_12 hour (AM/PM)"
 msgstr "12 tuntia (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #, fuzzy
 msgid "_24 hour"
 msgstr "24 tuntia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "_Compress weekends in month view"
 msgstr "Tiivist� viikonloput"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "_Display"
-msgstr "_P�iv�"
+msgid "_Day begins:"
+msgstr "Valmis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #, fuzzy
-msgid "_End of day:"
-msgstr "P�iv�n loppu:"
+msgid "_Display"
+msgstr "_P�iv�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_Fri"
 msgstr "Pe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_General"
 msgstr "Yleiset"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Mon"
 msgstr "Ma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Overdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #, fuzzy
 msgid "_Sat"
 msgstr "La"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "N�yt� tapaamisten loppumisajat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Mitat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "Ti"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
 msgid "_Wed"
 msgstr "Ke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 #, fuzzy
-msgid "before the start of the appointment"
+msgid "before every appointment"
 msgstr "Luo uusi tapaaminen"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4244,41 +4308,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:342
 #, fuzzy
-msgid "Could not update object!"
+msgid "Could not update invalid object"
 msgstr "Tiedostojen p�ivitys ei onnistunut"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Tiedostojen p�ivitys ei onnistunut"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Teht�v� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Tallenna nimell�..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4339,28 +4423,28 @@ msgstr "Poistettu"
 msgid "Enter Delegate"
 msgstr "Poistettu"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Muistutus"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 #, fuzzy
 msgid "Scheduling"
 msgstr "Varjostus"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 #, fuzzy
 msgid "Meeting"
 msgstr "Peruuta tapaaminen"
@@ -4413,7 +4497,7 @@ msgid "Pu_blic"
 msgstr "Ju_lkinen"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Show Time As"
 msgstr "N�yt�"
@@ -4436,19 +4520,19 @@ msgstr "_Loppumisaika:"
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Poista..."
@@ -4460,52 +4544,58 @@ msgstr "Osanottaja"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
+msgid "Click here to add an attendee"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-#, fuzzy
-msgid "Delegated From"
-msgstr "Poistettu"
+msgid "Common Name"
+msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
-msgid "Delegated To"
+msgid "Delegated From"
 msgstr "Poistettu"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr ""
+#, fuzzy
+msgid "Delegated To"
+msgstr "Poistettu"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 #, fuzzy
 msgid "Member"
 msgstr "Joulukuu"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rooli"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Tila"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tyyppi"
@@ -4521,15 +4611,10 @@ msgid "_Change Organizer"
 msgstr "Organisoija:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#, fuzzy
-msgid "_Other Organizer"
-msgstr "Organisoija:"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4718,7 +4803,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4730,20 +4815,20 @@ msgstr "_Prioriteetti:"
 msgid "_Status:"
 msgstr "_Tila:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 #, fuzzy
 msgid "Assignment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Kuvaus:"
 
@@ -4755,24 +4840,79 @@ msgstr "_Alkamisp�iv�:"
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, fuzzy, c-format
+msgid "100%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Poista valitut kontaktit"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Avaa"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Tallenna nimell�..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4780,20 +4920,20 @@ msgstr "Tallenna nimell�..."
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4801,36 +4941,37 @@ msgstr "_Kopioi"
 msgid "_Paste"
 msgstr "L_iit�"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Ladataan kalenteria"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Poista teht�v�"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
 
@@ -4838,47 +4979,48 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr ""
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Kuvaus"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL:"
 
@@ -4926,11 +5068,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -4971,7 +5115,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "Pakolliset tiedot"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Palvelimen asetukset"
@@ -4982,7 +5126,7 @@ msgid "_Configure Pilot..."
 msgstr "Palvelimen asetukset"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "Tallenna _nimell�..."
 
@@ -5009,77 +5153,429 @@ msgid "Delete _All Occurrences"
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+#, fuzzy
+msgid "Meeting begins: <b>"
+msgstr "L�hteen tiedot"
+
+#: calendar/gui/e-itip-control.c:683
+#, fuzzy
+msgid "Task begins: <b>"
+msgstr "Valmis"
+
+#: calendar/gui/e-itip-control.c:688
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "L�hteen tiedot"
+
+#: calendar/gui/e-itip-control.c:692
+#, fuzzy
+msgid "Begins: <b>"
+msgstr "L�hteen tiedot"
+
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "L�hteen tiedot"
+
+#: calendar/gui/e-itip-control.c:707
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "L�hteen tiedot"
+
+#: calendar/gui/e-itip-control.c:711
+#, fuzzy
+msgid "Ends: <b>"
+msgstr "L�hteen tiedot"
+
+#: calendar/gui/e-itip-control.c:725
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "Valmis"
+
+#: calendar/gui/e-itip-control.c:735
+#, fuzzy
+msgid "Task Due: <b>"
+msgstr "Valmis"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "Pakolliset tiedot"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Kalenteri"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "An unknown person"
+msgstr "Tuntematon virhe"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "_Tila:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+#, fuzzy
+msgid "Accepted"
+msgstr "Hyv�ksy "
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#, fuzzy
+msgid "Declined"
+msgstr "Poistettu"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: calendar/gui/e-itip-control.c:1564
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
 #, fuzzy
-msgid "Calendar file could not be updated!\n"
-msgstr "Kohdistimen lataaminen ep�onnistui\n"
+msgid "Choose an action:"
+msgstr "Valitse toiminto"
+
+#: calendar/gui/e-itip-control.c:972
+#, fuzzy
+msgid "Update"
+msgstr "Teht�v�t"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:1000
+#, fuzzy
+msgid "Accept"
+msgstr "Hyv�ksy "
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1002
+#, fuzzy
+msgid "Decline"
+msgstr "Poistettu"
+
+#: calendar/gui/e-itip-control.c:1026
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "L�hteen tiedot"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Tiedoksi"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: calendar/gui/e-itip-control.c:1117
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/e-itip-control.c:1118
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Valinnaiset tiedot"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1123
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1128
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/e-itip-control.c:1132
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/e-itip-control.c:1133
+#, fuzzy
+msgid "Meeting Update Request"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/e-itip-control.c:1156
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/e-itip-control.c:1157
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/e-itip-control.c:1161
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/e-itip-control.c:1162
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Valitse toiminto"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1167
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Hae viestist�"
+
+#: calendar/gui/e-itip-control.c:1189
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/e-itip-control.c:1190
+#, fuzzy
+msgid "Task Information"
+msgstr "Tiedoksi"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1195
+#, fuzzy
+msgid "Task Proposal"
+msgstr "Peruuta tapaaminen"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1200
+#, fuzzy
+msgid "Task Update"
+msgstr "Teht�v�t"
+
+#: calendar/gui/e-itip-control.c:1204
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/e-itip-control.c:1205
+#, fuzzy
+msgid "Task Update Request"
+msgstr "Teht�v�t"
+
+#: calendar/gui/e-itip-control.c:1229
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/e-itip-control.c:1230
+#, fuzzy
+msgid "Task Reply"
+msgstr "Vastaa"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1235
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Peruuta operaatio"
+
+#: calendar/gui/e-itip-control.c:1240
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Hae viestist�"
+
+#: calendar/gui/e-itip-control.c:1259
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/e-itip-control.c:1260
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "L�hteen tiedot"
+
+#: calendar/gui/e-itip-control.c:1264
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/e-itip-control.c:1265
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "Edellinen viesti"
+
+#: calendar/gui/e-itip-control.c:1269
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/e-itip-control.c:1270
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "Edellinen viesti"
+
+#: calendar/gui/e-itip-control.c:1275
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Edellinen viesti"
+
+#: calendar/gui/e-itip-control.c:1354
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Bug buddya ei voitu ajaa."
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+#, fuzzy
+msgid "Calendar file could not be updated!\n"
+msgstr "Kohdistimen lataaminen ep�onnistui\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
-#, fuzzy
-msgid "Attendee status could not be updated!\n"
-msgstr "Kohdistimen lataaminen ep�onnistui\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:1674
 #, fuzzy
+msgid "Attendee status could not be updated!\n"
+msgstr "Kohdistimen lataaminen ep�onnistui\n"
+
+#: calendar/gui/e-itip-control.c:1709
+#, fuzzy
 msgid "Removal Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "L�hetetty"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Valitse kansio"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Valitse kansio"
@@ -5121,88 +5617,85 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Autopuhelin"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 #, fuzzy
 msgid "Required Participants"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 #, fuzzy
 msgid "Group"
 msgstr "Ryhm�n nimi:"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 #, fuzzy
 msgid "Resource"
 msgstr "Paperil�hde:"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 #, fuzzy
 msgid "Needs Action"
 msgstr "Lis�� toiminto"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-#, fuzzy
-msgid "Accepted"
-msgstr "Hyv�ksy "
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#, fuzzy
-msgid "Declined"
-msgstr "Poistettu"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 #, fuzzy
 msgid "Delegated"
 msgstr "Poistettu"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 #, fuzzy
 msgid "In Process"
 msgstr "Ammatti"
@@ -5210,14 +5703,14 @@ msgstr "Ammatti"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5229,63 +5722,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Asetukset"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr ""
 
@@ -5304,16 +5797,23 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr ""
+"Tiedoston %s poistaminen ep�onnistui:\n"
+"%s"
+
+#: calendar/gui/e-tasks.c:558
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Poista valitut kontaktit"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 msgid "Expunging"
 msgstr ""
 
@@ -5325,17 +5825,17 @@ msgstr "Uusi t_apaaminen..."
 msgid "_Delete this Appointment"
 msgstr "P_oista t�m� tapaaminen"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
@@ -5396,19 +5896,58 @@ msgstr "Lokakuu"
 msgid "September"
 msgstr "Syyskuu"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "Valinnaiset tiedot"
+
+#: calendar/gui/itip-utils.c:356
+#, fuzzy
+msgid "Task information"
+msgstr "Tiedoksi"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "Valinnaiset tiedot"
+
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "L�hteen tiedot"
+
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "Pakolliset tiedot"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Teht�v�t"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "vuotta"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
@@ -5598,12 +6137,49 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
+#: calendar/gui/print.c:2249
+#, fuzzy
+msgid "Task"
+msgstr "_Teht�v�"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_Tila:"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioriteetti:"
+
+#: calendar/gui/print.c:2338
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Valmis"
+
+#: calendar/gui/print.c:2350
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2364
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Ryhm�t: "
+
+#: calendar/gui/print.c:2375
+#, fuzzy
+msgid "Contacts: "
+msgstr "Ko_ntaktit:"
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5634,8 +6210,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�l� kysy t�t� en�� uudelleen"
@@ -5689,6 +6265,11 @@ msgstr ""
 msgid "Imports vCalendar files into Evolution"
 msgstr ""
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Muistutus"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5782,8 +6363,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -6728,660 +7309,675 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Qatar"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Qatar"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr ""
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr ""
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr ""
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr ""
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Bahrain"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 #, fuzzy
 msgid "Asia/Qatar"
 msgstr "Qatar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr ""
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr ""
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr ""
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 #, fuzzy
 msgid "Asia/Singapore"
 msgstr "Singapore"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr ""
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr ""
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr ""
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 #, fuzzy
 msgid "Atlantic/Bermuda"
 msgstr "Bermudasaaret"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 #, fuzzy
 msgid "Atlantic/Cape_Verde"
 msgstr "Kap Verde"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 #, fuzzy
 msgid "Australia/Adelaide"
 msgstr "Australia"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 #, fuzzy
 msgid "Australia/Brisbane"
 msgstr "Australia"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 #, fuzzy
 msgid "Australia/Broken_Hill"
 msgstr "Australia"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 #, fuzzy
 msgid "Australia/Darwin"
 msgstr "Australia"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 #, fuzzy
 msgid "Australia/Hobart"
 msgstr "Australia"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 #, fuzzy
 msgid "Australia/Lindeman"
 msgstr "Australia"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 #, fuzzy
 msgid "Australia/Lord_Howe"
 msgstr "Australia"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 #, fuzzy
 msgid "Australia/Melbourne"
 msgstr "Australia"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 #, fuzzy
 msgid "Australia/Perth"
 msgstr "Australia"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 #, fuzzy
 msgid "Australia/Sydney"
 msgstr "Australia"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr ""
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr ""
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 #, fuzzy
 msgid "Europe/Athens"
 msgstr "Ominaisuudet"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr ""
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr ""
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr ""
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr ""
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr ""
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr ""
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr ""
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr ""
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 #, fuzzy
 msgid "Europe/Gibraltar"
 msgstr "Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr ""
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr ""
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr ""
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr ""
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr ""
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr ""
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 #, fuzzy
 msgid "Europe/Luxembourg"
 msgstr "Luxemburg"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr ""
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr ""
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr ""
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 #, fuzzy
 msgid "Europe/Monaco"
 msgstr "Monaco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr ""
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr ""
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 #, fuzzy
 msgid "Europe/Paris"
 msgstr "Ominaisuudet"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr ""
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr ""
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr ""
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr ""
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 #, fuzzy
 msgid "Europe/San_Marino"
 msgstr "San Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr ""
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr ""
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr ""
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr ""
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr ""
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr ""
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr ""
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 #, fuzzy
 msgid "Indian/Mahe"
 msgstr "Intia"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr ""
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 #, fuzzy
 msgid "Indian/Mauritius"
 msgstr "Mauritius"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr ""
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr ""
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr ""
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
@@ -7389,12 +7985,12 @@ msgstr ""
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "V�limuistihakemistoa ei voitu avata: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7402,7 +7998,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7410,11 +8006,16 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Poistetaan kansiota %s"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -7422,57 +8023,68 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe j�sennett�ess� suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viesti� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Viesti� ei voida avata"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viesti� %d / %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Viestin salauksen purkaminen ep�onnistui."
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Viestin salauksen purkaminen ep�onnistui."
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -7500,26 +8112,103 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 #, fuzzy
 msgid "Moving messages"
 msgstr "L�hetet��n viesti�"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "L�hetet��n viesti�"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Peruutettu."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Odottamaton vastaus POP-palvelimelta: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Vastaanottajia ei ole m��ritelty"
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Viestin salauksen purkaminen ep�onnistui."
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Viestin salauksen purkaminen ep�onnistui."
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Viestin salauksen purkaminen ep�onnistui."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "V�liaikaistiedostoa ei voitu luoda: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7615,89 +8304,23 @@ msgstr "Virhe kirjoitettaessa v�liaikaista viestitiedostoa: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Virhe kopioitaessa viestin v�liaikaistiedostoa: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: camel/camel-pgp-context.c:621
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-#, fuzzy
-msgid "Cannot sign this message: no password provided"
-msgstr "Viesti� ei voida l�hett��: l�hett�j�n osoite on ep�kelpo."
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, fuzzy, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Putken luominen GPG/PGP:lle ep�onnistui: %s"
-
-#: camel/camel-pgp-context.c:795
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
-
-#: camel/camel-pgp-context.c:987
-#, fuzzy
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
-
-#: camel/camel-pgp-context.c:993
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Putken luominen GPG/PGP:lle ep�onnistui: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "V�liaikaistiedostoa ei voitu luoda: %s"
-
-#: camel/camel-pgp-context.c:1177
-#, fuzzy
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
-
-#: camel/camel-pgp-context.c:1187
-#, fuzzy
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Viesti� ei voida l�hett��: l�hett�j�n osoite on ep�kelpo."
-
-#: camel/camel-pgp-context.c:1194
-#, fuzzy, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Putken luominen GPG/PGP:lle ep�onnistui: %s"
-
-#: camel/camel-pgp-context.c:1203
-#, fuzzy
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
-
-#: camel/camel-pgp-context.c:1372
-#, fuzzy
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1387
-#, fuzzy, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Putken luominen GPG/PGP:lle ep�onnistui: %s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Muu virhe"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7715,43 +8338,6 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Yhteys peruutettu"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr ""
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr ""
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr ""
@@ -7845,7 +8431,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -7873,11 +8459,9 @@ msgid ""
 "Password Authentication."
 msgstr "T�m� valitsin yhdist�� palvelimeen yksinkertaista salasanaa k�ytt�en."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Salasana"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7905,51 +8489,51 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Poistetaan kansiota %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8012,12 +8596,12 @@ msgstr "Viestin salauksen purkaminen ep�onnistui."
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
@@ -8041,7 +8625,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8050,16 +8634,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8074,15 +8658,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL:n `%s' j�sent�minen ep�onnistui"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Ei kyseist� viesti�: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Etsi uusia viestej� kaikista kansioista"
 
 #: camel/camel-vee-store.c:262
 #, fuzzy, c-format
@@ -8104,68 +8688,77 @@ msgstr "Kansion hakeminen ei onnistu: %s: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Et voi kopioida viestej� t�st� roskakorista."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-komento ep�onnistui: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Etsit��n muuttuneita viestej�"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "T�t� viesti� ei ole juuri nyt saatavilla"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Etsit��n uusia viestej�"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8219,32 +8812,80 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Salasana"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 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:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP-palvelin %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "SMTP-palvelin %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Yhteys peruutettu"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+msgid "SSL/TLS extension not supported."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Todennus ep�onnistui."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8252,69 +8893,86 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
-msgid "MH-format mail directories"
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, c-format
+msgid "~%s (%s)"
+msgstr ""
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, c-format
+msgid "mailbox:%s (%s)"
+msgstr ""
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, c-format
+msgid "%s (%s)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:49
+msgid "MH-format mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 #, fuzzy
 msgid "Local delivery"
 msgstr "Paikalliset kansiot"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+msgid "Standard Unix mbox spool or directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8340,7 +8998,7 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Hakemistoa %s ei voitu uudelleennimet� seuraavaksi: %s: %s"
@@ -8362,56 +9020,53 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 "Tiedoston %s poistaminen ep�onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Virhe viestin %d kohdalla"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8420,13 +9075,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Kansiota `%s' ei ole olemassa."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8440,7 +9095,7 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kansion `%s' poistaminen ep�onnistui: %s"
@@ -8449,8 +9104,8 @@ msgstr "Kansion `%s' poistaminen ep�onnistui: %s"
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -8471,46 +9126,38 @@ msgstr "Tarkastetaan onko uutta s�hk�postia"
 msgid "Checking for new messages"
 msgstr "Etsit��n uusia viestej�"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8519,13 +9166,11 @@ msgstr ""
 "Viestin %s hakeminen kansiosta %s ep�onnistui\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -8562,181 +9207,162 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "Tiedoston %s poistaminen ep�onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "Tiedoston %s poistaminen ep�onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
+#, c-format
+msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
-msgid "Error writing to temp mailbox: %s"
+msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
+msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
-#, c-format
-msgid "Could not close source folder %s: %s"
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
-msgid "Could not close temp folder: %s"
+msgid "Unknown error: %s"
+msgstr "Tuntematon virhe: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
 msgstr ""
+"Tiedoston %s poistaminen ep�onnistui:\n"
+"%s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:973
 #, c-format
-msgid "Could not rename folder: %s"
+msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:990
 #, c-format
-msgid "Unknown error: %s"
-msgstr "Tuntematon virhe: %s"
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "L�het� viesti kontaktille"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ei ole hakemisto."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-folder.c:515
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
-msgid "Cannot append message to spool file: %s: %s"
+msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr ""
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "`%s' ei ole tavallinen tiedosto."
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Kansiota `%s/%s' ei ole olemassa."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Poistetaan kansiota %s"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "V�liaikaishakemistoa %s ei voitu synkronoida: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, fuzzy, c-format
-msgid "Could not file: %s: %s"
-msgstr ""
-"Tiedoston %s poistaminen ep�onnistui:\n"
-"%s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "`%s' ei ole hakemisto."
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, c-format
-msgid "Mail tree %s"
-msgstr ""
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Keskusteluryhm�t"
@@ -8745,12 +9371,22 @@ msgstr "Keskusteluryhm�t"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "T�m� on USENET-keskusteluryhmien toimittaja."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8851,7 +9487,7 @@ msgstr "J�t� viestit palvelimelle"
 msgid "Delete after %s day(s)"
 msgstr "Poista %s:n p�iv�n kuluttua"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8872,68 +9508,59 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-msgid "SSL/TLS extension not supported."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Todennus ep�onnistui."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "IMAP-komento ep�onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "I/O-virhe"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9094,41 +9721,41 @@ msgstr "V�liaikainen todennusvirhe"
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "Palveli_meni vaati todennuksen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9136,89 +9763,89 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 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:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "L�hetet��n viesti�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 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:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP-todennus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9226,35 +9853,35 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr ""
 
@@ -9327,52 +9954,52 @@ msgstr "MIME-tyyppi:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr ""
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "L�hett�j�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Kopiot:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Anna osoitteet joihin l�hetet��n kopio viestist� (Cc)"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Piilokopiot:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9385,7 +10012,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Liit� tiedosto"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Allekirjoitustiedoston luonti ep�onnistui."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9394,48 +10026,48 @@ msgstr ""
 "Tiedoston %s lukeminen ep�onnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Varoitus!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9444,7 +10076,7 @@ msgstr ""
 "Virhe tallennettaessa tiedostoa automaattisesti: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9452,7 +10084,7 @@ msgstr ""
 "Ximian Evolution on l�yt�nyt tallentamattomia tiedostoja edelliselt� \n"
 "istunnolta. Haluatko koettaa niiden palauttamista?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9462,29 +10094,49 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Varoitus: Muutettu viesti"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Liit� tiedosto"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Tallenna allekirjoitus"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (oletus)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9492,6 +10144,12 @@ msgstr ""
 "Viestimuokkain -ikkunan luominen ep�onnistui:\n"
 "HTML-muokkainkomponentin k�ynnistys ei onnistunut."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9551,7 +10209,7 @@ msgstr "Otsikko sis�lt��"
 msgid "Subject does not contain"
 msgstr "Otsikko ei sis�ll�"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9696,7 +10354,7 @@ msgstr "tunti"
 msgid "minute"
 msgstr "minuutti"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -9763,7 +10421,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9775,6 +10433,21 @@ msgstr ""
 msgid "Filter Rules"
 msgstr ""
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Tyylin nimi:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "`%s' ei ole hakemisto."
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Valitse toiminto"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9791,7 +10464,7 @@ msgid ""
 msgstr ""
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr ""
 
@@ -9802,7 +10475,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr ""
 
@@ -9833,7 +10510,7 @@ msgstr "kaikki ehdot t�ytet��n"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "mik��n ehdoista t�yttyy"
 
 #: filter/filter-rule.c:780
@@ -9911,193 +10588,202 @@ msgid "Beep"
 msgstr "Belize"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Yritys"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "sis�lt��"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "L�hetetty"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "ei sis�ll�"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "ei lopu merkkijonoon"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "ei ole olemassa"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "ei ala merkkijonolla"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Luonnos"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "loppuu merkkijonoon"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "on"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "j�lkeen"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "ennen"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "on pienempi kuin"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+msgid "Label"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Viestin otsikko"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Siirr� kansioon"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Puola"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Lue"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "L�hett�j�"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Koko (kt)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "alkaa merkkijonolla"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Aihe"
 
@@ -10153,7 +10839,8 @@ msgid "Scanning %s"
 msgstr ""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr ""
 
@@ -10169,10 +10856,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Osoitekirja"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10222,7 +10905,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Roskakori"
 
@@ -10354,271 +11039,281 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "T�m� kansio ei voi sis�lt�� viestej�."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Ominaisuudet..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Muuta t�m�n kansion ominaisuuksia"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Varoitus: Muutettu viesti"
+
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Peruutetaan..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Kansion \"%s\" ominaisuudet"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Poistettu"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d l�hett�m�t�nt�"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d l�hett�m�t�nt�"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d yhteens�"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Luo viestist� suodatin"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Suodata _l�hett�j�n mukaan"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Tulosta viesti..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Vastaa l�hett�j�lle"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_V�lit�"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Valmis"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Kalenteri"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Merkitse t�rke�ks_i"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Merkitse t�rke�ks_i"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Siirr� kansioon..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:1645
-msgid "Label"
-msgstr ""
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lis�� l�hett�j� osoitekirjaan"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Toteuta suodattimet"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestist� s��nt�"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "_Oletukset"
+
+#: mail/folder-info.c:71
 #, fuzzy
 msgid "Getting Folder Information"
 msgstr "Valinnaiset tiedot"
@@ -10671,7 +11366,7 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Et ole t�ytt�nyt kaikkia tarvittavia kohtia."
 
@@ -10681,82 +11376,106 @@ msgid "Evolution News Editor"
 msgstr "Evolutionin keskusteluryhm�muokkain"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Is�nt�palvelin:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "K�ytt�j�t_unnus:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Lue"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa t�m�n tilin?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "�l� poista"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Poistetaanko tili todella?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "�l� k�yt�"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "K�yt�"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Haluatko varmasti poistaa t�m�n keskusteluryhm�tilin?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "K�yt�"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Tilin nimi:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Suodattimet"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Aihe on %s"
+
+#: mail/mail-autofilter.c:239
+#, fuzzy, c-format
+msgid "Mail from %s"
+msgstr "L�hett�j�:"
+
+#: mail/mail-autofilter.c:295
+#, fuzzy, c-format
+msgid "%s mailing list"
+msgstr "S�hk�posti 2"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Lis�� suodatuss��nt�"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10768,31 +11487,31 @@ msgstr ""
 "vastaanottaa tai kirjoittaa viestej�.\n"
 "Haluatko tehd� asetukset nyt?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 #, fuzzy
 msgid "Send anyway?"
 msgstr "L�het� s�hk�postia"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10800,61 +11519,61 @@ msgstr ""
 "Viestill� ei ole aihetta.\n"
 "L�hetet��nk� toedella?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "Sinuun tulee m��ritell� vastaanottajat ennen t�m�n viestin l�hett�mist�."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Sinun tulee luoda tili ennen kuin voit l�hett�� t�t� viesti�."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Tuntematon virhe"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Siirr� viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10862,7 +11581,7 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10870,39 +11589,39 @@ msgstr ""
 "Voit l�hett�� uudelleen vain\n"
 "\"L�hetetyt\"-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Haluatko todella l�hett�� kaikki %d viesti� uudelleen?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Ei viestej� valittuna"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimell�..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimell�..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "N�yt� seuraava lukematon viesti"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10910,39 +11629,75 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Haetaan viesti� %d / %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Viestin tulostus ep�onnistui"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Kuvaus:"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Nimet�n kontakti"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "L�het�"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Lis�� ehto"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Tallenna allekirjoitus"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -10980,188 +11735,174 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin tilimuokkain"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Ty�viikk_o"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "j�lkeen"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Tili"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Nimet�n kontakti"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 msgid " "
 msgstr ""
 
 #: mail/mail-config.glade.h:2
 #, fuzzy
-msgid " Edit "
-msgstr "_Muokkaa"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Uusi"
-
-#: mail/mail-config.glade.h:4
-#, fuzzy
 msgid " _Check for supported types "
 msgstr "Tar_kista tuetut tavat"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Tili"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "Lis�� ehto"
+
 #: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Peruuta operaatio"
+msgid "Add new signature..."
+msgstr "Tallenna allekirjoitus"
 
 #: mail/mail-config.glade.h:12
-msgid "Afrikaans"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-#, fuzzy
-msgid "Alerts"
-msgstr "Kansiot"
-
-#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Lis�� viestiin liitetiedoston"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Liite"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Todennus"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_Sulje"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Tarkastetaan onko uutta s�hk�postia"
 
 #: mail/mail-config.glade.h:29
+msgid "Color for _misspelled words:"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Kirjoita viesti"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11171,54 +11912,46 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
-msgid "Dari"
-msgstr ""
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Viesti� ei voida avata"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Luonnoskansio:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "K�_yt�"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11239,39 +11972,35 @@ msgstr "S�hk�postiosoite:"
 msgid "Empty _trash folders on exit"
 msgstr "Tyhj_enn� roskakorit lopetettaessa"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Suorita toiminnot"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "loppuu merkkijonoon"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Ominaisuudet"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "V�litetyt viestit"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Korosta lainaukset v�rill�"
 
-#: mail/mail-config.glade.h:59
-msgid "Hulu"
-msgstr ""
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11324,65 +12053,61 @@ msgstr ""
 msgid "NNTP Server:"
 msgstr "NNTP-palvelin"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "NNTP-palvelin"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Valitse v�ri"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Tulosta valitut kontaktit"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Viesti� ei voida avata"
 
-#: mail/mail-config.glade.h:93
-msgid "Quoted"
-msgstr ""
-
 #: mail/mail-config.glade.h:95
-msgid "Randomized"
+msgid "Quoted"
 msgstr ""
 
 #: mail/mail-config.glade.h:96
@@ -11419,256 +12144,255 @@ msgid "S_ecurity"
 msgstr "Turvallisuus"
 
 #: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Valitse PGP-ohjelma"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Allekirjoitustiedosto:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Poista kaikki paitsi allekirjoitus"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "L�hetet��n s�hk�postia"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "L�hetettyjen kansio:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "L�hetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Oikotiet"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Tallenna allekirjoitus"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Tallenna allekirjoitus"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "L�hde"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "L�hteen tiedot"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Tyylin nimi:"
 
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
+msgstr ""
+
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
 #: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+msgid "Standard Unix mbox"
 msgstr ""
 
 #: mail/mail-config.glade.h:126
-msgid "Standard Unix mbox"
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "_HTML-allekirjoitus:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_HTML-allekirjoitus:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Todennustapa:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Todennustapa:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "T_arkasta onko uutta postia joka"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "_HTML-allekirjoitus:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Tiedostonimi:"
+msgid "_Enable"
+msgstr "K�yt�"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "_V�litet� viesti"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Koko nimi:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "L�het� HTML-postia?"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "_HTML-allekirjoitus:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
-msgid "_Language:"
-msgstr ""
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Tee t�st� _oletustilini"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "_PGP-ohjelman polku:"
 
-#: mail/mail-config.glade.h:171
-msgid "_Play sound file when new mail arrives"
-msgstr ""
-
 #: mail/mail-config.glade.h:172
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgid "_Play sound file when new mail arrives"
 msgstr ""
 
 #: mail/mail-config.glade.h:173
-msgid "_Prompt when sending messages with an empty subject line"
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
 #: mail/mail-config.glade.h:174
-msgid "_Random"
+msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
 #: mail/mail-config.glade.h:175
@@ -11711,70 +12435,53 @@ msgstr "_HTML-allekirjoitus:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "_HTML-allekirjoitus:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "K�yt� salattua yhteytt� (_SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 #, fuzzy
 msgid "_every"
 msgstr "Joka"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " "
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 #, fuzzy
 msgid "description"
 msgstr "Kuvaus:"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr ""
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
@@ -11817,137 +12524,169 @@ msgstr "Ulkoinen katselin"
 msgid "Loading message content"
 msgstr "Ladataan viestin sis�lt��"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+msgid "Overdue:"
+msgstr ""
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Kopioi linkin sijainti"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Tallenna linkki nimell�"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Tallenna kuva nimell�..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "P�iv�ys"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Ep�kelpo osoite"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "L�hett�j�"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Vastausosoite:"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Kopiot:"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Bcc"
 msgstr "Piilokopiot:"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "_Matkapuhelin"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Tallenna viesti nimell�..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Paikalliset kansiot"
+
+#: mail/mail-local.c:670
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synkronoidaan kansiota"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Et voi muuttaa ei-paikallisen kansion tyyppi�."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Synkronoidaan kansiota"
@@ -12001,126 +12740,118 @@ msgstr ""
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Siirret��n"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Kopioidaan"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "V�litetyt viestit"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viesti� %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Haetaan %d viesti(�)"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Tallennetaan %d viesti(�)"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Hakuasetukset"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Etsi"
 
@@ -12193,10 +12924,6 @@ msgstr "P�ivitet��n..."
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Peruutettu."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr ""
@@ -12211,16 +12938,16 @@ msgstr ""
 msgid "Enter Password"
 msgstr "Salasana"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Allekirjoitustiedoston luonti ep�onnistui."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Tallenna allekirjoitus"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12230,10 +12957,30 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Nimi:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "Allekirjoitustiedosto:"
+msgid "Signature hint"
+msgstr "Tallenna allekirjoitus"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "HTML-allekirjoitustiedosto:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12248,17 +12995,17 @@ msgstr "V�litetty viesti"
 msgid "Forwarded Message"
 msgstr "V�litetty viesti"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12267,91 +13014,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+#, fuzzy
+msgid "VFolders"
+msgstr "Kansiot"
+
+#: mail/mail-vfolder.c:784
 #, fuzzy
 msgid "vFolders"
 msgstr "Kansiot"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Kansio"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Ei aihetta)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Viesti"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "N�hty"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "N�kem�tt�"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Vastattu"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "T�n��n %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -12373,10 +13126,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Alkuper�inen kontakti:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Otettu vastaan"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Koko"
 
@@ -17493,5692 +18251,5687 @@ msgstr "Latvia"
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "_Suuret kuvakkeet"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 #, fuzzy
 msgid "La Verne"
 msgstr "Kap Verde"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "Libanon"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 #, fuzzy
 msgid "Leesburg"
 msgstr "Luxemburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr ""
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 #, fuzzy
 msgid "Lemmon"
 msgstr "Libanon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "Poista"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "vuotta"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 #, fuzzy
 msgid "Lewisburg"
 msgstr "Luxemburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "Uusi luettelo"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr ""
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 #, fuzzy
 msgid "Lexington"
 msgstr "Libanon"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Liberal"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Libya"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr ""
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr ""
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limoges"
 msgstr "Matalin"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "kuukausi"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Lincoln"
 msgstr "tulevat"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 #, fuzzy
 msgid "Lisboa"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "Pakistan"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "Yrit"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "London"
 msgstr "Libanon"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "Honduras"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr ""
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 #, fuzzy
 msgid "Lousiana"
 msgstr "Botswana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "Libanon"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "l�htev�t"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "Luxemburg"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "Latvia"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "Maaliskuu"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "Osumia:"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr ""
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "Meksiko"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr ""
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr ""
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "Kanada"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr ""
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "Malawi"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "Paraguay"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "Malesia"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "Reunukset"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manchester"
 msgstr "Osumia:"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "Romania"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "Liit�"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "Maaliskuu"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "Reunukset"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "Reunukset"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "Reunukset"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "Maaliskuu"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "P�iv�ys"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Merkitse luke_mattomaksi"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Reunukset"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "Reunukset"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "Irlanti"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "Malesia"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr ""
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr ""
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr ""
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr ""
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "Tuo"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "Maaliskuu"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McClellan"
 msgstr "Islanti"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "Yrit"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "Maaliskuu"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "ennen"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "Maanantai"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "Perjantai"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "Meksiko"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 #, fuzzy
 msgid "Miami"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middle East"
 msgstr "_Toinen nimi:"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "_Toinen nimi:"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "Suomi"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "Tiedoston tyyppi:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "Ma"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "tulevat"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 #, fuzzy
 msgid "Minnesota"
 msgstr "minuutti"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "ei ole"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missoula"
 msgstr "Neiti"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Missouri"
 msgstr "Neiti"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitchell"
 msgstr "Osumia:"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "Ma"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "Matkapuhelin"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "Matkapuhelin"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Modesto"
 msgstr "Matalin"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "Siirr�"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "Matkapuhelin"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Moldova"
 msgstr "Maanantai"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 #, fuzzy
 msgid "Molokai"
 msgstr "Malawi"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "Maanantai"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "_Kuukausi"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montana"
 msgstr "Botswana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Kuukausi"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "_Kuukausi"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "Kuukausi"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "Kirjasinlajit"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morelia"
 msgstr "Korealainen"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organisaatio"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "Ensisijainen"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "Matkapuhelin"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "Kuukausi"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Kuukausi"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 #, fuzzy
 msgid "Muncie"
 msgstr "Kes�kuu"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 #, fuzzy
 msgid "Murcia"
 msgstr "It�valta"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "Nti."
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "Kirjasinlajit"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 #, fuzzy
 msgid "Najran"
 msgstr "Bahrain"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "Nimi"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "Varoitus"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "Japani"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "Nimi"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Napoli"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "Italia"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natchez"
 msgstr "Osumia:"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 #, fuzzy
 msgid "Nebraska"
 msgstr "Uusi teht�v�"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "Grenada"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Nevada"
 msgstr "Grenada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "Uusi teht�v�"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr ""
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "Uusi-Seelanti"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "Newcastle"
 msgstr "Keskusteluryhm�t"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Uusi-Seelanti"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Uusi-Seelanti"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "Uusi Kaledonia"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Iberia"
 msgstr "Uusi Kaledonia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "Seuraava viesti"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Mexico"
 msgstr "Meksiko"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "Alankomaat"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "Tuo"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "_Uusi kansio"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "Uusi"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "New York"
 msgstr "_Uusi kansio"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "Mitat:"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "Espanja"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nis"
 msgstr "on"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "Tavallinen"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "Nimi"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "Tavallinen"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr ""
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "Norja"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "Syntym�p�iv�"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "Syntym�p�iv�"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "Norja"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr ""
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "Norja"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "Norja"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "Ei kortteja"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "Thaimaa"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Jamaika"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Oceanside"
 msgstr "Islanti"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "Avaa"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "Avaa"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "Avaa"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "Muut"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 #, fuzzy
 msgid "Ojika Island"
 msgstr "Joulusaaret"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "Neitsytsaaret"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "Muut"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 #, fuzzy
 msgid "Olbia"
 msgstr "Kolumbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 #, fuzzy
 msgid "Omaha"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "Suunta"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oostende"
 msgstr "Osanottaja"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oran"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "Ranska"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 #, fuzzy
 msgid "Oregon"
 msgstr "Alueet"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "Irlanti"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orlando"
 msgstr "Irlanti"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 #, fuzzy
 msgid "Oruro"
 msgstr "Virhe"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr "sekunti"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 #, fuzzy
 msgid "Ostrava"
 msgstr "Australia"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "viikko"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr ""
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "Sivu"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "Paperi"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "Paperi"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "_S�hk�postiasetukset..."
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama City"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Peruutettu"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "Japani"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Paphos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 #, fuzzy
 msgid "Paris"
 msgstr "Ensisij"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "Ensisijainen"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "Salasana"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "Pakistan"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "p�iv��"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "Kysymys"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "Lue"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "K��nn� valinta"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "Georgia"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "Ensisij"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philip"
 msgstr "Filippiinit"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Filippiinit"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 #, fuzzy
 msgid "Phillips"
 msgstr "Filippiinit"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 #, fuzzy
 msgid "Pisa"
 msgstr "Pakistan"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 #, fuzzy
 msgid "Plymouth"
 msgstr "kuukausi"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "Tulosta kirjekuori"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "Kuvaus"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Tulosta viesti"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "Ominaisuudet"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponce"
 msgstr "M��rittelem�t�n"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "Kontaktit"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Tulosta kalenteri"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "Tulosta kirjekuori"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "Pysty"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Tulosta kortti"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Portland"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto"
 msgstr "_Portti:"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "Pysty"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Pysty"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "Pysty"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poza Rica"
 msgstr "Costa Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poznan"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Praha"
 msgstr "Paraguay"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Tulostuksen esikatselu"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Pretoria"
 msgstr "Georgia"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "Esikatselu:"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "Perinteinen"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Providence"
 msgstr "_Osavaltio/l��ni:"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "Esikatselu:"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "Edellinen"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Puebla"
 msgstr "Julkinen"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Pueblo"
 msgstr "Julkinen"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Kysymys"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "Kuvaus"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pula"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Tulosta kalenteri"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "Kysymys"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quebec"
 msgstr "Aihe"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Reading"
 msgstr "Lue"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Rebun Island"
 msgstr "F�rsaaret"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Recife"
 msgstr "Otettu vastaan"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr ""
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "Lue"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redmond"
 msgstr "Muistutus"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "Alueet"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Rennes"
 msgstr "Muistutukset"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Reno"
 msgstr "Poista"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "Libanon"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "S��nn�t"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "vuotta"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reynosa"
 msgstr "Lue"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Suomi"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Rhode Island"
 msgstr "F�rsaaret"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 #, fuzzy
 msgid "Riberalta"
 msgstr "Gibraltar"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "Kutsumanimi"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "Haiti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "Rooli"
 
-#: my-evolution/Locations.h:1881
-#, fuzzy
-msgid "Riga"
-msgstr "Oikea:"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rijeka"
 msgstr "Lue"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 #, fuzzy
 msgid "Rimini"
 msgstr "Romania"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "Nicaragua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "Neitsytsaaret"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Tulosta"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 #, fuzzy
 msgid "Riyadh"
 msgstr "Lue"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Roatan"
 msgstr "Kroatia"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 #, fuzzy
 msgid "Robore"
 msgstr "ennen"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr ""
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Rogers"
 msgstr "Kansiot"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "Romania"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "tuntia"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Roseglen"
 msgstr "Rooli"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "Is�nt�palvelin"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Russia"
 msgstr "It�valta"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 #, fuzzy
 msgid "Rutland"
 msgstr "Bhutan"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 #, fuzzy
 msgid "Sacramento"
 msgstr "Osasto"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 #, fuzzy
 msgid "Saginaw"
 msgstr "Espanja"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "Espanja"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salem"
 msgstr "Tallenna"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "La"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 #, fuzzy
 msgid "Salvador"
 msgstr "El Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "Jamaika"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "Su"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 #, fuzzy
 msgid "San Angelo"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "San Carlos"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "Sudan"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sandberg"
 msgstr "L�hett�j�"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sanderson"
 msgstr "L�hett�j�"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 #, fuzzy
 msgid "San Diego"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 #, fuzzy
 msgid "Sand Point"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr ""
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 #, fuzzy
 msgid "San Francisco"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "Varjostus"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Joaquin"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "Tallenna ja sulje"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Juan"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 #, fuzzy
 msgid "San Miguel"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 #, fuzzy
 msgid "San Salvador"
 msgstr "El Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 #, fuzzy
 msgid "San Sebastian"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 #, fuzzy
 msgid "Santa Maria"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "L�hett�j�"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santarem"
 msgstr "Qatar"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santorini"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "Tila"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr ""
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "Sri Lanka"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "Su"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "Tila"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "Organisaatio"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "Asetukset"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "N�kem�tt�"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "Etsi"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "Varjostus"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "Etsi"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "Lauantai"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "Lauantai"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "Ruotsi"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "K��nn� valinta"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Sheridan"
 msgstr "Sudan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "Koko"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "N�yt� 1 viikko"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 #, fuzzy
 msgid "Sidney"
 msgstr "Tulosta"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Silver City"
 msgstr "Turvallisuus"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "Koko"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skopje"
 msgstr "Pys�yt�"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "L�hetetyt"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "Slovakia"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "minuutti"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr ""
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sofia"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "L�hett�j�"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Carolina"
 msgstr "Etel�-Afrikka"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "L�het�"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "L�hett�j�"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "Espanja"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "Espanja"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "Yksinkertaistettu"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "Asetukset"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "Asetukset"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "Pys�yt�"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "Pys�yt�"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 #, fuzzy
 msgid "St Louis"
 msgstr "Pys�yt� lataaminen"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Sri Lanka"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "Norja"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "St Paul"
 msgstr "Tila"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "Joulusaaret"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "Lauantai"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "L�hde"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Luxemburg"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "Kuvaus"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 #, fuzzy
 msgid "Sutton"
 msgstr "Su"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Perinteinen"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "_Teht�v�"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "Ghana"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 #, fuzzy
 msgid "Taejon"
 msgstr "Sitten"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Taif"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Tainan"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Taiz"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "Taiwan"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 #, fuzzy
 msgid "Tampa"
 msgstr "Japani"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "Paperi"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "Kanada"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Taranto"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "_Teht�v�"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Tarija"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "Perinteinen"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "Lue"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "Tyyppi"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "Texas"
 msgstr "_Teht�v�"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr ""
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "Torstai"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tianjin"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Tijuana"
 msgstr "Liettua"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tirana"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "Pe"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "Henkil�kohtainen"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 #, fuzzy
 msgid "Tokunoshima Island"
 msgstr "Joulusaaret"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 #, fuzzy
 msgid "Toledo"
 msgstr "M��rit�"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Topeka"
 msgstr "Yl�:"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "Yl�:"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torrance"
 msgstr "Ranska"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Torreon"
 msgstr "Korealainen"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Toulouse"
 msgstr "Sulje"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trabzon"
 msgstr "Gabon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 #, fuzzy
 msgid "Trapani"
 msgstr "Japani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "Pe"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "Suunta"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "Edellinen"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "Turkki"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "Tiistai"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "Tunisia"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "Ti"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turaif"
 msgstr "Turkkilainen"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "Turkkilainen"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turku"
 msgstr "Turkki"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "Tyyppi"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "Ti"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "Yhdistyneet arabiemiirikunnat"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 #, fuzzy
 msgid "Unst"
 msgstr "N�hty"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruapan"
 msgstr "Japani"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Uruguay"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 #, fuzzy
 msgid "Utah"
 msgstr "."
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr ""
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Sulje"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vagar"
 msgstr "Qatar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valencia"
 msgstr "Kalenteri"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr ""
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "Peruuta"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 #, fuzzy
 msgid "Varadero"
 msgstr "Barbados"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Varna"
 msgstr "Ghana"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "j�lkeen"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 #, fuzzy
 msgid "Venezia"
 msgstr "Venezuela"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 #, fuzzy
 msgid "Venice"
 msgstr "Unicode"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vermont"
 msgstr "kuukausi"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "Yleiset"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 #, fuzzy
 msgid "Vicenza"
 msgstr "Venezuela"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "Tiedostonimi:"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "Australia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "Suomi"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volkel"
 msgstr "Rooli"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 #, fuzzy
 msgid "Volk Field"
 msgstr "_Kopio-kentt�"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 #, fuzzy
 msgid "Waco"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 #, fuzzy
 msgid "Wallops Island"
 msgstr "Falklandsaaret"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "Varoitus"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "S��tiedot"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Waterloo"
 msgstr "S��tiedot"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "S��tiedot"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 #, fuzzy
 msgid "Waterville"
 msgstr "Ryhm�t"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "Ke"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "S��tiedot"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 #, fuzzy
 msgid "Wendover"
 msgstr "L�hett�j�"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "West Burke"
 msgstr "L�nsieurooppalainen"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "Alankomaat"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "Varjostus"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "Joulusaaret"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 #, fuzzy
 msgid "Wien"
 msgstr "Ke"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 #, fuzzy
 msgid "Winchester"
 msgstr "Liechtenstein"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 #, fuzzy
 msgid "Winslow"
 msgstr "nyt"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 #, fuzzy
 msgid "Winter Park"
 msgstr "Salasana"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 #, fuzzy
 msgid "Wisconsin"
 msgstr "sekuntia"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "Ke"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "Hong Kong"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "Alatunniste:"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "L�hteet"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "Puola"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "tulevat"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 #, fuzzy
 msgid "Xiamen"
 msgstr "Nimi"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 #, fuzzy
 msgid "Yao Airport"
 msgstr "�l� tuo"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 #, fuzzy
 msgid "Yenbo"
 msgstr "Jemen"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zadar"
 msgstr "Kalenteri"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 #, fuzzy
 msgid "Zagreb"
 msgstr "Sivu"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zanesville"
 msgstr "Peruutettu"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 #, fuzzy
 msgid "Zaragoza"
 msgstr "Paraguay"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 #, fuzzy
 msgid "Zurich"
 msgstr "Turkkilainen"
@@ -23210,18 +23963,12 @@ msgstr "%A %d %B"
 msgid "No description"
 msgstr "Kuvaus:"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Postin yhteenveto"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-#, fuzzy
-msgid "VFolders"
-msgstr "Kansiot"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
@@ -23230,57 +23977,47 @@ msgstr "Paikalliset kansiot"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Nimi:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Virhe ladattaessa RDF:��</b>"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
-msgstr "_Lis��"
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "Poista"
+msgid "Add"
+msgstr "Lis��"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "N�yt� kaikki"
@@ -23327,10 +24064,46 @@ msgstr "Kuvaus"
 msgid "Printing of Summary failed"
 msgstr "Viestin tulostus ep�onnistui"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Kirjasinlajit"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Siirret��n"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "Suodattimet"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "Suodattimet"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr ""
@@ -24484,109 +25257,114 @@ msgid "C_elsius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Poista t�m� kansio"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Kuinka monta p�iv�� kalenterissa n�ytet��n kerrallaan?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "One mont_h"
 msgstr "Yksi kuukausi"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "One w_eek"
 msgstr "Yksi �viikko"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 #, fuzzy
 msgid "R_efresh time (seconds):"
 msgstr "Virkistysaika (sekunneissa):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "Refresh _time (seconds):"
 msgstr "Virkistysaika (sekunneissa):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "N�yt� t�ydet _otsikkotiedot"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "Show _all tasks"
 msgstr "N�yt� kaikki teht�v�t"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "N�yt� t�m�np�iv�iset teht�v�t"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Teht�v�t "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "_Five days"
 msgstr "Viisi p�iv��"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "_Mail"
 msgstr "_Matkapuhelin"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Yksi p�iv�"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_S��tiedot"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
+msgid "Configuration control for Evolution folder settings."
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Erikoiskansiot"
+msgid "Folder Settings"
+msgstr "Asetukset"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution-kuori."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -24597,6 +25375,37 @@ msgstr "N�yt� yksityiskohdat"
 msgid "Cancel Operation"
 msgstr "Peruuta operaatio"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Valitse kansio"
+
+#: shell/e-local-storage.c:174
+#, fuzzy
+msgid "Drafts"
+msgstr "Luonnos"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Saapuneet"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "L�htev�t"
+
+#: shell/e-local-storage.c:177
+#, fuzzy
+msgid "Sent"
+msgstr "N�kem�tt�"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolutionin asennus"
@@ -24692,6 +25501,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Kopioi t�m� kansio"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Erikoiskansiot"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Erikoiskansiot"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Erikoiskansiot"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Kopioi t�m� kansio"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -24719,55 +25553,54 @@ msgstr ""
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Kopioi kansio"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Siir� kansio"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Poista"
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
+#: shell/e-shell-folder-commands.c:407
 #, fuzzy, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Haluatko todella poistaa kansion '%s'?"
+msgid "Really delete folder \"%s\"?"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nime� kansio '%s' uudelleen"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Nime� kansio '%s' uudelleen"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24784,13 +25617,13 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Uusi..."
 
@@ -24832,111 +25665,158 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Valitse kansio"
+
+#: shell/e-shell-importer.c:498
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Kansiota `%s' ei ole olemassa."
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Virhe %s:n k�ynnistyksess�"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Virhe %s:n lataamisessa"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Tiedoston tyyppi:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "L�hett�j�:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Tuo"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr ""
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr "Virhe %s:n k�ynnistyksess�"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Synkronoidaan kansiota"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Synkronoidaan kansiota"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Poistetaan kansiota %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "L�hetet��n \"%s\""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+
 #: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
@@ -24949,8 +25829,8 @@ msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Uusi"
@@ -24973,45 +25853,45 @@ msgstr "T�m� kansio ei voi sis�lt�� viestej�."
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug budday ei l�ytynyt $PATH:istasi."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Tietoja Evolutionista..."
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Siirry kansioon..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 #, fuzzy
 msgid "_Work Online"
 msgstr "Ty�skentele linjoilla"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Ty�skentele poissa linjoilta"
 
@@ -25043,7 +25923,7 @@ msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25051,12 +25931,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25064,23 +25944,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -25103,97 +25979,97 @@ msgstr ""
 msgid "Don't remove"
 msgstr "�l� poista"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Nime� oikotieryhm� uudelleen"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Oikotieryhm�n uusi nimi:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Pienet kuvakkeet"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "N�yt� oikotiet pienin� kuvakkeina"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "_Suuret kuvakkeet"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "N�yt� oikotiet suurina kuvakkeina"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Uusi ryhm�..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Luo uusi oikotieryhm�"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "Poista t�m� _ryhm�..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Poista t�m� oikotieryhm�"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "_Nime� t�m� ryhm� uudelleen..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Nime� t�m� oikotieryhm� uudelleen"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "_Piilota oikotiepalkki"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Piilota oikotiepalkki"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Nime� oikotie uudelleen"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Oikotien uusi nimi:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Avaa t�m�n oikotien osoittama kansio"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Avaa uudessa _ikkunassa"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Avaa t�m�n oikotien osoittama kansio uudessa ikkunassa"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 #, fuzzy
 msgid "_Rename"
 msgstr "Nime� uudelleen"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Nime� t�m� oikotie uudelleen"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 #, fuzzy
 msgid "Re_move"
 msgstr "Poista"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Poista t�m� oikotie oikotiepalkista"
 
@@ -25205,10 +26081,6 @@ msgstr "Virhe tallennettaessa oikoteit�."
 msgid "Shortcuts"
 msgstr "Oikotiet"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Saapuneet"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -25272,10 +26144,11 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -25305,74 +26178,74 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 #, fuzzy
 msgid "CORBA error"
 msgstr "I/O-virhe"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 #, fuzzy
 msgid "No owner"
 msgstr "M��rittelem�t�n"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Tar_kista tuetut tavat"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 #, fuzzy
 msgid "Internal error"
 msgstr "I/O-virhe"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 #, fuzzy
 msgid "Exists"
 msgstr "_Poistu"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Luonnoskansio:"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 #, fuzzy
 msgid "No space left"
 msgstr "Ei viestej� valittuna"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Tiedoston tyyppi:"
@@ -25499,50 +26372,84 @@ msgstr "�l� kysy t�t� en�� uudelleen"
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolutionin aseukseni"
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"Kiitos\n"
+"The Evolution Team\n"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "�l� kysy t�t� en�� uudelleen"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Aloita uudelta sivulta"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Aloita uudelta sivulta"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttij�rjestelm�n alustus ep�onnistui"
 
@@ -25660,11 +26567,11 @@ msgstr "Tallenna nykyinen tiedosto"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "T_oiminnot"
 
@@ -25799,8 +26706,8 @@ msgstr "Poista t�m� kohta"
 msgid "Delete this item"
 msgstr "Poista t�m� kohta"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr ""
 
@@ -25841,7 +26748,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Tiedosto"
 
@@ -25907,19 +26814,19 @@ msgstr ""
 msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr ""
 
@@ -25927,10 +26834,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Peruuta"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Peruuta nykyinen postioperaatio"
@@ -26085,7 +26988,7 @@ msgstr "S�ikeistetty viesti-ikkuna"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Kansio"
 
@@ -26502,7 +27405,7 @@ msgstr "Edellinen viesti"
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "T_y�kalut"
 
@@ -26517,12 +27420,12 @@ msgstr "Sulje t�m� ikkuna"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_Sulje"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_N�yt�"
 
@@ -26711,7 +27614,7 @@ msgstr "_Avaa..."
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kentt�"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Ohje"
 
@@ -26862,115 +27765,124 @@ msgid "Move this folder to another place"
 msgstr "Siirr� t�m� kansio toiseen paikkaan"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Luo _uusi kansio"
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Avaa uudessa ikkunassa"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Avaa valittu kansio uudessa ikkunassa"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "L�het� / Vastaanota"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "L�het� jonossa olevat viestit ja hae uudet viestit"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "L�het� virheraportti"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "L�het� _virheraportti"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "L�het� virheraportti k�ytt�en Bug Buddy:a"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "M��rit�"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "M��rit�, n�ytet��nk� kansiopalkki"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "M��rit�, n�ytet��nk� oikotiepalkki"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "M��rit�, ty�skennell��nk� poissa linjoilta."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Tietoja Evolutionista..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_Kansiopalkki"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Import..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Siirr�..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Uusi"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Uusi kansio"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "_S�hk�postiasetukset..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Nime� uudelleen..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_L�het� / Vastaanota"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Oikotie"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "_Oikotiepalkki"
 
@@ -27059,21 +27971,21 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Nykyinen n�kym�"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "_Nykyinen n�kym�"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr ""
 
@@ -27195,16 +28107,21 @@ msgstr ""
 msgid "Save Search"
 msgstr "Tallenna haku"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Tallenna haku"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Tallenna haku"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Edistyneet..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Tiedoksi"
@@ -27226,22 +28143,22 @@ msgstr "Viesti"
 msgid "Don't show this message again."
 msgstr "�l� n�yt� t�t� viesti� uudelleen."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Etsi nyt"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Kalenteri"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 #, fuzzy
 msgid "Clear"
 msgstr "Kalenteri"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Etsi nyt"
 
@@ -27267,6 +28184,139 @@ msgstr "init_corba(): GNOME:n alustus ep�onnistui"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Osoitekirjal�hteet"
+
+#, fuzzy
+#~ msgid "Sta_rt of day:"
+#~ msgstr "P�iv�n alku:"
+
+#, fuzzy
+#~ msgid "_End of day:"
+#~ msgstr "P�iv�n loppu:"
+
+#, fuzzy
+#~ msgid "_Other Organizer"
+#~ msgstr "Organisoija:"
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Viesti� ei voida l�hett��: l�hett�j�n osoite on ep�kelpo."
+
+#, fuzzy
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Putken luominen GPG/PGP:lle ep�onnistui: %s"
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
+
+#, fuzzy
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
+
+#, fuzzy
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Putken luominen GPG/PGP:lle ep�onnistui: %s"
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Viesti� ei voida l�hett��: l�hett�j�n osoite on ep�kelpo."
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Putken luominen GPG/PGP:lle ep�onnistui: %s"
+
+#, fuzzy
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
+
+#, fuzzy
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Putken luominen GPG/PGP:lle ep�onnistui: %s"
+
+#~ msgid "No such message: %s"
+#~ msgstr "Ei kyseist� viesti�: %s"
+
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Et voi kopioida viestej� t�st� roskakorista."
+
+#, fuzzy
+#~ msgid "Could not file: %s: %s"
+#~ msgstr ""
+#~ "Tiedoston %s poistaminen ep�onnistui:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Lue"
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "_Muokkaa"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Uusi"
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Peruuta operaatio"
+
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Allekirjoitustiedosto:"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Poista kaikki paitsi allekirjoitus"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "_HTML-allekirjoitus:"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Tiedostonimi:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "_HTML-allekirjoitus:"
+
+#~ msgid "Moving"
+#~ msgstr "Siirret��n"
+
+#~ msgid "Copying"
+#~ msgstr "Kopioidaan"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Allekirjoitustiedosto:"
+
+#, fuzzy
+#~ msgid "Riga"
+#~ msgstr "Oikea:"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_Lis��"
+
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "Poista"
+
+#, fuzzy
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Haluatko todella poistaa kansion '%s'?"
+
 #~ msgid ""
 #~ "\n"
 #~ "Name: "
@@ -27459,12 +28509,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "The information below is required in order to add an addressbook.  "
 #~ msgstr "Allaolevat tiedot vaaditaan osoitekirjan lis��miseksi.  "
 
-#~ msgid "_My server requires authentication"
-#~ msgstr "Palveli_meni vaati todennuksen"
-
-#~ msgid "Other Contacts"
-#~ msgstr "Muut kontaktit"
-
 #~ msgid "Co_ntacts:"
 #~ msgstr "Ko_ntaktit:"
 
@@ -27486,13 +28530,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "_Mobile"
 #~ msgstr "_Matkapuhelin"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "Haluatko varmasti\n"
-#~ "poistaa t�m�n kontaktin?"
-
 #~ msgid "Create a new appointment"
 #~ msgstr "Luo uusi tapaaminen"
 
@@ -27511,210 +28548,10 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "_Other"
 #~ msgstr "Muut"
 
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
-
 #, fuzzy
 #~ msgid "_Delete this Task"
 #~ msgstr "Poista t�m� teht�v�"
 
-#, fuzzy
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "L�hteen tiedot"
-
-#, fuzzy
-#~ msgid "Task begins: <b>"
-#~ msgstr "Valmis"
-
-#, fuzzy
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "L�hteen tiedot"
-
-#, fuzzy
-#~ msgid "Begins: <b>"
-#~ msgstr "L�hteen tiedot"
-
-#, fuzzy
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "L�hteen tiedot"
-
-#, fuzzy
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "L�hteen tiedot"
-
-#, fuzzy
-#~ msgid "Ends: <b>"
-#~ msgstr "L�hteen tiedot"
-
-#, fuzzy
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Valmis"
-
-#, fuzzy
-#~ msgid "Task Due: <b>"
-#~ msgstr "Valmis"
-
-#, fuzzy
-#~ msgid "iCalendar Information"
-#~ msgstr "Pakolliset tiedot"
-
-#, fuzzy
-#~ msgid "iCalendar Error"
-#~ msgstr "Kalenteri"
-
-#, fuzzy
-#~ msgid "An unknown person"
-#~ msgstr "Tuntematon virhe"
-
-#, fuzzy
-#~ msgid "Choose an action:"
-#~ msgstr "Valitse toiminto"
-
-#, fuzzy
-#~ msgid "Update"
-#~ msgstr "Teht�v�t"
-
-#, fuzzy
-#~ msgid "Accept"
-#~ msgstr "Hyv�ksy "
-
-#, fuzzy
-#~ msgid "Decline"
-#~ msgstr "Poistettu"
-
-#, fuzzy
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "L�hteen tiedot"
-
-#, fuzzy
-#~ msgid "Send Latest Information"
-#~ msgstr "Tiedoksi"
-
-#, fuzzy
-#~ msgid "Meeting Information"
-#~ msgstr "Valinnaiset tiedot"
-
-#, fuzzy
-#~ msgid "Meeting Proposal"
-#~ msgstr "Peruuta tapaaminen"
-
-#, fuzzy
-#~ msgid "Meeting Update"
-#~ msgstr "Peruuta tapaaminen"
-
-#, fuzzy
-#~ msgid "Meeting Update Request"
-#~ msgstr "Peruuta tapaaminen"
-
-#, fuzzy
-#~ msgid "Meeting Reply"
-#~ msgstr "Peruuta tapaaminen"
-
-#, fuzzy
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Valitse toiminto"
-
-#, fuzzy
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Hae viestist�"
-
-#, fuzzy
-#~ msgid "Task Information"
-#~ msgstr "Tiedoksi"
-
-#, fuzzy
-#~ msgid "Task Proposal"
-#~ msgstr "Peruuta tapaaminen"
-
-#, fuzzy
-#~ msgid "Task Update"
-#~ msgstr "Teht�v�t"
-
-#, fuzzy
-#~ msgid "Task Update Request"
-#~ msgstr "Teht�v�t"
-
-#, fuzzy
-#~ msgid "Task Reply"
-#~ msgstr "Vastaa"
-
-#, fuzzy
-#~ msgid "Task Cancellation"
-#~ msgstr "Peruuta operaatio"
-
-#, fuzzy
-#~ msgid "Bad Task Message"
-#~ msgstr "Hae viestist�"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "Pakolliset tiedot"
-
-#, fuzzy
-#~ msgid "Free/Busy Information"
-#~ msgstr "L�hteen tiedot"
-
-#, fuzzy
-#~ msgid "Free/Busy Request"
-#~ msgstr "Edellinen viesti"
-
-#, fuzzy
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Edellinen viesti"
-
-#, fuzzy
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Edellinen viesti"
-
-#, fuzzy
-#~ msgid "Status: %s"
-#~ msgstr "_Tila:"
-
-#, fuzzy
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Valmis"
-
-#, fuzzy
-#~ msgid "URL: %s"
-#~ msgstr "URL:"
-
-#, fuzzy
-#~ msgid "Categories: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Ryhm�t: "
-
-#, fuzzy
-#~ msgid "Contacts: "
-#~ msgstr "Ko_ntaktit:"
-
 #~ msgid "Failed to send username to server"
 #~ msgstr "K�ytt�j�tunnuksen l�hetys palvelimelle ep�onnistui"
 
@@ -27733,9 +28570,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "(Unknown)"
 #~ msgstr "(tuntematon)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Odottamaton vastaus POP-palvelimelta: %s"
-
 #~ msgid "Cannot send message: sender address not defined."
 #~ msgstr "Viesti� ei voida l�hett��: l�hett�j�n osoitetta ei ole m��ritelty."
 
@@ -27753,12 +28587,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "New _Mail Message"
 #~ msgstr "Seuraava viesti"
 
-#~ msgid " (default)"
-#~ msgstr " (oletus)"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Aihe on %s"
-
 #, fuzzy
 #~ msgid "%s: Inbox"
 #~ msgstr "Saapuneet"
@@ -27769,9 +28597,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "Edit..."
 #~ msgstr "Muokkaa..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML-allekirjoitustiedosto:"
-
 #~ msgid "_Email Address:"
 #~ msgstr "S�hk�postiosoit_e:"
 
@@ -27798,14 +28623,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgstr "<dd><b>S��tietopalvelimeen ei saatu yhteytt�</b></dd>"
 
 #, fuzzy
-#~ msgid "inHg"
-#~ msgstr "Siirret��n"
-
-#, fuzzy
-#~ msgid "kilometers"
-#~ msgstr "Suodattimet"
-
-#, fuzzy
 #~ msgid "All _folders:"
 #~ msgstr "Paikalliset kansiot"
 
@@ -27813,18 +28630,9 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "_Display folders:"
 #~ msgstr "N�yt� toinen kansio"
 
-#~ msgid "Outbox"
-#~ msgstr "L�htev�t"
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#, fuzzy
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr "Kansion hakeminen ei onnistu: %s: %s"
-
 #~ msgid "(No name)"
 #~ msgstr "(Ei nime�)"
 
@@ -27912,11 +28720,3 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #, fuzzy
 #~ msgid "%s - Ximian Evolution %s [%s]"
 #~ msgstr "%s - Evolution %s [%s]"
-
-#, fuzzy
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Ximian Evolution Team\n"
-#~ msgstr ""
-#~ "Kiitos\n"
-#~ "The Evolution Team\n"
diff --git a/po/fr.po b/po/fr.po
index bb28c18eea..ed33cbffe1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1.0.99\n"
-"POT-Creation-Date: 2002-05-14 02:41+0200\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-05-14 02:20+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <christophe@merlet.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -37,7 +37,7 @@ msgstr "Importation fichiers VCard dans Evolution"
 msgid "File As"
 msgstr "Classer comme"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nom"
@@ -48,7 +48,7 @@ msgid "Email"
 msgstr "E-mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Principal"
 
@@ -58,7 +58,7 @@ msgstr "Prin."
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Adjoint"
@@ -66,8 +66,8 @@ msgstr "Adjoint"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Profession"
 
@@ -77,12 +77,12 @@ msgid "Bus"
 msgstr "Prof."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Répondeur"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Société"
 
@@ -93,8 +93,8 @@ msgstr "Soc."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Maison"
 
@@ -109,18 +109,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Mobile"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Voiture"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax professionnel"
@@ -130,13 +130,13 @@ msgid "Bus Fax"
 msgstr "Fax prof."
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax maison"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Travail 2"
 
@@ -145,43 +145,43 @@ msgid "Bus 2"
 msgstr "Prof. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Maison 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "RNIS"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Autre"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Fax Autre"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
@@ -193,14 +193,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-mail 3"
@@ -338,7 +338,7 @@ msgstr "VCard pour %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -346,7 +346,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Ne peut initialiser Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Recherche..."
 
@@ -359,31 +359,31 @@ msgstr "Chargement"
 msgid "Error in search expression."
 msgstr "Erreur dans l'expression de recherche."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Ajout de la carte sur le serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Suppression de la carte du serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Modification de la carte du serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Redémarrage de la recherche."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Récupération des résultats de recherche LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 msgid "Error performing search"
 msgstr "Erreur lors de la recherche"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 msgid "Could not parse query string"
 msgstr "Ne peut analyser la chaîne de recherche"
 
@@ -430,107 +430,138 @@ msgstr "Un contrôle Bonobo qui affiche un carnet d'adresses."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #, fuzzy
-msgid "Addressbook Settings"
-msgstr "Sources du carnet d'adresses"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr "Contrôle de configuration pour le carnet d'adresse d'Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr "Contrôle de configuration pour le carnet d'adresse d'Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Contrôle qui affiche une mini-Card du carnet d'adresses."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr "Serveurs de répertoire"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Visualisateur de minicard du carnet d'adresses"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Composant pour le traitement des contacts."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Utilitaire de contrôle Minicard du carnet d'adresses"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Utilitaire d'affichage des adresses du carnet"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Usine à composants pour les popups d'adresse du carnet d'adresse"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 "Usine pour le composant de configuration du carnet d'adresses d'Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Usine à composants pour l'exemple de composant Carnet d'adresses"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-#, fuzzy
-msgid "This page can be used to configure Addressbook Settings"
-msgstr "Cette page peut être utilisée pour configurer l'éditeur"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 #, fuzzy
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 "Cette page peut être utilisée pour configurer l'accès à des serveurs "
 "d'annuaire avec le protocole LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:172
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Contacts"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Dossier contenant les informations de contact"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "Serveur LDAP contenant les inforamtions des contacts"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Nouvelle liste de contacts"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "_Liste de Contacts"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Contacts"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Nouvelle liste de contacts"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Échec d'envoi du nom d'utilisateur au serveur"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "Contact _List"
-msgstr "_Liste de Contacts"
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Impossible de vous identifier sur le serveur IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+#, fuzzy
+msgid "Could not perform query on Root DSE"
+msgstr "Ne peut analyser la chaîne de recherche"
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "La réponse du serveur IMAP ne contient pas l'information %s"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Erreur de chargement des information du filtre :\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "La réponse du serveur IMAP ne contient pas l'information %s"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL n'est pas supporté dans cette compilation d'évolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Ne peut initialiser gnome-vfs"
 
@@ -571,42 +602,42 @@ msgstr ""
 "Nous n'avons pas pu ouvrir ce carnet d'adresse. Veuillez vérifiez\n"
 "que le chemin existe et que vous avez la permission d'accès."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 msgid "Name begins with"
 msgstr "Nom commence par"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 msgid "Email is"
 msgstr "Adresse est"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "La catégorie est"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Avancée..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Toute catégorie"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que le navigateur de dossier affichera"
 
@@ -621,7 +652,7 @@ msgstr "(Inconnu)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "E-mail principal"
 
@@ -667,106 +698,57 @@ msgstr "Désactiver les interrogations"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Activer les Interrogations (Dangereux!)"
 
-#: addressbook/gui/component/addressbook-config.c:198
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Échec d'envoi du nom d'utilisateur au serveur"
-
-#: addressbook/gui/component/addressbook-config.c:217
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Impossible de vous identifier sur le serveur IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:240
-#, fuzzy
-msgid "Could not perform query on Root DSE"
-msgstr "Ne peut analyser la chaîne de recherche"
-
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1153
-#, fuzzy
-msgid "This server does not support LDAPv3 schema information"
-msgstr "La réponse du serveur IMAP ne contient pas l'information %s"
-
-#: addressbook/gui/component/addressbook-config.c:1175
-#, fuzzy
-msgid "Error retrieving schema information"
-msgstr ""
-"Erreur de chargement des information du filtre :\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1183
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "La réponse du serveur IMAP ne contient pas l'information %s"
-
-#: addressbook/gui/component/addressbook-config.c:1628
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL n'est pas supporté dans cette compilation d'évolution)"
-
-#: addressbook/gui/component/addressbook-config.c:1704
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Date d'Achèvement"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "_Vérifier les types supportés"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "&lt;&lt; Fewer Options"
-msgstr "Options"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "&lt;- _Remove"
-msgstr "<- Supprimer"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr "1234"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr "2:30"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "380"
 msgstr "380"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr "666"
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "<- Supprimer"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Options"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -775,8 +757,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Sources du carnet d'adresses"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "Toujours"
 
@@ -872,8 +854,8 @@ msgstr "Configuration"
 msgid "Mappings"
 msgstr "Marges"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Jamais"
 
@@ -1125,7 +1107,7 @@ msgid "Using email address"
 msgstr "Adresse électronique"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:134
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr "Lorsque c'est possible"
 
@@ -1133,13 +1115,14 @@ msgstr "Lorsque c'est possible"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Ajouter"
 
 #: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add -&gt;"
-msgstr "_Ajouter -&gt;"
+#, fuzzy
+msgid "_Add ->"
+msgstr "Ajouter ->"
 
 #: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
@@ -1180,7 +1163,7 @@ msgid "_Download limit:"
 msgstr "Limite de _téléchargement"
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1217,7 +1200,7 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:121
 #, fuzzy
-msgid "_More Options &gt;&gt;"
+msgid "_More Options >>"
 msgstr "_Options"
 
 #: addressbook/gui/component/ldap-config.glade.h:122
@@ -1303,7 +1286,7 @@ msgstr ""
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:502
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
 #: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Supprimer"
@@ -1435,7 +1418,7 @@ msgstr "Collaboration"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Éditeur de contacts"
 
@@ -1444,7 +1427,7 @@ msgid "D_epartment:"
 msgstr "_Service :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Détails"
 
@@ -1503,11 +1486,12 @@ msgstr "Veut recevoir des messages _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:148
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:41
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Supprimer"
 
@@ -1536,7 +1520,7 @@ msgid "_Web page address:"
 msgstr "Adresse page _Web :"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Etats Unis"
 
@@ -2041,12 +2025,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Lettonie"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Liban"
 
@@ -2055,7 +2038,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Libéria"
 
@@ -2064,12 +2047,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lithuanie"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
@@ -2102,7 +2085,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malte"
 
@@ -2127,7 +2110,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexique"
 
@@ -2152,7 +2135,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Maroc"
 
@@ -2177,7 +2160,7 @@ msgid "Nepal"
 msgstr "Népal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Pays-Bas"
 
@@ -2190,12 +2173,12 @@ msgid "New Caledonia"
 msgstr "Nouvelle Calédonie"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nouvelle Zélande"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2212,7 +2195,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Ile Norfolk"
 
@@ -2221,17 +2204,17 @@ msgid "Northern Mariana Islands"
 msgstr "Iles Marianes"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norvège"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2244,7 +2227,7 @@ msgid "Palestinian Territory"
 msgstr "Territoire paléstinien"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2253,12 +2236,12 @@ msgid "Papua New Guinea"
 msgstr "Papouasie Nouvelle Guinée"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Pérou"
 
@@ -2271,22 +2254,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Pologne"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Prto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Quatar"
 
@@ -2295,7 +2278,7 @@ msgid "Reunion"
 msgstr "La Réunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Roumanie"
 
@@ -2332,7 +2315,7 @@ msgid "Sao Tome And Principe"
 msgstr "Säo Tome et Pricipe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Arabie Saoudite"
 
@@ -2349,17 +2332,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapour"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovaquie"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slovénie"
 
@@ -2372,7 +2355,7 @@ msgid "Somalia"
 msgstr "Somalie"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Afrique du Sud"
 
@@ -2381,7 +2364,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Georgie du Sud et Iles Sandwitch"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Espagne"
 
@@ -2402,7 +2385,7 @@ msgid "Sudan"
 msgstr "Soudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -2415,17 +2398,17 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Suède"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Suisse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
@@ -2462,7 +2445,7 @@ msgid "Tunisia"
 msgstr "Tunisie"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turquie"
 
@@ -2483,7 +2466,7 @@ msgid "Uganda"
 msgstr "Ouganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraine"
 
@@ -2492,7 +2475,7 @@ msgid "United Arab Emirates"
 msgstr "Emirats Unis"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Grande Bretagne"
 
@@ -2501,7 +2484,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "Iles isolées (US)"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2514,12 +2497,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Vénézuéla"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2540,12 +2523,12 @@ msgid "Western Sahara"
 msgstr "Sahara Occidental"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yémen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Yougoslavie"
 
@@ -2569,23 +2552,23 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Supprimer le contact ?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Editeur de catégorie non disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Ce contact appartient à ces catégories : "
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Enregistrer comme VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Ne peut trouver un widget pour un champ :  « %s »"
@@ -2612,11 +2595,11 @@ msgstr "E-mail"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2753,11 +2736,11 @@ msgid "contact-list-editor"
 msgstr "Éditeur de liste de contacts"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Éditeur de liste de contacts"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Enregistrer la liste comme VCard"
 
@@ -2834,21 +2817,21 @@ msgid "Error getting book view"
 msgstr "Erreur d'obtention de la vue livre"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Erreur lors de la modification de la carte"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Succès"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:505 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -2857,7 +2840,7 @@ msgid "Repository offline"
 msgstr "Repository Hors ligne"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Permission refusée"
 
@@ -2876,53 +2859,67 @@ msgstr "Protocole non supporté"
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2299
-#: camel/camel-service.c:737 camel/camel-service.c:777
-#: camel/camel-service.c:845 camel/camel-service.c:888
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Annulée"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr " Échec d'authentification"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Identification requise"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Autre Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Voulez-vous enregistrer les modifications ?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Ajout liste : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Ajout carte : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Modification de liste : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Suppression de liste : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Suppression de carte : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 msgid "Display Cards?"
 msgstr "Afficher les cartes ?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards"
 msgstr "Afficher les cartes"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2933,19 +2930,19 @@ msgstr ""
 "ouvrir\n"
 "%d nouvelles fenêtres sour votre écran. Voulez-vous vraiment tout afficher ?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 msgid "Move card to"
 msgstr "Déplacer la carte vers"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Copy card to"
 msgstr "Copier la carte vers"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 msgid "Move cards to"
 msgstr "Déplacer les cartes vers"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 msgid "Copy cards to"
 msgstr "Copier les cartes vers"
 
@@ -3009,98 +3006,104 @@ msgstr "Autre Téléphone"
 msgid "Other Address"
 msgstr "Autre adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Carnet d'adresses"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Enregistrer comme VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "New Contact..."
 msgstr "Nouveau contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "New Contact List..."
 msgstr "Nouvelle liste de contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Aller au dossier..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Importer..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Rechercher des contacts"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Sources du carnet d'adresses"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Paramétrage du Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Faire suivre au contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Envoyer un _message au contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimer"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Imprimer En_veloppe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Copy to folder..."
 msgstr "Copier vers le dossier..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Move to folder..."
 msgstr "Déplacer vers le dossier..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Couper"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Coller"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Supprimer"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3110,7 +3113,7 @@ msgstr "Vue _courante"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3118,7 +3121,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3266,7 +3269,7 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Nombre de colonnes :"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Options"
 
@@ -3276,7 +3279,7 @@ msgid "Orientation"
 msgstr "Orientation"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Page"
 
@@ -3350,33 +3353,33 @@ msgstr "Largeur :"
 msgid "_Font..."
 msgstr "_Police..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Rendez-vous sans titre"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:416 mail/message-list.c:684
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Haute"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:417 mail/message-list.c:683
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:682
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Basse"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Indéfinie"
 
@@ -3416,43 +3419,35 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Contrôle de configuration du calendrier d'Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Composant « Résumé du calendrier » du Résumé d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Afficheur Calendrier iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Composant pour le traitement du calendrier"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Utilitaire pour le composant Résumé Calendrier."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Utilitaire pour le composant tâches d'Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Utilitaire de contrôle de la vue iTip du Calendrier"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Utilitaire de contrôle du Calendrier"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 "Usine à composants pour centraliser les éditeurs de composants du calendrier"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Usine à composants pour créer les usines à éditeurs de composant"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 "Cette page peut être utilisée pour configurer le Calendrier et les Tâches"
@@ -3522,7 +3517,7 @@ msgstr ""
 "d'avertissement classique à la place."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2616
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avertissement"
@@ -3548,15 +3543,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ne plus me demander à propos de ce programme."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Ne peut initialiser GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "Impossible de créer le service de notification d'alarme"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "Impossible de créer l'usine à services de notification d'alarme"
 
@@ -3613,16 +3608,16 @@ msgstr ""
 "d'ORBit et d'OAF."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:395
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privé"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:396
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidentiel"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:394
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "_Public"
 
@@ -3643,32 +3638,32 @@ msgid "W"
 msgstr "O"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:468
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:469
-#: calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Occupé"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:489 calendar/gui/print.c:2290
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Non démarrée"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:490 calendar/gui/print.c:2293
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "En cours"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2296
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Achevée"
 
@@ -3683,12 +3678,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:439
-#: mail/mail-accounts.c:448 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:76 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3703,14 +3698,14 @@ msgstr "Récurrant"
 msgid "Assigned"
 msgstr "Attribué"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
-#: calendar/gui/e-meeting-model.c:821
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Oui"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Non"
 
@@ -3730,58 +3725,58 @@ msgstr "Vue hebdomadaire"
 msgid "Month View"
 msgstr "Vue mensuelle"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:171
-#: shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Dossier contenant des rendez-vous et des événements"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/print.c:1777
-#: calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:177
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
 #: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tâches"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Dossier contenant des éléments « À Faire »"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "New meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "_Meeting"
 msgstr "Ré_union"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "New task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Tâche"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 msgid "New All Day Appointment"
 msgstr "Nouveau rendez-vous quotidien"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 msgid "All _Day Appointment"
 msgstr "Rendez-vous _journée entière"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "New appointment"
 msgstr "Nouveau RDV"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "_Appointment"
 msgstr "_Rendez-vous"
 
@@ -4020,7 +4015,7 @@ msgstr "Fin du rendez-vous"
 msgid "hour(s)"
 msgstr "heure(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:186
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -4048,79 +4043,81 @@ msgstr "30 minutes"
 msgid "60 minutes"
 msgstr "60 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Paramètrage du calendrier et des tâches"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Couleur des tâches en retard"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Couleur des tâches du jour"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Jours"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Vendredi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Heures"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Lundi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "_Dim"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Samedi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Afficher les numéros de semaine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "_Début de la journée :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "_Dim"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "_Tâches d'aujourd'hui :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "_Jeu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "_Mar"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Task List"
 msgstr "Liste des tâches"
@@ -4148,81 +4145,96 @@ msgid "Tuesday"
 msgstr "Mardi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Sem. Travail"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 heures (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 heures"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Demander une confirmation pour l'effacement des éléments"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_Compresser les week-ends dans la vue mensuelle"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "La tâche commence : <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Affichage"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "_Fin de la journée :"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:156
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Général"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_Cacher les tâches achevées après"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Tâches en _retard :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_Sam"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Afficher l'heure de fin des rendez-vous"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Di_visions horaires :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_Mar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "M_er"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "Avant le début du  rendez-vous"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4309,40 +4321,61 @@ msgstr " (Date d'échéance "
 msgid "Due "
 msgstr "Date d'échéance "
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
 msgstr "Impossible de mettre à jour l'objet !"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Impossible de mettre à jour l'objet !"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Éditer le rendez-vous"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Tâche - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrée de journal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Aucun résumé"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Récupération de la version courante impossible !"
 
@@ -4400,27 +4433,27 @@ msgstr "Délégué À :"
 msgid "Enter Delegate"
 msgstr "Saisissez un délégué"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Rappeler"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Récurrence"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Programme"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Réunion"
 
@@ -4489,19 +4522,19 @@ msgstr "Heure de _fin :"
 msgid "_Start time:"
 msgstr "Heure de _début :"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Un organisateur est nécessaire"
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Au moins un participant est nécessaire."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Cette personne assiste déjà à la réunion !"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Délégué à..."
 
@@ -4553,8 +4586,8 @@ msgstr "Rôle"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:53
-#: mail/message-list.etspec.h:11
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "État"
 
@@ -4575,14 +4608,10 @@ msgid "_Change Organizer"
 msgstr "_Changer l'organizer"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Inviter d'autres personnes..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Autre organizer"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4763,7 +4792,7 @@ msgid "Progress"
 msgstr "En cours"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL :"
 
@@ -4775,19 +4804,19 @@ msgstr "_Priorité :"
 msgid "_Status:"
 msgstr "_État :"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Basique"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Tâche"
 
 #: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:40
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Description :"
 
@@ -4799,66 +4828,77 @@ msgstr "Date de _début :"
 msgid "_Due Date:"
 msgstr "Date d'_échéance :"
 
-#: calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:439
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "Ouvrir"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 msgid "_Save as..."
 msgstr "Enregistrer _sous..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4866,20 +4906,20 @@ msgstr "Enregistrer _sous..."
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_uper"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copier"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4887,32 +4927,32 @@ msgstr "_Copier"
 msgid "_Paste"
 msgstr "C_oller"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 msgid "_Assign Task"
 msgstr "_Affecter une tâche"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 msgid "_Forward as iCalendar"
 msgstr "_Faire suivre comme iCalendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "Marquer comme terminé"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marquer les tâches comme terminées"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "Supprimer les tâches sélectionnées"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une tâche"
@@ -4921,8 +4961,8 @@ msgstr "Cliquez ici pour ajouter une tâche"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Terminé"
 
@@ -4953,7 +4993,7 @@ msgstr "Date de début"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:773
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
 #: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Résumé"
@@ -5064,7 +5104,7 @@ msgid "_Configure Pilot..."
 msgstr "_Configurer le Pilot..."
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
@@ -5089,12 +5129,12 @@ msgid "Delete _All Occurrences"
 msgstr "Supprimer toutes les occurences"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:627
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Les utilitaires Gnome Pilot ne semblent pas installés sur ce système."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:635
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Erreur à l'exécution de %s"
@@ -5166,28 +5206,28 @@ msgstr "<i>Aucun</i>"
 msgid "Status:"
 msgstr "État :"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:318
-#: calendar/gui/e-meeting-model.c:341 calendar/gui/e-meeting-model.c:835
-#: calendar/gui/itip-utils.c:323
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
 msgid "Accepted"
 msgstr "Accepté"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:326
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
 msgid "Tentatively Accepted"
 msgstr "Accepté pour voir"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:320
-#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:836
-#: calendar/gui/itip-utils.c:329 calendar/gui/itip-utils.c:355
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
 msgid "Declined"
 msgstr "Refusé"
 
 #: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:289 calendar/gui/e-meeting-model.c:354
-#: calendar/gui/e-meeting-model.c:793 calendar/gui/e-meeting-model.c:809
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
@@ -5206,7 +5246,7 @@ msgstr "Mise à jour"
 #: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
 #: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
 #: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
@@ -5234,8 +5274,8 @@ msgstr "Mettre à jour le status de l'interlocuteur"
 msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:343
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -5408,56 +5448,74 @@ msgstr "L'attachement ne contient pas d'information de calendrier valide"
 msgid "The attachment has no viewable calendar items"
 msgstr "L'attachement ne contient pas d'information de calendrier visualisable"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "Le fichier de calendrier n'a pas pu être mis à jour !\n"
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#, fuzzy
+msgid "There was an error on the CORBA system\n"
+msgstr "Il y a eu une erreur lors du téléchargement des données pour"
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "L'item n'a pas pu être envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Mise à jour terminée\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Le fichier de calendrier n'a pas pu être mis à jour !\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Le status du participant ne peut être mis à jour car l'entrée n'existe plus"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Cette réponse ne provient pas d'un participant. L'ajouter comme participant ?"
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Le status du participant n'a pas pu être mis à jour à cause d'un status "
 "invalide !\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "Le status du participant n'a pas pu être mis à jour !\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Status du participant mis à jour\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "Le status du participant n'a pas pu être mis à jour !\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Effacement Terminé"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Item envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "L'item n'a pas pu être envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Sélectionnez un Dossier"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Sélectionnez un Dossier"
@@ -5499,92 +5557,92 @@ msgstr "date de fin"
 msgid "date-start"
 msgstr "date de début"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Présidents"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Participants demandés"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Participants optionnels"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Non participants"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533 calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Individuel"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Groupe"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Ressource"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Salle"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Président"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535 calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Participant exigé"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:807
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Participant optionnel"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:808
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Non participant"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543 calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Nécessite une action"
 
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Provisoire"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:838
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Délégué"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "En cours"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5596,63 +5654,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Hors du bureau"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Pas d'information"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Options"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Afficher _seulement les heures de travail"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Afficher _Zoomé arrière"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Mettre à jour Libre/Occupé"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Choix automatique"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Toutes les personnes et ressources"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Toute les _personnes et une ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Personnes _nécessaires"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Personnes nécessaires et _une ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Heure de _début de la réunion :"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Heure de _fin de la réunion :"
 
@@ -5671,17 +5729,22 @@ msgstr "Ne peut charger les tâches dans « %s »"
 msgid "The method required to load `%s' is not supported"
 msgstr "La méthode requise pour charger « %s » n'est pas supportée"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Ne peut ouvrir le dossier dans « %s »"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Date d'Achèvement"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Supprimer les objets sélectionnés"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 msgid "Expunging"
 msgstr "Nettoyage"
 
@@ -5693,17 +5756,17 @@ msgstr "Nouveau _RDV..."
 msgid "_Delete this Appointment"
 msgstr "_Supprimer ce rendez-vous"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ne peut ouvrir le dossier dans « %s »"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "La méthode requise pour ouvrir « %s » n'est pas supportée"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ouverture du calendrier à %s"
@@ -5764,51 +5827,51 @@ msgstr "Octobre"
 msgid "September"
 msgstr "Septembre"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Au moins un participant est nécessaire"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Un organizer doit être configuré."
 
-#: calendar/gui/itip-utils.c:295
+#: calendar/gui/itip-utils.c:354
 msgid "Event information"
 msgstr "Information événement"
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:356
 msgid "Task information"
 msgstr "Informations de la tâche"
 
-#: calendar/gui/itip-utils.c:299
+#: calendar/gui/itip-utils.c:358
 msgid "Journal information"
 msgstr "Informations du journal"
 
-#: calendar/gui/itip-utils.c:301
+#: calendar/gui/itip-utils.c:360
 msgid "Free/Busy information"
 msgstr "Information Libre-Occupé"
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:362
 msgid "Calendar information"
 msgstr "Information calendrier"
 
-#: calendar/gui/itip-utils.c:339
+#: calendar/gui/itip-utils.c:398
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: calendar/gui/itip-utils.c:347
+#: calendar/gui/itip-utils.c:406
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: calendar/gui/itip-utils.c:351
+#: calendar/gui/itip-utils.c:410
 msgid "Counter-proposal"
 msgstr "Contre-proposition"
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Vous devez être inscrit comme participant à l'événement."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "Impossible de créer l'usine à éditeurs de composants"
 
@@ -6035,7 +6098,7 @@ msgid "Print Calendar"
 msgstr "Imprimer le Calendrier"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2903
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -6072,8 +6135,8 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment effacer les tâches ?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2389
-#: mail/mail-callbacks.c:2630
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Ne plus me demander."
 
@@ -7160,638 +7223,654 @@ msgid "Asia/Macao"
 msgstr "Asie/Macao"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Asie/Macao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Asie/Magadan"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Asie/Magadan"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Asie/Manille"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Asie/Muscat"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Asie/Nicosie"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Asie/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Asie/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Asie/Kaboul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Asie/Phnom_Penh"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Asie/Pontianak"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Asie/Pyongyang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Asie/Qatar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Asie/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Asie/Rangoon"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Asie/Riyadh"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Asie/Saïgon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Asie/Sakhalin"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Asie/Samarkand"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Asie/Seoul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Asie/Shanghai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Asie/Singapour"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Asie/Taipei"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Asie/Tashkent"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Asie/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Asie/Téhéran"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Asie/Thimphu"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Asie/Tokyo"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Asie/Ujung_Pandang"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Asie/Ulaanbaatar"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Asie/Urumqi"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Asie/Vientiane"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Asie/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Asie/Yakutsk"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Asie/Yekaterinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Asie/Yerevan"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantique/Açores"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantique/Bermudes"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlantique/Canaries"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantique/Cap_Vert"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlantique/Faeroe"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantique/Jan_Mayen"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlantique/Madeira"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantique/Reykjavik"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantique/Géorgie_du_Sud"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlantique/St_Hélène"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlantique/Stanley"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australie/Adelaide"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australie/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australie/Broken_Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australie/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australie/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australie/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australie/Lord_Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australie/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australie/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australie/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europe/Amsterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europe/Andorre"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europe/Athènes"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europe/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europe/Belgrade"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europe/Berlin"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europe/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europe/Bruxelles"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europe/Bucharest"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europe/Budapest"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europe/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europe/Copenhague"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europe/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europe/Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europe/Helsinki"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europe/Istanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europe/Kaliningrad"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europe/Kiev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europe/Lisbonne"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europe/Ljubljana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europe/Londres"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europe/Luxembourg"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europe/Madrid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europe/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europe/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europe/Monaco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europe/Moscou"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europe/Nicosie"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europe/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europe/Paris"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europe/Prague"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europe/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europe/Rome"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europe/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europe/Saint_Marin"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europe/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europe/Simferopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europe/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europe/Sofia"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europe/Stockholm"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europe/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europe/Tirane"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europe/Uzhgorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europe/Vaduz"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europe/Vatican"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europe/Vienne"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europe/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europe/Warsaw"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europe/Zagreb"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europe/Zaporozhye"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europe/Zurich"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Océan_Indien/Antananarivo"
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Océan_Indien/Chagos"
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Océan_Indien/Christmas"
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Océan_Indien/Cocos"
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Océan_Indien/Comore"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Océan_Indien/Kerguelen"
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indien/Mahe"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indien/Maldives"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indien/Mauritius"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indien/Mayotte"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indien/Réunion"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Pacifique/Apia"
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Pacifique/Auckland"
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Pacifique/Chatham"
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Pacifique/Easter"
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Pacifique/Efate"
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Pacifique/Enderbury"
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Pacifique/Fakaofo"
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Pacifique/Fiji"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Pacifique/Funafuti"
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Pacifique/Galapagos"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Pacifique/Gambier"
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Pacifique/Guadalcanal"
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Pacifique/Guam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Pacifique/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Pacifique/Johnston"
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Pacifique/Kiritimati"
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Pacifique/Kosrae"
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Pacifique/Kwajalein"
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Pacifique/Majuro"
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Pacifique/Marquesas"
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Pacifique/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Pacifique/Nauru"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Pacifique/Niue"
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Pacifique/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Pacifique/Noumea"
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Pacifique/Pago_Pago"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Pacifique/Palau"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Pacifique/Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Pacifique/Ponape"
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Pacifique/Port_Moresby"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Pacifique/Rarotonga"
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Pacifique/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Pacifique/Tahiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Pacifique/Tarawa"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Pacifique/Tongatapu"
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Pacifique/Truk"
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Pacifique/Wake"
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Pacifique/Wallis"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Pacifique/Yap"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "La signature n'est pas supportée par ce message chiffré"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "La signature en clair n'est pas supportée par ce message chiffré"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "La vérification n'est pas supportée par ce message chiffré"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Le codage n'est pas supporté par ce message chiffré"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Le décodage n'est pas supporté par ce message chiffré"
 
@@ -7799,12 +7878,12 @@ msgstr "Le décodage n'est pas supporté par ce message chiffré"
 msgid "Unable to create cache path"
 msgstr "Impossible de créer le répertoire de cache"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Impossible de supprimer l'entrée du cache : %s : %s"
 
-#: camel/camel-disco-diary.c:183
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7815,7 +7894,7 @@ msgstr ""
 "Des informations de ce serveur ne seront pas rejouées\n"
 "quand vous vous reconnecterez au réseau."
 
-#: camel/camel-disco-diary.c:246
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7826,11 +7905,16 @@ msgstr ""
 "%s\n"
 "Les modifications apportées à ce dossier ne seront pas resynchronisées."
 
-#: camel/camel-disco-diary.c:280
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Resynchronisation avec le serveur"
 
-#: camel/camel-disco-store.c:365
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Ecriture du dossier « %s »"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Vous devez travailler en ligne pour terminer cette opération"
 
@@ -7838,67 +7922,67 @@ msgstr "Vous devez travailler en ligne pour terminer cette opération"
 msgid "Syncing folders"
 msgstr "Synchronisation des dossiers"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erreur analyse filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur exécution du filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Impossible d'ouvrir le dossier de spool"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Ne peut traiter le dossier de spool"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Récupération du message %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Ne peut ouvrir le message"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Anomalie message %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Récupération du message %d parmis %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Anomalie message %d du %d"
 
-#: camel/camel-filter-search.c:138
+#: camel/camel-filter-search.c:140
 msgid "Failed to retrieve message"
 msgstr "Échec de la récupération du message"
 
-#: camel/camel-filter-search.c:525
+#: camel/camel-filter-search.c:538
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Impossible de mettre le message %s en cache : %s"
 
-#: camel/camel-filter-search.c:564
+#: camel/camel-filter-search.c:577
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Impossible de mettre le message %s en cache : %s"
 
-#: camel/camel-filter-search.c:666 camel/camel-filter-search.c:674
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur lors de la recherche filtrée : %s : %s"
@@ -7930,30 +8014,103 @@ msgstr "(compare tout) demande un unique résultat booléen"
 msgid "Performing query on unknown header: %s"
 msgstr "Interrogation sur un en-tête inconnu : %s"
 
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Action non supportée : Ajout du message : pour %s"
 
-#: camel/camel-folder.c:1043
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Opération non-supportée : recherche par expression : pour %s"
 
-#: camel/camel-folder.c:1083
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Opération non-supportée : recherche par uids : pour %s"
 
-#: camel/camel-folder.c:1199
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Déplacement des messages"
 
-#: camel/camel-folder.c:1199
+#: camel/camel-folder.c:1317
 #, fuzzy
 msgid "Copying messages"
 msgstr "Copie des messages vers %s"
 
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Annulé."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Réponse inattendue du serveur IMAP : %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Aucun nom de fichier spécifié"
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Impossible de crypter ce message : aucun déstinataire n'est spécifié"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Impossible de mettre le message %s en cache : %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Impossible de mettre le message %s en cache : %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Échec de décodage du message."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+"Impossible de vérifier ce message : ne peut créer de fichier temporaire : %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8052,88 +8209,24 @@ msgstr "Erreur d'écriture du fichier temporaire de courrier : %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Erreur d'écriture du fichier temporaire de courrier : %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Veuillez saisir votre phrase de passe %s pour %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Veuillez saisir votre phrase de passe pour %s"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Impossible de signer ce message : pas de partie plaintext à signer"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "Impossible de signer ce message : pas de mot de passe fourni"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Impossible de signer ce message : ne peut créer le tube vers GPG/PGP : %s"
 
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Impossible de signer ce message : pas de partie plaintext à signer"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Impossible de vérifier ce message : pas de partie plaintext à vérifier"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Impossible de vérifier ce message : ne peut pas créer le tube vers GPG/PGP : "
-"%s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-"Impossible de vérifier ce message : ne peut créer de fichier temporaire : %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Impossible de crypter ce message : pas de partie plaintext à crypter"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Impossible de crypter ce message : pas de mot de passe fourni"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Impossible de crypter ce message : ne peut créer le tube vers GPG/PGP : %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Impossible de crypter ce message : aucun déstinataire n'est spécifié"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-"Impossible de décrypter ce message : pas de partie cyphertext à décrypter"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Impossible de décrypter ce message : pas de mot de passe spécifié"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Impossible de décrypter ce message : ne peut créer le tube vers GPG/PGP : %s"
+#: camel/camel-multipart-encrypted.c:325
+#, fuzzy
+msgid "Failed to decrypt MIME part: parse error"
+msgstr "Impossible de décrypter : Erreur inconnue"
 
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Ceci est une partie de message numériquement signée"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Autre Erreur"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -8151,43 +8244,6 @@ msgstr "Ne peut charger %s : %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ne peut charger %s : Aucun code d'initialisation dans le module."
 
-#: camel/camel-remote-store.c:270
-#, c-format
-msgid "%s server %s"
-msgstr "%s serveur %s"
-
-#: camel/camel-remote-store.c:274
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s service pour %s sur %s"
-
-#: camel/camel-remote-store.c:325 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Connexion annulée"
-
-#: camel/camel-remote-store.c:328 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, 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:329
-msgid "(unknown host)"
-msgstr "(Hôte inconnu)"
-
-#: camel/camel-remote-store.c:421 camel/camel-remote-store.c:483
-#: camel/camel-remote-store.c:544
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Opération annulée"
-
-#: camel/camel-remote-store.c:547
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Serveur déconnecté de manière inattendue : %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonyme"
@@ -8297,7 +8353,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Mauvaise réponse d'identification du serveur."
 
@@ -8326,11 +8382,9 @@ msgstr ""
 "Cette option sert à se connecter à un serveur Windows utilisant une "
 "authentification NTLM / mot de passe sécurisé."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:82
-msgid "Password"
-msgstr "Mot de passe"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -8357,52 +8411,52 @@ msgstr "POP avant authentification SMTP utilisant une source non-pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Échec de compilation d'expression régulière : %s : %s"
 
-#: camel/camel-service.c:280
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL « %s » nécessite un  « nom d'utilisateur »"
 
-#: camel/camel-service.c:288
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL « %s »  nécessite un composant  « Host »"
 
-#: camel/camel-service.c:296
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL « %s » nécessite un chemin"
 
-#: camel/camel-service.c:741
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Résolution de : %s"
 
-#: camel/camel-service.c:772 camel/camel-service.c:883
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Échec de la résolution du nom : %s"
 
-#: camel/camel-service.c:797
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Échec de la résolution de l'hôte : %s : hôte non trouvé"
 
-#: camel/camel-service.c:799
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Échec de la résolution de l'hôte : %s : raison inconnue"
 
-#: camel/camel-service.c:849
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Résolution de : %s"
 
-#: camel/camel-service.c:911
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Échec de la résolution de l'hôte : %s : hôte non trouvé"
 
-#: camel/camel-service.c:914
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Échec de la résolution de l'hôte : %s : raison inconnue"
@@ -8501,7 +8555,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8514,16 +8568,16 @@ msgstr ""
 "Empreinte  :        %s\n"
 "Signature  :        %s"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr "BON"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr "MAUVAIS"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8543,12 +8597,12 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Ne peut analyser l'URL « %s »"
 
-#: camel/camel-vee-folder.c:590
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Pas de tel message %s dans %s"
 
-#: camel/camel-vee-folder.c:737 camel/camel-vee-folder.c:743
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Vérifie les nouveaux messages dans tous les dossiers"
@@ -8573,64 +8627,77 @@ msgstr "Impossible de renommer le dossier : %s : Opération invalide"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossible de renommer le dossier : %s : Dossier inexistant"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Opération annulée"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Serveur déconnecté de manière inattendue : %s"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Réponse inattendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Échec de la commande IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "La réponse du serveur s'est terminée trop tot."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La réponse du serveur IMAP ne contient pas l'information %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Réponse OK inattendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:205
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ne peut créer le répertoire %s : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:224
+#: camel/providers/imap/camel-imap-folder.c:234
 #, 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:290
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Le dossier a été détruit et recréé sur le serveur"
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:475
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Examen des messages modifiés"
 
-#: camel/providers/imap/camel-imap-folder.c:1673
-#: camel/providers/imap/camel-imap-folder.c:2149
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Ce message n'est pas disponible"
 
-#: camel/providers/imap/camel-imap-folder.c:1828
-#: camel/providers/imap/camel-imap-folder.c:1902
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Recherche des informations de résumé pour des nouveaux messages"
 
-#: camel/providers/imap/camel-imap-folder.c:1834
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Examen des nouveaux messages"
 
-#: camel/providers/imap/camel-imap-folder.c:2186
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Ne peut trouver le corps du message dans la réponse FETCH."
 
@@ -8683,35 +8750,82 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Lecture et stockage du courrier sur des serveurs IMAP."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Mot de passe"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 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:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Serveur SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s service pour %s sur %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Connexion annulée"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Ne peut se connecter à %s (port %d) : %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Impossible de se connecter au serveur SMTP %s en mode sécurisé : %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+msgid "SSL/TLS extension not supported."
+msgstr "Extension SSL/TSL non supportée"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+msgid "SSL negotiations failed"
+msgstr " Échec des négociations SSL"
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Le serveur IMAP %s ne supporte pas le mécanisme d'authetification de type %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Pas de support pour les authentifications de type %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe IMAP pour %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Vous n'avez pas saisi de mot de passe."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8722,78 +8836,92 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Pas de tel dossier « %s »."
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Le dossier parent n'est pas autorisé à contenir des sous-dossiers"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Ne peut ouvrir la boîte à lettres : %s : %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Rpéertoires de courrier au format MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Pour stocker le courrier local dans des répertoires de type MH."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Distribution locale"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 "Pour récupérer le courrier local dans des boîtes aux lettres au format "
 "standard mbox"
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr ""
 "Appliquer les filtres aux nouveaux messages dans la boîte de réception."
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Répertoires de courrier au format Maildir"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr ""
 "Pour stocker le courrier local dans des répertoires de courrier au format "
 "Maildir"
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Boîte aux lettres format mbox (standard Unix)"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "Pour stocker le courrier local dans des fichiers au format mbox"
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr "Arborescence de répertoires des fichiers mbox"
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Boîte aux lettres format mbox (standard Unix)"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
-"Pour accéder à du courrier stocké dans une arborescence de \n"
-"fichiers mbox externe. Cela vous permets d'accéder directement \n"
-"à des fichiers Pine ou elm.\n"
-"NOTE : Ce fournisseur est expérimental, donc assurez vous de \n"
-"sauvegarder tous les courriers de ces répertoires avant tout."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "Pour stocker le courrier local dans des fichiers au format mbox"
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La racine de stockage %s n'est pas un chemin absolu"
@@ -8819,7 +8947,7 @@ msgstr "Le stockage local n'a pas de boîte de réception"
 msgid "Local mail file %s"
 msgstr "Fichier de courrier local %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossible de renommer le dossier %s vers %s : %s"
@@ -8839,13 +8967,12 @@ msgstr "Impossible de supprimer le fichier de résumé de dossier « %s » :
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossible de supprimer le fichier d'index de dossier « %s » : %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Impossible d'enregistrer le résumé : %s : %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Impossible d'ajouter un message au résumé : raison inconnue"
 
@@ -8861,11 +8988,10 @@ msgstr "Impossible de joindre le message au dossier maildir : %s : %s"
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:334
+#: camel/providers/local/camel-mbox-folder.c:348
 #: camel/providers/local/camel-mh-folder.c:201
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:218
-#: camel/providers/local/camel-spool-folder.c:585
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8875,9 +9001,8 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:334
+#: camel/providers/local/camel-mbox-folder.c:348
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-spool-folder.c:585
 msgid "No such message"
 msgstr "Aucun message correspondant"
 
@@ -8887,7 +9012,7 @@ msgid "Invalid message contents"
 msgstr "Contenu de message invalide"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8898,13 +9023,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Le dossier « %s » n'existe pas."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8920,7 +9045,7 @@ msgstr "« %s » n'est pas un répertoire maildir."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Impossible de supprimer le dossier « %s » : %s"
@@ -8929,8 +9054,8 @@ msgstr "Impossible de supprimer le dossier « %s » : %s"
 msgid "not a maildir directory"
 msgstr "n'est pas un répertoire maildir"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Impossible de scruter le dossier « %s » : %s"
@@ -8949,45 +9074,37 @@ msgstr "Vérification du dossier"
 msgid "Checking for new messages"
 msgstr "Recherche de nouveaux messages"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Ecriture du dossier"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Impossible de créer le verrou sur le dossier %s : %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne peut ouvrir la boîte à lettres : %s : %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Ajout de courrier annulé"
 
-#: camel/providers/local/camel-mbox-folder.c:271
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Impossible de joindre le message au fichier mbox : %s : %s"
 
-#: camel/providers/local/camel-mbox-folder.c:350
-#: camel/providers/local/camel-mbox-folder.c:382
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:601
-#: camel/providers/local/camel-spool-folder.c:633
-#: camel/providers/local/camel-spool-folder.c:645
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8996,13 +9113,11 @@ msgstr ""
 "Impossible d'obtenir le message : %s du dossier %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:383
-#: camel/providers/local/camel-spool-folder.c:634
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Le dossier semble irrémédiablement corrompu"
 
-#: camel/providers/local/camel-mbox-folder.c:395
-#: camel/providers/local/camel-spool-folder.c:646
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Erreur construction message : Boîte à lettre corrompue ?"
 
@@ -9045,87 +9160,81 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Le dossier « %s » n'est pas vide. Non supprimé."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Impossible d'ouvrir le dossier : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Erreur fatale d'analyse du courrier prés de la position %ld dans le dossier %"
 "s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Impossible de vérifier le dossier : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Impossible d'ouvrir le fichier : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ne peut ouvrir la boîte à lettres temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-"Le résumé et le dossier ne correspondent pas, même après une synchronisation"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Erreur d'écriture dans la boite à lettres temporaire : %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Échec d'écriture dans la boite à lettres temporaire : %s : %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Impossible de fermer le dossier source %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossible de fermer le dossier temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossible de renommer le dossier : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
+"Le résumé et le dossier ne correspondent pas, même après une synchronisation"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erreur inconnue : %s"
 
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Impossible de renommer le dossier : %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Erreur d'écriture dans la boite à lettres temporaire : %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Échec d'écriture dans la boite à lettres temporaire : %s : %s"
+
 #: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Ajout de message au dossier (format MH) annulé"
@@ -9135,62 +9244,68 @@ msgstr "Ajout de message au dossier (format MH) annulé"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Impossible de joindre le message au dossier mh : %s : %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "« %s » n'est pas un répertoire."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ne peut ouvrir le réperoire format MH : %s : %s"
 
-#: camel/providers/local/camel-spool-folder.c:518
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Impossible d'ajouter le message au fichier mbox : %s : %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Les dossiers spool  ne peuvent être renommés."
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Spool « %s » n'existe pas ou n'est pas un fichier normal."
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "La racine de stockage %s n'est pas un répertoire habituel"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Le dossier « %s/%s » n'existe pas."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr "Le stockage ne supporte pas de boîte de réception"
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Fichier de courrier spool %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Les dossiers spool  ne peuvent être renommés."
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Les dossiers spool  ne peuvent être renommés."
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Les dossiers spool  ne peuvent être effacés."
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Ne peut synchroniser le dossier de courrier temporaire %s : %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Ne peut synchroniser le dossier de spool %s : %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -9199,25 +9314,6 @@ msgstr ""
 "Ne peut synchroniser le dossier de spool %s : %s\n"
 "Le dossier est peut-être corrompu, copie enregistrée dans '%s'"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Impossible d'ouvrir le fichier : %s : %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Stockage « %s » n'existe pas ou n'est pas un répertoire."
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr "Le stockage ne supporte pas de boîte de réception"
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, c-format
-msgid "Mail tree %s"
-msgstr "Arbre de courrier %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Nouvelles USENET"
@@ -9228,12 +9324,22 @@ msgstr ""
 "C'est un fournisseur pour la lecture et la publication dans les groupes de "
 "nouvelles USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Ne peut créer le répertoire %s : %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nouvelles USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9333,7 +9439,7 @@ msgstr "Ne pas effacer les messages du serveur"
 msgid "Delete after %s day(s)"
 msgstr "Supprime apès %s jour(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -9359,28 +9465,20 @@ 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:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Impossible de se connecter au serveur POP %s en mode sécurisé : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-msgid "SSL/TLS extension not supported."
-msgstr "Extension SSL/TSL non supportée"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-msgid "SSL negotiations failed"
-msgstr " Échec des négociations SSL"
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, 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:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -9388,27 +9486,27 @@ 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:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "SASL '%s' Identification échouée : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr "Erreur de protocole SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr "Erreur d'E/S : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe POP3 pour %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -9417,7 +9515,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:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Aucun dossier « %s »."
@@ -9477,7 +9575,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Livraison du courrier via le programme sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:99
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9587,41 +9685,41 @@ msgstr "Anomalie authentification temporaire"
 msgid "Authentication required"
 msgstr "Identification requise"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erreur du message de bienvenue : %s : sûrement pas grave"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Impossible de se connecter au serveur SMTP %s en mode sécurisé : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 msgid "server does not appear to support SSL"
 msgstr "le serveur ne semble pas supporter SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Requête STARTTLS expirée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 msgid "STARTTLS response error"
 msgstr "Erreur de réponse STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Le serveur SMTP %s ne supporte pas le type d'identification demandé %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe IMAP pour %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9632,89 +9730,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serveur SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Livraison du courrier SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 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:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Envoi du message"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 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:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ne peut envoyer le message : un ou plusieurs déstinataires invalides."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "Accueil SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Demande HELO dépassée : %s non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erreur réponse HELO : %s non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "Identification SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Erreur création objet identification SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Demande AUTH expirée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "Erreur demande AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Mauvaise réponse d'identification du serveur.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Demande MAIL FROM dépassée : %s : courrier non envoyé"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr "Erreur réponse MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Demande RCPT TO expirée : %s : courrier non envoyé"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Echec de RCPT TO  <%s>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Demande DATA expirée : %s : courrier non envoyé."
@@ -9722,35 +9820,35 @@ msgstr "Demande DATA expirée : %s : courrier non envoyé."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr "Erreur réponse DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Envoi DATA expiré : Arrêt du message : %s : courrier non envoyé."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr "Erreur réponse de fin de DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Demande RSET dépassée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr "Erreur réponse RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Réponse QUIT dépassée : %s / non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr "Erreur réponse QUIT"
 
@@ -9824,52 +9922,52 @@ msgstr "Type MIME :"
 msgid "Suggest automatic display of attachment"
 msgstr "Suggérer l'affichage automatique de la pièce jointe"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "De :"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Répondre-à :"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "À :"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Saisissez les destinataires du message"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc :"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Saisissez les adresses qui recevront une copie carbone de ce message"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc :"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9882,7 +9980,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Ne peut créer un contexte de signature PGP."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9891,34 +9994,34 @@ msgstr ""
 "Erreur durant la lecture du fichier %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Avertissement !"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Le fichier existe, l'écraser ?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erreur accès au fichier : %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Ne peut récupérer le message de l'éditeur"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9927,7 +10030,7 @@ msgstr ""
 "Ne peut rechercher dans le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9936,7 +10039,7 @@ msgstr ""
 "Ne peut tronquer le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9945,7 +10048,7 @@ msgstr ""
 "Erreur lors de l'auto-enregistrement du message : %s :\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9953,7 +10056,7 @@ msgstr ""
 "Evolution a trouvé des fichiers non enregistrés d'une session précédente.\n"
 "Voulez-vous essayer de les récupérer ?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9963,23 +10066,43 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Avertissement : Message modifié"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Insérer un fichier"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Signature"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr "Restaurer les valeurs par défaut"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9987,7 +10110,7 @@ msgstr ""
 "Impossible de créer la fenête de composition:\n"
 "Impossible d'activer le composant de sélection d'adresse."
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9995,7 +10118,7 @@ msgstr ""
 "Impossible de créer la fenêtre de composition :\n"
 "Ne peut activer le composant « Editeur HTML »."
 
-#: composer/e-msg-composer.c:3466
+#: composer/e-msg-composer.c:3665
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be editted.)"
 "<b>"
@@ -10063,7 +10186,7 @@ msgstr "Le sujet contient"
 msgid "Subject does not contain"
 msgstr "Le sujet ne contient pas"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2255
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -10207,7 +10330,7 @@ msgstr "heure"
 msgid "minute"
 msgstr "minute"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:188
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "secondes"
 
@@ -10281,7 +10404,7 @@ msgstr "passé(e)s"
 msgid "ago"
 msgstr "passé(e)s"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
@@ -10293,6 +10416,21 @@ msgstr "<cliquez ici pour sélectionner une date>"
 msgid "Filter Rules"
 msgstr "Règles de Filtrage"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Spécifiez le nom de fichier : "
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Spool « %s » n'existe pas ou n'est pas un fichier normal."
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Ouvrir un fichier"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -10312,7 +10450,7 @@ msgstr ""
 "y délivrer du courrier."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Sélectionnez un Dossier"
 
@@ -10325,6 +10463,10 @@ msgstr ""
 "Erreur dans l'expression régulière « %s » :\n"
 "%s"
 
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
 #: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
@@ -10354,7 +10496,8 @@ msgid "if all criteria are met"
 msgstr "si tous les critères sont remplis"
 
 #: filter/filter-rule.c:769
-msgid "if any criterion are met"
+#, fuzzy
+msgid "if any criteria are met"
 msgstr "si un des critères est rempli"
 
 #: filter/filter-rule.c:780
@@ -10506,8 +10649,8 @@ msgstr "Expression"
 msgid "Follow Up"
 msgstr "Donner suite"
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:74
-#: mail/mail-config.glade.h:59
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Important"
 
@@ -10543,81 +10686,85 @@ msgstr "n'est pas"
 msgid "is not Flagged"
 msgstr "n'est pas Marqué"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+msgid "Label"
+msgstr "Étiquette"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Liste de diffusion"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Corps du message"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "En-tête du message"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Déplacer vers le dossier"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Jouer un son"
 
-#: filter/libfilter-i18n.h:41 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Lu"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinataires"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regex correspond"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Répondu à"
 
-#: filter/libfilter-i18n.h:45 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:46 mail/mail-callbacks.c:1560
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Expéditeur"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Définir l'état"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Taille (ko)"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "ressemble à"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Compte source"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "En-tête spécifique"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "Débute par"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Arrête le traitement"
 
-#: filter/libfilter-i18n.h:55 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Sujet"
 
@@ -10672,7 +10819,8 @@ msgid "Scanning %s"
 msgstr "Scrutation de %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Courrier"
 
@@ -10688,10 +10836,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Carnet d'adresses"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10743,7 +10887,7 @@ msgstr "Evolution importe vos anciennes données Netscape"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Corbeille"
 
@@ -10847,11 +10991,11 @@ msgstr "Utilitaire pour le composant de résumé de messagerie."
 msgid "Font Preferences"
 msgstr "Préférences du courrier"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:65
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
 msgid "Mail Accounts"
 msgstr "Comptes de courrier"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:67
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
 msgid "Mail Preferences"
 msgstr "Préférences du courrier"
 
@@ -10879,31 +11023,31 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr "Cette page peut être utilisée pour configurer l'éditeur"
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Dossier contenant du courrier"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Corbeille Virtuelle"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Dossier de corbeille Virtuelle"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Ce dossier ne peut contenir de messages."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Propriétés..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Modifier les propriétés de ce dossier"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10911,230 +11055,235 @@ msgstr ""
 "Certains de vos règlages de messagerie semblent corrompus, vérifiez que tout "
 "est en ordre."
 
-#: mail/component-factory.c:928
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Vous n'avez pas défini de méthode de transport de courrier"
 
-#: mail/component-factory.c:970
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Avertissement : Message modifié"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Nouveau message électronique"
 
-#: mail/component-factory.c:970 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Message électronique"
 
-#: mail/component-factory.c:997
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: mail/component-factory.c:1006
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "Ne peut initialiser le composant de configuration de messagerie d'Evolution."
 
-#: mail/component-factory.c:1012
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Impossible d'initialiser le composant d'information des dossiers d'Evolution"
 
-#: mail/component-factory.c:1212 mail/component-factory.c:1243
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: mail/component-factory.c:1253
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Ne peut enregistrer le stockage avec le shell"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriétés de « %s »"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Propriétés"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ne peut créer de répertoire temporaire : %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d nouveaux"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d cachés"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr "%d visibles"
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d sélectionnés"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d non envoyés"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d envoyés"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d au total"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 msgid "Create _Virtual Folder From Search..."
 msgstr "Créer un dossier _virtuel à partir d'une recherche..."
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xpéditeur"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "Dossier virtuel sur la liste de diffusion"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filtre sur l'expéditeur"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filtre sur les destinataires"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Editer comme nouveau  message..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Répondre à l'expéditeur"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr "_Donner suite..."
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 msgid "Fla_g Completed"
 msgstr "Marquer _Achevé"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 msgid "Cl_ear Flag"
 msgstr "_Effacer les marqueurs"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Marquer comme _Important"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 msgid "_Mark as Unimportant"
 msgstr "Marquer comme Non Im_portant"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 msgid "U_ndelete"
 msgstr "_Récupérer"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 msgid "Mo_ve to Folder..."
 msgstr "Déplacer _vers le dossier..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: mail/folder-browser.c:1645
-msgid "Label"
-msgstr "Étiquette"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 msgid "Add Sender to Address_book"
 msgstr "Ajouter l'expéditeur au _carnet d'adresses"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 msgid "Appl_y Filters"
 msgstr "Appliquer les _filtres"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 msgid "Crea_te Rule From Message"
 msgstr "Créer une _règle à partir du message"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 msgid "VFolder on M_ailing List"
 msgstr "Dossier virtuel sur la liste de _diffusion"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtre sur la _liste de diffusion (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Dossier virtuel sur la liste de _diffusion (%s)"
 
-#: mail/folder-browser.h:26
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
 msgid "Default"
 msgstr "Défaut"
 
-#: mail/folder-info.c:70
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Récupération des informations dossier"
 
@@ -11189,7 +11338,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Vous n'avez pas saisi toutes les informations requises."
 
@@ -11199,75 +11348,65 @@ msgid "Evolution News Editor"
 msgstr "Editeur de News d'Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Éditeur de compte d'Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:159
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Nom d'_utilisateur :"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:167
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Chemin :"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:91
-msgid "Random"
-msgstr "Aléatoirement"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-"Veuillez spécifier un fichier de signature\n"
-"dans la section avancée de la configuration\n"
-"des signatures."
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Vous ne devez pas créer deux comptes avec le même nom."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce compte ?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "De pas supprimer"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Effacer réellement le compte ?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Désactiver."
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Activer"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce compte de nouvelles ?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Activé"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Nom de Compte"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -11311,7 +11450,7 @@ msgstr ""
 "        « %s »\n"
 "Et ont été mis à jour."
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11323,7 +11462,7 @@ msgstr ""
 "recevoir ou composer des courriers.\n"
 "Voulez-vous le configurer maintenant ?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11331,7 +11470,7 @@ msgstr ""
 "Vous devez configurer une identité\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11340,7 +11479,7 @@ msgstr ""
 "avant de pouvoir composer un message."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11348,11 +11487,11 @@ msgstr ""
 "Vous êtes sur le point d'envoyer un courrier au format HTML, mais les "
 "déstinataires suivants ne veulent pas de ce format :\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Envoyer tout de même ?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11360,7 +11499,7 @@ msgstr ""
 "Ce message n'a pas de sujet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11368,11 +11507,11 @@ msgstr ""
 "Depuis que la liste de contacts que vous envoyez est configurée pour cacher "
 "la liste d'adresses, ce message contiendra seulement des destinataires Bcc."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Le message contient seulement des destinataires Bcc"
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11382,16 +11521,16 @@ msgstr ""
 "en ajoutant un en-tête Apparently-To.\n"
 "Envoyer quand même ?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 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:497
+#: mail/mail-callbacks.c:499
 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:639
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11399,28 +11538,28 @@ msgstr ""
 "Impossible d'ouvrir le dossier brouillons pour ce compte.\n"
 "Voulez-vous utiliser le dossier brouillons générique ?"
 
-#: mail/mail-callbacks.c:985
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "Un expéditeur inconnu"
 
-#: mail/mail-callbacks.c:989
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Le %a %d/%m/%Y à %H:%M,  %%s a écrit :"
 
-#: mail/mail-callbacks.c:1441
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Déplacez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1443
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:2099
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Êtes-vous sûr de vouloir éditer tous les %d messages  ?"
 
-#: mail/mail-callbacks.c:2124
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11428,7 +11567,7 @@ msgstr ""
 "Vous ne pouvez éditer des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:2163
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11436,32 +11575,32 @@ msgstr ""
 "Vous ne pouvez renvoyer des messages que\n"
 "lorsqu'ils sont dans le dossier Envoyés."
 
-#: mail/mail-callbacks.c:2177
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Êtes-vous sûr de vouloir renvoyer tous les %d messages ?"
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Aucun message sélectionné"
 
-#: mail/mail-callbacks.c:2248 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Écraser le fichier ?"
 
-#: mail/mail-callbacks.c:2302
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/mail-callbacks.c:2304
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Enregistrer les messages sous..."
 
-#: mail/mail-callbacks.c:2374
+#: mail/mail-callbacks.c:2415
 msgid "Go to next folder with unread messages?"
 msgstr "Aller au dossier suivant conntenant des messages non lus ?"
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11469,7 +11608,7 @@ msgstr ""
 "Il n'y a plus de nouveau messages dans ce dossier.\n"
 "Voulez-vous aller au dossier suivant ?"
 
-#: mail/mail-callbacks.c:2623
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11481,7 +11620,7 @@ msgstr ""
 "\n"
 "Effacer réellement ces messages ?"
 
-#: mail/mail-callbacks.c:2736
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11490,34 +11629,72 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:2748
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtres"
 
-#: mail/mail-callbacks.c:2791
+#: mail/mail-callbacks.c:2833
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d parmis %d"
 
-#: mail/mail-callbacks.c:2844
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:2871
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2910
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Échec de l'impression du message"
 
-#: mail/mail-callbacks.c:3096 mail/mail-callbacks.c:3136
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Êtes-vous sûr de vouloir ouvrir tous les %d messages dans une fenêtre "
 "séparée ?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+"Veuillez spécifier un fichier de signature\n"
+"dans la section avancée de la configuration\n"
+"des signatures."
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "_Script"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+msgid "Unnamed"
+msgstr "Sans nom"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Envoyer"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Ajouter une nouvelle signature"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Signature"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11572,126 +11749,113 @@ msgstr ""
 "Ce nom sera utilisé uniquement dans un but d'affichage."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:135
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 msgid "Work"
 msgstr "Travail"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:83
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Personnel"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:125
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 msgid "To Do"
 msgstr "À faire"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:63
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr "Plus tard"
 
-#: mail/mail-config.c:634
+#: mail/mail-config.c:625
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Compte"
 
-#: mail/mail-config.c:2541
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Service de vérification"
 
-#: mail/mail-config.c:2619 mail/mail-config.c:2623
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Connexion au serveur"
 
-#: mail/mail-config.c:2821
-msgid "Unnamed"
-msgstr "Sans nom"
-
-#: mail/mail-config.c:2999
-msgid "Cannot execute signature script"
-msgstr "Impossible d'exécuter le script de signature"
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "_Éditer"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Nouveau"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Vérifier les types supportés"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL n'est pas supporté dans cette compilation d'évolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL n'est pas supporté dans cette compilation d'évolution)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Toujours crypter pour moi lors de l'envoi de courrier crypté"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
 msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:7
 msgid "Account Editor"
 msgstr "Éditeur de compte"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Information du compte"
 
-#: mail/mail-config.glade.h:11 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gestionnaire de comptes"
 
-#: mail/mail-config.glade.h:12
-msgid "Advanced Options"
-msgstr "Options avancées"
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "_Script"
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Add new signature..."
+msgstr "Ajouter une nouvelle signature"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Toujours crypter pour moi lors de l'envoi de courrier crypté"
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 "Toujours signer les messages sortants lors de l'utilisation de ce compte"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Toujours envoyée une copie cachée (_Bcc) à : "
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Toujours envoyer une copie (_Cc) à :"
 
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
 #: mail/mail-config.glade.h:19
 msgid "Attach original message"
 msgstr "Joindre le message d'origine"
@@ -11726,18 +11890,27 @@ msgid "C_olors"
 msgstr "C_ouleurs"
 
 #: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Recherche de nouveau courrier"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Couleur des tâches du jour"
+
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr "Composer des messages"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Configuration"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11753,272 +11926,251 @@ msgstr ""
 "\n"
 "Cliquez sur « Terminer » pour enregistrer vos nouveaux paramètres."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "Dé_faut"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Comportement par defaut"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Jeu de caractères par défaut : "
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "Deleting Mail"
 msgstr "Effacement du courrier"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "IDs numériques..."
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:45
 msgid "Do not quote original message"
 msgstr "Ne pas citer le message d'origine"
 
-#: mail/mail-config.glade.h:43 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Fait"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Dossier des _brouillons : "
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "A_ctiver"
 
-#: mail/mail-config.glade.h:46
-#, fuzzy
-msgid "E_nable advanced options"
-msgstr "Activer les options avancées"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Email Accounts"
 msgstr "Comptes de courrier"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email _address:"
 msgstr "Adresse électronique :"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Empty _trash folders on exit"
 msgstr "_Vider les dossiers corbeille en sortant"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Exécuter une commande..."
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "finit par"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propriétés"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Messages suivis"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Obtenir un ID numérique..."
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Mettre les citations en _surbrillance avec"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:58 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identité"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "En ligne"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr "Étiquettes et couleurs"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr "Chargement des images"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Localisation de la boîte à lettres"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Message Composer"
 msgstr "Éditeur de messages"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Display"
 msgstr "Affichage du message"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "Serveur NNTP :"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Notification du courrier entrant"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:79
 msgid "News Servers"
 msgstr "Serveurs de nouvelles"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Informations optionnelles"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Organisation :"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _clé PGP : "
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Avertissement lors de l'envoi d'un message avec uniquement des destinataires "
 "_Bcc"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimer les contacts sélectionnés"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Répertoire de courrier Qmail"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Citer le message d'origine"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Cité"
 
-#: mail/mail-config.glade.h:92
-msgid "Randomized"
-msgstr "Aléatoire"
-
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Se souvenir du mot de passe"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Répondre-à :"
 
-#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Réception des messages"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Options de réception"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Se souvenir du mot de passe"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Informations requises"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Sécurité"
 
-#: mail/mail-config.glade.h:101
-msgid "Same as text"
-msgstr "Même chose en texte"
-
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME sécurisé (S/MIME)"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:109
 msgid "Select PGP program"
 msgstr "Sélectionner un programme PGP"
 
-#: mail/mail-config.glade.h:108
-msgid "Select a signature file"
-msgstr "Sélectionnez un fichier de signature"
-
-#: mail/mail-config.glade.h:109
-msgid "Select a signature script"
-msgstr "Sélectionnez un script de signature"
-
 #: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Envoi du message"
@@ -12049,53 +12201,70 @@ msgid "Shortcuts _type:"
 msgstr "Types de raccourcis : "
 
 #: mail/mail-config.glade.h:118
-msgid "Signature"
+#, fuzzy
+msgid "Signature #1"
 msgstr "Signature"
 
 #: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Signature"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Source"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Informations de source"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Spécifiez le nom de fichier : "
 
-#: mail/mail-config.glade.h:122
-msgid "Spell Checking"
-msgstr "Correction orthographique"
-
 #: mail/mail-config.glade.h:123
 #, fuzzy
-msgid "Spell Checking Languages"
+msgid "Spell Checking Language"
 msgstr "Correction orthographique"
 
 #: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Spell _Checking"
+msgstr "Correction orthographique"
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "mbox Unix standard"
 
 #: mail/mail-config.glade.h:126
 msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
+msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 "Saisissez le nom par lequel vous voulez désigner ce compte.\n"
 "Par example : « Travail » ou « Personnel »"
 
-#: mail/mail-config.glade.h:128
-msgid "Use _HTML for this signature"
-msgstr "Utiliser _HTML pour cette signature"
-
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12105,243 +12274,225 @@ msgstr ""
 "\n"
 "Cliquez sur  « Suivant » pour commencer."
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_Signatures"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "_Toujours charger les images hors du réseau"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 "Toujours signer les messages sortants lors de l'utilisation de ce compte"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "Type d'authentification : "
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:146
 msgid "_Authentication type: "
 msgstr "Type d'_authentification : "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "Vérifier automatiquement la présence de nouveaux messages"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "Vérifier automatiquement la présence de nouveaux messages"
+
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Émettre un bip lorsque du courrier arrive"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "ID de Certificat : "
 
-#: mail/mail-config.glade.h:145
-#, fuzzy
-msgid "_Color for misspelled words"
-msgstr "Couleur des tâches du jour"
-
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:151
 msgid "_Confirm when expunging a folder"
 msgstr "_Confirmer avant le nettoyage du dossier"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "_Signature texte :"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Défauts"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ne pas prévenir lors de l'arrivée de courrier"
 
-#: mail/mail-config.glade.h:151
-msgid "_Enable spell checking"
-msgstr "_Activer la correction orthographique"
-
-#: mail/mail-config.glade.h:152
-msgid "_Filename:"
-msgstr "Nom du _fichier :"
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Enable"
+msgstr "Activer"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Style de transfert par défaut : "
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:160
 msgid "_Full name:"
 msgstr "_Nom complet :"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Courrier HTML"
 
-#: mail/mail-config.glade.h:158
-msgid "_HTML Signature:"
-msgstr "Signature _HTML :"
-
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identité"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 "_Charger les images si l'expéditeur est présent dans le carnet d'adresses"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "En faire mon compte par défaut"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marquer les messages comme lus après"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Ne jamais charger les images hors du réseau"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "Chemin binaire _PGP"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Jouer un fichier son lorsque du courrier arrive"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Avertissement lors de l'envoi d'un message HTML à des contacts qui n'en "
 "veulent pas"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Avertissement lors de l'envoi d'un message sans sujet"
 
-#: mail/mail-config.glade.h:171
-msgid "_Random"
-msgstr "_Aléatoire"
-
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Réception des messages"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Style de réponse par défaut : "
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Restore defaults"
 msgstr "Restaurer les valeurs par défaut"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:178
 msgid "_Script:"
 msgstr "_Script : "
 
-#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Sécurité"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Envoi du message"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Afficher les images animées"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:182
 msgid "_Signatures"
 msgstr "_Signatures"
 
-#: mail/mail-config.glade.h:180
-#, fuzzy
-msgid "_Text Signature:"
-msgstr "_Signature texte :"
-
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:183
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Utilisez une connexion _sécurisée (SSL)"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_toutes les"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:186
 msgid "color"
 msgstr "couleur"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "description"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Ne peut créer un contexte de signature PGP."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Ne peut créer un contexte de vérification PGP."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Ne peut créer un contexte de codage PGP."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Ne peut créer un contexte de décodage PGP."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Ne peut créer un contexte de signature S/MIME."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Ne peut créer un contexte seulement S/MIME certsonly."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Ne peut créer un contexte de codage S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Ne peut créer un contexte d'enveloppe S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Ne peut créer un contexte de décodage S/MIME."
 
@@ -12385,124 +12536,131 @@ msgid "Loading message content"
 msgstr "Chargement contenu de message"
 
 #: mail/mail-display.c:1553
-msgid "<b>Overdue:</b>&nbsp;"
-msgstr ""
+#, fuzzy
+msgid "Overdue:"
+msgstr "Tâches en _retard :"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Ouvrir un lien dans le Navigateur"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Copier l'emplacement du lien"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Enregistrer le lien sous (FIXME)"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Enregistrer l'image sous..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "pièce-jointe %s"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossible d'analyser le message MIME. Afficher comme source"
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Date"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Mauvaise adresse"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Répondre-À :"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "À"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 msgid "Mailer"
 msgstr "Logiciel de messagerie"
 
-#: mail/mail-format.c:1707
+#: mail/mail-format.c:1736
 msgid "View messages..."
 msgstr "Voir les messages..."
 
-#: mail/mail-format.c:1813
+#: mail/mail-format.c:1832
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Ce message est signé numériquement. Cliquez sur l'icône de verrou pour plus "
 "d'information."
 
-#: mail/mail-format.c:1836
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution ne reconnait pas ce type de message signé numériquement."
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Ne peut créer un contexte de vérification PGP."
 
-#: mail/mail-format.c:1844
+#: mail/mail-format.c:1868
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Ce message est signé numériquement et a été certifié authentique."
 
-#: mail/mail-format.c:1852
+#: mail/mail-format.c:1876
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Ce message est signé numériquement mais ne peut être certifié authentique."
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointeur sur le site FTP (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pointeur sur le fichier local (%s) valide sur le site « %s »"
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointeur sur le fichier local (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointeur sur des données distantes (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointeur sur des données externes inconnues (« %s » type)"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Partie corps externe malformée"
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Dossiers locaux"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Reconfiguration du dossier"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12511,27 +12669,27 @@ msgstr ""
 "Ne peut enregistrer les méta-informations du dossier; vous \n"
 "n'allez probablement plus pouvoir ouvrir ce dossier : %s : %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Impossible d'enregistrer les méta-informations du dossier dans %s : %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Impossible de supprimer les méta-informations du dossier %s : %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Changement du dossier « %s » vers le format « %s »"
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s ne peut être reconfigurer cr il ne s'agit pas d'un dossier local."
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12539,11 +12697,11 @@ msgstr ""
 "Si vous ne pouvez plus ouvrir cette boîte aux lettres, \n"
 "vous aurez besoin de la réparer manuellement."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Vous ne pouvez modifier le format d'un dossier non local"
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigure /%s"
@@ -12703,22 +12861,22 @@ msgstr ""
 msgid "Could not write data: %s"
 msgstr "Ne peut écrire les données : %s"
 
-#: mail/mail-ops.c:2105
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Déconnexion de %s"
 
-#: mail/mail-ops.c:2106
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnexion à %s"
 
-#: mail/mail-ops.c:2205
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Exécution de la commande : %s"
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:53
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "Rechercher"
 
@@ -12789,10 +12947,6 @@ msgstr "Mise à jour..."
 msgid "Waiting..."
 msgstr "Attente..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Annulé."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulé la requête"
@@ -12806,16 +12960,16 @@ msgstr "Saisissez le mot de passe pour %s"
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Ne peut enregistrer le fichier de signature : %s"
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Enregistrer la signature"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12825,9 +12979,33 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: mail/mail-signature-editor.c:357
-msgid "Signature name:"
-msgstr "Nom de signature : "
+#: mail/mail-signature-editor.c:378
+#, fuzzy
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+"Saisissez le nom par lequel vous voulez désigner ce compte.\n"
+"Par example : « Travail » ou « Personnel »"
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Nom :"
+
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "Signature"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "Ajouter une nouvelle signature"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12842,17 +13020,17 @@ msgstr "Message suivi"
 msgid "Forwarded Message"
 msgstr "Message suivi"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Mise en place du dossier virtuel : %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Mise à jours des dossiers virutels pour l'URI : %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12865,86 +13043,94 @@ msgstr ""
 "        « %s »\n"
 "Et ont été mis à jour."
 
-#. Make this static, saves having to recompute it each time
-#: mail/mail-vfolder.c:728 my-evolution/e-summary-mail.c:255
-#: my-evolution/e-summary-mail.c:757
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
 msgid "VFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Éditer le dossier virtuel"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tentative d'édition du dossier virtuel « %s » qui n'existe pas."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
-#: mail/message-list.c:672
+#: mail/message-browser.c:209
+msgid "(No subject)"
+msgstr "(Pas de sujet)"
+
+#: mail/message-browser.c:211
+#, c-format
+msgid "%s - Message"
+msgstr "%s - Message"
+
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Non vu"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Vu"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Répondu"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Messages non vus multiples"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Messages multiples"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Plus bas"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Plus haut"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Le plus haut"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %H:%M"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %H:%M"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Generation de la liste des messages"
 
@@ -12965,10 +13151,15 @@ msgid "Follow Up Flag"
 msgstr "Marqueur « Donner suite »"
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Contact initial : "
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Reçu"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Taille"
 
@@ -17671,5227 +17862,5224 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds and Bradford"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libye"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisboa"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "Londres"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "Londres/City"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "Londres/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "London/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "Londres/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Lousiana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "Lubeck-Blankensee"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr "Lviv"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malmo/Sturup"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Airport"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Airport"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Airport"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Middle East"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Miyakejima Airport"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Airport"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Airport"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannée"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Moscow Domodedovo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moscow Sheremetyevo"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mont Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mont Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "Munchen"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Airport"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoya (Aéroprt)"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Naha (Aéroport)"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Airport"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama Airport"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Atlantique"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "Naples"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "Nouveau Mexique"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "Nouvelle Orléans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "New Tokyo International Airport"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata (Aéroport)"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "Caroline du Nord"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "Dakota du nord"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Philadelphie (Nord-est)"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "Kingstown (Nord)"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro Airport"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr "Odesa"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita Airport"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okayama (Aéroport)"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki (Aéroport)"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Osaka International Airport"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Oshima Airport"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvanie"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "Chine (République populaire de)"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphie"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Apt"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr "Rivne"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Vallée de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Russie"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Sendai Airport"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O International Airport"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Îles"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Seville"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "Dakota du Sud"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr "Sympheropol"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Airport"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talinn"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Tanegashima Airport"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Tehran-Mehrabad"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokyo International Airport"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokyo New International Airport"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori Airport"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama Airport"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Tsushima Airport"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "Émirats Arabes Unis"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr "Uzhgorod"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech Airport"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser Airport"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Airport"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Yamagata Airport"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube Airport"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao Airport"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Zurich"
 
@@ -22923,8 +23111,8 @@ msgstr "Pas de description"
 msgid "Mail summary"
 msgstr "Résumé de courrier"
 
-#: my-evolution/e-summary-mail.c:260 my-evolution/e-summary-mail.c:404
-#: my-evolution/e-summary-mail.c:760 shell/e-local-storage.c:1021
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Dossiers locaux"
 
@@ -22933,51 +23121,47 @@ msgstr "Dossiers locaux"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KPRX"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionnary.com du jour"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Citations du jour"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Ajouter un serveur de news"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Saisissez l'URL du serveur de news que vous voulez ajouter"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Nom :"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Erreur lors du téléchargement des données RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Serveur de forums"
 
-#: my-evolution/e-summary-shown.c:486
+#: my-evolution/e-summary-shown.c:536
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:495
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
 msgid "Add"
 msgstr "_Ajouter"
 
-#: my-evolution/e-summary-shown.c:510 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Montré"
 
@@ -23017,7 +23201,7 @@ msgstr "Imprimer le résumé"
 msgid "Printing of Summary failed"
 msgstr "Échec de l'impression du résumé"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Le composant « Résumé » n'a pas pu initialiser Bonobo.\n"
 
@@ -24204,99 +24388,107 @@ msgid "C_elsius"
 msgstr "C_elcius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Ajouter une source de _nouvelles"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Combien de jours le calendrier devrait il afficher à la fois ?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Nombre Ma_ximum d'éléments affichés"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Paramétrage du serveur de news"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "1 _mois"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "1 _semaine"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "Temps de rafraîchissement (secondes) :"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "Rafraîchir l'heure (secondes) :"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "Afficher le c_hemin complet des dossiers"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Afficher toutes les _tâches"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Afficher les tâches du _jour"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Afficher les températures en :"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Tâches"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Paramétrage de la météo"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_5 jours"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Courrier"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "Sources de _nouvelles"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_1 jour"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Planifier"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Météo"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
 msgstr "Contrôle de configuration pour les dossiers par défaut d'Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
-msgid "Default Folders"
-msgstr "Dossiers par défaut"
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Paramétrage Messagerie..."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Le shell Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+#, fuzzy
+msgid "This page can be used to configure various folder settings"
 msgstr "Cette page peut être utilisée pour configurer les dossiers par défaut"
 
 #: shell/e-activity-handler.c:162
@@ -24307,20 +24499,34 @@ msgstr "Afficher les détails"
 msgid "Cancel Operation"
 msgstr "Annuler l'opération"
 
-#: shell/e-local-storage.c:173
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Impossible de transférer le dossier :\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Sélectionnez un Dossier"
+
+#: shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: shell/e-local-storage.c:174 shell/e-shell-view.c:385
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
 #: shell/e-shortcuts.c:1033
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#: shell/e-local-storage.c:175
+#: shell/e-local-storage.c:176
 msgid "Outbox"
 msgstr "Boîte d'expédition"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "Envoyé"
 
@@ -24440,6 +24646,30 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Amené sur votre bureau par"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Date d'Achèvement"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Dossiers par défaut"
+
+#: shell/e-shell-config-folder-settings.c:71
+msgid "Default Folders"
+msgstr "Dossiers par défaut"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Dossiers par défaut"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Date d'Achèvement"
+
 #: shell/e-shell-folder-commands.c:140
 #, c-format
 msgid "Cannot copy folder: %s"
@@ -24467,20 +24697,20 @@ msgstr "Ne peut déplacer un répertoire sur un de ses descendant."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Spécifier un dossier pour y copier le dossier  « %s » :"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Copier le dossier"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Spécifier un dossier pour y déplacer le dossier  « %s » :"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Déplacer le dossier"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24489,18 +24719,19 @@ msgstr ""
 "Ne peut supprimer le dossier :\n"
 "« %s »"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Supprimer « %s »"
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Êtes-vous sûr de vouloir supprimer le dossier « %s » ?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"Ne peut supprimer le dossier :\n"
+"« %s »"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24509,16 +24740,16 @@ msgstr ""
 "Ne peut supprimer le dossier :\n"
 "« %s »"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renommer le dossier « %s » en : "
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Renommer le dossier"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24537,7 +24768,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Créez un nouveau dossier"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -24545,7 +24776,7 @@ msgstr ""
 "Le type du dossier sélectionné n'est pas valide pour\n"
 "l'opération demandée."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Nouveau..."
 
@@ -24597,21 +24828,26 @@ msgstr ""
 "Importation %s\n"
 "Importation élément %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Sélectionnez un Dossier"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Le fichier « %s » n'existe pas"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Erreur Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Vous ne pouvez importer que vers des dossiers locaux"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24620,11 +24856,11 @@ msgstr ""
 "Il n'y a pas d'outils d'import capable de traiter\n"
 "%s."
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importation"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24633,17 +24869,17 @@ msgstr ""
 "Importation %s.\n"
 "Lancement %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Erreur au lancement de %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Erreur de chargement %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24652,31 +24888,31 @@ msgstr ""
 "Importation %s\n"
 "Importation élément 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automatique"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Sélectionner un fichier"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Type de fichier :"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Importer les données et règlages d'autres programmes"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Importer un seul fichier"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24684,31 +24920,78 @@ msgstr ""
 "Veuillez attendre...\n"
 "Recherche des paramétrages existants"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Importateurs intelligents de démarrage"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "De %s :"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Sélectionnez un Dossier"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Sélectionnez un dossier de destination pour importer ces données"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importer"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Fermeture des connexions..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Erreur durant « %s » :\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Synchronisation du dossier"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Alarme d'Evolution"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Ouverture du dossier %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Ouverture du dossier %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Ouvrir dans %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Ne peut créer le dossier spécifié :\n"
+"« %s »"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -24723,8 +25006,8 @@ msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "Impossible de lancer l'interface de l'assistant du lecteur de courriers\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nouveau"
@@ -24745,43 +25028,43 @@ msgstr "Le nom du dossier ne peut contenir de slashes."
 msgid "'.' and '..' are reserved folder names."
 msgstr " « . » et  « .. » sont réservés aux noms de dossiers."
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy n'a pas été trouvé dans votre $PATH."
 
-#: shell/e-shell-view-menu.c:177
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut être exécuté."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "À propos de Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:462
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Aller au dossier..."
 
-#: shell/e-shell-view-menu.c:463
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Sélectionnez le dossier que vous voulez ouvrir"
 
-#: shell/e-shell-view-menu.c:583
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Créer un nouveau raccourci"
 
-#: shell/e-shell-view-menu.c:584
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Sélectionnez le dossier que le raccourci doit pôinter :"
 
-#: shell/e-shell-view-menu.c:751
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "Travail _En ligne"
 
-#: shell/e-shell-view-menu.c:764 ui/evolution.xml.h:59
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "Travail _Hors ligne"
 
-#: shell/e-shell-view-menu.c:777 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Travail _Hors ligne"
 
@@ -24816,7 +25099,7 @@ msgstr ""
 "Ximian Evolution est hors ligne. Cliquez sur ce bouton pour travailler en "
 "ligne."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24827,12 +25110,12 @@ msgstr ""
 "L'erreur du système d'activation est :\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne peut paramétrer le stockage local -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24843,19 +25126,19 @@ msgstr ""
 "terminé de manière inattendue. Vous devrez relancer Evolution pour voir\n"
 "ces données à nouveau."
 
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Arguments invalides"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Impossible enregistrer dans OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Base de données de configuration non trouvée"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Erreur générique"
 
@@ -24880,95 +25163,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Ne pas enlever"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Renommer ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Renommer le groupe de raccourcis sélectionné par :"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Petites icônes"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Afficher les raccourcis sous forme de petites icônes"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "_Grandes icônes"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Afficher les raccourcis sous forme de grandes icônes"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Nouveau groupe..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Créer un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "_Supprimer ce groupe..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Supprimer ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "Re_nommer ce groupe..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Renommer ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "Masquer la barre de _raccourcis"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Masquer la barre de raccourcis"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Renommer le raccourci"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Renommer le raccourci sélectionné par :"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Ouvrir le dossier lié à ce raccourci"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "_Ouvrir dans une nouvelle fenêtre"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Ouvrir le dossier lié à ce raccourci dans une nouvelle fenêtre"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Renommer ce raccourci"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "Supprimer"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Supprimer ce raccourci de la barre de raccourcis"
 
@@ -25046,7 +25329,7 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fait)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<cliquez ici pour sélectionner un dossier>"
 
@@ -25086,63 +25369,63 @@ msgstr ""
 "L'erreur du système d'activation est :\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "Erreur CORBA"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Interrompu"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Argument invalide"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "A déjà un propriétaire"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Pas de propriétaire"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Non trouvée"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Tyoe non-supporté"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Schéma non supporté"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Opération non-supportée"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "URI invalide"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "A des sous-dossiers"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Pas de place restante"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "L'ancien propriétaire s'est terminé"
 
@@ -25275,40 +25558,72 @@ msgstr "Ne plus me demander"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution ne peut importer de données depuis les fichiers suivants :"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution se ferme..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Ne plus me demander"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne peut accéder au shell de Ximian Evolution."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne peut initialiser le shell de Ximian Evolution : %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Désactiver la fenêtre de démarrage"
 
-#: shell/main.c:318
+#: shell/main.c:438
 msgid "Start in offline mode"
 msgstr "Démarrer en mode déconnecté"
 
-#: shell/main.c:319
+#: shell/main.c:439
 msgid "Start in online mode"
 msgstr "Démarrer en mode connecté"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Envoyer la sortie de déboguage de tous les composants à un fichier."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -25317,7 +25632,7 @@ msgstr ""
 "%s : --online et --offline ne peuvent pas être utilisés \n"
 "ensemble. Utilisez %s --help pour plus d'informations.\n"
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne peut initialiser le composant Bonobo"
 
@@ -25426,11 +25741,11 @@ msgstr "Voir le contact courant"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:37
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Actions"
 
@@ -25551,8 +25866,8 @@ msgstr "Fermer cet élément"
 msgid "Delete this item"
 msgstr "Supprimer cet élément"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Barre d'outils principale"
 
@@ -25657,19 +25972,19 @@ msgstr "Faire suivre comme i_Calendar"
 msgid "Forward this item via email"
 msgstr "Fait suivre cet élément par message"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Obtenir les dernières informations de la réunion"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "Ra_fraîchir la réunion"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "Planifier une _réunion"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Planifier une réunion pour cet élément"
 
@@ -26225,7 +26540,7 @@ msgstr "Message _précédent"
 msgid "_Quoted"
 msgstr "_Cité"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:57
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Outils"
 
@@ -26245,7 +26560,7 @@ msgid "_Close"
 msgstr "_Fermer"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:58
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Vue"
 
@@ -26681,15 +26996,15 @@ msgstr "Paramétrage du Pilot..."
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "Envoyer/Recevoir"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Raccourci"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "Barre de _raccourcis"
 
@@ -26773,20 +27088,20 @@ msgstr ""
 "sélectionner un fuseau horaire.\n"
 "Utilisez le bouton droit de la souris pour réduire."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "Vue _courante"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 msgid "Custom View"
 msgstr "Vue personnalisée"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr "Enregistrer la vue personnalisée"
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Vues définies"
 
@@ -26907,17 +27222,18 @@ msgstr "Éditeur de recherche"
 msgid "Save Search"
 msgstr "Enregistrer la recherche"
 
-#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 msgid "_Save Search..."
 msgstr "Enre_gistrer la recherche..."
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 msgid "_Edit Saved Searches..."
 msgstr "É_diter les recherches enregistrées..."
 
-#: widgets/misc/e-filter-bar.h:93
-msgid "_Advanced Search..."
-msgstr "Recherche _avancée..."
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Avancée..."
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -26940,19 +27256,19 @@ msgstr "Message"
 msgid "Don't show this message again."
 msgstr "Ne plus afficher ce message."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 msgid "_Find Now"
 msgstr "_Trouver maintenant"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Tous"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Trouver maintenant"
 
@@ -26979,6 +27295,195 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 
 #, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Sources du carnet d'adresses"
+
+#~ msgid "Configuration control for the Evolution Addressbook."
+#~ msgstr "Contrôle de configuration pour le carnet d'adresse d'Evolution."
+
+#, fuzzy
+#~ msgid "This page can be used to configure Addressbook Settings"
+#~ msgstr "Cette page peut être utilisée pour configurer l'éditeur"
+
+#, fuzzy
+#~ msgid "&lt;- _Remove"
+#~ msgstr "<- Supprimer"
+
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Ajouter -&gt;"
+
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Composant « Résumé du calendrier » du Résumé d'Evolution"
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Utilitaire pour le composant Résumé Calendrier."
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "_Début de la journée :"
+
+#~ msgid "_End of day:"
+#~ msgstr "_Fin de la journée :"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "_Autre organizer"
+
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "La signature en clair n'est pas supportée par ce message chiffré"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Veuillez saisir votre phrase de passe %s pour %s"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Veuillez saisir votre phrase de passe pour %s"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Impossible de signer ce message : pas de partie plaintext à signer"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Impossible de signer ce message : pas de mot de passe fourni"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Impossible de signer ce message : ne peut créer le tube vers GPG/PGP : %s"
+
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Impossible de signer ce message : pas de partie plaintext à signer"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr ""
+#~ "Impossible de vérifier ce message : pas de partie plaintext à vérifier"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Impossible de vérifier ce message : ne peut pas créer le tube vers GPG/"
+#~ "PGP : %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr ""
+#~ "Impossible de crypter ce message : pas de partie plaintext à crypter"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Impossible de crypter ce message : pas de mot de passe fourni"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Impossible de crypter ce message : ne peut créer le tube vers GPG/PGP : %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "Impossible de décrypter ce message : pas de partie cyphertext à décrypter"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Impossible de décrypter ce message : pas de mot de passe spécifié"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Impossible de décrypter ce message : ne peut créer le tube vers GPG/PGP : "
+#~ "%s"
+
+#~ msgid "%s server %s"
+#~ msgstr "%s serveur %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(Hôte inconnu)"
+
+#~ msgid "Directory tree of mbox files"
+#~ msgstr "Arborescence de répertoires des fichiers mbox"
+
+#~ msgid ""
+#~ "For accessing mail storedin an external tree of mbox files.\n"
+#~ "This will allow you to directly access pine and elm folders.\n"
+#~ "NOTE: This provider is still experimental so ensure you backup any mail "
+#~ "folders first."
+#~ msgstr ""
+#~ "Pour accéder à du courrier stocké dans une arborescence de \n"
+#~ "fichiers mbox externe. Cela vous permets d'accéder directement \n"
+#~ "à des fichiers Pine ou elm.\n"
+#~ "NOTE : Ce fournisseur est expérimental, donc assurez vous de \n"
+#~ "sauvegarder tous les courriers de ces répertoires avant tout."
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Impossible d'ajouter le message au fichier mbox : %s : %s"
+
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Impossible d'ouvrir le fichier : %s : %s"
+
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Stockage « %s » n'existe pas ou n'est pas un répertoire."
+
+#~ msgid "Mail tree %s"
+#~ msgstr "Arbre de courrier %s"
+
+#~ msgid "Random"
+#~ msgstr "Aléatoirement"
+
+#~ msgid "Cannot execute signature script"
+#~ msgstr "Impossible d'exécuter le script de signature"
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "_Éditer"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Nouveau"
+
+#~ msgid "Advanced Options"
+#~ msgstr "Options avancées"
+
+#, fuzzy
+#~ msgid "E_nable advanced options"
+#~ msgstr "Activer les options avancées"
+
+#~ msgid "Randomized"
+#~ msgstr "Aléatoire"
+
+#~ msgid "Same as text"
+#~ msgstr "Même chose en texte"
+
+#~ msgid "Select a signature file"
+#~ msgstr "Sélectionnez un fichier de signature"
+
+#~ msgid "Select a signature script"
+#~ msgstr "Sélectionnez un script de signature"
+
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "Utiliser _HTML pour cette signature"
+
+#~ msgid "_Enable spell checking"
+#~ msgstr "_Activer la correction orthographique"
+
+#~ msgid "_Filename:"
+#~ msgstr "Nom du _fichier :"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "Signature _HTML :"
+
+#~ msgid "_Random"
+#~ msgstr "_Aléatoire"
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Ne peut créer un contexte de codage PGP."
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Ne peut créer un contexte de décodage PGP."
+
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "Evolution ne reconnait pas ce type de message signé numériquement."
+
+#~ msgid "Signature name:"
+#~ msgstr "Nom de signature : "
+
+#~ msgid "Riga"
+#~ msgstr "Riga"
+
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Êtes-vous sûr de vouloir supprimer le dossier « %s » ?"
+
+#~ msgid "_Advanced Search..."
+#~ msgstr "Recherche _avancée..."
+
+#, fuzzy
 #~ msgid "Could not query for schema information"
 #~ msgstr ""
 #~ "Informations de trace opaque invalides :\n"
@@ -27022,20 +27527,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "Copying"
 #~ msgstr "Duplication"
 
-#~ msgid "(No subject)"
-#~ msgstr "(Pas de sujet)"
-
-#~ msgid "%s - Message"
-#~ msgstr "%s - Message"
-
-#, fuzzy
-#~ msgid "Add ->"
-#~ msgstr "Ajouter ->"
-
-#, fuzzy
-#~ msgid "<- Remove"
-#~ msgstr "<- Supprimer"
-
 #~ msgid "Edit Addressbook"
 #~ msgstr "Éditer le carnet d'adresses"
 
@@ -27166,13 +27657,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "_Server type: "
 #~ msgstr "Type de _serveur : "
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impossible de transférer le dossier :\n"
-#~ "%s"
-
 #~ msgid "Baltic (IS0-8859-13)"
 #~ msgstr "Baltique (IS0-8859-13)"
 
@@ -27194,9 +27678,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "Ad_vanced &gt;&gt;"
 #~ msgstr "A_vancée &gt;&gt;"
 
-#~ msgid "Add new signature"
-#~ msgstr "Ajouter une nouvelle signature"
-
 #~ msgid "Composer"
 #~ msgstr "Composeur"
 
@@ -27238,9 +27719,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "List of signatures"
 #~ msgstr "Liste de signatures"
 
-#~ msgid "Mail Settings"
-#~ msgstr "Paramétrage Messagerie..."
-
 #~ msgid "Name of selected signature"
 #~ msgstr "Nom de la signature sélectionnée"
 
@@ -27284,9 +27762,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "_Name"
 #~ msgstr "_Nom"
 
-#~ msgid "_Script"
-#~ msgstr "_Script"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "Envoyer par défaut le courrier au format HTML"
 
@@ -27448,9 +27923,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "Could not encrypt: encoding failed."
 #~ msgstr "Échec de l'encryptage : l'encodage a échoué."
 
-#~ msgid "Failed to decrypt: Unknown"
-#~ msgstr "Impossible de décrypter : Erreur inconnue"
-
 #~ msgid "Please enter the NNTP password for %s@%s"
 #~ msgstr "Veuillez saisir le mot de passe NNTP pour %s@%s"
 
diff --git a/po/ga.po b/po/ga.po
index fc98615fc0..aa18555bf6 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: locales 0.01\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-01-25 14:00-0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "File As"
 msgstr "S�bh�il Mar"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ainm"
@@ -46,7 +46,7 @@ msgid "Email"
 msgstr "Rpost"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Tosa�ocht"
 
@@ -56,7 +56,7 @@ msgstr "Tos."
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr ""
@@ -64,8 +64,8 @@ msgstr ""
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Gn�"
 
@@ -75,12 +75,12 @@ msgid "Bus"
 msgstr "GN"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Teoranta"
 
@@ -91,8 +91,8 @@ msgstr "Teor."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Baile"
 
@@ -107,18 +107,18 @@ msgstr "Eag."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "G�than P�ca"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Car"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Facs Ghn�"
@@ -128,13 +128,13 @@ msgid "Bus Fax"
 msgstr "Facs Ghn�"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Facs Bhaile"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Gn� 2"
 
@@ -143,43 +143,43 @@ msgid "Bus 2"
 msgstr "Gn� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Baile 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Eile"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Facs Eile"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Raidio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
@@ -191,14 +191,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "Rphost 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Rphost 3"
@@ -336,7 +336,7 @@ msgstr "VCard do %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -344,7 +344,7 @@ msgid "Could not initialize Bonobo"
 msgstr ""
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Ag Cuardaigh..."
 
@@ -357,31 +357,31 @@ msgstr "Ag L��d��il..."
 msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 msgid "Error performing search"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Te�p ag fork: %s"
@@ -429,104 +429,129 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "Leabhar Seoladh:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Tadhalla�"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "Freastala� LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "L��osta Tadhall Nua"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "Liost Tadhall"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Tadhall"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "L��osta Tadhall Nua"
+#: addressbook/gui/component/addressbook-config.c:197
+msgid "Failed to connect to LDAP server"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:565
-#, fuzzy
-msgid "Contact _List"
-msgstr "Liost Tadhall"
+#: addressbook/gui/component/addressbook-config.c:216
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1174
+msgid "Error retrieving schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1182
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1638
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Tadhalla� Eile"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr ""
@@ -552,49 +577,58 @@ msgid ""
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Pasfhocal do %s, le do thoil (�s�ideoir %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "Rphost 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(gan ainm)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr ""
 
@@ -640,96 +674,59 @@ msgstr ""
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:197
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:215
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-msgid "Could not query for schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1169
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1613
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "_Fillte�n"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:2
 #, fuzzy
-msgid "<< Fewer Options"
-msgstr "Roghanna"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "_Scr�os"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
-#, fuzzy
 msgid "1234"
 msgstr "123"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "_Scr�os"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Roghanna"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -743,8 +740,8 @@ msgstr ""
 # ## 	The 'msgid' names and spellings for languages are those listed
 # ##     in iso-639.def from glibc
 # aa 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Af�iris"
@@ -837,8 +834,8 @@ msgstr "Socr�"
 msgid "Mappings"
 msgstr "An tS�n"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_gach"
@@ -1019,14 +1016,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1046,8 +1043,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1079,7 +1076,7 @@ msgid "Using email address"
 msgstr "Seoladh Rpost:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1087,7 +1084,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Suimigh"
 
@@ -1137,7 +1134,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1253,10 +1250,12 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Scr�os"
 
@@ -1381,7 +1380,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr ""
 
@@ -1391,7 +1390,7 @@ msgid "D_epartment:"
 msgstr "_Rang:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Sonra�"
 
@@ -1451,11 +1450,12 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Dealaigh"
 
@@ -1485,7 +1485,7 @@ msgstr "Seoladh leathanach greas�n:"
 
 # US
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "St�it Aontaithe Mheirice�"
 
@@ -2099,13 +2099,12 @@ msgstr ""
 
 # LV
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr ""
 
 # LB
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "An Liob�in"
 
@@ -2116,7 +2115,7 @@ msgstr ""
 
 # LR
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr ""
 
@@ -2127,13 +2126,13 @@ msgstr ""
 
 # LT
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr ""
 
 # LU
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Lucsamburg"
 
@@ -2174,7 +2173,7 @@ msgstr "Mali"
 
 # MT
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "M�lta"
 
@@ -2206,7 +2205,7 @@ msgstr ""
 
 # MX
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Meicsiceo"
 
@@ -2236,7 +2235,7 @@ msgstr ""
 
 # MA
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marac�"
 
@@ -2267,7 +2266,7 @@ msgstr "Neipe�l"
 
 # NL
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "An Isiltir"
 
@@ -2283,13 +2282,13 @@ msgstr ""
 
 # NZ
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "An Nua-Sh�alainn"
 
 # NI 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2310,7 +2309,7 @@ msgstr ""
 
 # NF
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr ""
 
@@ -2321,19 +2320,19 @@ msgstr ""
 
 # NO
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "An Iorua"
 
 # OM
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr ""
 
 # PK
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "An Phacast�in"
 
@@ -2348,7 +2347,7 @@ msgstr "An Phalaist�n"
 
 # PA
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr ""
 
@@ -2359,13 +2358,13 @@ msgstr ""
 
 # PY
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
 # PE
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peiri�"
 
@@ -2381,25 +2380,25 @@ msgstr ""
 
 # PL
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "An Pholainn"
 
 # PT
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "An Phortaing�il"
 
 # PR
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr ""
 
 # QA
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr ""
 
@@ -2410,7 +2409,7 @@ msgstr ""
 
 # RO 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "An R�m�in"
 
@@ -2452,7 +2451,7 @@ msgstr ""
 
 # SA
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "An Araib"
 
@@ -2473,19 +2472,19 @@ msgstr ""
 
 # SG
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singeap�r"
 
 # SK
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr ""
 
 # SI
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr ""
 
@@ -2501,7 +2500,7 @@ msgstr ""
 
 # ZA 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr ""
 
@@ -2511,7 +2510,7 @@ msgstr ""
 
 # ES
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "An Sp�inn"
 
@@ -2535,7 +2534,7 @@ msgstr "An tS�d�in"
 
 # SR
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr ""
 
@@ -2550,19 +2549,19 @@ msgstr ""
 
 # SE
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "An tSualainn"
 
 # CH
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "An Eilv�is"
 
 # TW
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr ""
 
@@ -2606,7 +2605,7 @@ msgstr "An T�in�is"
 
 # TR
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "An Tuirc"
 
@@ -2631,7 +2630,7 @@ msgstr "Uganda"
 
 # UA
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr ""
 
@@ -2642,7 +2641,7 @@ msgstr "Aontas na n�im�r�ochta� Arabacha"
 
 # UK
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "An R�ocht"
 
@@ -2653,7 +2652,7 @@ msgstr ""
 
 # UY
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uragua"
 
@@ -2669,13 +2668,13 @@ msgstr ""
 
 # VE
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Veinis�ala"
 
 # VN
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vitneam"
 
@@ -2698,13 +2697,13 @@ msgstr ""
 
 # YE
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "�imin"
 
 # YU
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "An I�glaiv"
 
@@ -2719,27 +2718,33 @@ msgid "Zimbabwe"
 msgstr "An tSiomb�ib"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Dealaigh Tadhall?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "S�bh�il mar VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2766,11 +2771,11 @@ msgstr "R-phost"
 msgid "card.vcf"
 msgstr "carta.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "l�osta"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2903,11 +2908,11 @@ msgid "contact-list-editor"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "S�bh�il mar VCard"
@@ -2982,21 +2987,21 @@ msgid "Error getting book view"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "iEarraidh gan Aithne"
 
@@ -3005,7 +3010,7 @@ msgid "Repository offline"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr ""
 
@@ -3023,55 +3028,70 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Ceangailte"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "�dar�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "�dar�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Earraidh Eile"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Taispea�n"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Taispea�n"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -3079,22 +3099,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Gan carta�"
@@ -3159,103 +3179,109 @@ msgstr "F�n Eile"
 msgid "Other Address"
 msgstr "Seoladh Eile"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Leabhar Seoladh:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "S�bh�il mar VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Tadhall Nua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "L��osta Tadhall Nua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_C�ip do Fillte�n..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "Chl�_fhoireann..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Post sce�l do Tadhall..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Albachta� Phoist"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr ""
 
 # fa 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Priont�il"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_C�ip do Fillte�n..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Gearr"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "C�ip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Greamaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Dealaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3265,7 +3291,7 @@ msgstr "Radharc Carta"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,ij,k,l,m,Mc,o,p,qr,s,t,u,v,w,xyz"
 
@@ -3273,7 +3299,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,ij,k,l,m,Mc,o,p,qr,s,t,u,v,w,xyz"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,Mc,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3413,7 +3439,7 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Roghanna"
 
@@ -3423,7 +3449,7 @@ msgid "Orientation"
 msgstr "Treoshu�omh"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Leathanach"
 
@@ -3497,29 +3523,33 @@ msgstr "Leitheid:"
 msgid "_Font..."
 msgstr "Chl�_fhoireann..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Ard"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Gn�th"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Bun"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr ""
 
@@ -3561,42 +3591,34 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3608,10 +3630,25 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "�lbachta�"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Rabhadh"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "am neamhbhail�"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution "
+
 # ##
 # ## Languages (ISO 639 code in brackets)
 # ## 	The 'msgid' names and spellings for languages are those listed
@@ -3652,7 +3689,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Rabhadh"
@@ -3672,15 +3709,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "T�ip ag tosnaithe GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3696,7 +3733,7 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr ""
 
@@ -3735,14 +3772,16 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Priobhdach"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr ""
 
@@ -3763,27 +3802,32 @@ msgid "W"
 msgstr "I"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Saor"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Cr�ochnaithe"
 
@@ -3795,11 +3839,12 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3814,12 +3859,14 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "T�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "N�l"
 
@@ -3839,63 +3886,65 @@ msgstr "Radharc Seachtain"
 msgid "Month View"
 msgstr "Radharc M�"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Feilire"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr ""
 
 # tg
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Teascanna"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "Bealach Nuacht�in"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "�lbachta�"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "Teasc Nua"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Teasc"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Coinne Nua"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Coinne"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "Coinne Nua"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "Coinne"
@@ -4105,7 +4154,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Coimri�:"
 
@@ -4134,7 +4183,7 @@ msgstr "deireadh an coinne"
 msgid "hour(s)"
 msgstr "uair"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "noimea(i)d"
 
@@ -4162,78 +4211,81 @@ msgstr "30 noime�id"
 msgid "60 minutes"
 msgstr "60 noime�id"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+# DZ
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "An Ailg�ir"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Lae"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Aoine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Uair"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Noimea�d"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Luain"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "_Dom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Sathairn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "_Dom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domhnaigh"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_asks due today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "D_ea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "_Mai"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4262,80 +4314,94 @@ msgid "Tuesday"
 msgstr "Mairt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Ce�daoin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Seachtain Oibre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 uair (IN/RN)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 uair"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "_Day begins:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Taispea�n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "_Deireadh an L�:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_Aoi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Lua"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Overdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_Sat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Show appointment end times in week and month views"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Guth�n sa Baile"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_Mai"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_Cea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
+msgstr "Scr�os an sceal seo"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
@@ -4417,40 +4483,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Te�p ag fork: %s"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Te�p ag fork: %s"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Teasc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Gan coimri�"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "S�nbh�il le..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4508,27 +4595,27 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
@@ -4576,7 +4663,7 @@ msgid "Pu_blic"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr ""
 
@@ -4598,19 +4685,19 @@ msgstr ""
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr ""
 
@@ -4621,49 +4708,55 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
+msgid "Click here to add an attendee"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
+msgid "Common Name"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
+msgid "Delegated From"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Teanga"
+msgid "Delegated To"
+msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Ball"
+msgid "Language"
+msgstr "Teanga"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Ball"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "St�das"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Saghas"
@@ -4678,14 +4771,10 @@ msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr ""
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4874,7 +4963,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4886,19 +4975,19 @@ msgstr "Tosa�ocht"
 msgid "_Status:"
 msgstr "_St�das:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Gn�th"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Tuarasc�il:"
 
@@ -4910,24 +4999,79 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Osc�il"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "S�nbh�il le..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4935,13 +5079,13 @@ msgstr "S�nbh�il le..."
 msgid "_Print..."
 msgstr "_Priont�il..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "G_earr"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
@@ -4949,7 +5093,7 @@ msgid "_Copy"
 msgstr "_C�ip"
 
 # PS
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4958,36 +5102,37 @@ msgstr "_C�ip"
 msgid "_Paste"
 msgstr "_Greamaigh"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 msgid "_Assign Task"
 msgstr ""
 
 # ln
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Liong�ilis"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "% Rinneadh:"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
 
@@ -5001,47 +5146,48 @@ msgstr ""
 msgid "Alarms"
 msgstr "Af�iris"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Tosa�ocht"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr ""
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Coimri�"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -5086,11 +5232,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "rn"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "in"
 
@@ -5130,7 +5278,7 @@ msgid "_Publish Free/Busy Information"
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Socraigh Fillte�in..."
@@ -5141,7 +5289,7 @@ msgid "_Configure Pilot..."
 msgstr "Socraigh Fillte�in..."
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "_S�bh�il Mar..."
 
@@ -5168,72 +5316,417 @@ msgid "Delete _All Occurrences"
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+#, fuzzy
+msgid "Meeting begins: <b>"
+msgstr "Eolas"
+
+#: calendar/gui/e-itip-control.c:683
+#, fuzzy
+msgid "Task begins: <b>"
+msgstr "Cr�ochnaithe.`"
+
+#: calendar/gui/e-itip-control.c:688
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Eolas"
+
+#: calendar/gui/e-itip-control.c:692
+#, fuzzy
+msgid "Begins: <b>"
+msgstr "Eolas"
+
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Eolas"
+
+#: calendar/gui/e-itip-control.c:707
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Eolas"
+
+#: calendar/gui/e-itip-control.c:711
+#, fuzzy
+msgid "Ends: <b>"
+msgstr "Eolas"
+
+#: calendar/gui/e-itip-control.c:725
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "Cr�ochnaithe.`"
+
+#: calendar/gui/e-itip-control.c:735
+#, fuzzy
+msgid "Task Due: <b>"
+msgstr "Cr�ochnaithe.`"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "eolas fheilire"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Feilire"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "An unknown person"
+msgstr "iEarraidh gan Aithne"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Ar bith</i>"
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "_St�das:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Gan Aithne"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Fillte�n _Nua"
+
+#: calendar/gui/e-itip-control.c:972
+#, fuzzy
+msgid "Update"
+msgstr "Data"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Ceart go Leor"
+
+#: calendar/gui/e-itip-control.c:1000
+#, fuzzy
+msgid "Accept"
+msgstr "Cuntas"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1002
+#, fuzzy
+msgid "Decline"
+msgstr "Dealaigh"
+
+#: calendar/gui/e-itip-control.c:1026
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Eolas"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Eolas Theasc"
+
+# FR
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "An Fhrainc"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1118
+#, fuzzy
+msgid "Meeting Information"
+msgstr "eolas fheilire"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1123
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "_Dealaigh gach rud"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1128
+#, fuzzy
+msgid "Meeting Update"
+msgstr "�lbachta�"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1157
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Freagrair"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1167
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Post an sce�l seo"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Eolas Theasc"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1200
+#, fuzzy
+msgid "Task Update"
+msgstr "Data"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1230
+#, fuzzy
+msgid "Task Reply"
+msgstr "Freagrair"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1235
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Eolas Theasc"
+
+#: calendar/gui/e-itip-control.c:1240
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Teachtaireacht Feilire"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1260
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Eolas"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1270
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "Freagrair"
+
+#: calendar/gui/e-itip-control.c:1275
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Post an sce�l seo"
+
+#: calendar/gui/e-itip-control.c:1354
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+msgid "Object could not be found\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Fillte�n _Nua"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Fillte�n _Nua"
@@ -5278,96 +5771,95 @@ msgid "date-start"
 msgstr ""
 
 # FIXME (Plural)
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Cathlaoirlaig"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr ""
 
 # IN 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Pearsanta"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Goireas"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Seomra"
 
 # th
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 #, fuzzy
 msgid "Chair"
 msgstr "T�alainnis"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Freagra"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5379,63 +5871,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "As an Oifig"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Gan Eolas"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Roghanna"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr ""
 
@@ -5454,16 +5946,21 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Te�p ag fork: %s"
+
+#: calendar/gui/e-tasks.c:558
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 msgid "Expunging"
 msgstr ""
 
@@ -5476,17 +5973,17 @@ msgstr "Coinne Nua..."
 msgid "_Delete this Appointment"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Osc�il Feilire"
@@ -5555,19 +6052,58 @@ msgstr "D. F�mhair"
 msgid "September"
 msgstr "M. F�mhair"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "eolas fheilire"
+
+#: calendar/gui/itip-utils.c:356
+#, fuzzy
+msgid "Task information"
+msgstr "Eolas Theasc"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "Eolas Cuntais"
+
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "Eolas"
+
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "eolas fheilire"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Data"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Freagrair"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr ""
 
@@ -5758,12 +6294,52 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
+# tg
+#: calendar/gui/print.c:2249
+#, fuzzy
+msgid "Task"
+msgstr "T�ids�cis"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_St�das:"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "Tosa�ocht"
+
+#: calendar/gui/print.c:2338
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Cr�ochnaithe.`"
+
+#: calendar/gui/print.c:2350
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2364
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Aicm�:"
+
+#: calendar/gui/print.c:2375
+#, fuzzy
+msgid "Contacts: "
+msgstr ""
+"\n"
+"Tr�cht:"
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Priont�il Feilire"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5794,8 +6370,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr ""
 
@@ -5848,6 +6424,10 @@ msgstr ""
 msgid "Imports vCalendar files into Evolution"
 msgstr ""
 
+#: calendar/importers/icalendar-importer.c:424
+msgid "Reminder!!"
+msgstr ""
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5938,8 +6518,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -6898,670 +7478,684 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
-msgid "Asia/Magadan"
+msgid "Asia/Macau"
 msgstr ""
 
 #: calendar/zones.h:231
-msgid "Asia/Manila"
+msgid "Asia/Magadan"
 msgstr ""
 
 #: calendar/zones.h:232
-msgid "Asia/Muscat"
+msgid "Asia/Makassar"
 msgstr ""
 
 #: calendar/zones.h:233
-msgid "Asia/Nicosia"
+msgid "Asia/Manila"
 msgstr ""
 
 #: calendar/zones.h:234
-msgid "Asia/Novosibirsk"
+msgid "Asia/Muscat"
 msgstr ""
 
 #: calendar/zones.h:235
-msgid "Asia/Omsk"
+msgid "Asia/Nicosia"
 msgstr ""
 
 #: calendar/zones.h:236
-msgid "Asia/Phnom_Penh"
+msgid "Asia/Novosibirsk"
 msgstr ""
 
 #: calendar/zones.h:237
-msgid "Asia/Pontianak"
+msgid "Asia/Omsk"
 msgstr ""
 
+# AT
 #: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "An Ostair"
+
+#: calendar/zones.h:239
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:240
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr ""
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr ""
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr ""
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr ""
 
 # SG
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 #, fuzzy
 msgid "Asia/Singapore"
 msgstr "Singeap�r"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr ""
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr ""
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr ""
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr ""
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr ""
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
 # AU
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 #, fuzzy
 msgid "Australia/Adelaide"
 msgstr "An Astr�il"
 
 # AU
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 #, fuzzy
 msgid "Australia/Brisbane"
 msgstr "An Astr�il"
 
 # AU
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 #, fuzzy
 msgid "Australia/Broken_Hill"
 msgstr "An Astr�il"
 
 # AU
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 #, fuzzy
 msgid "Australia/Darwin"
 msgstr "An Astr�il"
 
 # AU
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 #, fuzzy
 msgid "Australia/Hobart"
 msgstr "An Astr�il"
 
 # AU
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 #, fuzzy
 msgid "Australia/Lindeman"
 msgstr "An Astr�il"
 
 # AU
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 #, fuzzy
 msgid "Australia/Lord_Howe"
 msgstr "An Astr�il"
 
 # AU
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 #, fuzzy
 msgid "Australia/Melbourne"
 msgstr "An Astr�il"
 
 # AU
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 #, fuzzy
 msgid "Australia/Perth"
 msgstr "An Astr�il"
 
 # AU
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 #, fuzzy
 msgid "Australia/Sydney"
 msgstr "An Astr�il"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr ""
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr ""
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 #, fuzzy
 msgid "Europe/Athens"
 msgstr "�lbacta�"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr ""
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr ""
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr ""
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr ""
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr ""
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr ""
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr ""
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr ""
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr ""
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr ""
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr ""
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr ""
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr ""
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr ""
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr ""
 
 # LU
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 #, fuzzy
 msgid "Europe/Luxembourg"
 msgstr "Lucsamburg"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr ""
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr ""
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr ""
 
 # MC
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 #, fuzzy
 msgid "Europe/Monaco"
 msgstr "Monac�"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr ""
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr ""
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 #, fuzzy
 msgid "Europe/Paris"
 msgstr "�lbacta�"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr ""
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr ""
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr ""
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr ""
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr ""
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr ""
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr ""
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr ""
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr ""
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr ""
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr ""
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr ""
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
 # IN 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 #, fuzzy
 msgid "Indian/Mahe"
 msgstr "An India"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr ""
 
 # mr
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 #, fuzzy
 msgid "Indian/Mauritius"
 msgstr "Marata�"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr ""
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr ""
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr ""
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
@@ -7569,12 +8163,12 @@ msgstr ""
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7582,7 +8176,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7590,11 +8184,16 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -7602,58 +8201,69 @@ msgstr ""
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 #, fuzzy
 msgid "Syncing folder"
 msgstr "ag sioncronaich filtean"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "_Post sce�l"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Te�p ag fork: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Te�p ag fork: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -7681,26 +8291,101 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 #, fuzzy
 msgid "Moving messages"
 msgstr "Post an sce�l seo"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Post an sce�l seo"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Ceangailte."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:782
+msgid "No data provided"
+msgstr ""
+
+#: camel/camel-gpg-context.c:827
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr ""
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "_Post sce�l"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "_Post sce�l"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "_Post sce�l"
+
+#: camel/camel-gpg-context.c:1258
+#, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7796,81 +8481,23 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr ""
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr ""
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Earraidh Eile"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7886,43 +8513,6 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s freastala� %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(��st gan aithne)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr ""
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Gan anim"
@@ -8016,7 +8606,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8043,11 +8633,9 @@ msgid ""
 "Password Authentication."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Pasfhocal"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -8074,51 +8662,51 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Ag dealaigh fillte�n %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8180,12 +8768,12 @@ msgstr "_Post sce�l"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Te�p ag fork: %s"
@@ -8209,7 +8797,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8218,16 +8806,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8242,15 +8830,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Ni raibh aon sceal %s i %s"
 
-#: camel/camel-vee-folder.c:753
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "Ni raibh sceal sinn: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Fillte�n _Nua"
 
 #: camel/camel-vee-store.c:262
 #, fuzzy, c-format
@@ -8272,69 +8860,78 @@ msgstr "Te�p ag fork: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Ag S�bh�il scealta"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8387,32 +8984,80 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Pasfhocal"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP freastala� %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "SMTP freastala� %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Te�p ag fork: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+msgid "SSL/TLS extension not supported."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8420,69 +9065,86 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
-msgid "MH-format mail directories"
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, c-format
+msgid "mailbox:%s (%s)"
+msgstr ""
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:49
+msgid "MH-format mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Scr�os an sceal seo"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+msgid "Standard Unix mbox spool or directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8508,7 +9170,7 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
@@ -8528,55 +9190,52 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "_Post sce�l"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 #, fuzzy
 msgid "No such message"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8585,13 +9244,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8605,7 +9264,7 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
@@ -8614,8 +9273,8 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Te�p ag fork: %s"
@@ -8635,58 +9294,48 @@ msgstr ""
 msgid "Checking for new messages"
 msgstr "Ag S�bh�il scealta"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Ag stoir filtean"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -8723,176 +9372,155 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
+#, c-format
+msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
-msgid "Error writing to temp mailbox: %s"
+msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
+msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
-#, c-format
-msgid "Could not close source folder %s: %s"
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
-msgid "Could not close temp folder: %s"
-msgstr ""
+msgid "Unknown error: %s"
+msgstr "Earraidh gan aithne: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Te�p ag fork: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
 #, c-format
-msgid "Could not rename folder: %s"
+msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:990
 #, c-format
-msgid "Unknown error: %s"
-msgstr "Earraidh gan aithne: %s"
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "N�l aon Eolaire `%s' ann."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, fuzzy, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr ""
-"Earraidh ag s�bhh�il sc�ala� do: %s\n"
-" %s"
-
-#: camel/providers/local/camel-spool-store.c:115
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
+msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "N�l aon Eolaire `%s' ann."
+
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, c-format
+msgid "Spool folder tree %s"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, fuzzy, c-format
-msgid "Could not file: %s: %s"
-msgstr "Te�p ag fork: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "N�l aon Eolaire `%s' ann."
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Post do %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Nuachtain USENET"
@@ -8901,12 +9529,22 @@ msgstr "Nuachtain USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Te�p ag fork: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nuachtain USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9009,7 +9647,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr "Scrios indiath %s la(e)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -9030,68 +9668,59 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-msgid "SSL/TLS extension not supported."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Ag oscailt an t-eolaire %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "Earraidh I/A"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "N�l aon eolaire `%s' ann."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9252,41 +9881,41 @@ msgstr ""
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
+#: camel/providers/smtp/camel-smtp-transport.c:461
 #, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9294,89 +9923,89 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP freastala� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 #, fuzzy
 msgid "Sending message"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9384,35 +10013,35 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr ""
 
@@ -9487,7 +10116,7 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr ""
 
@@ -9495,45 +10124,45 @@ msgstr ""
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr ""
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9544,55 +10173,60 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Te�p ag fork: %s"
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Rabhadh!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9601,47 +10235,74 @@ msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Osc�il Comhad"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr ""
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+# SG
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Singeap�r"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (gn�th)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9701,7 +10362,7 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9858,7 +10519,7 @@ msgstr "��ghur"
 msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "soicind"
 
@@ -9926,7 +10587,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9938,6 +10599,21 @@ msgstr ""
 msgid "Filter Rules"
 msgstr ""
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Ainm St�l:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "N�l aon Eolaire `%s' ann."
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Fillte�n _Nua"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9954,7 +10630,7 @@ msgid ""
 msgstr ""
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 #, fuzzy
 msgid "Select Folder"
 msgstr "Fillte�n _Nua"
@@ -9966,7 +10642,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test"
 msgstr "An Tib�id"
@@ -9996,7 +10676,7 @@ msgid "if all criteria are met"
 msgstr ""
 
 #: filter/filter-rule.c:769
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr ""
 
 #: filter/filter-rule.c:780
@@ -10075,195 +10755,206 @@ msgid "Beep"
 msgstr "An Bheilg"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Teoranta"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr ""
 
 # mt
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Scr�oste"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
 # IR
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "riomh"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+# PE
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "_Larger"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr ""
 
 # PL
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "An Pholainn"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr ""
 
 # Avoid; either use KR or KP
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Sc�r"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "M�id (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Abair"
 
@@ -10319,7 +11010,8 @@ msgid "Scanning %s"
 msgstr "Ag Oscailt '%s'"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Post"
 
@@ -10333,10 +11025,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Leabhar Seoladh:"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10384,7 +11072,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Bruscar"
 
@@ -10515,267 +11205,274 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr ""
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr ""
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr ""
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "�lbachta�..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Ag S�bh�il scealta"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Teachaireacht Post Nua"
 
 # mt
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Sc�al R�omhphost"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ag Cealaigh..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Albachta� do \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "�lbacta�"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d nua"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
 # c-format
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d �oml�n"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Fillte�n _Nua"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_Priont�il"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Freagrair do L�osta"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Freagrair do _Gach rud"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Cr�ochnaithe"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Glan"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Athdealaigh"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_C�ip do Fillte�n..."
 
-# PE
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "_Larger"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Suim Leabhar Seoladh"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Teachtaireacht Feilire"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Gn�th"
+
+#: mail/folder-info.c:71
 #, fuzzy
 msgid "Getting Folder Information"
 msgstr "eolas fheilire"
@@ -10828,7 +11525,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
@@ -10838,83 +11535,107 @@ msgid "Evolution News Editor"
 msgstr "Eagarth�ir Nuachr�in Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_�st:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Ainm _�saideoir"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Sl�:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Raidio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "M�chumasach"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Chumasach"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Ainm _Chuntas:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Portr�id"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Post do %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Abair is %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Sc�al � %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "l�osta r�omhphost %s"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10922,132 +11643,132 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Post ar aon n�s?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Am %a, %Y-%m-%d ag %H:%M, scr�obh %%s:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "S�bh�il Sc�al Mar..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "S�bh�il Sc�ala Mar..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Scr�os an sceal seo"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11055,40 +11776,75 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "(Gan Tuarascail)"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+msgid "Unnamed"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "n"
+
+#: mail/mail-composer-prefs.c:861
+msgid "Add script signature"
+msgstr ""
+
+# SG
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Singeap�r"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11126,188 +11882,169 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr ""
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Ag Obair"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Gn�th"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "Bainisteoir"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Cuntas"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.c:2999
-msgid "Unnamed"
-msgstr ""
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "_Eagar"
+msgid " _Check for supported types "
+msgstr ""
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "_Nua"
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid " _Check for supported types "
+msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of Evolution)"
+msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
-msgid "(SSL is not supported in this build of evolution)"
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
 #: mail/mail-config.glade.h:7
-msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Account Editor"
 msgstr "Cuntas %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Eolas Cuntais"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Bainisteoireacht Chuntas"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Roghanna"
+msgid "Add Sc_ript"
+msgstr "_Sl�nd�il"
 
-# AQ
-#: mail/mail-config.glade.h:12
-#, fuzzy
-msgid "Afrikaans"
-msgstr "an tAntartasch"
+#: mail/mail-config.glade.h:11
+msgid "Add new signature..."
+msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-# DZ
 #: mail/mail-config.glade.h:14
-#, fuzzy
-msgid "Alerts"
-msgstr "An Ailg�ir"
-
-#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-# AT
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "An Ostair"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "�dar�"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Automatically _detect links"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Earraidh gan aithne: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_D�n"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:29
+msgid "Color for _misspelled words:"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Cruthaigh Sc�al _Nua"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Socr�"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11317,55 +12054,45 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-# BG
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "An Bhulg�ir"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Gn�th"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Tosa�ocht"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "_Dealaigh gach rud"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Cr�ochnaithe"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Gach _Fillte�in:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Cumasach"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 # ta
 #: mail/mail-config.glade.h:49
 #, fuzzy
@@ -11386,36 +12113,31 @@ msgstr "_Seoladh RPost:"
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "�lbacta�"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Gn�th"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
@@ -11469,65 +12191,61 @@ msgstr ""
 msgid "NNTP Server:"
 msgstr "Freatala� NNTP:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Socr� Post"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Eagr�:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Eochar PGP:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "T�g dath"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Priont�il an tadhalla� seo"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
-msgid "Quoted"
-msgstr ""
-
 #: mail/mail-config.glade.h:95
-msgid "Randomized"
+msgid "Quoted"
 msgstr ""
 
 #: mail/mail-config.glade.h:96
@@ -11563,257 +12281,254 @@ msgstr "Sl�nd�il"
 
 #: mail/mail-config.glade.h:104
 #, fuzzy
-msgid "Same as text"
-msgstr "Taispe�in"
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
 # FIXME SP?
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "T�g Ainmh�:"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "T�g Comhad"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "T�g Comhad"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "_Post sce�l filtean"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 msgid "Shortcuts _type:"
 msgstr ""
 
 # SG
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Singeap�r"
 
-#: mail/mail-config.glade.h:122
+# SG
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Singeap�r"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Ainm St�l:"
 
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
+msgstr ""
+
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
 #: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+msgid "Standard Unix mbox"
 msgstr ""
 
 #: mail/mail-config.glade.h:126
-msgid "Standard Unix mbox"
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-msgid "Use _HTML for this signature"
+#: mail/mail-config.glade.h:131
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Luaineach"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_St�das:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "Saghas _Udar� :"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Saghas _Udar� :"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
-msgid "_Beep when new mail arrives"
+#: mail/mail-config.glade.h:148
+msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
-msgid "_Certificate ID:"
+#: mail/mail-config.glade.h:149
+msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
+#: mail/mail-config.glade.h:150
+msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Gn�th"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Gn�th"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Ainm Chomad:"
+msgid "_Enable"
+msgstr "Chumasach"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "Ainm _Fhada:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "i HTML post"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr ""
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Teanga"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Ainm:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Raidio"
-
 #: mail/mail-config.glade.h:175
 msgid "_Receiving Mail"
 msgstr ""
@@ -11851,68 +12566,52 @@ msgid "_Signatures"
 msgstr "_St�das:"
 
 #: mail/mail-config.glade.h:183
-msgid "_Text Signature:"
-msgstr ""
-
-#: mail/mail-config.glade.h:184
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Luaineach"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_gach"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " dath"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr ""
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
@@ -11955,136 +12654,168 @@ msgstr ""
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1832
-msgid "Open Link in Browser"
+#: mail/mail-display.c:1553
+msgid "Overdue:"
 msgstr ""
 
 #: mail/mail-display.c:1833
+msgid "Open Link in Browser"
+msgstr ""
+
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "S�bh�il Iomha le..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "D�ta"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Droch Seoladh"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "�"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Freagrair-Do"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Do"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "Post"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Clodaigh teachtairecht..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Te�p ag fork: %s"
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "_Fillte�n"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
 # c-format
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
@@ -12139,90 +12870,81 @@ msgstr "_Post sce�l"
 msgid "Complete."
 msgstr "Cr�ochnaithe.`"
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-# mo 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr ""
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Ag C�ip"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ag dealaigh fillte�n %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ag S�bh�il scealta"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12231,38 +12953,38 @@ msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "C_uardaigh..."
 
@@ -12334,10 +13056,6 @@ msgstr ""
 msgid "Waiting..."
 msgstr "Ag Fanacht..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Ceangailte."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr ""
@@ -12351,26 +13069,47 @@ msgstr "Pasfhocal do %s, le do thoil"
 msgid "Enter Password"
 msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Ainm:"
+
+# SG
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "Ainm St�l:"
+msgid "Signature hint"
+msgstr "Singeap�r"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "T�g Comhad"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12385,17 +13124,17 @@ msgstr ""
 msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12404,90 +13143,95 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr ""
+
+#: mail/mail-vfolder.c:784
 #, fuzzy
 msgid "vFolders"
 msgstr "Fillte�in"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Fillte�n _Nua"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Gan abair)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Sce�l"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Inni� %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Inn� %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr ""
 
@@ -12509,10 +13253,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Treoshu�omh"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr ""
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "M�id"
 
@@ -17819,269 +18568,269 @@ msgstr "B�isteach"
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
 # PE
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "_Larger"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
 # LB
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "An Liob�in"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
 # LU
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 #, fuzzy
 msgid "Leesburg"
 msgstr "Lucsamburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr ""
 
 # LB
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 #, fuzzy
 msgid "Lemmon"
 msgstr "An Liob�in"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "Scr�os"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "bliana"
 
 # LU
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 #, fuzzy
 msgid "Lewisburg"
 msgstr "Lucsamburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "L�osta Nua"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr ""
 
 # LB
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 #, fuzzy
 msgid "Lexington"
 msgstr "An Liob�in"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr ""
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr ""
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
 # NE
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "An N�gir"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr ""
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr ""
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr ""
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "m�"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr ""
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr ""
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "l�osta"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "Logann NT"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "Teor."
 
 # LB
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "London"
 msgstr "An Liob�in"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
 # IN 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "An India"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
@@ -18090,5538 +18839,5533 @@ msgstr ""
 # ## 	The 'msgid' names and spellings for languages are those listed
 # ##     in iso-639.def from glibc
 # aa 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 #, fuzzy
 msgid "Los Alamos"
 msgstr "Af�iris"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr ""
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
 # LB
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "An Liob�in"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "Freagra"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
 # LU
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "Lucsamburg"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr ""
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
 # mr
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "Marata�"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "Bainisteoir"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr ""
 
 # MC
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "Monac�"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "Raidio"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
 # CA
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "Ceanada"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "Bain."
 
 # MW
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "Malawi"
 
 # MT
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "M�lta"
 
 # MT
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "M�lta"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "Bainisteoir"
 
 # MY
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "An Mhalaeisia"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr ""
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "Greamaigh"
 
 # MT
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "M�lta"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
 # MC
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "Monac�"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "Post"
 
 # MT
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "M�lta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
 # mr
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "Marata�"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr ""
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr ""
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "Post"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
 # MT
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "M�lta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
 # mr
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "Marata�"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "D�ta"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr ""
 
 # mr
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Marata�"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr ""
 
 # EI
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "�ire"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
 # mr
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "Marata�"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr ""
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mattoon"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Bainisteoir"
 
 # ms
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "Malaeis"
 
 # MT
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "M�lta"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 #, fuzzy
 msgid "McAllen"
 msgstr "Gach Rud"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "Post"
 
 # mr
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "Marata�"
 
 # IS
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McClellan"
 msgstr "An �oslainn"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "Teor."
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
 # mr
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "Marata�"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "riomh"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 #, fuzzy
 msgid "Mehamn"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
 # MT
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "M�lta"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "Luain"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "Aoine"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
 # MX
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "Meicsiceo"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 #, fuzzy
 msgid "Miami"
 msgstr "Post"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middle East"
 msgstr "_M�an:"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "_M�an:"
 
 # FI
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "An Fhionlainn"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "Cin�al Comhad:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "Post do %s"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr ""
 
 # fr 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "Fraincis"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 #, fuzzy
 msgid "Minnesota"
 msgstr "Noimea�d"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "Noimea�d"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr ""
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr ""
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "Lu"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "F�n Ph�ca"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "G�than P�ca"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "Bog"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "G�than P�ca"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Moldova"
 msgstr "Luain"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
 # MW
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 #, fuzzy
 msgid "Molokai"
 msgstr "Malawi"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
 # MC
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "Monac�"
 
 # MC
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "Monac�"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "Luain"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
 # MC
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "Monac�"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "Bainisteoir"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montana"
 msgstr "M�"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Radharc M�"
 
 # MN
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 #, fuzzy
 msgid "Montego Bay"
 msgstr "An Mh�ng�il"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "M�"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 #, fuzzy
 msgid "Monterrey"
 msgstr "Idirbhr�ste"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
 # MC
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "Monac�"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "Radharc M�"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "Chl�fhoireanna"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
 # MN
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morelia"
 msgstr "An Mh�ng�il"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "Eagr�"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "Tosa�ocht"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "G�than P�ca"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "Radharc M�"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Radharc M�"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 #, fuzzy
 msgid "Mullan"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
 # GN
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 #, fuzzy
 msgid "Muncie"
 msgstr "An Ghuine"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
 # AT
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 #, fuzzy
 msgid "Murcia"
 msgstr "An Ostair"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "GN"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
 # MC
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "Monac�"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "Ainm"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "Rabhadh"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
 # NP
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "Neipe�l"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "Nuacht"
 
 # ML
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Napoli"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "L.ainm."
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
 # NP
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "Neipe�l"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 #, fuzzy
 msgid "Nebraska"
 msgstr "Teasc Nua"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr ""
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "Teasc Nua"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bedford"
 msgstr "Bealach Nuacht�in"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "Fillte�n _Nua"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "Newcastle"
 msgstr "Nuacht"
 
 # NZ
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "An Nua-Sh�alainn"
 
 # NZ
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "Newfoundland"
 msgstr "An Nua-Sh�alainn"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "Sce�l Nua"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr ""
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "Sce�l Nua"
 
 # MX
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Mexico"
 msgstr "Meicsiceo"
 
 # NZ
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "An Nua-Sh�alainn"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "Tuaisceart"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "Fillte�n _Nua"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "_Nua"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "New York"
 msgstr "Fillte�n _Nua"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr ""
 
 # ES
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "An Sp�inn"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "Gn�th"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "Ainm"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "Gn�th"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norrkoping"
 msgstr "Ag Obair"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Adams"
 msgstr "Tuaisceart"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "Tuaisceart"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
 # NO
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "An Iorua"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "Data Breithe"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "Data Breithe"
 
 # NO
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "An Iorua"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "_Nota�:"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "Tuaisceart"
 
 # NO
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "An Iorua"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "Nota"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "Gan carta�"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
 # TH
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "An T�alainn"
 
 # JM
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Iam�ice"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
 # MT
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "M�lta"
 
 # IS
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Oceanside"
 msgstr "An �oslainn"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "Aon"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "Osc�il"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "Osc�il"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "Eile"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "Eile"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
 # AL
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 #, fuzzy
 msgid "Olbia"
 msgstr "An Alb�in"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "Ceart go Leor"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 #, fuzzy
 msgid "Omsk"
 msgstr "Ceart go Leor"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "Treoshu�omh"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr ""
 
 # ko
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oran"
 msgstr "Coir�is"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
 # FR
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "An Fhrainc"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 #, fuzzy
 msgid "Oregon"
 msgstr "Eag."
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
 # EI
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "�ire"
 
 # EI
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orlando"
 msgstr "�ire"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 #, fuzzy
 msgid "Oruro"
 msgstr "Earraidh"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr "soic�nd"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
 # AU
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 #, fuzzy
 msgid "Ostrava"
 msgstr "An Astr�il"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "seachtain"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr ""
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "Leathanach"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "P�ip�ir"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "Pager"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "Albachta� Phoist"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr ""
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Ceangailte"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "P�ip�ir"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 #, fuzzy
 msgid "Paris"
 msgstr "Tos."
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
 # ca 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "Catal�inis"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "Pasfhocal"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
 # PK
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "An Phacast�in"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
 # PK
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "An Phacast�in"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "Lae"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "Freagra"
 
 # IS
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "An �oslainn"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "Fillte�n _Nua"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "Tosa�ocht"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "Tos."
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
 # PE
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "Peiri�"
 
 # PE
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "Peiri�"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
 # PH FIXME
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philip"
 msgstr "Na hOile�in"
 
 # PH FIXME
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Na hOile�in"
 
 # PH FIXME
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 #, fuzzy
 msgid "Phillips"
 msgstr "Na hOile�in"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
 # PS
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "Reamhthaispe�intas"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
 # PK
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 #, fuzzy
 msgid "Pisa"
 msgstr "An Phacast�in"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 #, fuzzy
 msgid "Plymouth"
 msgstr "m�"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr ""
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "Coimiri� Pr�ont"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Post an sce�l seo"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "�lbacta�"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponce"
 msgstr "Cr�ochnaithe"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "_Tadhall"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
 # PL
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Priont�il Feilire"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
 # PT
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "An Phortaing�il"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "Reamhthaispe�intas"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Priont�il carta"
 
 # PL
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
 # PL
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Portland"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto"
 msgstr "_Poirt:"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "Portr�id"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Portr�id"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "Portr�id"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
 # PL
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
 # CR
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poza Rica"
 msgstr "C�sta Rice"
 
 # PL
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poznan"
 msgstr "An Pholainn"
 
 # PY
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Praha"
 msgstr "Paraguay"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Priont�il Reamhtaispe�ntais"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Pretoria"
 msgstr "Portr�id"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "Reamhthaispe�intas"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
 # PK
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "An Phacast�in"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr ""
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "Reamhthaispe�intas"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "Dea."
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
 # CU
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Puebla"
 msgstr "C�ba"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Freagra"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "Coimiri� Pr�ont"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
 # PL
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pula"
 msgstr "An Pholainn"
 
 # PL
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Priont�il Feilire"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "Freagra"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quebec"
 msgstr "Abair"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Rawlins"
 msgstr "B�isteach"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Reading"
 msgstr "B�isteach"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Recife"
 msgstr "Dealaigh"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr ""
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "Raidio"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redmond"
 msgstr "Scr�os"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "B�isteach"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr ""
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Reno"
 msgstr "Post"
 
 # LB
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "An Liob�in"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "Post"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "Freagrair"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
 # IS
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reynosa"
 msgstr "An �oslainn"
 
 # FI
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "An Fhionlainn"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "Leasainm"
 
 # HT
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "H��t�"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "_Comhad"
 
-#: my-evolution/Locations.h:1881
-#, fuzzy
-msgid "Riga"
-msgstr "Deis:"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr ""
 
 # RO 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 #, fuzzy
 msgid "Rimini"
 msgstr "An R�m�in"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rioja"
 msgstr "Raidio"
 
 # NI 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "Nicaragua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
 # NG
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "An Nig�ir"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "B�isteach"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr ""
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
 # RO 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Roatan"
 msgstr "An R�m�in"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 #, fuzzy
 msgid "Robore"
 msgstr "riomh"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
 # PL
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rodos"
 msgstr "Seomra"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Rogers"
 msgstr "Fillte�in"
 
 # RO 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "An R�m�in"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "Seomra"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 #, fuzzy
 msgid "Rosario"
 msgstr "Raidio"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "�st"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
 # AT
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Russia"
 msgstr "An Ostair"
 
 # PL
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 #, fuzzy
 msgid "Rutland"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 #, fuzzy
 msgid "Sacramento"
 msgstr "iat�n"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
 # ES
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 #, fuzzy
 msgid "Saginaw"
 msgstr "An Sp�inn"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "Priont�il Carta�"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "Sa"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salem"
 msgstr "S�bh�il"
 
 # ML
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
 # ES
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "An Sp�inn"
 
 # ES
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "An Sp�inn"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
 # MT
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salta"
 msgstr "M�lta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
 # st
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "Stad"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
 # SV
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 #, fuzzy
 msgid "Salvador"
 msgstr "An tSalvad�ir"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
 # JM
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "Iam�ice"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr ""
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "_Dom"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "San Carlos"
 msgstr "S�bh�il agus D�n"
 
 # SD
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "An tS�d�in"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr ""
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "S�bh�il agus D�n"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
 # SD
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Juan"
 msgstr "An tS�d�in"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr ""
 
 # SV
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 #, fuzzy
 msgid "San Salvador"
 msgstr "An tSalvad�ir"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "Bainisteoir"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "St�das"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr ""
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
 # LK
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "Sr� Lanca"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "_Dom"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "St�das"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "Eagr�"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "�lbachta�"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "M. F�mhair"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "Cuardaigh"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
 # GH
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "G�na"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "Cuardaigh"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "Sathairn"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "Sathairn"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
 # SE
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "An tSualainn"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "Fillte�n _Nua"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
 # SD
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Sheridan"
 msgstr "An tS�d�in"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "M�id"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
 # Avoid; either use KR or KP
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Shoreham"
 msgstr "Sc�r"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "Taispe�n aon seachtain"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 #, fuzzy
 msgid "Sidney"
 msgstr "M�id"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Silver City"
 msgstr "Sl�nd�il"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "S�bh�il"
 
 # st
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skopje"
 msgstr "Stad"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr ""
 
 # AL
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "An Alb�in"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "Taispe�in"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Sochi"
 msgstr "Deisceart"
 
 # Avoid; either use KR or KP
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socorro"
 msgstr "Sc�r"
 
 # Avoid; either use KR or KP
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Socotra"
 msgstr "Sc�r"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr ""
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Somerset"
 msgstr "Taispe�in"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr ""
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "Southampton"
 msgstr "Deisceart"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "Deisceart"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "Deisceart"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "M. F�mhair"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "l�osta"
 
 # ES
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "An Sp�inn"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "Ag stoir filtean"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "Rabhadh"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "S�bh�il"
 
 # st
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "Stad"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
 # st
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "Stad"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr ""
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
 # LK
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Sr� Lanca"
 
 # NO
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "An Iorua"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "St Paul"
 msgstr "St�das"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "Sathairn"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
 # Avoid; either use KR or KP
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "Sc�r"
 
 # LU
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Lucsamburg"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "Coimri�"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
 # st
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 #, fuzzy
 msgid "Sutton"
 msgstr "Stad"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr ""
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
 # tg
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "T�ids�cis"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
 # GH
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "G�na"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr ""
 
 # TH
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Tainan"
 msgstr "An T�alainn"
 
 # TH
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr "An T�alainn"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr "Am"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "B�isteach"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "B�isteach"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
 # JP
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 #, fuzzy
 msgid "Tampa"
 msgstr "An tSeap�in"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "P�ip�ir"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
 # CA
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "Ceanada"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
 # tg
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "T�ids�cis"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "An Tib�id"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "Texas"
 msgstr "An Tib�id"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "Teideal"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "Deardaoin"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr ""
 
 # GY
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Tijuana"
 msgstr "An Ghu�in"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "Am"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "Teideal"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "Priobhdach"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr ""
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Topeka"
 msgstr "Saghas"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "Thar:"
 
 # FR
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torrance"
 msgstr "An Fhrainc"
 
 # ko
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Torreon"
 msgstr "Coir�is"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Toulouse"
 msgstr "D�n"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr ""
 
 # JP
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 #, fuzzy
 msgid "Trapani"
 msgstr "An tSeap�in"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "Treoshu�omh"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "Riomh"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 #, fuzzy
 msgid "Trieste"
 msgstr "An Tib�id"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
 # TR
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "An Tuirc"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "Mairt"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "Mairt"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "Saghas"
 
 # tr
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turaif"
 msgstr "Tuircis"
 
 # tr
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "Tuircis"
 
 # TR
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turku"
 msgstr "An Tuirc"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "bliain"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "Saghas"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
 # AR
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "Aontas na n�im�r�ochta� Arabacha"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
 # JP
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruapan"
 msgstr "An tSeap�in"
 
 # UY
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Uragua"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr ""
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vadso"
 msgstr "Raidio"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Luaineach"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vagar"
 msgstr "Pager"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
 # MT
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "M�lta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valencia"
 msgstr "Feilire"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 #, fuzzy
 msgid "Van"
 msgstr "Bain."
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
 # FR
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "An Fhrainc"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 #, fuzzy
 msgid "Varadero"
 msgstr "Luaineach"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Varna"
 msgstr "Luaineach"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "Greamaigh"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
 # VE
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 #, fuzzy
 msgid "Venezia"
 msgstr "Veinis�ala"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 #, fuzzy
 msgid "Venice"
 msgstr "Uinc�d"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vermont"
 msgstr "m�"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "Gn�th"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
 # VE
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 #, fuzzy
 msgid "Vicenza"
 msgstr "Veinis�ala"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "Ainm Chomad:"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
 # AU
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "An Astr�il"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
 # EI
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "�ire"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr ""
 
 # MC
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 #, fuzzy
 msgid "Waco"
 msgstr "Monac�"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "Rabhadh"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "Aimsir"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Waterloo"
 msgstr "Aimsir"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "Aimsir"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Webster City"
 msgstr "Idirl�on"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "Ce"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Aimsir"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr ""
 
 # NL
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "An Isiltir"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westfield"
 msgstr "Iarthair"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "L.ainm."
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 #, fuzzy
 msgid "Wien"
 msgstr "Ce"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 #, fuzzy
 msgid "Williston"
 msgstr "l�osta"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 #, fuzzy
 msgid "Winslow"
 msgstr "anois"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 #, fuzzy
 msgid "Winter Park"
 msgstr "Pasfhocal, le do thoil"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 #, fuzzy
 msgid "Wisconsin"
 msgstr "soicind"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "Ce"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "Scr�obh�ir"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "Aimsir"
 
 # PL
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "An Pholainn"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "Ag Obair"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "Ag Obair"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 #, fuzzy
 msgid "Xiamen"
 msgstr "Am"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 #, fuzzy
 msgid "Yenbo"
 msgstr "Imbosca"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zadar"
 msgstr "Feilire"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 #, fuzzy
 msgid "Zagreb"
 msgstr "Leathanach"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zanesville"
 msgstr "Ceangailte"
 
 # PY
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 #, fuzzy
 msgid "Zaragoza"
 msgstr "Paraguay"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
 # tr
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 #, fuzzy
 msgid "Zurich"
 msgstr "Tuircis"
@@ -23652,17 +24396,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "(Gan Tuarascail)"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Coimri� phoist"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr ""
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 #, fuzzy
 msgid "Local Folders"
 msgstr "_Fillte�n"
@@ -23672,58 +24411,48 @@ msgstr "_Fillte�n"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Focal do Lae"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Ainm:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Bealach Nuacht�in"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 #, fuzzy
 msgid "All"
 msgstr "Gach Rud"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
+msgid "Add"
 msgstr "_Suimigh"
 
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "_Scr�os"
-
 # SE
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "An tSualainn"
@@ -23765,10 +24494,46 @@ msgstr "Coimiri� Pr�ont"
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " F"
+msgstr ", "
+
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " C"
+msgstr ", "
+
+# MC
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Monac�"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "m�le"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "km"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Geal"
@@ -24927,95 +25692,100 @@ msgid "C_elsius"
 msgstr "C_elsius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Scr�oste"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Aon _mh�"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "Aon _seachtain"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Taispe�n gach teascanna"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Taispe�n teocht as:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "_Five days"
 msgstr "Aoine"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Post"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "_News Feeds"
 msgstr "Fillte�n _Nua"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Aimsir"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
+msgid "Configuration control for Evolution folder settings."
 msgstr ""
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "_Fillte�in Speis�alta"
+msgid "Folder Settings"
+msgstr "Albachta� Phoist"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 #, fuzzy
@@ -25025,7 +25795,7 @@ msgstr ""
 "An Fhoireann Evolution\n"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -25036,6 +25806,38 @@ msgstr "Taisp�an Sonra�"
 msgid "Cancel Operation"
 msgstr ""
 
+#: shell/e-folder-dnd-bridge.c:52
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr "Te�p ag fork: %s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Fillte�n _Nua"
+
+# DE
+#: shell/e-local-storage.c:174
+#, fuzzy
+msgid "Drafts"
+msgstr "An Ghearm�in"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Imbosca"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Asbosca"
+
+#: shell/e-local-storage.c:177
+#, fuzzy
+msgid "Sent"
+msgstr "Post"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr ""
@@ -25122,6 +25924,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "_Fillte�n"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "_Fillte�in Speis�alta"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "_Fillte�in Speis�alta"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "_Fillte�in Speis�alta"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "_Fillte�n"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -25149,55 +25976,54 @@ msgstr ""
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "C�ip Fillte�n"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Dealaigh \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr ""
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr "Dealaigh Fillte�n '%s'"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -25214,13 +26040,13 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Cruthaigh fillte�n nua"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Nua..."
 
@@ -25262,111 +26088,160 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Fillte�n _Nua"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution "
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Ainm Chomad:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "T�g Comhad"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Cin�al Comhad:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "� %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "T�g Fillte�n"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr ""
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Earraidh ag s�bhh�il sc�ala� do: %s\n"
+" %s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "ag sioncronaich filtean"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Osc�il san %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -25378,8 +26253,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "_Nua"
@@ -25400,45 +26275,45 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Faoi Evolution..."
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Scr�os an sceal seo"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "Sheoladh Chuig duine"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr ""
 
@@ -25469,7 +26344,7 @@ msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25477,12 +26352,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25490,23 +26365,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "Ceart go Leor"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr ""
 
@@ -25529,98 +26400,98 @@ msgstr ""
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Post an sce�l seo"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "_Scr�os"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -25632,10 +26503,6 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Imbosca"
-
 # th
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
@@ -25701,11 +26568,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, fuzzy
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% Rinneadh:"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -25735,67 +26602,67 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "Earraidh CORBA"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Idirbhr�ste"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Gan �in�ar"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Earraidh Intire"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Post an sce�l seo"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Cin�al Comhad:"
@@ -25912,50 +26779,82 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"Go raibh maith agat\n"
+"An Fhoireann Evolution\n"
+
+#: shell/main.c:254
+msgid "Don't tell me again"
+msgstr ""
+
+#: shell/main.c:347
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:318
+#: shell/main.c:438
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:319
+#: shell/main.c:439
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr ""
 
@@ -26073,11 +26972,11 @@ msgstr ""
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr ""
 
@@ -26201,8 +27100,8 @@ msgstr ""
 msgid "Delete this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr ""
 
@@ -26242,7 +27141,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Comhad"
 
@@ -26308,19 +27207,19 @@ msgstr ""
 msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr ""
 
@@ -26328,12 +27227,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr ""
 
-# FR
-#: ui/evolution-mail-global.xml.h:1
-#, fuzzy
-msgid "Cancel"
-msgstr "An Fhrainc"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr ""
@@ -26494,7 +27387,7 @@ msgstr "Post an sce�l seo"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Fillte�n"
 
@@ -26927,7 +27820,7 @@ msgstr "Post an sce�l seo"
 msgid "_Quoted"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Uirlis�"
 
@@ -26942,12 +27835,12 @@ msgstr "D�n an fhuinneog seo"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_D�n"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Radharc"
 
@@ -27140,7 +28033,7 @@ msgstr "_Osc�il..."
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "C_�idi�"
 
@@ -27290,112 +28183,121 @@ msgid "Move this folder to another place"
 msgstr ""
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Oscail 'san Fhuinneog Nua"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_Faoi Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_C�ip..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Import..."
 msgstr "Chl�_fhoireann..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Bog..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nua"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "Albachta� Phoist"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr ""
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr ""
 
@@ -27485,21 +28387,21 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr ""
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "Radharc Carta"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr ""
 
@@ -27630,16 +28532,21 @@ msgstr ""
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "S�nbh�il le..."
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "S�bh�il 'san _fillte�n"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "_Iat�n"
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Eolas"
@@ -27661,20 +28568,20 @@ msgstr "Sce�l"
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Glan"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Glan"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr ""
 
@@ -27700,177 +28607,132 @@ msgstr ""
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Eagar Leabhar Sheoladh"
-
-#~ msgid "Add Addressbook"
-#~ msgstr "Suim Leabhar Seoladh"
-
-#~ msgid "Base"
-#~ msgstr "B��n"
-
-#~ msgid "Server Name"
-#~ msgstr "Ainm do Fhreastala�"
-
-#~ msgid "Other Contacts"
-#~ msgstr "Tadhalla� Eile"
-
-#~ msgid "(none)"
-#~ msgstr "(gan ainm)"
-
-#~ msgid "_Other"
-#~ msgstr "_Eile"
-
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Leabhar Seoladh:"
 
-#~ msgid "90%"
-#~ msgstr "90%"
+#~ msgid "_End of day:"
+#~ msgstr "_Deireadh an L�:"
 
-#~ msgid "100%"
-#~ msgstr "100%"
+#~ msgid "%s server %s"
+#~ msgstr "%s freastala� %s"
 
-#~ msgid "_Delete this Task"
-#~ msgstr "Scr�os an teasc seo"
+#~ msgid "(unknown host)"
+#~ msgstr "(��st gan aithne)"
 
 #, fuzzy
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Eolas"
+#~ msgid "No such message: %s"
+#~ msgstr "Ni raibh sceal sinn: %s"
 
 #, fuzzy
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Eolas"
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr ""
+#~ "Earraidh ag s�bhh�il sc�ala� do: %s\n"
+#~ " %s"
 
 #, fuzzy
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Eolas"
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Te�p ag fork: %s"
 
 #, fuzzy
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Cr�ochnaithe.`"
+#~ msgid "Random"
+#~ msgstr "Raidio"
 
 #, fuzzy
-#~ msgid "iCalendar Information"
-#~ msgstr "eolas fheilire"
+#~ msgid " Edit "
+#~ msgstr "_Eagar"
 
 #, fuzzy
-#~ msgid "iCalendar Error"
-#~ msgstr "Feilire"
+#~ msgid " New "
+#~ msgstr "_Nua"
 
 #, fuzzy
-#~ msgid "An unknown person"
-#~ msgstr "iEarraidh gan Aithne"
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Ar bith</i>"
+#~ msgid "Advanced Options"
+#~ msgstr "Roghanna"
 
+# AQ
 #, fuzzy
-#~ msgid "Status:"
-#~ msgstr "_St�das:"
+#~ msgid "Afrikaans"
+#~ msgstr "an tAntartasch"
 
+# AT
 #, fuzzy
-#~ msgid "Choose an action:"
-#~ msgstr "Fillte�n _Nua"
+#~ msgid "Arabic"
+#~ msgstr "An Ostair"
 
+# BG
 #, fuzzy
-#~ msgid "Update"
-#~ msgstr "Data"
+#~ msgid "Dari"
+#~ msgstr "An Bhulg�ir"
 
 #, fuzzy
-#~ msgid "Accept"
-#~ msgstr "Cuntas"
+#~ msgid "Hulu"
+#~ msgstr "Gn�th"
 
 #, fuzzy
-#~ msgid "Decline"
-#~ msgstr "Dealaigh"
+#~ msgid "Same as text"
+#~ msgstr "Taispe�in"
 
 #, fuzzy
-#~ msgid "Send Latest Information"
-#~ msgstr "Eolas Theasc"
-
-#~ msgid "Task Information"
-#~ msgstr "Eolas Theasc"
+#~ msgid "Select a signature file"
+#~ msgstr "T�g Comhad"
 
 #, fuzzy
-#~ msgid "Event information"
-#~ msgstr "eolas fheilire"
+#~ msgid "_Filename:"
+#~ msgstr "Ainm Chomad:"
 
 #, fuzzy
-#~ msgid "Task information"
-#~ msgstr "Eolas Theasc"
+#~ msgid "_Language:"
+#~ msgstr "Teanga"
 
 #, fuzzy
-#~ msgid "Journal information"
-#~ msgstr "Eolas Cuntais"
+#~ msgid "_Random"
+#~ msgstr "Raidio"
 
-#, fuzzy
-#~ msgid "Free/Busy information"
-#~ msgstr "Eolas"
+#~ msgid "Copying"
+#~ msgstr "Ag C�ip"
 
 #, fuzzy
-#~ msgid "Calendar information"
-#~ msgstr "eolas fheilire"
+#~ msgid "Signature name:"
+#~ msgstr "Ainm St�l:"
 
 #, fuzzy
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "Eolas"
+#~ msgid "Riga"
+#~ msgstr "Deis:"
 
 #, fuzzy
-#~ msgid "iCalendar information"
-#~ msgstr "eolas fheilire"
+#~ msgid "Add ->"
+#~ msgstr "_Suimigh"
 
-# tg
 #, fuzzy
-#~ msgid "Task"
-#~ msgstr "T�ids�cis"
+#~ msgid "<- Remove"
+#~ msgstr "_Scr�os"
 
-#, fuzzy
-#~ msgid "Status: %s"
-#~ msgstr "_St�das:"
+#~ msgid "Edit Addressbook"
+#~ msgstr "Eagar Leabhar Sheoladh"
 
-#, fuzzy
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Cr�ochnaithe.`"
+#~ msgid "Add Addressbook"
+#~ msgstr "Suim Leabhar Seoladh"
 
-#, fuzzy
-#~ msgid "URL: %s"
-#~ msgstr "URL:"
+#~ msgid "Base"
+#~ msgstr "B��n"
+
+#~ msgid "Server Name"
+#~ msgstr "Ainm do Fhreastala�"
+
+#~ msgid "_Other"
+#~ msgstr "_Eile"
+
+#~ msgid "_Delete this Task"
+#~ msgstr "Scr�os an teasc seo"
 
 #, fuzzy
-#~ msgid "Categories: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Aicm�:"
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "Eolas"
 
 #, fuzzy
-#~ msgid "Contacts: "
-#~ msgstr ""
-#~ "\n"
-#~ "Tr�cht:"
+#~ msgid "iCalendar information"
+#~ msgstr "eolas fheilire"
 
 #, fuzzy
 #~ msgid "Could not encrypt data: invalid user key: \"%s\"."
@@ -27901,14 +28763,6 @@ msgstr ""
 #~ msgstr "Ag oscailt an t-eolaire %s"
 
 #, fuzzy
-#~ msgid ""
-#~ "Error reading data:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Earraidh ag s�bhh�il sc�ala� do: %s\n"
-#~ " %s"
-
-#, fuzzy
 #~ msgid "RDF Summary"
 #~ msgstr "Coimri�"
 
@@ -27924,37 +28778,12 @@ msgstr ""
 #~ msgid "Update every "
 #~ msgstr "Data"
 
-#, fuzzy
-#~ msgid "Needs Reply"
-#~ msgstr "Freagrair"
-
-#~ msgid "Default"
-#~ msgstr "Gn�th"
-
 #~ msgid "Mailbox Format"
 #~ msgstr "Form�id Boscaphoist"
 
-#~ msgid " (default)"
-#~ msgstr " (gn�th)"
-
-#~ msgid "Mail Settings"
-#~ msgstr "Albachta� Phoist"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Abair is %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Sc�al � %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "l�osta r�omhphost %s"
-
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Inbosca"
 
-#~ msgid "Account"
-#~ msgstr "Cuntas"
-
 #~ msgid "Display"
 #~ msgstr "Taispea�n"
 
@@ -27978,36 +28807,9 @@ msgstr ""
 #~ msgid "Mail Summary"
 #~ msgstr "Coimri� phoist"
 
-#~ msgid "kph"
-#~ msgstr "kph"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "m�le"
-
-#~ msgid "kilometers"
-#~ msgstr "km"
-
-#~ msgid "Outbox"
-#~ msgstr "Asbosca"
-
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "C�ipcheart 1999, 2000, 2001 Ximian, Inc."
 
-#, fuzzy
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr "Te�p ag fork: %s"
-
 #~ msgid "(No name)"
 #~ msgstr "(gan ainm)"
 
@@ -28230,23 +29032,9 @@ msgstr ""
 #~ msgid "%s - Ximian Evolution %s [%s]"
 #~ msgstr "%s - Ximian Evolution %s [%s]"
 
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Ximian Evolution Team\n"
-#~ msgstr ""
-#~ "Go raibh maith agat\n"
-#~ "An Fhoireann Evolution\n"
-
 #~ msgid "Password:"
 #~ msgstr "Pasfhocal:"
 
-#, fuzzy
-#~ msgid "Evolution Shortcuts"
-#~ msgstr "Evolution"
-
-#~ msgid "Delete folder '%s'"
-#~ msgstr "Dealaigh Fillte�n '%s'"
-
 #~ msgid "%d"
 #~ msgstr "%d"
 
@@ -28304,9 +29092,6 @@ msgstr ""
 #~ msgid "m"
 #~ msgstr "m"
 
-#~ msgid "n"
-#~ msgstr "n"
-
 #~ msgid "o"
 #~ msgstr "o"
 
@@ -28401,9 +29186,6 @@ msgstr ""
 #~ msgid "_Task (FIXME)"
 #~ msgstr "_Teasc"
 
-#~ msgid "Print message..."
-#~ msgstr "Clodaigh teachtairecht..."
-
 #~ msgid "Reply to all"
 #~ msgstr "Freagrair do Gach rud"
 
diff --git a/po/gl.po b/po/gl.po
index 92c3b52169..bcfe91f993 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2001-09-17 15:10+0200\n"
 "Last-Translator: Manuel A. Fern�ndez Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -43,7 +43,7 @@ msgstr "Importa ficheiros VCard a Evolution."
 msgid "File As"
 msgstr "Arquivar coma"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nome:"
@@ -54,7 +54,7 @@ msgid "Email"
 msgstr "Correo Electr�nico"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Principal"
 
@@ -65,7 +65,7 @@ msgstr "Principal"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asistente"
@@ -73,8 +73,8 @@ msgstr "Asistente"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Traballo"
 
@@ -85,12 +85,12 @@ msgid "Bus"
 msgstr "Ocupado"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Resposta"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Compa��a"
 
@@ -102,8 +102,8 @@ msgstr "Copiar"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Particular"
 
@@ -121,18 +121,18 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "M�bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Autom�bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax do Traballo"
@@ -143,13 +143,13 @@ msgid "Bus Fax"
 msgstr "Fax do Traballo"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax Particular"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Traballo 2"
 
@@ -159,43 +159,43 @@ msgid "Bus 2"
 msgstr "Ocupado"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Particular 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "RDSI"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Outro"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Outro Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Buscapersoas"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
@@ -207,14 +207,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "Correo Electr�nico 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Correo Electr�nico 3"
@@ -361,7 +361,7 @@ msgstr "VCard de %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -369,7 +369,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 #, fuzzy
 msgid "Searching..."
 msgstr "Buscar M_ensaxe..."
@@ -387,34 +387,34 @@ msgstr ""
 "Erro ao executar a expresi�n de busca: %s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Conectando ao servidor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Eliminando as tarxetas..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Erro ao elimina-la tarxeta"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Non foi posible analizar o URL `%s'"
@@ -463,108 +463,146 @@ msgstr "Un control Bonobo de exemplo que amosa un libro de enderezos."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #, fuzzy
-msgid "Addressbook Settings"
-msgstr "Fontes do Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr "F�brica para o compo�ente Libro de Enderezos de Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#, fuzzy
-msgid "Configuration control for the Evolution Addressbook."
-msgstr "F�brica para o compo�ente Libro de Enderezos de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Control que amosa unha minitarxeta de libro de enderezos de Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Compo�ente de Evolution para manexar contactos."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "F�brica para o control de Minitarxetas do Libro de Enderezos"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "F�brica para o visor de enderezos do Libro de Enderezos"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "F�brica para o men� emerxente de enderezos do Libro de Enderezos"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr "F�brica para o compo�ente Libro de Enderezos de Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "F�brica para o control de exemplo do Libro de Enderezos"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Cartafol que cont�n informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor NNTP:"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "Cartafol que cont�n informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Nova Lista de Contactos"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "Lista de _Contactos"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Novo Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Nova Lista de Contactos"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr ""
+"Non foi posible autenticarse co servidor IMAP.\n"
+"%s\n"
+"\n"
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "Lista de _Contactos"
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Non foi posible autenticarse co servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "A resposta do servidor IMAP non conti�a informaci�n sobre %s"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Erro ao cargar a informaci�n do filtro:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "A resposta do servidor IMAP non conti�a informaci�n sobre %s"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL non est� soportado nesta versi�n de evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Non foi posible inicializar gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Outros Contactos"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
@@ -599,50 +637,59 @@ msgstr ""
 "Non foi posible abrir este libro de enderezos. Por favor, comprobe\n"
 "que a ruta existe e que ten permisos para acceder a ela."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "remata en"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "Correo Electr�nico 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "A categor�a �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Calquera campo cont�n"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Avanzado..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Calquera Categor�a"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que ha amosar o Navegador de Cartafoles"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(ning�n)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Correo Electr�nico Principal"
 
@@ -688,56 +735,6 @@ msgstr "Desactivar Petici�ns"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Activar Petici�ns (�Perigoso!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr ""
-"Non foi posible autenticarse co servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Non foi posible autenticarse co servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Informaci�n de traza opaca non v�lida:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "A resposta do servidor IMAP non conti�a informaci�n sobre %s"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL non est� soportado nesta versi�n de evolution)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Data na que se completa"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
@@ -745,53 +742,53 @@ msgstr "Dete_ctar tipos soportados "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
 #, fuzzy
-msgid "<< Fewer Options"
-msgstr "Opci�ns"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "_Eliminar"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
-#, fuzzy
 msgid "1234"
 msgstr "123"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "_Eliminar"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Opci�ns"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -800,8 +797,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Fontes do Libro de Enderezos"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Alarmas"
@@ -894,8 +891,8 @@ msgstr "Configuraci�n do Correo"
 msgid "Mappings"
 msgstr "Marxes"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
@@ -1079,14 +1076,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1109,8 +1106,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1142,7 +1139,7 @@ msgid "Using email address"
 msgstr "_Este � o enderezo de correo"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1150,7 +1147,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Engadir"
 
@@ -1197,7 +1194,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1317,10 +1314,12 @@ msgstr ""
 "F�brica para a interface de selecci�n de nome do Libro de Enderezos de "
 "Evolution"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -1446,7 +1445,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
@@ -1456,7 +1455,7 @@ msgid "D_epartment:"
 msgstr "_Departamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Detalles"
 
@@ -1518,11 +1517,12 @@ msgstr "Quere recibir correo en _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -1552,7 +1552,7 @@ msgid "_Web page address:"
 msgstr "Enderezo da p�xina _Web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Estados Unidos"
 
@@ -2058,12 +2058,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Letonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "L�bano"
 
@@ -2072,7 +2071,7 @@ msgid "Lesotho"
 msgstr "Lesoto"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
@@ -2081,12 +2080,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lituania"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
@@ -2119,7 +2118,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2144,7 +2143,7 @@ msgid "Mayotte"
 msgstr "Maiote"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "M�xico"
 
@@ -2169,7 +2168,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marrocos"
 
@@ -2194,7 +2193,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Pa�ses Baixos"
 
@@ -2207,12 +2206,12 @@ msgid "New Caledonia"
 msgstr "Nova Caledonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nova Celandia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2229,7 +2228,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Illa Norfolk"
 
@@ -2238,17 +2237,17 @@ msgid "Northern Mariana Islands"
 msgstr "Illas Marianas do Norte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Noruega"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Om�n"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Paquist�n"
 
@@ -2262,7 +2261,7 @@ msgid "Palestinian Territory"
 msgstr "Territorios Brit�nicos do Oc�ano �ndico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panam�"
 
@@ -2271,12 +2270,12 @@ msgid "Papua New Guinea"
 msgstr "Pap�a Nova Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguai"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Per�"
 
@@ -2289,22 +2288,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
@@ -2313,7 +2312,7 @@ msgid "Reunion"
 msgstr "Xuntanza"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Roman�a"
 
@@ -2350,7 +2349,7 @@ msgid "Sao Tome And Principe"
 msgstr "San Tom� e Pr�ncipe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Arabia Saud�"
 
@@ -2367,17 +2366,17 @@ msgid "Sierra Leone"
 msgstr "Serra Leoa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapur"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Eslovenia"
 
@@ -2390,7 +2389,7 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Sud�frica"
 
@@ -2399,7 +2398,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Xeorxia do Sul e Illas Sandwich do Sul"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Espa�a"
 
@@ -2420,7 +2419,7 @@ msgid "Sudan"
 msgstr "Sud�n"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -2433,17 +2432,17 @@ msgid "Swaziland"
 msgstr "Suazilandia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Suecia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Su�za"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiw�n"
 
@@ -2481,7 +2480,7 @@ msgid "Tunisia"
 msgstr "Tunicia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turqu�a"
 
@@ -2502,7 +2501,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ucra�na"
 
@@ -2511,7 +2510,7 @@ msgid "United Arab Emirates"
 msgstr "Emiratos �rabes Unidos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
@@ -2520,7 +2519,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "Illas Exteriores Menores dos EEUU"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguai"
 
@@ -2533,12 +2532,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Viet Nam"
 
@@ -2561,12 +2560,12 @@ msgid "Western Sahara"
 msgstr "Sahara Occidental"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Iemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Iugoslavia"
 
@@ -2579,28 +2578,36 @@ msgid "Zimbabwe"
 msgstr "Cimbabue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"�Est� seguro de que quere\n"
+"borrar este contacto?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "�Borrar Contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 #, fuzzy
 msgid "Category editor not available."
 msgstr "Non hai unha descrici�n dispo�ible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categor�as:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Non se puido atopa-lo control dun campo: `%s'"
@@ -2627,12 +2634,12 @@ msgstr "Correo Electr�nico"
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 #, fuzzy
 msgid "list"
 msgstr "Br�tema"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2768,11 +2775,11 @@ msgid "contact-list-editor"
 msgstr "editor-de-contactos"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Editor de Listas de Contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Gardar como VCard"
@@ -2851,21 +2858,21 @@ msgid "Error getting book view"
 msgstr "Erro ao iniciar %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Erro ao modifica-la tarxeta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "�xito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Erro desco�ecido"
 
@@ -2874,7 +2881,7 @@ msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -2892,55 +2899,70 @@ msgstr "Protocolo non soportado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Cancelada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "A autenticaci�n fallou."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autenticaci�n requirida"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "�Quere gardar os cambios?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Erro ao engadi-la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Erro ao engadi-la tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Erro ao modifica-la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Erro ao elimina-la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Erro ao elimina-la tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Amosar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Amosar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2948,22 +2970,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Sen tarxetas"
@@ -3028,102 +3050,108 @@ msgstr "Outro Tel�fono"
 msgid "Other Address"
 msgstr "Outro Enderezo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Libro de Enderezos"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Novo Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Ir � Cartafol..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "Importando..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Buscar Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Fontes do Libro de Enderezos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Remitir Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Enviar unha Mensaxe a un Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Imprimir Sobre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Mover � Cartafol.."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Eliminar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3133,7 +3161,7 @@ msgstr "_Vista Actual"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3141,7 +3169,7 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3293,7 +3321,7 @@ msgstr "Marxes"
 msgid "Number of columns:"
 msgstr "N�mero de columnas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opci�ns"
 
@@ -3303,7 +3331,7 @@ msgid "Orientation"
 msgstr "Orientaci�n"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "P�xina"
 
@@ -3377,30 +3405,34 @@ msgstr "Largura:"
 msgid "_Font..."
 msgstr "_Fonte..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "_Editar cita"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Baixa"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -3444,44 +3476,36 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "F�brica para o compo�ente da axenda de Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Compo�ente do resumo executivo da axenda de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Visor da axenda iTip/iMip de Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Compo�ente de Evolution para manexar a axenda."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "F�brica para o compo�ente Resume da Axenda."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "F�brica para o compo�ente de correo de Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "F�brica para o control vista iTip da axenda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "F�brica para o control Axenda de exemplo"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "F�brica para centraliza-los di�logos editores de compo�entes da axenda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "F�brica para centraliza-los di�logos editores de compo�entes da axenda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3493,11 +3517,26 @@ msgstr "Servicio de notificaci�n de alarma"
 msgid "Factory for the alarm notification service"
 msgstr "F�bica para o servicio de notificaci�n de alarmas"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Opci�ns"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "�_ndice"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 #, fuzzy
 msgid "invalid time"
 msgstr "Hora de _finalizaci�n:"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, fuzzy, c-format
 msgid "Alarm on %s"
@@ -3533,7 +3572,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advertencia"
@@ -3554,16 +3593,16 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Non preguntar de novo"
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Non foi posible inicializar GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 #, fuzzy
 msgid "Could not create the alarm notify service"
 msgstr "Non foi posible crear a f�brica do servicio de notificaci�ns de alarma"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "Non foi posible crear a f�brica do servicio de notificaci�ns de alarma"
 
@@ -3579,7 +3618,7 @@ msgstr "A descrici�n cont�n"
 msgid "Comment contains"
 msgstr "O comentario cont�n"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Non concorda"
 
@@ -3620,14 +3659,16 @@ msgstr ""
 "ORBit e OAF."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privado"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "P�blico"
 
@@ -3648,27 +3689,32 @@ msgid "W"
 msgstr "O"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Ocupado"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Non Iniciada"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "En Progreso"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Completada"
 
@@ -3683,11 +3729,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3702,12 +3749,14 @@ msgstr "Recorrendo"
 msgid "Assigned"
 msgstr "Asignada"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Non"
 
@@ -3727,62 +3776,64 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Axenda"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Cartafol que cont�n citas e eventos"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Cartafol que cont�n elementos para-facer"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "Configuraci�n da Fonte de Novas"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cita"
@@ -3991,7 +4042,7 @@ msgstr "Recordatorios"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -4020,7 +4071,7 @@ msgstr "fin da cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minutos"
 
@@ -4048,79 +4099,81 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alarmas"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Preferencias da Axenda e as Tarefas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Cor para tarefas retrasadas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Cor para tarefas para hoxe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "D�as"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Venres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Luns"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "_Dom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "S�bado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Amosa-los _n�meros das semanas no navegador de datas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "_Inicio do d�a:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "_Dom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Tarefas para _hoxe:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "_Xov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "_Mar"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4149,82 +4202,97 @@ msgid "Tuesday"
 msgstr "Martes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "M�rcores"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Semana Laboral"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pedir confirmaci�n ao eliminar elementos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_Comprimi-las fins de semana na vista mensual"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "_Amosar estaci�ns:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Amosar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "_Final do d�a:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Xeral"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_Agocha-las tarefas completadas despois de"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Tarefas _retrasadas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_S�b"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Amosar os prazos _finais das citas nas vistas semanal e mensual"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Di_visi�ns horarias:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_Mar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "M�_r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
-msgstr "antes do comezo da cita"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
+msgstr "antes da fin da cita"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
@@ -4306,41 +4374,61 @@ msgstr " (Pendente "
 msgid "Due "
 msgstr "Pendente "
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Non foi posible actualizar os ficheiros correctamente"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
 #, fuzzy
-msgid "Could not update object!"
+msgid "Could not update object"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "�Non foi posible obter a versi�n actual!"
 
@@ -4398,28 +4486,28 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Recorrencia"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 #, fuzzy
 msgid "Scheduling"
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Xuntanza"
 
@@ -4469,7 +4557,7 @@ msgid "Pu_blic"
 msgstr "P�_blico"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Amosa-lo Tempo Coma"
 
@@ -4491,20 +4579,20 @@ msgstr "Hora de _finalizaci�n:"
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "�Esa persoa xa asiste � xuntanza!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Delegar En..."
 
@@ -4515,49 +4603,55 @@ msgstr "Asistente"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Nome Com�n"
+msgid "Click here to add an attendee"
+msgstr "Prema aqu� para engadir un asistente"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delegada Por"
+msgid "Common Name"
+msgstr "Nome Com�n"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegada En"
+msgid "Delegated From"
+msgstr "Delegada Por"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Idioma"
+msgid "Delegated To"
+msgstr "Delegada En"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Membro"
+msgid "Language"
+msgstr "Idioma"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo:"
@@ -4572,14 +4666,10 @@ msgid "_Change Organizer"
 msgstr "_Cambiar Organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Convidar Outros..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Outro Organizador"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4768,7 +4858,7 @@ msgid "Progress"
 msgstr "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4780,19 +4870,19 @@ msgstr "_Prioridade:"
 msgid "_Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "B�sico"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Asignaci�n"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Descrici�n:"
 
@@ -4804,24 +4894,79 @@ msgstr "Data de _Inicio:"
 msgid "_Due Date:"
 msgstr "_Data L�mite"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, fuzzy, c-format
+msgid "100%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Gardar como..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4829,20 +4974,20 @@ msgstr "Gardar como..."
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4850,35 +4995,36 @@ msgstr "_Copiar"
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Asignar Tarefa"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca-las Tarefas como Completas"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
 
@@ -4886,47 +5032,48 @@ msgstr "Prema para engadir unha tarefa"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Completo"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Data L�mite"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Data Final"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Posici�n Xeogr�fica"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Data de _Inicio:"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Ordeamento das tarefas"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL:"
 
@@ -4974,11 +5121,13 @@ msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -5018,7 +5167,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Informaci�n de Libre/Ocupado"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "_Configurar Cartafol..."
@@ -5029,7 +5178,7 @@ msgid "_Configure Pilot..."
 msgstr "_Configurar Cartafol..."
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
@@ -5056,75 +5205,414 @@ msgid "Delete _All Occurrences"
 msgstr "Borrar _T�dalas Ocorrencias"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar o filtro: %s: %s"
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+#, fuzzy
+msgid "Meeting begins: <b>"
+msgstr "Hora do _final da reuni�n:"
+
+#: calendar/gui/e-itip-control.c:683
+#, fuzzy
+msgid "Task begins: <b>"
+msgstr " (Completada "
+
+#: calendar/gui/e-itip-control.c:688
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Informaci�n de Libre/Ocupado"
+
+#: calendar/gui/e-itip-control.c:692
+#, fuzzy
+msgid "Begins: <b>"
+msgstr "Hora do _final da reuni�n:"
+
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Hora do _final da reuni�n:"
+
+#: calendar/gui/e-itip-control.c:707
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Informaci�n de Libre/Ocupado"
+
+#: calendar/gui/e-itip-control.c:711
+#, fuzzy
+msgid "Ends: <b>"
+msgstr "Hora do _final da reuni�n:"
+
+#: calendar/gui/e-itip-control.c:725
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (Completada "
+
+#: calendar/gui/e-itip-control.c:735
+#, fuzzy
+msgid "Task Due: <b>"
+msgstr " (Completada "
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "informaci�n de axenda"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Axenda"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "An unknown person"
+msgstr "un remitente desco�ecido"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Por favor, olle a seguinte informaci�n, e escolla unha acci�n do men� "
+"de embaixo."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Ningunha</i>"
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "E_stado:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Aceptado"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr " Tentativa "
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Rexeitado"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Desco�ecido"
 
-#: calendar/gui/e-itip-control.c:1564
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
 #, fuzzy
-msgid "Calendar file could not be updated!\n"
+msgid "Choose an action:"
+msgstr "Escolla unha Acci�n"
+
+#: calendar/gui/e-itip-control.c:972
+#, fuzzy
+msgid "Update"
+msgstr "Actualizaci�n de Tarefa"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Aceptar"
+
+#: calendar/gui/e-itip-control.c:1000
+#, fuzzy
+msgid "Accept"
+msgstr "Aceptado"
+
+#: calendar/gui/e-itip-control.c:1001
+#, fuzzy
+msgid "Tentatively accept"
+msgstr " Tentativa "
+
+#: calendar/gui/e-itip-control.c:1002
+#, fuzzy
+msgid "Decline"
+msgstr "Rexeitado"
+
+#: calendar/gui/e-itip-control.c:1026
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Informaci�n de Libre/Ocupado"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Informaci�n da Tarefa"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> publicou informaci�n sobre unha reuni�n."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Informaci�n da Xuntanza"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> require a s�a presencia nunha reuni�n."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "Proposta de Xuntanza"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> desexa asistir a unha reuni�n existente."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "Actualizaci�n da Xuntanza"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> desexa recibir a �ltima informaci�n sobre a reuni�n."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "_Solicitude de Actualizaci�n de Xuntanza"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> respostou a unha petici�n de xuntanza."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "Resposta de Xuntanza"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> cancelou unha reuni�n."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "Cancelaci�n da Xuntanza"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> enviou unha mensaxe inintelixible."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Mensaxe Incorrecta sobre a Xuntanza"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> publicou informaci�n sobre tarefa."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Informaci�n da Tarefa"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> require que se encargue dunha tarefa."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Proposta de Tarefas"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> desexa asistir a unha tarefa existente."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Actualizaci�n de Tarefa"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> desexa recibir a �ltima informaci�n sobre a tarefa."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Petici�n de Actualizaci�n de Tarefa"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> respostou a unha asignaci�n de tarefa."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Resposta � Tarefa"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> cancelou unha tarefa."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Cancelaci�n de Tarefa"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Mensaxe Incorrecta sobre a Tarefa"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> publicou informaci�n de libre/ocupado."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Informaci�n de Libre/Ocupado"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> require a s�a informaci�n libre/ocupado."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Petici�n de Libre/Ocupado"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> respostou a unha petici�n de libre/ocupado."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Resposta de Libre/Ocupado"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Mensaxe de Libre/Ocupado Incorrecta"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "O cartafol parece estar corrompido sen recuperaci�n posible."
+
+#: calendar/gui/e-itip-control.c:1373
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#, fuzzy
+msgid "There was an error on the CORBA system\n"
+msgstr "Houbo un erro ao descarga-la fonte de novas"
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
 msgstr "�Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Actualizaci�n completada\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+#, fuzzy
+msgid "Calendar file could not be updated!\n"
+msgstr "�Non se puido envia-lo elemento!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
+#: calendar/gui/e-itip-control.c:1671
 #, fuzzy
-msgid "Attendee status could not be updated!\n"
+msgid "Attendee status updated\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
-msgid "Attendee status updated\n"
+msgid "Attendee status could not be updated!\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Eliminaci�n Completa"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "�Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "�Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccionar Cartafol"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccionar Cartafol"
@@ -5166,93 +5654,92 @@ msgstr "data-finalizaci�n"
 msgid "date-start"
 msgstr "data-comezo"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Participantes Requiridos"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Participantes Opcionais"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Non-Participantes"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Cuarto"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Presidencia"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Participantes Requiridos"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Participante Opcional"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Non-Participante"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Precisa dunha Acci�n"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Aceptado"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Rexeitado"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Delegado"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "En Progreso"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5264,63 +5751,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "F�ra da Oficina"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Sen Informaci�n"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Opci�ns"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Amosar _S� as Horas de Traballo"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Amozar sen _Zoom"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Actualizar Libres/Ocupadas"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Autoescoller"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_T�dalas Persoas e Recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "T�dalas _Persoas e Un Recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Persoas _Requiridas"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Persoas Requiridas e _Un Recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Hora do _inicio da reuni�n:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Hora do _final da reuni�n:"
 
@@ -5339,17 +5826,22 @@ msgstr "Non foi posible cargar as tarefas en `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Non foi posible abrir o cartafol en `%s'"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "Limpar"
@@ -5362,17 +5854,17 @@ msgstr "Nova _Cita..."
 msgid "_Delete this Appointment"
 msgstr "_Borrar esta Cita"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrir axenda"
@@ -5433,19 +5925,58 @@ msgstr "outubro"
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "informaci�n de axenda"
+
+#: calendar/gui/itip-utils.c:356
+#, fuzzy
+msgid "Task information"
+msgstr "Informaci�n da Tarefa"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "Informaci�n Opcional"
+
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "Informaci�n de Libre/Ocupado"
+
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "informaci�n de axenda"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Actualizaci�n de Tarefa"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Actualizar Lista"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Non foi posible crear a f�brica do servicio de notificaci�ns de alarma"
@@ -5635,12 +6166,49 @@ msgstr "Mes seleccionado (%b de %Y)"
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
+#: calendar/gui/print.c:2249
+#, fuzzy
+msgid "Task"
+msgstr "_Tarefa"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "E_stado:"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioridade:"
+
+#: calendar/gui/print.c:2338
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Porcentaxe completada"
+
+#: calendar/gui/print.c:2350
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2364
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Categor�as: "
+
+#: calendar/gui/print.c:2375
+#, fuzzy
+msgid "Contacts: "
+msgstr "Co_ntactos:"
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Imprimir Axenda"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5679,8 +6247,8 @@ msgstr ""
 "\n"
 "�Eliminar realmente estas mensaxes?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo"
 
@@ -5746,6 +6314,11 @@ msgstr "Importa ficheiros VCard a Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importa ficheiros VCard a Evolution."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Recordatorio"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5839,8 +6412,8 @@ msgstr "contains? espera que o argumento 2 sexa unha cadea"
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 "contains? espera que o argumento 1 sexa un de \"any\", \"summary\", "
 "\"description\""
@@ -6845,668 +7418,683 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Asistente"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Qatar"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr ""
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 #, fuzzy
 msgid "Asia/Muscat"
 msgstr "Asistente"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr ""
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 #, fuzzy
 msgid "Asia/Omsk"
 msgstr "Asignar Tarefa"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Asignar Tarefa"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 #, fuzzy
 msgid "Asia/Qatar"
 msgstr "Qatar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr ""
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr ""
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr ""
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 #, fuzzy
 msgid "Asia/Singapore"
 msgstr "Singapur"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr ""
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr ""
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr ""
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 #, fuzzy
 msgid "Atlantic/Bermuda"
 msgstr "Bermudas"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 #, fuzzy
 msgid "Atlantic/Cape_Verde"
 msgstr "Cabo Verde"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 #, fuzzy
 msgid "Australia/Adelaide"
 msgstr "Australia"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 #, fuzzy
 msgid "Australia/Brisbane"
 msgstr "Australia"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 #, fuzzy
 msgid "Australia/Broken_Hill"
 msgstr "Australia"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 #, fuzzy
 msgid "Australia/Darwin"
 msgstr "Australia"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 #, fuzzy
 msgid "Australia/Hobart"
 msgstr "Australia"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 #, fuzzy
 msgid "Australia/Lindeman"
 msgstr "Australia"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 #, fuzzy
 msgid "Australia/Lord_Howe"
 msgstr "Australia"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 #, fuzzy
 msgid "Australia/Melbourne"
 msgstr "Australia"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 #, fuzzy
 msgid "Australia/Perth"
 msgstr "Australia"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 #, fuzzy
 msgid "Australia/Sydney"
 msgstr "Australia"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr ""
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 #, fuzzy
 msgid "Europe/Andorra"
 msgstr "Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 #, fuzzy
 msgid "Europe/Athens"
 msgstr "Propiedades"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr ""
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr ""
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr ""
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr ""
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr ""
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr ""
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr ""
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr ""
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 #, fuzzy
 msgid "Europe/Gibraltar"
 msgstr "Xibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr ""
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr ""
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr ""
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr ""
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr ""
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr ""
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 #, fuzzy
 msgid "Europe/Luxembourg"
 msgstr "Luxemburgo"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr ""
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr ""
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr ""
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 #, fuzzy
 msgid "Europe/Monaco"
 msgstr "M�naco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr ""
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr ""
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 #, fuzzy
 msgid "Europe/Paris"
 msgstr "Propiedades"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr ""
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr ""
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr ""
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr ""
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 #, fuzzy
 msgid "Europe/San_Marino"
 msgstr "San Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr ""
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr ""
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr ""
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr ""
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr ""
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr ""
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 #, fuzzy
 msgid "Indian/Comoro"
 msgstr "Comores"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 #, fuzzy
 msgid "Indian/Mahe"
 msgstr "India"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 #, fuzzy
 msgid "Indian/Maldives"
 msgstr "Maldivas"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 #, fuzzy
 msgid "Indian/Mauritius"
 msgstr "Mauricio"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 #, fuzzy
 msgid "Indian/Mayotte"
 msgstr "Maiote"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 #, fuzzy
 msgid "Indian/Reunion"
 msgstr "Xuntanza"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 #, fuzzy
 msgid "Pacific/Pitcairn"
 msgstr "Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "As sinaturas non est�n soportadas por este cifrado"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Non est� soportado asinar en claro por este cifrado"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "A verificaci�n non est� soportada neste cifrado"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Non se soporta o cifrado con esta cifra"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Non est� soportado o descifrado desta cifra"
 
@@ -7517,12 +8105,12 @@ msgstr ""
 "Non foi posible crear o ficheiro de sa�da: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Non foi posible abrir o directorio de cach�: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7533,7 +8121,7 @@ msgstr ""
 "As posteriores operaci�ns deste servidor non se han repetir cando\n"
 "se volte conectar � rede."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7544,11 +8132,16 @@ msgstr ""
 "%s\n"
 "Os cambios que se fixeron a este cartafol non se han resincronizar."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Volvendo a sincronizar co servidor"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Creando o cartafol %s"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar traballando conectado para completar esta operaci�n"
 
@@ -7556,57 +8149,68 @@ msgstr "Debe estar traballando conectado para completar esta operaci�n"
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analizar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Non se puido descodifica-la mensaxe."
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Non se puido descodifica-la mensaxe."
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar a busca por filtro: %s: %s"
@@ -7638,30 +8242,107 @@ msgstr "(coinciden-todas) require un �nico resultado booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "Efectuando petici�n sobre a cabeceira desco�ecida: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Erro ao executar a expresi�n de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Erro ao executar a expresi�n de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 #, fuzzy
 msgid "Moving messages"
 msgstr "Copiando as mensaxes"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Copiando as mensaxes a %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Cancelado."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Resposta inesperada do servidor IMAP: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Non se especificou un nome de cartafol"
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Non se puido descodifica-la mensaxe."
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Non se puido descodifica-la mensaxe."
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Non se puido descodifica-la mensaxe."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Non foi posible crear o ficheiro temporal: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7759,89 +8440,23 @@ msgstr "Erro ao escribir o ficheiro temporal de correo: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Erro ao copiar o ficheiro temporal de correo: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Introduza o seu contrasinal %s para %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Introduza o seu contrasinal %s"
-
-#: camel/camel-pgp-context.c:621
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-#, fuzzy
-msgid "Cannot sign this message: no password provided"
-msgstr "Non se pode enviar a mensaxe: enderezo do autor non v�lido"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, fuzzy, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Non foi posible crear unha canalizaci�n co GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
-
-#: camel/camel-pgp-context.c:987
-#, fuzzy
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
-
-#: camel/camel-pgp-context.c:993
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Non foi posible crear unha canalizaci�n co GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "Non foi posible crear o ficheiro temporal: %s"
-
-#: camel/camel-pgp-context.c:1177
-#, fuzzy
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
-
-#: camel/camel-pgp-context.c:1187
-#, fuzzy
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Non se pode enviar a mensaxe: enderezo do autor non v�lido"
-
-#: camel/camel-pgp-context.c:1194
-#, fuzzy, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Non foi posible crear unha canalizaci�n co GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-#, fuzzy
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
-
-#: camel/camel-pgp-context.c:1372
-#, fuzzy
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1387
-#, fuzzy, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Non foi posible crear unha canalizaci�n co GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
+msgstr ""
 
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Outro erro"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7858,43 +8473,6 @@ msgstr "Non foi posible cargar %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Non foi posible cargar %s: Non hai c�digo de inicializaci�n no m�dulo."
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "Servidor %s %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "Servicio %s para %s en %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Conexi�n cancelada"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, 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:258
-msgid "(unknown host)"
-msgstr "(m�quina desco�ecida)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Operaci�n cancelada"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, fuzzy, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "O servidor desconectou inesperadamente"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "An�nimo"
@@ -7969,8 +8547,8 @@ msgstr "Desaf�o do servidor non v�lido\n"
 #: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
-"O desaf�o do servidor conti�a un elemento \"Quality of Protection\" "
-"(\"Calidade da Protecci�n\") non v�lido\n"
+"O desaf�o do servidor conti�a un elemento \"Quality of Protection"
+"\" (\"Calidade da Protecci�n\") non v�lido\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
@@ -8002,7 +8580,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticaci�n do servidor."
 
@@ -8030,11 +8608,9 @@ msgid ""
 "Password Authentication."
 msgstr "Esta opci�n conectarase � servidor usando autenticaci�n Kerberos 4."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Contrasinal"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -8061,52 +8637,52 @@ msgstr "Autorizaci�n POP antes de SMTP usando unha fonte non-pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fallo na compilaci�n da expresi�n regular: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, 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:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte coa ruta"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fallo na b�squeda do nome: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Fallo na busca do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Fallo na busca do servidor: %s: motivo desco�ecido"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Fallo na busca do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Fallo na busca do servidor: %s: motivo desco�ecido"
@@ -8170,12 +8746,12 @@ msgstr "Non se puido descodifica-la mensaxe."
 msgid "Failed to verify certificates."
 msgstr "Non se puido verifica-los certificados."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
@@ -8206,7 +8782,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8215,16 +8791,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8244,15 +8820,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar o URL `%s'"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non existe a mensaxe %s en %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Non existe a mensaxe: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Comprobar as novas mensaxes en t�dolos cartafoles"
 
 #: camel/camel-vee-store.c:262
 #, fuzzy, c-format
@@ -8278,68 +8854,77 @@ msgstr "Non foi posible renomear o cartafol: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Non pode copiar mensaxes deste cartafol de lixo."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Operaci�n cancelada"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, fuzzy, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "O servidor desconectou inesperadamente"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "A resposta do servidor rematou cedo de m�is."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "A resposta do servidor IMAP non conti�a informaci�n sobre %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta positiva inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Non foi posible carga-lo resumo de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "O cartafol foi destruido e rexenerado no servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Buscando mensaxes cambiadas"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non est� dispo�ible actualmente."
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Recollendo informaci�n de resumo para as mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Buscando mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
@@ -8392,33 +8977,84 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e almacenar correo en servidores IMAP."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Contrasinal"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 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:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Servidor de SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Servicio %s para %s en %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Conexi�n cancelada"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Non foi posible conectarse a %s (porto %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Non foi posible conectarse � servidor POP.\n"
+"Erro enviando o nome de usuario: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operaci�n non soportada"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "A autenticaci�n fallou."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "O servidor IMAP %s non soporta o tipo de autenticaci�n %s solicitado."
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Non hai soporte para o tipo de autenticaci�n %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, 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:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8429,72 +9065,91 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Non se pode abri-la caixa do correo: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Directorios de correo en formato MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Para armacenar correo local en directorios de correo tipo MH"
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Entrega local"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Para recibir correo local dende spools est�ndar con formato mbox."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Aplicar filtros �s mensaxes novas de INBOX neste servidor"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "Directorios de correo en formato MH"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 #, fuzzy
 msgid "For storing local mail in maildir directories."
 msgstr "Para armacenar correo local en directorios maildir de qmail"
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Spools mbox est�ndar de Unix"
-
-#: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
-"Para ler e armacenar correo local en ficheiros spool est�ndar de tipo mbox."
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Spools mbox est�ndar de Unix"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
+"Para ler e armacenar correo local en ficheiros spool est�ndar de tipo mbox."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "A ra�z de almacenamento %s non � unha ruta absoluta"
@@ -8520,7 +9175,7 @@ msgstr "Os armacenamentos locais non te�en un inbox"
 msgid "Local mail file %s"
 msgstr "Ficheiro local de correo %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
@@ -8540,34 +9195,32 @@ msgstr "Non foi posible borrar o ficheiro de resumo de cartafol `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de �ndice de cartafol `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Non foi posible carga-lo resumo de %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Incapaz de engadir a mensaxe ao resumo: motivo desco�ecido"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao cartafol maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8576,20 +9229,19 @@ msgstr ""
 "Non � posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Non existe a mensaxe"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Contido da mensaxe non v�lido"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8600,13 +9252,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "O cartafol `%s' non existe."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8622,7 +9274,7 @@ msgstr "`%s' non � un directorio maildir."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Non foi posible borrar o cartafol `%s': %s"
@@ -8631,8 +9283,8 @@ msgstr "Non foi posible borrar o cartafol `%s': %s"
 msgid "not a maildir directory"
 msgstr "non � un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Non foi posible examina-lo cartafol `%s': %s"
@@ -8653,47 +9305,39 @@ msgstr "Comprobando o novo correo"
 msgid "Checking for new messages"
 msgstr "Buscando mensaxes novas"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non se pode abri-la caixa do correo: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Operaci�n cancelada"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao ficheiro mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8702,13 +9346,11 @@ msgstr ""
 "Non � posible obter a mensaxe: %s do cartafol %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "O cartafol parece estar corrompido sen recuperaci�n posible."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Contrucci�n da mensaxe fallida: �mailbox corrompido?"
 
@@ -8751,155 +9393,155 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "O cartafol `%s' non est� baleiro. Non borrado."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "Non � posible abrir o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Erro grave do analizador de correo preto da posici�n %ld no cartafol %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Non � posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "Non foi posible abrir o ficheiro %s:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, 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:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "O resumo e o cartafol non concordan, mesmo logo de sincronizar"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Erro ao escribir � caixa de correo temporal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Erro escribindo � caixa de correo temporal: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Non foi posible pechar o cartafol orixe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Non foi posible pechar o cartafol temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "O resumo e o cartafol non concordan, mesmo logo de sincronizar"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desco�ecido: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Erro ao escribir � caixa de correo temporal: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Erro escribindo � caixa de correo temporal: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "Enviar mensaxe a un contacto"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Non � posible engadir a mensaxe � cartafol mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' non � un directorio."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Non foi posible abrir a ruta do directorio MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Non se pode engadir a mensaxe ao ficheiro de spool: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Non se pode renomear os cartafoles spool"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "O spool `%s' non existe ou non � un ficheiro normal"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "O ra�z de armacenamento %s non � un directorio normal."
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "O cartafol `%s/%s' non existe."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Ficheiro spool de correo %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Non se pode renomear os cartafoles spool"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Non se pode renomear os cartafoles spool"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Os cartafoles spool non se poden eliminar"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Non foi posible sincroniza-lo cartafol temporal %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Non se puido sincroniza-lo cartafol spool %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8908,25 +9550,6 @@ msgstr ""
 "Non foi posible sincronizar o cartafol spool %s: %s\n"
 "O cartafol pode estar corrupto, copia gardada en `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, fuzzy, c-format
-msgid "Could not file: %s: %s"
-msgstr "Non foi posible cargar %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "O spool `%s' non existe ou non � un ficheiro normal"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Mensaxe para %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Novas USENET"
@@ -8935,12 +9558,22 @@ msgstr "Novas USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Este � un provedor para ler e enviar aos grupos de novas de USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Non foi posible crear o directorio %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Novas USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9044,7 +9677,7 @@ msgstr "Deixar as mensaxes no servidor"
 msgid "Delete after %s day(s)"
 msgstr "Borrar despois de %s d�a(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -9070,32 +9703,22 @@ msgstr ""
 "trav�s do protocolo APOP. Pode que isto non funcione para t�dolos usuarios, "
 "mesmo nalg�ns servidores que indican que o soportan."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Operaci�n non soportada"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "A autenticaci�n fallou."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Non foi posible conectarse � servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -9103,27 +9726,27 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Non hai soporte para o mecanismo de autenticaci�n solicitado."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "Erro de E/S"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sIntroduza o contrasinal POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -9132,13 +9755,13 @@ msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9309,45 +9932,45 @@ msgstr "Fallo temporal de autenticaci�n"
 msgid "Authentication required"
 msgstr "Autenticaci�n requirida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erro na resposta de benvida: %s: posiblemente non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "O cartafol parece estar corrompido sen recuperaci�n posible."
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "A petici�n AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "O servidor SMTP %s non soporta o tipo de autenticaci�n %s requirida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIntroduza o contrasinal SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9358,90 +9981,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo SMTP v�a %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "Non se pode enviar a mensaxe: enderezo do autor non v�lido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "Sa�do SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "A petici�n HELO expirou: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erro na resposta HELO: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "Autenticaci�n SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao crear o obxecto de autenticaci�n SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "A petici�n AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "A petici�n AUTH fallou."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Mala resposta de autenticaci�n do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "A petici�n MAIL FROM expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Erro na resposta MAIL FROM: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "A petici�n RCPT TO expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "A petici�n DATA expirou: %s: correo non enviado"
@@ -9449,38 +10072,38 @@ msgstr "A petici�n DATA expirou: %s: correo non enviado"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "O env�o de DATA expirou: remate da mensaxe: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Mala resposta de autenticaci�n do servidor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "A petici�n RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "A petici�n QUIT expirou: %s: non fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Erro na resposta RSET: %s"
@@ -9554,52 +10177,52 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Prema aqu� para o libro de enderezos"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 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:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9612,7 +10235,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Non foi posible crear un contexto de sinatura PGP."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9621,34 +10249,34 @@ msgstr ""
 "Erro ao le-lo ficheiro %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "�Aviso!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "O ficheiro existe, �sobrescribir?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao gardar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao cargar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acceder ao ficheiro: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9657,7 +10285,7 @@ msgstr ""
 "Non � posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9666,7 +10294,7 @@ msgstr ""
 "Non foi posible trunca-lo ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9675,7 +10303,7 @@ msgstr ""
 "Erro ao autogardar a mensaxe: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -9684,7 +10312,7 @@ msgstr ""
 "Evolution atopou ficheiros non gravados dunha sesi�n anterior.\n"
 "�Gostar�alle probar a recuperalos?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9694,30 +10322,50 @@ msgstr ""
 "\n"
 "�Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mensaxe Remitida"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Inserir Ficheiro"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Gravar sinatura"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (por defecto)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Compo�er unha mensaxe"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -9726,6 +10374,12 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque a�nda\n"
 "non configurou ningunha identidade no compo�ente de correo."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9787,7 +10441,7 @@ msgstr "O asunto cont�n"
 msgid "Subject does not contain"
 msgstr "O asunto non cont�n"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9940,7 +10594,7 @@ msgstr "hora"
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "segundos"
 
@@ -10018,7 +10672,7 @@ msgstr " atr�s"
 msgid "ago"
 msgstr "atr�s"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B �s %k:%M"
 
@@ -10030,6 +10684,21 @@ msgstr "<prema aqu� para seleccionar unha data>"
 msgid "Filter Rules"
 msgstr "Regras de Filtrado"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Nome do estilo:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "O spool `%s' non existe ou non � un ficheiro normal"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Escolla unha Acci�n"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -10049,7 +10718,7 @@ msgstr ""
 "Volva atr�s e especifique un cartafol v�lido no que deixar o correo."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Seleccionar Cartafol"
 
@@ -10062,7 +10731,11 @@ msgstr ""
 "Erro na expresi�n regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Proba"
 
@@ -10093,7 +10766,7 @@ msgstr "se se cumpren t�dolos criterios"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "se se cumpre alg�n criterio"
 
 #: filter/filter-rule.c:780
@@ -10172,194 +10845,203 @@ msgid "Beep"
 msgstr "Belice"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Compa��a"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "cont�n"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Copiar � Cartafol"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Data de recepci�n"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Data de env�o"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "non cont�n"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "non remata en"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "non existe"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "non soa como"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "non comeza por"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Non Existe"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Borrador"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "remata en"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Expresi�n"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "�"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "foi posterior a"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "foi anterior a"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "� maior que"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "� menor que"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "non �"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+msgid "Label"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Lista de Correo"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Cabeceira da Mensaxe"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Mover a un Cartafol"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Tocar un son:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Ler"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Busca por Expresi�n Regular"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Autor"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Establecer Estado"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Tama�o (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "soa como"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Conta Fonte"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Cabeceira espec�fica"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "comeza por"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Asunto"
 
@@ -10416,7 +11098,8 @@ msgid "Scanning %s"
 msgstr "Examinando %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Correo"
 
@@ -10432,10 +11115,6 @@ msgstr ""
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Libro de Enderezos"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10485,7 +11164,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution est� importando os datos antigos de Netscape"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Lixo"
 
@@ -10625,268 +11306,278 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Cartafol que cont�n correo"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Lixo Virtual"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Cartafol de Lixo Virtual"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Este cartafol non pode conter mensaxes."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Non definiu ning�n m�todo de env�o de correo"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Mensaxe Remitida"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "Enviar _Mensaxe"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando ao servidor..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o armacenamento co shell"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades de \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d nova(s)"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d oculta(s)"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionada(s)"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d sen enviar"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d sen enviar"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear Cartafol _Virtual Dende Mensaxe"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Responder � Autor"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Responder � _Lista"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completada"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover � Cartafol.."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/folder-browser.c:1645
-msgid "Label"
-msgstr ""
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "CartafolV pola Lista de Correo"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrar pola Lista de Correo (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "CartafolV pola Lista de Correo (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "Por de_fecto"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Obtendo Informaci�n do Cartafol"
 
@@ -10942,7 +11633,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Non encheu toda a informaci�n requirida."
 
@@ -10952,83 +11643,107 @@ msgid "Evolution News Editor"
 msgstr "Editor de Novas de Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome de _Usuario:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Ruta:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Radio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear d�as contas co mesmo nome"
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "�Est� seguro de que quere borrar esta conta?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Non borrar"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "�Borrar esta conta de verdade?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Desactivar"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Activado"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "�Est� seguro de que quere borrar esta conta de novas?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Activado"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Nome da Cont_a:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Rico"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Mensaxe para %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "O asunto � %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Mensaxe de %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "lista de correo %s"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11040,7 +11755,7 @@ msgstr ""
 "recibir ou compo�er correo.\n"
 "�Quere configuralo agora?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11048,7 +11763,7 @@ msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11057,18 +11772,18 @@ msgstr ""
 "antes de poder compo�elo."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Enviar unha mensaxe"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11076,7 +11791,7 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "�Enviar realmente?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11084,11 +11799,11 @@ msgstr ""
 "Xa que a lista de contactos � que env�a est� configurada para agocha-los "
 "enderezos da lista, esta mensaxe s� ha conter destinatarios Bcc."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11098,15 +11813,15 @@ msgstr ""
 "cabeceira Apparently-To.\n"
 "�Enviar de todas maneiras?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 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:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Ten que configurar unha conta antes de poder enviar este correo."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11114,28 +11829,28 @@ msgstr ""
 "Incapaz de abrir o cartafol de borradores para esta conta.\n"
 "�Gostar�alle usar o cartafol de borradores por defecto?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "un remitente desco�ecido"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "O %a, %Y-%m-%d �s %H:%M, %%s escribiu:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�Est� seguro de que quere editar todas as %d mensaxes?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11143,7 +11858,7 @@ msgstr ""
 "S� pode editar mensaxes gardadas\n"
 "no cartafol de Borradores."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11151,39 +11866,39 @@ msgstr ""
 "S� pode reenviar mensaxes\n"
 "do cartafol de Enviadas."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�Est� seguro de que quere re-enviar as %d mensaxes?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Ningunha Mensaxe Seleccionada"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "�Sobrescribir ficheiro?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Amosa-la seguinte mensaxe sen ler"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11195,7 +11910,7 @@ msgstr ""
 "\n"
 "�Eliminar realmente estas mensaxes?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11204,33 +11919,69 @@ msgstr ""
 "Erro ao cargar a informaci�n do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "A impresi�n da mensaxe fallou"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "�Est� seguro de que quere abrir todas as %d mensaxes en fiestras separadas?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "descrici�n"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Contacto Sen Nome"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "n"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Engadir criterio"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Gravar sinatura"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11284,58 +12035,46 @@ msgstr ""
 "Este nome s� se emprega para amosalo."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Traballando"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "despois"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Conta"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Comprobando Servicio"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Contacto Sen Nome"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
@@ -11343,118 +12082,112 @@ msgstr ", "
 
 #: mail/mail-config.glade.h:2
 #, fuzzy
-msgid " Edit "
-msgstr "Editar"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Novo"
-
-#: mail/mail-config.glade.h:4
-#, fuzzy
 msgid " _Check for supported types "
 msgstr "Dete_ctar tipos soportados "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL non est� soportado nesta versi�n de evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL non est� soportado nesta versi�n de evolution)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Sempre cifrarme a min mesmo cando se env�e correo cifrado"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Informaci�n de Contas"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Xesti�n de Contas"
 
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "Engadir criterio"
+
 #: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Cancelar Operaci�n"
+msgid "Add new signature..."
+msgstr "Gravar sinatura"
 
 #: mail/mail-config.glade.h:12
-msgid "Afrikaans"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Sempre cifrarme a min mesmo cando se env�e correo cifrado"
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alarmas"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Asinar sempre as mensaxes sa�ntes cando se use esta conta"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexar un ficheiro � mensaxe"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autenticaci�n"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Xogo de caracteres desco�ecido: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "P_echar"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
@@ -11462,15 +12195,20 @@ msgstr "Comprobando o novo correo"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Cor para tarefas para hoxe"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "Compo�er unha mensaxe"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11486,56 +12224,47 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuraci�n."
 
-#: mail/mail-config.glade.h:37
-msgid "Dari"
-msgstr ""
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Codificaci�n de caracteres por defecto: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "IDs dixitais..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Cartafol de borradores:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: mail/mail-config.glade.h:48
-#, fuzzy
-msgid "E_nable advanced options"
-msgstr "Opci�ns do navegador de datas"
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11556,40 +12285,35 @@ msgstr "Enderezo de Correo:"
 msgid "Empty _trash folders on exit"
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executar acci�ns"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "remata en"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propiedades"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Obter ID Dixital..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Resaltar as citas con "
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Tuvalu"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
@@ -11643,70 +12367,66 @@ msgstr "Micronesia"
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "Fontes de _Novas"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Informaci�n Opcional"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zaci�n:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da Clave PGP:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Escoller unha cor"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Avisar cando se env�en mensaxes con s� destinatarios _Bcc definidos"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimi-los contactos seleccionados"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
@@ -11741,120 +12461,124 @@ msgid "S_ecurity"
 msgstr "Seguridade"
 
 #: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME Seguro"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Seleccionar un binario PGP"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Ficheiro de sinatura:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Borrar todo ag�s a sinatura"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "O servidor require _autenticaci�n"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Configuraci�n do Servidor"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Atallos"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Gravar sinatura"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Gravar sinatura"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Fonte"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Informaci�n da Fonte"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "mbox est�ndar de Unix"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "Sinatura _HTML:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11864,149 +12588,142 @@ msgstr ""
 "\n"
 "Prema en \"Seguinte\" para comezar. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Este"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "Sinatura _HTML:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "Cargar _sempre as mensaxes da rede"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Asinar sempre as mensaxes sa�ntes cando se use esta conta"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Tipo de Autenticaci�n: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tipo de Autenticaci�n: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "Comprobar _automaticamente se hai correo novo cada"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "ID do certificado:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Sinatura _HTML:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Opci�ns por defecto"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Nome do ficheiro:"
+msgid "_Enable"
+msgstr "Activado"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Remitir Coma"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Nome Completo:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "En correo HTML"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "Sinatura _HTML:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Idioma"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_Cargar imaxes se o autor est� no libro de enderezos"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Facer esta a mi�a conta por _defecto"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensaxes como Lidas despois de"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Nunca cargar as imaxes da rede"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "Ruta do binario _PGP:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Avisar cando se env�en mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Avisar cando se env�en mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Radio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -12047,70 +12764,53 @@ msgstr "Sinatura _HTML:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "Sinatura _HTML:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Usar conexi�n segura (_SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 #, fuzzy
 msgid "_every"
 msgstr "Cada"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " cor"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "descrici�n"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "fiestranovas1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Non foi posible crear un contexto de sinatura PGP."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Non foi posible crear un contexto de verificaci�n PGP."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Non foi posible crear un contexto de cifrado PGP."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Non foi posible crear un contexto de descifrado PGP."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Non foi posible crear un contexto de sinatura S/MIME."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Non foi posible crear un contexto de s� certificaci�n S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Non foi posible crear un contexto de cifrado S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Non foi posible crear un contexto de sobre S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Non foi posible crear un contexto de descodificaci�n S/MIME."
 
@@ -12153,102 +12853,138 @@ msgstr "Visualizador Externo"
 msgid "Loading message content"
 msgstr "Cargado o contido da mensaxe"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Tarefas _retrasadas:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Abrir Ligaz�n no Navegador"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Copiar Localizaci�n da Ligaz�n"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Gardar Ligaz�n coma (AM��AME)"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Gardar Imaxe coma..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Enderezo Incorrecto"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Cliente de Correo: "
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Imprimir mensaxe..."
+
+#: mail/mail-format.c:1832
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "Esta mensaxe est� asinada dixitalmente e comprobouse a autenticidade."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Non foi posible crear un contexto de verificaci�n PGP."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Esta mensaxe est� asinada dixitalmente e comprobouse a autenticidade."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Esta mensaxe est� asinada dixitalmente pero non se puido comprobar a s�a "
+"autenticidade"
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro a ficheiro local (%s) v�lido no sitio \"%s\""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos desco�ecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Cartafoles Locais"
+
+#: mail/mail-local.c:670
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12257,29 +12993,29 @@ msgstr ""
 "Non foi posible garda-la metainformaci�n do cartafol, seguramente\n"
 "non poder� abrir este cartafol outra vez: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando o cartafol \"%s\" � formato \"%s\""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12287,11 +13023,11 @@ msgstr ""
 "Se non pode abrir m�is esta caixa de correo, poida\n"
 "que te�a que reparala a man."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Non se pode cambia-lo formato dun cartafol non local."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar %s"
@@ -12349,81 +13085,73 @@ msgstr "Fallou na mensaxe %d de %d"
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Movendo"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Copiando"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gardando %d mensaxe(s)"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12432,7 +13160,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de sa�da: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12441,11 +13169,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12454,27 +13182,27 @@ msgstr ""
 "Non � posible crear ficheiro de sa�da: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -12547,10 +13275,6 @@ msgstr "Actualizando..."
 msgid "Waiting..."
 msgstr "Agardando..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Cancelado."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operaci�n."
@@ -12565,18 +13289,18 @@ msgstr "Introduza o seu contrasinal para %s"
 msgid "Enter Password"
 msgstr "Contrasinal"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Gravar sinatura"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12586,10 +13310,30 @@ msgstr ""
 "\n"
 "�Desexa gardar os cambios?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Nome:"
+
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "Gravar sinatura"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
 #, fuzzy
-msgid "Signature name:"
-msgstr "Ficheiro de sinatura:"
+msgid "Hide signature hint"
+msgstr "Ficheiro de sinatura HTML:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12604,17 +13348,17 @@ msgstr "Mensaxe remitida"
 msgid "Forwarded Message"
 msgstr "Mensaxe Remitida"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12623,91 +13367,96 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "CartafolesV"
+
+#: mail/mail-vfolder.c:784
 #, fuzzy
 msgid "vFolders"
 msgstr "Cartafoles"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editar CartafolesV"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Sen asunto)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensaxe"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "M�ltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "M�ltiples Mensaxes"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "A m�is baixa"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "M�is baixa"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "M�is alta"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "A m�is alta"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Hoxe �s %k:%M"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Onte �s %k:%M"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "O %A �s %k:%M"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -12730,10 +13479,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Contacto Orixinal:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Recibido"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Tama�o"
 
@@ -17931,5816 +18685,5811 @@ msgstr "Letonia"
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "Buscapersoas"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 #, fuzzy
 msgid "La Verne"
 msgstr "Cabo Verde"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "L�bano"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 #, fuzzy
 msgid "Learmouth"
 msgstr "Lesoto"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 #, fuzzy
 msgid "Leesburg"
 msgstr "Luxemburgo"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "maio"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "Martinica"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 #, fuzzy
 msgid "Lemmon"
 msgstr "L�bano"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "Eliminar"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "anos"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 #, fuzzy
 msgid "Lewisburg"
 msgstr "Luxemburgo"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "Lesoto"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 #, fuzzy
 msgid "Lewistown"
 msgstr "Lesoto"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 #, fuzzy
 msgid "Lexington"
 msgstr "L�bano"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Liberal"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Libya"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "N�xer"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Lihue"
 msgstr "Niue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limoges"
 msgstr "A m�is baixa"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "mes"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Lincoln"
 msgstr "entrante"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 #, fuzzy
 msgid "Lisboa"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "Br�tema"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 #, fuzzy
 msgid "Litchfield"
 msgstr "Pedrisco lene"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "Login de NT"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "Copiar"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "London"
 msgstr "L�bano"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "Honduras"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 #, fuzzy
 msgid "Los Alamos"
 msgstr "Alarmas"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 #, fuzzy
 msgid "Lousiana"
 msgstr "Botsuana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "L�bano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "sa�nte"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "Luxemburgo"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "Letonia"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "marzo"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "Macau"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macapa"
 msgstr "Macau"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "Macedonia"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "maio"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "Macedonia"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "maio"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "maio"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "Malaui"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "Xestor"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "Malaisia"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "Macau"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manchester"
 msgstr "Aparici�ns:"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "maio"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "Br�tema"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "Barra de ferramentas principal"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "M�naco"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "Correo"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 #, fuzzy
 msgid "Maraba"
 msgstr "Mauritania"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "marzo"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "Mauritania"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "Mauritania"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "Mauritania"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "Marxes"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 #, fuzzy
 msgid "Marquette"
 msgstr "Martinica"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "Illas Marshall"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 #, fuzzy
 msgid "Marshalltown"
 msgstr "Illas Marshall"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "Martinica"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Marcar como _Non Lida"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Martinica"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "Martinica"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "Irlanda"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "Malaisia"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "Macedonia"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "Comores"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mattoon"
 msgstr "maio"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Xestor"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "Maiote"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Kazakhst�n"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 #, fuzzy
 msgid "Mazu"
 msgstr "Macau"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 #, fuzzy
 msgid "McAllen"
 msgstr "Todas"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "marzo"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McClellan"
 msgstr "Islandia"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "Copiar"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "Macau"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "antes"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 #, fuzzy
 msgid "Mehamn"
 msgstr "maio"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "Macedonia"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 #, fuzzy
 msgid "Merced"
 msgstr "m_�tricas"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "Venres"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 #, fuzzy
 msgid "Merril Field"
 msgstr "Campo _Desde"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "M�xico"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 #, fuzzy
 msgid "Miami"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middle East"
 msgstr "_Outros nomes:"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middleton Island"
 msgstr "Illas Salom�n"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "_Outros nomes:"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "Finlandia"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "Tipo de ficheiro:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 #, fuzzy
 msgid "Milford"
 msgstr "para"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "Mensaxe para %s"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minatitlan"
 msgstr "Mauritania"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "entrante"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 #, fuzzy
 msgid "Minnesota"
 msgstr "Micronesia"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "non �"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missoula"
 msgstr "Sri�a."
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Missouri"
 msgstr "Sri�a."
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitchell"
 msgstr "Aparici�ns:"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 #, fuzzy
 msgid "Mitilini"
 msgstr "Lista de Correo"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "Lu"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "Tel�fono M�bil"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Modesto"
 msgstr "N�boa moderada"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "Mover"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Moldova"
 msgstr "Luns"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 #, fuzzy
 msgid "Molokai"
 msgstr "Malaui"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "M�naco"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "M�naco"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "Luns"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "M�naco"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "Xestor"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montana"
 msgstr "Botsuana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "Neve moderada"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Vista Mensual"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 #, fuzzy
 msgid "Montego Bay"
 msgstr "Mongolia"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 #, fuzzy
 msgid "Monterrey"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 #, fuzzy
 msgid "Montgomery"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "M�naco"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morelia"
 msgstr "Mongolia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organizaci�n"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "Principal"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "M�bil"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "Vista Mensual"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "Sureste"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Vista Mensual"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 #, fuzzy
 msgid "Mullan"
 msgstr "maio"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 #, fuzzy
 msgid "Muncie"
 msgstr "xu�o"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 #, fuzzy
 msgid "Murcia"
 msgstr "Mauritania"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "Ocupado"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 #, fuzzy
 msgid "Muscatine"
 msgstr "Martinica"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "n�s"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 #, fuzzy
 msgid "Najran"
 msgstr "Bahrain"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "Nome:"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "Advertencia"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "Xap�n"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "Nome:"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Napoli"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "Alcume"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "Italia"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natchez"
 msgstr "Aparici�ns:"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 #, fuzzy
 msgid "Nebraska"
 msgstr "Nova Tarefa"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "Granada"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Nevada"
 msgstr "Granada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "Nova Tarefa"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bedford"
 msgstr "Fonte de Novas"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "Novo _Evento"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "Newcastle"
 msgstr "Novas"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Nova Celandia"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Nova Celandia"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "Novo _Evento"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Iberia"
 msgstr "Nova Caledonia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "Nova Mensaxe"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Mexico"
 msgstr "M�xico"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "Pa�ses Baixos"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "Norte"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "Novo _Evento"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "Novo"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "New York"
 msgstr "Novo CartafolV"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "Dimensi�ns:"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "Espa�a"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nis"
 msgstr "�"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "Nome:"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "Illa Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 #, fuzzy
 msgid "Norfolk NAS"
 msgstr "Illa Norfolk"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norrkoping"
 msgstr "Traballando"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Adams"
 msgstr "Nord�s"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "Norte"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "Noruega"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "Nord�s"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "Nord�s"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "Noruega"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "Territorios Franceses do Sul"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "Norte"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "Noruega"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "Nota"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "Non Iniciada"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 #, fuzzy
 msgid "Oahu"
 msgstr "Opaco"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "Tailandia"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Xamaica"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Oceanside"
 msgstr "Islandia"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "�nico"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "Abrir"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "Abrir"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "Outro"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 #, fuzzy
 msgid "Ojika Island"
 msgstr "Illas Cook"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "Illas Virxes Brit�nicas"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "Outro"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 #, fuzzy
 msgid "Olbia"
 msgstr "Albania"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 #, fuzzy
 msgid "Omaha"
 msgstr "Om�n"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "Om�n"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 #, fuzzy
 msgid "Omsk"
 msgstr "Aceptar"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "Orientaci�n"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oostende"
 msgstr "Asistente"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oran"
 msgstr "Om�n"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr ""
 "\n"
 "Org: "
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 #, fuzzy
 msgid "Oregon"
 msgstr ""
 "\n"
 "Org: "
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "Irlanda"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orlando"
 msgstr "Irlanda"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 #, fuzzy
 msgid "Oruro"
 msgstr "Erro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr "segundo"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 #, fuzzy
 msgid "Ostrava"
 msgstr "Australia"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "semana"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 #, fuzzy
 msgid "Oxford"
 msgstr "para"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "P�xina"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 #, fuzzy
 msgid "Palacios"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "Buscapersoas"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 #, fuzzy
 msgid "Palmdale"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "Buscapersoas"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "Configuraci�n de Correo"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 #, fuzzy
 msgid "Pamplona"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama City"
 msgstr "Panam�"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Cancelada"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "Xap�n"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Paphos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 #, fuzzy
 msgid "Paris"
 msgstr "Principal"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "Orballo parcial"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "Contrasinal"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "Panam�"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "Area forte"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "Tocar un son:"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "Pregunta"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "Recargar"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "Selecci�n:"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "Xeorxia"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "Principal"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "Per�"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "Per�"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philip"
 msgstr "Filipinas"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Filipinas"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 #, fuzzy
 msgid "Phillips"
 msgstr "Filipinas"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "Per�"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "Previsualizar"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 #, fuzzy
 msgid "Pine Bluff"
 msgstr "Correo de Pine"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 #, fuzzy
 msgid "Pisa"
 msgstr "Paquist�n"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 #, fuzzy
 msgid "Plymouth"
 msgstr "mes"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 #, fuzzy
 msgid "Podgorica Titograd"
 msgstr "Tornado parcial"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "Imprimir Sobre"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "Imprimir Resumo"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Imprimir Mensaxe"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "Propiedades"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponca City"
 msgstr "Lista de Tel�fonos"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponce"
 msgstr "Nada"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "Contactos"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "Polonia"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Imprimir Axenda"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "Imprimir Sobre"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "Previsualizar"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Imprimir tarxeta"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Polonia"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Portland"
 msgstr "Polonia"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto"
 msgstr "_Porto:"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "En Progreso"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "Vertical"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Vertical"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "Vertical"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "Polonia"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poza Rica"
 msgstr "Costa Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poznan"
 msgstr "Polonia"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Praha"
 msgstr "Paraguai"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "Chuvisca parcial"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Previsualizaci�n da Impresi�n"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Pretoria"
 msgstr "Xeorxia"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "Ant"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Price-Carbon"
 msgstr "Pitcairn"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "Tradicional"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Providence"
 msgstr "E_stado/Provincia:"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "Previsualizar"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "Ant"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 #, fuzzy
 msgid "Pucallpa"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Puebla"
 msgstr "P�blico"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Pueblo"
 msgstr "P�blico"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 #, fuzzy
 msgid "Puerto Barrios"
 msgstr "Porto Rico"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 #, fuzzy
 msgid "Puerto Escondido"
 msgstr "Porto Rico"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "Porto Rico"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Porto Rico"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 #, fuzzy
 msgid "Puerto Maldonado"
 msgstr "Tornado parcial"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "Porto Rico"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "Porto Rico"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "Imprimir Resumo"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pula"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "Polonia"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Imprimir Axenda"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "Pregunta"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quebec"
 msgstr "Asunto"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 #, fuzzy
 msgid "Rapid City"
 msgstr "Respondido a"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Rawlins"
 msgstr "Choiva"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Reading"
 msgstr "Encabezados"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Rebun Island"
 msgstr "Illa Bouvet"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Recife"
 msgstr "Recibido"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redding"
 msgstr "Encabezados"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "Ler"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redmond"
 msgstr "Refacer"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "Rexi�ns"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Rennes"
 msgstr "Recordatorios"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Reno"
 msgstr "Refacer"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "Xuntanza"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "Regras"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "anos"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reynosa"
 msgstr "Recargar"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Finlandia"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Rhode Island"
 msgstr "Illa Bouvet"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 #, fuzzy
 msgid "Riberalta"
 msgstr "Xibraltar"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "Alcume"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "Hait�"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "Papel"
 
-#: my-evolution/Locations.h:1881
-#, fuzzy
-msgid "Riga"
-msgstr "Dereita:"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rijeka"
 msgstr "Ler"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 #, fuzzy
 msgid "Rimini"
 msgstr "Roman�a"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rioja"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "Nicaragua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "Illas Virxes Brit�nicas"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Imprimir"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 #, fuzzy
 msgid "Riyadh"
 msgstr "Ler"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Roatan"
 msgstr "Croacia"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 #, fuzzy
 msgid "Robore"
 msgstr "antes"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "Polonia"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rodos"
 msgstr "Cuarto"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Rogers"
 msgstr "Cartafoles"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "Roman�a"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "Comores"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 #, fuzzy
 msgid "Rosario"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Roseglen"
 msgstr "Papel"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "Servidor"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "Recorrencia"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Russia"
 msgstr "Austria"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 #, fuzzy
 msgid "Rutland"
 msgstr "But�n"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 #, fuzzy
 msgid "Sacramento"
 msgstr "Departamento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 #, fuzzy
 msgid "Saginaw"
 msgstr "Espa�a"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saint Paul"
 msgstr "Santa Luc�a"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "Espa�a"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Salalah"
 msgstr "Refachos de vento"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salem"
 msgstr "Gardar"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salmon"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "_S�b"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 #, fuzzy
 msgid "Salvador"
 msgstr "O Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samos"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "_Dom"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 #, fuzzy
 msgid "Sana'A"
 msgstr "Area"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 #, fuzzy
 msgid "San Angelo"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "San Carlos"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "Area"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sandberg"
 msgstr "Autor"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sanderson"
 msgstr "Autor"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 #, fuzzy
 msgid "San Diego"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 #, fuzzy
 msgid "Sand Point"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sanford"
 msgstr "Area"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 #, fuzzy
 msgid "San Francisco"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "Sombreado"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Joaquin"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "Gardar e Pechar"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Juan"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 #, fuzzy
 msgid "San Miguel"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 #, fuzzy
 msgid "San Nicholas Island"
 msgstr "Illa Norfolk"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 #, fuzzy
 msgid "San Salvador"
 msgstr "O Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 #, fuzzy
 msgid "San Sebastian"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 #, fuzzy
 msgid "Santa Ana"
 msgstr "Santa Luc�a"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 #, fuzzy
 msgid "Santa Maria"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santa Monica"
 msgstr "Santa Luc�a"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "Autor"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santarem"
 msgstr "Treboada de area"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 #, fuzzy
 msgid "Santiago"
 msgstr "Santa Luc�a"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santorini"
 msgstr "Treboada de area"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "Estado"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 #, fuzzy
 msgid "Sao Luiz"
 msgstr "Santa Luc�a"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 #, fuzzy
 msgid "Sarasota"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "Sri Lanka"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "_Dom"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "Estado"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "Organizaci�n"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "Opci�ns"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "Vista"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "Comezando a importaci�n"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "Buscar"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "Sombreado"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "Buscar"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "S�bado"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "S�bado"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Shearwater"
 msgstr "Data de _Inicio:"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "Suecia"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "Selecci�n:"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Sheridan"
 msgstr "Sud�n"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "Tama�o"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Shoreham"
 msgstr "Puntuaci�n"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "Neve superficial"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 #, fuzzy
 msgid "Sidney"
 msgstr "Imprimir"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Silver City"
 msgstr "Seguridade"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "Tama�o"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skopje"
 msgstr "Parar"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "Enviada"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "Albania"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "minutos"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Snowshoe Lake"
 msgstr "Neve abundante"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Sochi"
 msgstr "Sur"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socorro"
 msgstr "Puntuaci�n"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Socotra"
 msgstr "Puntuaci�n"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 #, fuzzy
 msgid "Soda Springs"
 msgstr "Folerpas de neve"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sofia"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Soldotna"
 msgstr "Eslovenia"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Somerset"
 msgstr "Chuvieira"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Autor"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "Southampton"
 msgstr "Sureste"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "Sur"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Carolina"
 msgstr "Sud�frica"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "South Dakota"
 msgstr "Sureste"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "Sur"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "Illas Marshall"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "Autor"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "Br�tema"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "Espa�a"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "Simplificado"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "State College"
 msgstr "Data Completada:"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "Opci�ns"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "Opci�ns"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "Parar"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "Stephenville"
 msgstr "Seichelles"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 #, fuzzy
 msgid "St. George"
 msgstr "Santa Helena"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "Parar"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 #, fuzzy
 msgid "St Louis"
 msgstr "Santa Luc�a"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Sri Lanka"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "Noruega"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "St Paul"
 msgstr "Estado"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 #, fuzzy
 msgid "Strevell"
 msgstr "Sub�rbore"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "Illas Salom�n"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "S�bado"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "Puntuaci�n"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Luxemburgo"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "Resumo"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 #, fuzzy
 msgid "Sutton"
 msgstr "_Dom"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Tradicional"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "Tarefa"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "Gana"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 #, fuzzy
 msgid "Taejon"
 msgstr "Ent�n"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Taif"
 msgstr "Taiw�n"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Tainan"
 msgstr "Taiw�n"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Taiw�n"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Taiz"
 msgstr "Taiw�n"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr "Taiw�n"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "Taiw�n"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Taiw�n"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 #, fuzzy
 msgid "Tampa"
 msgstr "Xap�n"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "Papel"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "Canad�"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Taiw�n"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Taranto"
 msgstr "Taiw�n"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "Tarefa"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Tarija"
 msgstr "Taiw�n"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "Tradicional"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "Toquelau"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "Texas"
 msgstr "Tarefa"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 #, fuzzy
 msgid "The Dalles"
 msgstr "Seichelles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "T�tulo"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "Xoves"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tianjin"
 msgstr "Taiw�n"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Tijuana"
 msgstr "Lituania"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tirana"
 msgstr "Taiw�n"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "Libre"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "T�tulo"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "Privado"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 #, fuzzy
 msgid "Tokunoshima Island"
 msgstr "Illa Christmas"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 #, fuzzy
 msgid "Toledo"
 msgstr "Trocar"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 #, fuzzy
 msgid "Toluca"
 msgstr "Toquelau"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Topeka"
 msgstr "Toquelau"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 #, fuzzy
 msgid "Toronto"
 msgstr "Tornado"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "Superior:"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torrance"
 msgstr "Francia"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Torreon"
 msgstr "Coreano"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "Comezando a importaci�n"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Toulouse"
 msgstr "Pechar"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trabzon"
 msgstr "Gab�n"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 #, fuzzy
 msgid "Trapani"
 msgstr "Xap�n"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "Orientaci�n"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "Anterior"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 #, fuzzy
 msgid "Trieste"
 msgstr "Proba"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 #, fuzzy
 msgid "Trinidad"
 msgstr "Tornado"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "Turqu�a"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "Martes"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "Tunicia"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "_Mar"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turaif"
 msgstr "Turco"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "Turco"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turku"
 msgstr "Turqu�a"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 #, fuzzy
 msgid "Twenthe"
 msgstr "Tentativa"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "Tipo:"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "_Mar"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "Emiratos �rabes Unidos"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 #, fuzzy
 msgid "Unst"
 msgstr "Non vista"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruapan"
 msgstr "Xap�n"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Uruguai"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 #, fuzzy
 msgid "Utah"
 msgstr " "
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vadso"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Variable"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vagar"
 msgstr "Buscapersoas"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valencia"
 msgstr "Eslovenia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 #, fuzzy
 msgid "Valentine"
 msgstr "Ver Inline"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 #, fuzzy
 msgid "Van"
 msgstr "maio"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "Cancelar"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 #, fuzzy
 msgid "Varadero"
 msgstr "Barbados"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Varna"
 msgstr "Vanuatu"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "despois"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 #, fuzzy
 msgid "Venezia"
 msgstr "Venezuela"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 #, fuzzy
 msgid "Venice"
 msgstr "Unicode"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vermont"
 msgstr "mes"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "Xeral"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 #, fuzzy
 msgid "Vicenza"
 msgstr "Venezuela"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "Nome do ficheiro:"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 #, fuzzy
 msgid "Villahermosa"
 msgstr "Alarmas Visuais"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "Australia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "Finlandia"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volkel"
 msgstr "Toquelau"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 #, fuzzy
 msgid "Volk Field"
 msgstr "Campo _Desde"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 #, fuzzy
 msgid "Voslau"
 msgstr "Toquelau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 #, fuzzy
 msgid "Waco"
 msgstr "M�naco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 #, fuzzy
 msgid "Wallops Island"
 msgstr "Illas Falkland (Malvinas)"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "Advertencia"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "Tempo"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Waterloo"
 msgstr "Tempo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "Tempo"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 #, fuzzy
 msgid "Waterville"
 msgstr "Categor�as"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 #, fuzzy
 msgid "Wausau"
 msgstr "Vanuatu"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Webster City"
 msgstr "Sitio Web"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "Me"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Tempo"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 #, fuzzy
 msgid "Wendover"
 msgstr "Autor"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "West Burke"
 msgstr "Europeo Occidental"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "Pa�ses Baixos"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westfield"
 msgstr "Oeste"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "_Programar Xuntanza"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "Illa Christmas"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "Alcume"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 #, fuzzy
 msgid "Wien"
 msgstr "Me"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 #, fuzzy
 msgid "Williston"
 msgstr "Br�tema"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 #, fuzzy
 msgid "Winchester"
 msgstr "Liechtenstein"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 #, fuzzy
 msgid "Windsor"
 msgstr "Treboada de area"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 #, fuzzy
 msgid "Winslow"
 msgstr "agora"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 #, fuzzy
 msgid "Winter Park"
 msgstr "Contrasinal"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 #, fuzzy
 msgid "Wisconsin"
 msgstr "Micronesia"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "Me"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "Hong Kong"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "Ao p�:"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "para sempre"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "Polonia"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "Traballando"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "Traballando"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 #, fuzzy
 msgid "Xiamen"
 msgstr "Nome:"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 #, fuzzy
 msgid "Yao Airport"
 msgstr "Non importar"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 #, fuzzy
 msgid "Yenbo"
 msgstr "Iemen"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zadar"
 msgstr "Axenda"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 #, fuzzy
 msgid "Zagreb"
 msgstr "P�xina"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zanesville"
 msgstr "Cancelada"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 #, fuzzy
 msgid "Zaragoza"
 msgstr "Paraguai"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 #, fuzzy
 msgid "Zurich"
 msgstr "Turco"
@@ -23772,17 +24521,12 @@ msgstr "%A, %d de %B"
 msgid "No description"
 msgstr "descrici�n"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Resumo de correo"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "CartafolesV"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
 
@@ -23791,57 +24535,47 @@ msgstr "Cartafoles Locais"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Palabra do D�a de Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Citas do D�a"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Engadir fonte de novas"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Introduza o URL da fonte de novas que desexe engadir"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Nome:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Erro descargando o RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Fonte de Novas"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr "Todas"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
-msgstr "_Engadir"
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "_Eliminar"
+msgid "Add"
+msgstr "Enga_dir"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Chuvieira"
@@ -23885,10 +24619,46 @@ msgstr "Imprimir Resumo"
 msgid "Printing of Summary failed"
 msgstr "A impresi�n do Resumo fallou"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "O compo�ente Resumo Executivo non puido inicializar Bonobo.\n"
 
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " F"
+msgstr ", "
+
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " C"
+msgstr ", "
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "n�s"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "polHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "millas"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "quil�metros"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Ceo limpo"
@@ -25055,102 +25825,108 @@ msgid "C_elsius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "T�dalas _fontes de novas:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "�Cantos d�as deber�an aparecer na axenda ao mesmo tempo?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "M�_ximo n�mero de elementos a amosar:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Configuraci�n da Fonte de Novas"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Un m_es"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "Unha sema_na"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 #, fuzzy
 msgid "R_efresh time (seconds):"
 msgstr "_Tempo de refresco (segundos):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "_Tempo de refresco (segundos):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "Amo_sa-las rutas completas dos cartafoles"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "_Amosar t�dalas tarefas"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Amosa-las _tarefas de hoxe"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Tarefas "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Configuraci�n do tempo"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Cinco d�as"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Correo"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "Fontes de _Novas"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Un d�a"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Programar"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Tempo"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "F�brica para o compositor de Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Cartafoles Especiais"
+msgid "Folder Settings"
+msgstr "Opci�ns"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "O shell de Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -25161,6 +25937,39 @@ msgstr "Amosa-los Detalles"
 msgid "Cancel Operation"
 msgstr "Cancelar Operaci�n"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Seleccionar Cartafol"
+
+#: shell/e-local-storage.c:174
+#, fuzzy
+msgid "Drafts"
+msgstr "Borrador"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Entrada"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Sa�da"
+
+#: shell/e-local-storage.c:177
+#, fuzzy
+msgid "Sent"
+msgstr "Vista"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instalaci�n de Evolution"
@@ -25267,6 +26076,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Data na que se completa"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Cartafoles Especiais"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Cartafoles Especiais"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Cartafoles Especiais"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Data na que se completa"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -25296,20 +26130,20 @@ msgstr "Non se pode mover un cartafol a un dos seus descendentes"
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Indique un cartafol no que copia-lo cartafol \"%s\":"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Copiar cartafol"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Indique un cartafol no que move-lo cartafol \"%s\":"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Mover cartafol"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25318,18 +26152,17 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Eliminar"
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
+#: shell/e-shell-folder-commands.c:407
 #, fuzzy, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "�Est� seguro de que quere borrar o cartafol '%s'?"
+msgid "Really delete folder \"%s\"?"
+msgstr "Elimina-lo cartafol '%s'"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25338,17 +26171,17 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -25367,7 +26200,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear un novo cartafol"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -25375,7 +26208,7 @@ msgstr ""
 "O tipo do cartafol seleccionado non � v�lido para\n"
 "a operaci�n solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Nova..."
 
@@ -25427,22 +26260,27 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Seleccionar Cartafol"
+
+#: shell/e-shell-importer.c:498
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "O cartafol `%s' non existe."
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25451,11 +26289,11 @@ msgstr ""
 "Non hai importador capaz de manexar\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25464,17 +26302,17 @@ msgstr ""
 "Importando %s.\n"
 "Comezando %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao cargar %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25483,32 +26321,32 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Autom�tico"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Tipo de ficheiro:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 #, fuzzy
 msgid "Import a single file"
 msgstr "Importar un formato de ficheiro externo"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25516,31 +26354,76 @@ msgstr ""
 "Agarde...\n"
 "Buscando configuraci�ns existentes"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Escolla un cartafol de destino para importar estes datos"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Pechando as conexi�ns..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr "Sincronizando '%s'"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Sincronizando cartafol"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "Sincronizando '%s'"
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Abrindo cartafol %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Abrindo cartafol %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Abrir en %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Non se pode crear o cartafol indicado:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
@@ -25557,8 +26440,8 @@ msgstr ""
 "Non se puido inicia-la interface do Mago de Correo de Evolution\n"
 "%s"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Novo"
@@ -25580,45 +26463,45 @@ msgstr "Este cartafol non pode conter mensaxes."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' son nomes de cartafol reservados."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Non se atopou o Bug buddy no seu $PATH."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Acerca de Evolution..."
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Ir � cartafol..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Seleccione o cartafol a abrir"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Crear un novo atallo"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Escolla o cartafol ao que quere que apunte o atallo:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 #, fuzzy
 msgid "_Work Online"
 msgstr "Traballar Conectado"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
@@ -25652,7 +26535,7 @@ msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Evolution est� desconectado. Prema neste bot�n para conectar."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25660,12 +26543,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o armacenamento local -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25673,23 +26556,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "Aceptar"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Argumentos non v�lidos"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Non se atopou a Base de Datos de configuraci�ns"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Erro xen�rico"
 
@@ -25714,95 +26593,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Non eliminar"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Renomear Grupo de Atallos"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Renomear o grupo de atallos seleccionado a:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Amosar os atallos como iconas pequenas"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Amosar os atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "Re_nomear este Grupo..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Renomear este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "Agochar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Agochar a barra de atallos"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Renomear atallo"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Renomea-lo atallo seleccionado a:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir o cartafol ligado a este atallo"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Abrir nunha Nova _Fiestra"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Abri-lo cartafol ligado a este atallo nunha nova fiestra"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Renomear este atallo"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "Eli_minar"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
@@ -25814,10 +26693,6 @@ msgstr "Erro ao gardar os atallos."
 msgid "Shortcuts"
 msgstr "Atallos"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Entrada"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -25881,10 +26756,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<prema aqu� para seleccionar un cartafol>"
 
@@ -25914,78 +26790,78 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 #, fuzzy
 msgid "CORBA error"
 msgstr "Erro de E/S"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 #, fuzzy
 msgid "Invalid argument"
 msgstr "Argumentos non v�lidos"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 #, fuzzy
 msgid "No owner"
 msgstr "Nada"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 #, fuzzy
 msgid "Not found"
 msgstr "Tarxeta non atopada"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Dete_ctar tipos soportados "
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "O usuario cancelou a operaci�n."
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 #, fuzzy
 msgid "Internal error"
 msgstr "Outro erro"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 #, fuzzy
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Non v�lido"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Non existe o cartafol %s"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 #, fuzzy
 msgid "No space left"
 msgstr "Ningunha Mensaxe Seleccionada"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Tipo de ficheiro:"
@@ -26111,51 +26987,97 @@ msgstr "Non preguntar de novo"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar datos dos seguintes ficheiros:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "_Fiestra de Evolution"
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, fuzzy, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"Ola. Gracias por toma-lo tempo de baixar esta versi�n de avaliaci�n\n"
+"da suite de traballo en grupo Evolution.\n"
+"\n"
+"Evolution a�nda non est� completa. Est� acheg�ndose, pero hai sitios\n"
+"nos que non temos algunhas caracter�sticas, ou est�n a medio facer.\n"
+"\n"
+"Se atopa erros, por favor, inf�rmenos deles en bugzilla.ximian.com\n"
+"Este producto non t�n garant�a e non se pretende que o empreguen\n"
+"individuos propensos a ataques de furia.\n"
+"\n"
+"Esperamos que desfrute do resultado do noso duro traballo, e\n"
+"agardamos con impaciencia polas s�as colaboraci�ns.\n"
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"Graci�as\n"
+"O Equipo de Evolution\n"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Non preguntar de novo"
+
+#: shell/main.c:347
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Non se pode acceder ao shell de Evolution."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Non se pode inicializar o shell de Evolution: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Desactivar a pantalla inicial"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Comezando a importaci�n"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a sa�da da depuraci�n de todos os compo�entes a un ficheiro."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compo�entes de Bonobo."
 
@@ -26273,11 +27195,11 @@ msgstr "a hora actual"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Acci�ns"
 
@@ -26399,8 +27321,8 @@ msgstr "Pechar este elemento"
 msgid "Delete this item"
 msgstr "Borrar este elemento"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Barra de ferramentas principal"
 
@@ -26440,7 +27362,7 @@ msgstr "Gravar este elemento no disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -26505,19 +27427,19 @@ msgstr "Remitir como i_Calendar"
 msgid "Forward this item via email"
 msgstr "Remitir este elemento por correo"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Obter a �ltima informaci�n sobre a reuni�n"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "Re_frescar Xuntanza"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "_Programar Xuntanza"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Programar unha xuntanza para este elemento"
 
@@ -26525,10 +27447,6 @@ msgstr "Programar unha xuntanza para este elemento"
 msgid "Customise My Evolution"
 msgstr "Personalizar My Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancela-la operaci�n de correo actual"
@@ -26685,7 +27603,7 @@ msgstr "Lista de Mensaxes por F�os"
 msgid "_Expunge"
 msgstr "_Limpar"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Cartafol"
 
@@ -27102,7 +28020,7 @@ msgstr "Anterior Mensaxe"
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Ferramentas"
 
@@ -27117,12 +28035,12 @@ msgstr "Pechar esta fiestra"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_Pechar"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Vista"
 
@@ -27311,7 +28229,7 @@ msgstr "_Abrir..."
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -27461,116 +28379,125 @@ msgid "Move this folder to another place"
 msgstr "Mover este cartafol a outro sitio"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Crear un _Novo Cartafol..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Abrir nunha Nova Fiestra"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Abrir este cartafol noutra fiestra"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Amosar informaci�n sobre Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Trocar"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Trocar a mostra da barra de cartafoles"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Trocar a mostra da barra de atallos"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Trocar entre traballo conectado e desconectado"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Ver o cartafol seleccionado"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ de Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Acerca de Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "Barra de _Cartafoles"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_Ir � Cartafol..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Import..."
 msgstr "Importando..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Novo Cartafol"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Atallo"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
 
@@ -27655,22 +28582,22 @@ msgstr ""
 "escoller un fuso horario.\n"
 " Empregue o bot�n dereito para alonxarse."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Vista Actual"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "Personalizar"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 #, fuzzy
 msgid "Save Custom View"
 msgstr "Personalizar"
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Definir Vistas"
 
@@ -27792,16 +28719,21 @@ msgstr "Editor de Buscas"
 msgid "Save Search"
 msgstr "Gardar Busca"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Gardar Busca"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Engadir �s Buscas Gardadas"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Avanzado..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informaci�n"
@@ -27823,21 +28755,21 @@ msgstr "Mensaxe"
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Buscar Agora"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Buscar Agora"
 
@@ -27863,6 +28795,197 @@ msgstr "init_corba(): non foi posible inicializar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Fontes do Libro de Enderezos"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Addressbook."
+#~ msgstr "F�brica para o compo�ente Libro de Enderezos de Evolution."
+
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "Informaci�n de traza opaca non v�lida:\n"
+#~ "%s"
+
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Compo�ente do resumo executivo da axenda de Evolution."
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "F�brica para o compo�ente Resume da Axenda."
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "_Inicio do d�a:"
+
+#~ msgid "_End of day:"
+#~ msgstr "_Final do d�a:"
+
+#~ msgid "before the start of the appointment"
+#~ msgstr "antes do comezo da cita"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "_Outro Organizador"
+
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Non est� soportado asinar en claro por este cifrado"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Introduza o seu contrasinal %s para %s"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Introduza o seu contrasinal %s"
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Non se pode enviar a mensaxe: enderezo do autor non v�lido"
+
+#, fuzzy
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Non foi posible crear unha canalizaci�n co GPG/PGP: %s"
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
+
+#, fuzzy
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
+
+#, fuzzy
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Non foi posible crear unha canalizaci�n co GPG/PGP: %s"
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Non se pode enviar a mensaxe: enderezo do autor non v�lido"
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Non foi posible crear unha canalizaci�n co GPG/PGP: %s"
+
+#, fuzzy
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
+
+#, fuzzy
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Non foi posible crear unha canalizaci�n co GPG/PGP: %s"
+
+#~ msgid "%s server %s"
+#~ msgstr "Servidor %s %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(m�quina desco�ecida)"
+
+#~ msgid "No such message: %s"
+#~ msgstr "Non existe a mensaxe: %s"
+
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Non pode copiar mensaxes deste cartafol de lixo."
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Non se pode engadir a mensaxe ao ficheiro de spool: %s: %s"
+
+#, fuzzy
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Non foi posible cargar %s: %s"
+
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "O spool `%s' non existe ou non � un ficheiro normal"
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Radio"
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "Editar"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Novo"
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Cancelar Operaci�n"
+
+#, fuzzy
+#~ msgid "E_nable advanced options"
+#~ msgstr "Opci�ns do navegador de datas"
+
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Tuvalu"
+
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Ficheiro de sinatura:"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Borrar todo ag�s a sinatura"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "Sinatura _HTML:"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Nome do ficheiro:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "Sinatura _HTML:"
+
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Idioma"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Radio"
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Non foi posible crear un contexto de cifrado PGP."
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Non foi posible crear un contexto de descifrado PGP."
+
+#~ msgid "Moving"
+#~ msgstr "Movendo"
+
+#~ msgid "Copying"
+#~ msgstr "Copiando"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Ficheiro de sinatura:"
+
+#, fuzzy
+#~ msgid "Riga"
+#~ msgstr "Dereita:"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_Engadir"
+
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "_Eliminar"
+
+#, fuzzy
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "�Est� seguro de que quere borrar o cartafol '%s'?"
+
 #~ msgid "Card: "
 #~ msgstr "Tarxeta: "
 
@@ -28124,19 +29247,19 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgstr "Esta informaci�n non � obrigatoria nos m�is dos servidores ldap. "
 
 #~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
 #~ msgstr ""
 #~ "Esta informaci�n empr�gaa o servidor ldap para especificar que nodos se "
 #~ "empregan nunha busca. P��ase en contacto co administrador do seu servidor "
 #~ "para obter m�is informaci�n."
 
 #~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
 #~ msgstr ""
-#~ "Este � o nodo base para t�dalas buscas no servidor ldap. P��ase en contacto "
-#~ "co administrador do seu servidor para obter m�is informaci�n."
+#~ "Este � o nodo base para t�dalas buscas no servidor ldap. P��ase en "
+#~ "contacto co administrador do seu servidor para obter m�is informaci�n."
 
 #~ msgid "This is the name of the server where your addressbook is located."
 #~ msgstr "Este � o nome do servidor onde se atopa o libro de enderezos."
@@ -28147,12 +29270,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "_My server requires authentication"
 #~ msgstr "O _meu servidor require autenticaci�n"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Outros Contactos"
-
-#~ msgid "(none)"
-#~ msgstr "(ning�n)"
-
 #~ msgid "Co_ntacts:"
 #~ msgstr "Co_ntactos:"
 
@@ -28177,13 +29294,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "_Mobile"
 #~ msgstr "_M�bil"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "�Est� seguro de que quere\n"
-#~ "borrar este contacto?"
-
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Rep�blica de Moldavia"
 
@@ -28205,239 +29315,12 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "_Other"
 #~ msgstr "_Outro"
 
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Prema aqu� para engadir un asistente"
-
 #~ msgid "The journal entry has changed. Send an updated version?"
 #~ msgstr "A entrada do diario cambiou. �Enviar unha versi�n actualizada?"
 
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
-
 #~ msgid "_Delete this Task"
 #~ msgstr "_Borrar esta Tarefa"
 
-#, fuzzy
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Informaci�n de Libre/Ocupado"
-
-#, fuzzy
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Hora do _final da reuni�n:"
-
-#, fuzzy
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Informaci�n de Libre/Ocupado"
-
-#, fuzzy
-#~ msgid "Task Completed: <b>"
-#~ msgstr " (Completada "
-
-#, fuzzy
-#~ msgid "iCalendar Information"
-#~ msgstr "informaci�n de axenda"
-
-#, fuzzy
-#~ msgid "iCalendar Error"
-#~ msgstr "Axenda"
-
-#, fuzzy
-#~ msgid "An unknown person"
-#~ msgstr "un remitente desco�ecido"
-
-#~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
-#~ msgstr ""
-#~ "<br> Por favor, olle a seguinte informaci�n, e escolla unha acci�n do men� "
-#~ "de embaixo."
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Ningunha</i>"
-
-#, fuzzy
-#~ msgid "Choose an action:"
-#~ msgstr "Escolla unha Acci�n"
-
-#, fuzzy
-#~ msgid "Update"
-#~ msgstr "Actualizaci�n de Tarefa"
-
-#, fuzzy
-#~ msgid "Accept"
-#~ msgstr "Aceptado"
-
-#, fuzzy
-#~ msgid "Tentatively accept"
-#~ msgstr " Tentativa "
-
-#, fuzzy
-#~ msgid "Decline"
-#~ msgstr "Rexeitado"
-
-#, fuzzy
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Informaci�n de Libre/Ocupado"
-
-#, fuzzy
-#~ msgid "Send Latest Information"
-#~ msgstr "Informaci�n da Tarefa"
-
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> publicou informaci�n sobre unha reuni�n."
-
-#~ msgid "Meeting Information"
-#~ msgstr "Informaci�n da Xuntanza"
-
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> require a s�a presencia nunha reuni�n."
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "Proposta de Xuntanza"
-
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> desexa asistir a unha reuni�n existente."
-
-#~ msgid "Meeting Update"
-#~ msgstr "Actualizaci�n da Xuntanza"
-
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> desexa recibir a �ltima informaci�n sobre a reuni�n."
-
-#~ msgid "Meeting Update Request"
-#~ msgstr "_Solicitude de Actualizaci�n de Xuntanza"
-
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> respostou a unha petici�n de xuntanza."
-
-#~ msgid "Meeting Reply"
-#~ msgstr "Resposta de Xuntanza"
-
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> cancelou unha reuni�n."
-
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Cancelaci�n da Xuntanza"
-
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> enviou unha mensaxe inintelixible."
-
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Mensaxe Incorrecta sobre a Xuntanza"
-
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> publicou informaci�n sobre tarefa."
-
-#~ msgid "Task Information"
-#~ msgstr "Informaci�n da Tarefa"
-
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> require que se encargue dunha tarefa."
-
-#~ msgid "Task Proposal"
-#~ msgstr "Proposta de Tarefas"
-
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> desexa asistir a unha tarefa existente."
-
-#~ msgid "Task Update"
-#~ msgstr "Actualizaci�n de Tarefa"
-
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> desexa recibir a �ltima informaci�n sobre a tarefa."
-
-#~ msgid "Task Update Request"
-#~ msgstr "Petici�n de Actualizaci�n de Tarefa"
-
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> respostou a unha asignaci�n de tarefa."
-
-#~ msgid "Task Reply"
-#~ msgstr "Resposta � Tarefa"
-
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> cancelou unha tarefa."
-
-#~ msgid "Task Cancellation"
-#~ msgstr "Cancelaci�n de Tarefa"
-
-#~ msgid "Bad Task Message"
-#~ msgstr "Mensaxe Incorrecta sobre a Tarefa"
-
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> publicou informaci�n de libre/ocupado."
-
-#~ msgid "Free/Busy Information"
-#~ msgstr "Informaci�n de Libre/Ocupado"
-
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> require a s�a informaci�n libre/ocupado."
-
-#~ msgid "Free/Busy Request"
-#~ msgstr "Petici�n de Libre/Ocupado"
-
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> respostou a unha petici�n de libre/ocupado."
-
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Resposta de Libre/Ocupado"
-
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Mensaxe de Libre/Ocupado Incorrecta"
-
-#, fuzzy
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
-
-#, fuzzy
-#~ msgid "Status: %s"
-#~ msgstr "E_stado:"
-
-#, fuzzy
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Porcentaxe completada"
-
-#, fuzzy
-#~ msgid "URL: %s"
-#~ msgstr "URL:"
-
-#, fuzzy
-#~ msgid "Categories: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Categor�as: "
-
-#, fuzzy
-#~ msgid "Contacts: "
-#~ msgstr "Co_ntactos:"
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Tipo inv�lido no contido do corpo, esper�base unha cadea"
 
@@ -28502,9 +29385,11 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "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."
+#~ "Isto conectarase � servidor POP e usar� Kerberos 4 para autenticarse con "
+#~ "el."
 
 #~ msgid "Could not authenticate to KPOP server: %s"
 #~ msgstr "Non foi posible autenticarse co servidor KPOP: %s"
@@ -28515,10 +29400,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "(Unknown)"
 #~ msgstr "(Desco�ecido)"
 
-#, fuzzy
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Resposta inesperada do servidor IMAP: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Non foi posible atopar o enderezo 'De' na mensaxe"
 
@@ -28565,25 +29446,9 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Filter on Mailing List"
 #~ msgstr "Filtrar pola Lista de Correo"
 
-#, fuzzy
-#~ msgid "Indexing:"
-#~ msgstr "�_ndice"
-
 #~ msgid "Mailbox Format"
 #~ msgstr "Formato mailbox"
 
-#~ msgid " (default)"
-#~ msgstr " (por defecto)"
-
-#~ msgid "Subject is %s"
-#~ msgstr "O asunto � %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Mensaxe de %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "lista de correo %s"
-
 #, fuzzy
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
@@ -28591,9 +29456,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Inbox"
 
-#~ msgid "Account"
-#~ msgstr "Conta"
-
 #, fuzzy
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr "Sempre cifrarme a min mesmo cando se env�e correo cifrado"
@@ -28607,9 +29469,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Edit..."
 #~ msgstr "Editar..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "Ficheiro de sinatura HTML:"
-
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Seleccionar un ficheiro de rexistro para o filtro..."
 
@@ -28639,25 +29498,9 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgstr "segundos."
 
 #, fuzzy
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "Esta mensaxe est� asinada dixitalmente e comprobouse a autenticidade."
-
-#, fuzzy
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Non se reco�ece este tipo de compo�ente de axenda."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr ""
-#~ "Esta mensaxe est� asinada dixitalmente e comprobouse a autenticidade."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Esta mensaxe est� asinada dixitalmente pero non se puido comprobar a s�a "
-#~ "autenticidade"
-
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "Compo�ente de Evolution para o resumo executivo"
 
@@ -28677,47 +29520,18 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "�C"
 #~ msgstr "�C"
 
-#~ msgid "kph"
-#~ msgstr "kph"
-
-#~ msgid "inHg"
-#~ msgstr "polHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "kilometers"
-#~ msgstr "quil�metros"
-
 #~ msgid "All _folders:"
 #~ msgstr "T�dolos carta_foles:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "T�dalas _fontes de novas:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "_Amosar cartafoles:"
 
-#~ msgid "_Display stations:"
-#~ msgstr "_Amosar estaci�ns:"
-
 #~ msgid "_Displayed feeds:"
 #~ msgstr "Fontes _amosadas:"
 
-#~ msgid "Outbox"
-#~ msgstr "Sa�da"
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#, fuzzy
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Non foi posible borrar o cartafol:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(Sen nome)"
 
@@ -28934,42 +29748,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "%s - Ximian Evolution %s [%s]"
 #~ msgstr "%s - Evolution %s [%s]"
 
-#, fuzzy
-#~ msgid ""
-#~ "Hi.  Thanks for taking the time to download this preview release\n"
-#~ "of the Ximian Evolution groupware suite.\n"
-#~ "\n"
-#~ "Ximian Evolution is not yet complete. It's getting close, but there are\n"
-#~ "places where features are either missing or only half working. \n"
-#~ "\n"
-#~ "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
-#~ "This product comes with no warranty and is not intended for\n"
-#~ "individuals prone to violent fits of anger.\n"
-#~ "\n"
-#~ "We hope that you enjoy the results of our hard work, and we\n"
-#~ "eagerly await your contributions!\n"
-#~ msgstr ""
-#~ "Ola. Gracias por toma-lo tempo de baixar esta versi�n de avaliaci�n\n"
-#~ "da suite de traballo en grupo Evolution.\n"
-#~ "\n"
-#~ "Evolution a�nda non est� completa. Est� acheg�ndose, pero hai sitios\n"
-#~ "nos que non temos algunhas caracter�sticas, ou est�n a medio facer.\n"
-#~ "\n"
-#~ "Se atopa erros, por favor, inf�rmenos deles en bugzilla.ximian.com\n"
-#~ "Este producto non t�n garant�a e non se pretende que o empreguen\n"
-#~ "individuos propensos a ataques de furia.\n"
-#~ "\n"
-#~ "Esperamos que desfrute do resultado do noso duro traballo, e\n"
-#~ "agardamos con impaciencia polas s�as colaboraci�ns.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Ximian Evolution Team\n"
-#~ msgstr ""
-#~ "Graci�as\n"
-#~ "O Equipo de Evolution\n"
-
 #~ msgid "F_ormat"
 #~ msgstr "_Formato"
 
@@ -29032,9 +29810,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "m"
 #~ msgstr "m"
 
-#~ msgid "n"
-#~ msgstr "n"
-
 #~ msgid "o"
 #~ msgstr "o"
 
@@ -29081,8 +29856,8 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgstr "Adiar"
 
 #~ msgid ""
-#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-#~ "know."
+#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like "
+#~ "to know."
 #~ msgstr ""
 #~ "Son as %s. O tempo Unix � agora %ld. Pensamos que lle gostar�a sabelo."
 
@@ -29101,9 +29876,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "after start of appointment"
 #~ msgstr "despois do comezo da cita"
 
-#~ msgid "before end of appointment"
-#~ msgstr "antes da fin da cita"
-
 #~ msgid "I couldn't update your calendar file!\n"
 #~ msgstr "�Non foi posible actualizar o ficheiro da axenda!\n"
 
@@ -29173,9 +29945,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Registering '%s'"
 #~ msgstr "Rexistrando '%s'"
 
-#~ msgid "Synchronizing '%s'"
-#~ msgstr "Sincronizando '%s'"
-
 #~ msgid "%l:%M%p"
 #~ msgstr "%l:%M%p"
 
@@ -29185,9 +29954,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "_Refresh time (seconds):"
 #~ msgstr "Tempo de _refresco (segundos):"
 
-#~ msgid "Delete folder '%s'"
-#~ msgstr "Elimina-lo cartafol '%s'"
-
 #~ msgid "Rename"
 #~ msgstr "Renomear"
 
@@ -29207,8 +29973,9 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgstr "Ficheiros de correo con formato de spool mbox de Unix"
 
 #~ 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."
+#~ "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 ""
 #~ "Para conectarse a servidores POP. O protocolo POP tam�n se pode usar para "
 #~ "recibir correo de certos provedores de correo web e sistemas de email "
@@ -29291,8 +30058,8 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgstr "Crear ruta se non existe."
 
 #~ msgid ""
-#~ "Select the kind of addressbook you have, and enter the relevant information "
-#~ "about it."
+#~ "Select the kind of addressbook you have, and enter the relevant "
+#~ "information about it."
 #~ msgstr ""
 #~ "Escolla a clase de Libro de Enderezos que ten, e introduza a informaci�n "
 #~ "relevante sobre el."
@@ -29585,11 +30352,11 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgstr "Mensaxe remitida (sen asunto)"
 
 #~ msgid ""
-#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-#~ "%s<br><b>Subject:</b> %s<br>"
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
+#~ "s<br><b>Subject:</b> %s<br>"
 #~ msgstr ""
-#~ "-----Mensaxe Remitida-----<br><b>De:</b> %s<br><b>Para:</b> "
-#~ "%s<br><b>Asunto:</b> %s<br>"
+#~ "-----Mensaxe Remitida-----<br><b>De:</b> %s<br><b>Para:</b> %"
+#~ "s<br><b>Asunto:</b> %s<br>"
 
 #~ msgid "Print the selected message"
 #~ msgstr "Imprimir a mensaxe seleccionada"
@@ -29784,9 +30551,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Print message to the printer"
 #~ msgstr "Imprimir mensaxe na impresora"
 
-#~ msgid "Print message..."
-#~ msgstr "Imprimir mensaxe..."
-
 #~ msgid "Redirect (FIXME: implement me)"
 #~ msgstr "Redireccionar (AM��AME: implem�ntame)"
 
diff --git a/po/hu.po b/po/hu.po
index e58534509d..8279ac64aa 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.2\n"
-"POT-Creation-Date: 2002-06-10 23:06+0200\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-06-10 17:00+0200\n"
 "Last-Translator: Andras Timar <timar@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -34,7 +34,7 @@ msgstr "VCard f�jlok import�l�sa az Evolutionbe."
 msgid "File As"
 msgstr "T�rol�s mint"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "N�v"
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Keres�s..."
 
@@ -356,31 +356,31 @@ msgstr "Bet�lt�s..."
 msgid "Error in search expression."
 msgstr "Hiba a keres�si kifejez�sben."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "N�vjegy hozz�ad�sa az LDAP-kiszolg�l�hoz..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "N�vjegy elt�vol�t�sa az LDAP-kiszolg�l�r�l..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "N�vjegy m�dos�t�sa az LDAP-kiszolg�l�n..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Keres�s �jraind�t�sa."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "LDAP keres�s eredm�nyeinek let�lt�se..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 msgid "Error performing search"
 msgstr "Hiba a keres�s k�zben"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 msgid "Could not parse query string"
 msgstr "Nem siker�lt �rtelmezni a lek�rdez�st"
 
@@ -495,21 +495,63 @@ msgid "LDAP server containing contact information"
 msgstr "N�vjegyeket tartalmaz� LDAP-kiszolg�l�"
 
 #: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "�j c�mlista"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "_C�mlista"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "�j n�vjegy"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_N�vjegy"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact List"
-msgstr "�j c�mlista"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Nem siker�lt kapcsolatba l�pni az LDAP-kiszolg�l�val."
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "Contact _List"
-msgstr "_C�mlista"
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Nem siker�lt bejelentkezni az IMAP kiszolg�l�ra.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Hiba a sz�r�inform�ci�k bet�lt�se k�zben:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "Az IMAP kiszolg�l� v�lasza nem tartalmaz %s inform�ci�t"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(Ez az Evolution-v�ltozat nem t�mogatja az SSL-t)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
@@ -652,48 +694,6 @@ msgstr "Lek�rdez�sek tilt�sa"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Lek�rdez�sek enged�lyez�se (Vesz�lyes!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Nem siker�lt kapcsolatba l�pni az LDAP-kiszolg�l�val."
-
-#: addressbook/gui/component/addressbook-config.c:216
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Nem siker�lt bejelentkezni az IMAP kiszolg�l�ra.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:239
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:648
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1152
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1174
-#, fuzzy
-msgid "Error retrieving schema information"
-msgstr ""
-"Hiba a sz�r�inform�ci�k bet�lt�se k�zben:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1182
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "Az IMAP kiszolg�l� v�lasza nem tartalmaz %s inform�ci�t"
-
-#: addressbook/gui/component/addressbook-config.c:1627
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(Ez az Evolution-v�ltozat nem t�mogatja az SSL-t)"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
@@ -846,7 +846,7 @@ msgid "Mappings"
 msgstr "Marg�k"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Soha"
 
@@ -1084,7 +1084,7 @@ msgid "Using email address"
 msgstr "E-mail c�m haszn�lata"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:137
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr "Amikor csak lehets�ges"
 
@@ -1092,7 +1092,7 @@ msgstr "Amikor csak lehets�ges"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "Hozz�_ad�s"
 
@@ -1134,7 +1134,7 @@ msgid "_Download limit:"
 msgstr "_Let�lt�si korl�t:"
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:155 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1244,7 +1244,7 @@ msgstr "Factory a c�mjegyz�k n�vkiv�laszt� fel�let�hez"
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:534
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
 #: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "T�rl�s"
@@ -1380,7 +1380,7 @@ msgid "D_epartment:"
 msgstr "_Oszt�ly:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "R�szletek"
 
@@ -1440,10 +1440,10 @@ msgstr "Tud fogadni _HTML levelet"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706
+#: calendar/gui/dialogs/meeting-page.c:673
 #: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
 #: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:153 ui/evolution-calendar.xml.h:27
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
 #: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
 #: ui/evolution.xml.h:41
 msgid "_Delete"
@@ -1474,7 +1474,7 @@ msgid "_Web page address:"
 msgstr "_Weblap c�me:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Egyes�lt �llamok"
 
@@ -1980,12 +1980,11 @@ msgid "Laos"
 msgstr "Laosz"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Lettorsz�g"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libanon"
 
@@ -1994,7 +1993,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
@@ -2003,12 +2002,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litv�nia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
@@ -2041,7 +2040,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "M�lta"
 
@@ -2066,7 +2065,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexik�"
 
@@ -2092,7 +2091,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marokk�"
 
@@ -2117,7 +2116,7 @@ msgid "Nepal"
 msgstr "Nep�l"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Hollandia"
 
@@ -2130,12 +2129,12 @@ msgid "New Caledonia"
 msgstr "�j-Kaled�nia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "�j-Z�land"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2152,7 +2151,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolk-sziget"
 
@@ -2161,17 +2160,17 @@ msgid "Northern Mariana Islands"
 msgstr "�szaki Mariana-szigetek"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norv�gia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakiszt�n"
 
@@ -2184,7 +2183,7 @@ msgid "Palestinian Territory"
 msgstr "Palesztin Ter�let"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2193,12 +2192,12 @@ msgid "Papua New Guinea"
 msgstr "P�pua �j-Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2211,22 +2210,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Lengyelorsz�g"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portug�lia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Katar"
 
@@ -2235,7 +2234,7 @@ msgid "Reunion"
 msgstr "Reunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rom�nia"
 
@@ -2272,7 +2271,7 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome And Principe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Sza�d Ar�bia"
 
@@ -2289,17 +2288,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Szingap�r"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Szlov�kia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Szlov�nia"
 
@@ -2312,7 +2311,7 @@ msgid "Somalia"
 msgstr "Szom�lia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "D�l-Afrika"
 
@@ -2321,7 +2320,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "South Georgia And The South Sandwich Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Spanyolorsz�g"
 
@@ -2342,7 +2341,7 @@ msgid "Sudan"
 msgstr "Szud�n"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Suriname"
 
@@ -2355,17 +2354,17 @@ msgid "Swaziland"
 msgstr "Szv�zif�ld"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Sv�dorsz�g"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Sv�jc"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Tajvan"
 
@@ -2403,7 +2402,7 @@ msgid "Tunisia"
 msgstr "Tun�zia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "T�r�korsz�g"
 
@@ -2424,7 +2423,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukrajna"
 
@@ -2433,7 +2432,7 @@ msgid "United Arab Emirates"
 msgstr "Egyes�lt Arab Emir�tusok"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Egyes�lt Kir�lys�g"
 
@@ -2442,7 +2441,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2455,12 +2454,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2483,12 +2482,12 @@ msgid "Western Sahara"
 msgstr "Nyugat-Szahara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoszl�via"
 
@@ -2555,11 +2554,11 @@ msgstr "Email"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3238,7 +3237,7 @@ msgstr "Marg�k"
 msgid "Number of columns:"
 msgstr "Oszlopok sz�ma:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Be�ll�t�sok"
 
@@ -3248,7 +3247,7 @@ msgid "Orientation"
 msgstr "Elhelyezked�s"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Lap"
 
@@ -3322,26 +3321,26 @@ msgstr "Sz�less�g:"
 msgid "_Font..."
 msgstr "_Bet�k�szlet..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "N�vtelen tal�lkoz�"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:688
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Magas"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:687
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Norm�lis"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:686
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Alacsony"
 
@@ -3485,7 +3484,7 @@ msgstr ""
 "p�rbesz�dablakot fogja ehelyett megjelen�teni."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2638
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Figyelmeztet�s"
@@ -3612,7 +3611,7 @@ msgid "Free"
 msgstr "Szabad"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:435
+#: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Foglalt"
@@ -3631,8 +3630,8 @@ msgstr "Folyamatban"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2296
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "K�sz"
 
@@ -3647,12 +3646,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1847
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
 #: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1620 mail/mail-accounts.c:442
-#: mail/mail-accounts.c:451 mail/mail-accounts.c:506
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3667,14 +3666,14 @@ msgstr "Ism�tl�d�"
 msgid "Assigned"
 msgstr "Kiosztva"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
-#: calendar/gui/e-meeting-model.c:821
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Igen"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Nem"
 
@@ -3694,7 +3693,7 @@ msgstr "H�tn�zet"
 msgid "Month View"
 msgstr "H�napn�zet"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1362
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
 #: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
@@ -3984,7 +3983,7 @@ msgstr "tal�lkoz� v�ge"
 msgid "hour(s)"
 msgstr "�ra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:187
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "perc"
 
@@ -4118,8 +4117,8 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#, fuzzy
-msgid "Wenesday"
+#: calendar/gui/dialogs/recurrence-page.c:1123
+msgid "Wednesday"
 msgstr "Szerda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
@@ -4161,7 +4160,7 @@ msgid "_Fri"
 msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Alap"
 
@@ -4284,52 +4283,59 @@ msgstr " (Esed�kes "
 msgid "Due "
 msgstr "Esed�kes "
 
-#: calendar/gui/dialogs/comp-editor.c:327
+#: calendar/gui/dialogs/comp-editor.c:342
 msgid "Could not update invalid object"
 msgstr "�rv�nytelen objektumot nem lehet friss�teni"
 
-#: calendar/gui/dialogs/comp-editor.c:330
+#: calendar/gui/dialogs/comp-editor.c:345
 msgid "Object not found, not updated"
 msgstr "Az objektum nem tal�lhat�, nem friss�lt"
 
-#: calendar/gui/dialogs/comp-editor.c:333
+#: calendar/gui/dialogs/comp-editor.c:348
 msgid "You don't have permissions to update this object"
 msgstr "Nincs jogosults�god az objektum friss�t�s�hez"
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:351
 msgid "Could not update object"
 msgstr "Nem siker�lt friss�teni az objektumot"
 
-#: calendar/gui/dialogs/comp-editor.c:725
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Tal�lkoz� szerkeszt�se"
 
-#: calendar/gui/dialogs/comp-editor.c:730
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Id�pont - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:733
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Feladat - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:736
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Napl� bejegyz�s - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:750
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Nincs �sszegz�s"
 
-#: calendar/gui/dialogs/comp-editor.c:1129
+#: calendar/gui/dialogs/comp-editor.c:1203
 #: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1001
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Ment�s m�sk�nt..."
 
-#: calendar/gui/dialogs/comp-editor.c:1281
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Nem siker�lt megszerezni a legfrissebb v�ltozatot!"
 
@@ -4387,27 +4393,27 @@ msgstr "A feladat v�grehajt�ja:"
 msgid "Enter Delegate"
 msgstr "V�grehajt� megad�sa"
 
-#: calendar/gui/dialogs/event-editor.c:190 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Tal�lkoz�"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Eml�keztet�"
 
-#: calendar/gui/dialogs/event-editor.c:200
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Ism�tl�d�s"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:265
-#: calendar/gui/dialogs/event-editor.c:370
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "�temez�s"
 
-#: calendar/gui/dialogs/event-editor.c:212
-#: calendar/gui/dialogs/event-editor.c:268
-#: calendar/gui/dialogs/event-editor.c:373 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "�rtekezlet"
 
@@ -4476,19 +4482,19 @@ msgstr "_Befejez�s id�pontja:"
 msgid "_Start time:"
 msgstr "_Kezd�s id�pontja:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "A szervez�t be kell �ll�tani."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Legal�bb egy r�sztvev� sz�ks�ges."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Ez a szem�ly m�r rajta van a r�sztvev�k list�j�n!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Feladatkiad�s..."
 
@@ -4562,14 +4568,10 @@ msgid "_Change Organizer"
 msgstr "_Szervez� megv�ltoztat�sa"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_M�sok megh�v�sa..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_M�sik szervez�"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4651,10 +4653,6 @@ msgstr "Egy�b d�tum"
 msgid "day"
 msgstr "nap"
 
-#: calendar/gui/dialogs/recurrence-page.c:1123
-msgid "Wednesday"
-msgstr "Szerda"
-
 #: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "ezen:"
@@ -4754,7 +4752,7 @@ msgid "Progress"
 msgstr "Folyamatban"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:782
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4766,19 +4764,19 @@ msgstr "_Priorit�s:"
 msgid "_Status:"
 msgstr "�ll_apot:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Egyszer�"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Kioszt�s"
 
 #: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Le�r�s:"
 
@@ -4791,46 +4789,57 @@ msgid "_Due Date:"
 msgstr "Le_j�rat:"
 
 #: calendar/gui/e-calendar-table.c:440
+#, c-format
 msgid "0%"
 msgstr "0%"
 
 #: calendar/gui/e-calendar-table.c:441
+#, c-format
 msgid "10%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:442
+#, c-format
 msgid "20%"
 msgstr "20%"
 
 #: calendar/gui/e-calendar-table.c:443
+#, c-format
 msgid "30%"
 msgstr "30%"
 
 #: calendar/gui/e-calendar-table.c:444
+#, c-format
 msgid "40%"
 msgstr "40%"
 
 #: calendar/gui/e-calendar-table.c:445
+#, c-format
 msgid "50%"
 msgstr "50%"
 
 #: calendar/gui/e-calendar-table.c:446
+#, c-format
 msgid "60%"
 msgstr "60%"
 
 #: calendar/gui/e-calendar-table.c:447
+#, c-format
 msgid "70%"
 msgstr "70%"
 
 #: calendar/gui/e-calendar-table.c:448
+#, c-format
 msgid "80%"
 msgstr "80%"
 
 #: calendar/gui/e-calendar-table.c:449
+#, c-format
 msgid "90%"
 msgstr "90%"
 
 #: calendar/gui/e-calendar-table.c:450
+#, c-format
 msgid "100%"
 msgstr "100%"
 
@@ -5155,26 +5164,26 @@ msgstr "<i>Nincs</i>"
 msgid "Status:"
 msgstr "�llapot:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:318
-#: calendar/gui/e-meeting-model.c:341 calendar/gui/e-meeting-model.c:835
-#: calendar/gui/itip-utils.c:323
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
 msgid "Accepted"
 msgstr "Elfogadva"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:326
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
 msgid "Tentatively Accepted"
 msgstr "K�s�rletileg elfogadva"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:320
-#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:836
-#: calendar/gui/itip-utils.c:329 calendar/gui/itip-utils.c:355
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
 msgid "Declined"
 msgstr "Elutas�tva"
 
 #: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:289 calendar/gui/e-meeting-model.c:354
-#: calendar/gui/e-meeting-model.c:793 calendar/gui/e-meeting-model.c:809
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
@@ -5223,7 +5232,7 @@ msgstr "V�laszol� �llapot�nak friss�t�se"
 msgid "Send Latest Information"
 msgstr "Legut�bbi inform�ci� k�ld�se"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:343
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
 #: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "M�gse"
@@ -5501,92 +5510,92 @@ msgstr "date-end"
 msgid "date-start"
 msgstr "date-start"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Eln�k"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Sz�ks�ges r�sztvev�k"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Esetleges r�sztvev�k"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Nem vesz r�szt"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533 calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Egy�n"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Csoport"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Er�forr�s"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Szoba"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Levezet�"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535 calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Sz�ks�ges r�sztvev�k"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:807
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Esetleges r�sztvev�"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:808
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Nem vesz r�szt"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543 calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Beavatkoz�s sz�ks�ges"
 
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "K�s�rleti"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:838
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Deleg�lt"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "Folyamatban"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%Y %B %d, %A"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
@@ -5598,63 +5607,63 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Nincs bent"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Nincs inform�ci�"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Be�ll�t�sok"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Csak a _munka�r�k megjelen�t�se"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "_Megjelen�t�s nagy�tva"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Szabad/foglalt friss�t�se"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Automatikus kiszed�s"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Minden ember �s er�forr�s"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Minden _ember �s egy er�forr�s"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "_A k�rt emberek"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "A k�rt emberek �s egy e_r�forr�s"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Megbesz�l�s _kezd�dik:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Megbesz�l�s _v�ge:"
 
@@ -5673,7 +5682,7 @@ msgstr "Nem siker�lt bet�lteni a feladatot %s-be."
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' bet�lt�s�hez sz�ks�ges elj�r�s nem t�mogatott"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nem siker�lt megnyitni a mapp�t '%s'-ben"
@@ -5698,17 +5707,17 @@ msgstr "�j _tal�lkoz�..."
 msgid "_Delete this Appointment"
 msgstr "A _tal�lkoz� t�rl�se"
 
-#: calendar/gui/gnome-cal.c:1521
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nem siker�lt megnyitni a mapp�t '%s'-ben"
 
-#: calendar/gui/gnome-cal.c:1532
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' megnyit�s�hoz sz�ks�ges elj�r�s nem t�mogatott"
 
-#: calendar/gui/gnome-cal.c:1914
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Napt�r megnyit�sa %s-kor"
@@ -5769,47 +5778,47 @@ msgstr "okt�ber"
 msgid "September"
 msgstr "szeptember"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Legal�bb egy r�sztvev� sz�ks�ges"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "A szervez�t be kell �ll�tani."
 
-#: calendar/gui/itip-utils.c:295
+#: calendar/gui/itip-utils.c:354
 msgid "Event information"
 msgstr "Esem�nyinform�ci�"
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:356
 msgid "Task information"
 msgstr "Feladatinform�ci�"
 
-#: calendar/gui/itip-utils.c:299
+#: calendar/gui/itip-utils.c:358
 msgid "Journal information"
 msgstr "Napl�inform�ci�"
 
-#: calendar/gui/itip-utils.c:301
+#: calendar/gui/itip-utils.c:360
 msgid "Free/Busy information"
 msgstr "Szabad/foglalt inform�ci�"
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:362
 msgid "Calendar information"
 msgstr "Napt�rinform�ci�"
 
-#: calendar/gui/itip-utils.c:339
+#: calendar/gui/itip-utils.c:398
 msgid "Updated"
 msgstr "Friss�tve"
 
-#: calendar/gui/itip-utils.c:347
+#: calendar/gui/itip-utils.c:406
 msgid "Refresh"
 msgstr "Friss�t�s"
 
-#: calendar/gui/itip-utils.c:351
+#: calendar/gui/itip-utils.c:410
 msgid "Counter-proposal"
 msgstr "Ellenjavaslat"
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "R�szt kell venned az esem�nyen."
 
@@ -6040,7 +6049,7 @@ msgid "Print Calendar"
 msgstr "Napt�r nyomtat�sa"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2925
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -6078,8 +6087,8 @@ msgstr ""
 "\n"
 "T�nyleg t�rl�d ezeket a leveleket?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2410
-#: mail/mail-callbacks.c:2652
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Ne k�rdezze meg t�bbet."
 
@@ -7173,638 +7182,654 @@ msgid "Asia/Macao"
 msgstr "�zsia/Macao"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "�zsia/Macao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "�zsia/Magadan"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "�zsia/Magadan"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "�zsia/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "�zsia/Muscat"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "�zsia/Nicosia"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "�zsia/Novoszibirszk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "�zsia/Omszk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "�zsia/Kabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "�zsia/Phnom_Penh"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "�zsia/Pontianak"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "�zsia/Pyongyang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "�zsia/Katar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "�zsia/G�za"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "�zsia/Rangoon"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "�zsia/Rij�d"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "�zsia/Saigon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "�zsia/Szahalin"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "�zsia/Szamarkand"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "�zsia/Sz�ul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "�zsia/Sanghaj"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "�zsia/Szingap�r"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "�zsia/Taipei"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "�zsia/Taskent"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "�zsia/Tbiliszi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "�zsia/Teher�n"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "�zsia/Thimphu"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "�zsia/Toki�"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "�zsia/Ujung_Pandang"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "�zsia/Ul�nb�tor"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "�zsia/Urumcsi"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "�zsia/Vientiane"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "�zsia/Vlagyivosztok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "�zsia/Jakutszk"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "�zsia/Jekatyerinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "�zsia/Jerev�n"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlanti-�ce�n/Azori-szigetek"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlanti-�ce�n/Bermuda-szigetek"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlanti-�ce�n/Kan�ri-szigetek"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlanti-�ce�n/Z�ldfoki-szigetek"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlanti-�ce�n/Faeroe"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlanti-�ce�n/Jan_Mayen"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlanti-�ce�n/Madeira"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlanti-�ce�n/Reykjavik"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlanti-�ce�n/South_Georgia"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlanti-�ce�n/Szent_Ilona"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlanti-�ce�n/Stanley"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Ausztr�lia/Adelaide"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Ausztr�lia/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Ausztr�lia/Broke_Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Ausztr�lia/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Ausztr�lia/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Ausztr�lia/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Ausztr�lia/Lord_Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Ausztr�lia/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Ausztr�lia/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Ausztr�lia/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Eur�pa/Amszterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Eur�pa/Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Eur�pa/Ath�n"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Eur�pa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Eur�pa/Belgr�d"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Eur�pa/Berlin"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Eur�pa/Pozsony"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Eur�pa/Br�sszel"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Eur�pa/Bukarest"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Eur�pa/Budapest"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Eur�pa/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Eur�pa/Koppenh�ga"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Eur�pa/Gibralt�r"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Eur�pa/Helsinki"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Eur�pa/Isztanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Eur�pa/Kalinyingr�d"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Eur�pa/Kijev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Eur�pa/Lisszabon"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Eur�pa/Ljubljana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Eur�pa/London"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Eur�pa/Luxemburg"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Eur�pa/Madrid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Eur�pa/M�lta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Eur�pa/Minszk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Eur�pa/Monaco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Eur�pa/Moszkva"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Eur�pa/Nicosia"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Eur�pa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Eur�pa/P�rizs"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Eur�pa/Pr�ga"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Eur�pa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Eur�pa/R�ma"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Eur�pa/Szamara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Eur�pa/San_Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Eur�pa/Szarajev�"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Eur�pa/Szimferopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Eur�pa/Szkopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Eur�pa/Sz�fia"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Eur�pa/Stockholm"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Eur�pa/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Eur�pa/Tirana"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Eur�pa/Ungv�r"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Eur�pa/Vaduz"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Eur�pa/Vatik�n"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Eur�pa/B�cs"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Eur�pa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Eur�pa/Vars�"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Eur�pa/Z�gr�b"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Eur�pa/Zaporozsje"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Eur�pa/Z�rich"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Indiai-�ce�n/Antananarivo"
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Indiai-�ce�n/Chagos"
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Indiai-�ce�n/Kar�csony-szigetek"
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Indiai-�ce�n/Cocos"
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indiai-�ce�n/Comoro"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Indiai-�ce�n/Kerguelen"
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indiai-�ce�n/Mahe"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indiai-�ce�n/Mald�v-szigetek"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indiai-�ce�n/Mauritius"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indiai-�ce�n/Mayotte"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indiai-�ce�n/Reunion"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Csendes-�ce�n/Apia"
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Csendes-�ce�n/Auckland"
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Csendes-�ce�n/Chatham"
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Csendes-�ce�n/H�sv�t-szigetek"
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Csendes-�ce�n/Efate"
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Csendes-�ce�n/Enderbury"
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Csendes-�ce�n/Fakaofo"
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Csendes-�ce�n/Fidzsi-szigetek"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Csendes-�ce�n/Funafuti"
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Csendes-�ce�n/Galapagos-szigetek"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Csendes-�ce�n/Gambier"
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Csendes-�ce�n/Guadalcanal"
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Csendes-�ce�n/Guam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Csendes-�ce�n/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Csendes-�ce�n/Johnston"
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Csendes-�ce�n/Kiritimati"
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Csendes-�ce�n/Kosrae"
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Csendes-�ce�n/Kwajelein"
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Csendes-�ce�n/Majuro"
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Csendes-�ce�n/Marquesas"
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Csendes-�ce�n/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Csendes-�ce�n/Nauru"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Csendes-�ce�n/Niue"
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Csendes-�ce�n/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Csendes-�ce�n/Noumea"
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Csendes-�ce�n/Pago_Pago"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Csendes-�ce�n/Palau"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Csendes-�ce�n/Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Csendes-�ce�n/Ponape"
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Csendes-�ce�n/Port_Moresby"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Csendes-�ce�n/Rarotonga"
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Csendes-�ce�n/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Csendes-�ce�n/Tahiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Csendes-�ce�n/Tarawa"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Csendes-�ce�n/Tongatapu"
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Csendes-�ce�n/Truk"
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Csendes-�ce�n/Wake"
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Csendes-�ce�n/Wallis"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Csendes-�ce�n/Yap"
 
-#: camel/camel-cipher-context.c:174
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Ez a titkos�t� nem t�mogatja az al��r�st"
 
-#: camel/camel-cipher-context.c:214
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Ez a titkos�t� nem t�mogatja a nem k�dolt �zenetek al��r�s�t"
-
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Ez a titkos�t� nem t�mogatja az ellen�rz�st"
 
-#: camel/camel-cipher-context.c:297
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Ez a titkos�t� nem t�mogatja a titkos�t�st"
 
-#: camel/camel-cipher-context.c:339
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Ez a titkos�t� nem t�mogatja a visszafejt�st"
 
@@ -7820,7 +7845,7 @@ msgstr ""
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nem siker�lt megnyitni a gyorst�r k�nyvt�r�t: %s"
 
-#: camel/camel-disco-diary.c:183
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7831,7 +7856,7 @@ msgstr ""
 "A tov�bbi m�veletek ezen a kiszolg�l�n nem lesznek �jra lej�tszva,\n"
 "amikor ism�t kapcsol�dsz a h�l�zathoz."
 
-#: camel/camel-disco-diary.c:246
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7842,7 +7867,7 @@ msgstr ""
 "%s\n"
 "Az ebben a mapp�ban t�rt�nt v�ltoz�sok nem lesznek �jraszinkroniz�lva."
 
-#: camel/camel-disco-diary.c:280
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "�jraszinkroniz�l�s a kiszolg�l�val"
 
@@ -7957,25 +7982,99 @@ msgstr "Lek�rdez�s futtat�sa ismeretlen fejl�cen: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nem t�mogatott m�velet: lev�l hozz�f�z�se: %s"
 
-#: camel/camel-folder.c:1155
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nem t�mogatott m�velet: keres�s kifejez�s szerint: %s"
 
-#: camel/camel-folder.c:1195
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nem t�mogatott m�velet: keres�s uid szerint: %s"
 
-#: camel/camel-folder.c:1311
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Levelek �thelyz�se"
 
-#: camel/camel-folder.c:1311
+#: camel/camel-folder.c:1317
 #, fuzzy
 msgid "Copying messages"
 msgstr "Levelek m�sol�sa %s-be"
 
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Megszak�tva"
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "V�ratlan v�lasz a POP kiszolg�l�t�l: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Nincs f�jln�v megadva."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Nem lehet titkos�tani a levelet: nincs c�mzett"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Nem siker�lt gyorst�razni %s �zenetet: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Nem siker�lt gyorst�razni %s �zenetet: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "A lev�l dek�dol�sa sikertelen."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+"Nem lehet ellen�rizni a levelet: nem siker�lt l�trehozni az ideiglenes "
+"f�jlt: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8071,91 +8170,23 @@ msgstr "Hiba az ideiglenes lev�lf�jl �r�sa k�zben: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Hiba az ideiglenes lev�lf�jl m�sol�sa k�zben: %s"
 
-#: camel/camel-pgp-context.c:206
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Add meg %s jelszavadat %s sz�m�ra"
-
-#: camel/camel-pgp-context.c:209
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Add meg %s jelszavadat"
-
-#: camel/camel-pgp-context.c:634
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Nem lehet al��rni a levelet: nincs al��rhat� sima sz�veg"
-
-#: camel/camel-pgp-context.c:641 camel/camel-pgp-context.c:815
-msgid "Cannot sign this message: no password provided"
-msgstr "Nem lehet al��rni a levelet: nincs jelsz� megadva"
-
-#: camel/camel-pgp-context.c:647 camel/camel-pgp-context.c:821
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Nem lehet al��rni a levelet: nem siker�lt cs�vezet�ket l�trehozni a GPG/PGP-"
-"hez: %s"
-
-#: camel/camel-pgp-context.c:808
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Nem lehet al��rni a levelet: nincs al��rhat� sima sz�veg"
-
-#: camel/camel-pgp-context.c:1000
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Nem lehet ellen�rizni a levelet: nincs ellen�rizhet� sima sz�veg"
 
-#: camel/camel-pgp-context.c:1006
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
-"Nem lehet ellen�rizni a levelet: nem siker�lt cs�vezet�ket l�trehozni a GPG/"
-"PGP-hez: %s"
 
-#: camel/camel-pgp-context.c:1017
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-"Nem lehet ellen�rizni a levelet: nem siker�lt l�trehozni az ideiglenes "
-"f�jlt: %s"
-
-#: camel/camel-pgp-context.c:1190
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Nem lehet titkos�tani a levelet: nincs titkos�that� sima sz�veg"
-
-#: camel/camel-pgp-context.c:1200
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Nem lehet titkos�tani a levelet: nincs jelsz� megadva"
-
-#: camel/camel-pgp-context.c:1207
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Nem lehet titkos�tani a levelet: nem siker�lt cs�vezet�ket l�trehozni a GPG/"
-"PGP-hez: %s"
-
-#: camel/camel-pgp-context.c:1216
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Nem lehet titkos�tani a levelet: nincs c�mzett"
-
-#: camel/camel-pgp-context.c:1385
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Nem lehet visszafejteni a levelet: nincs visszafejthet� titkos sz�veg"
-
-#: camel/camel-pgp-context.c:1393
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Nem lehet visszafejteni a levelet: nincs jelsz� megadva"
-
-#: camel/camel-pgp-context.c:1400
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Nem lehet visszafejteni a levelet: nem siker�lt cs�vezet�ket l�trehozni a "
-"GPG/PGP-hez: %s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Ez az �zenetr�sz digit�lis al��r�ssal van ell�tva"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Egy�b hiba"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -8307,11 +8338,9 @@ msgid ""
 "Password Authentication."
 msgstr "Kerberos 4 hiteles�t�s haszn�lat�val kapcsol�dik a kiszolg�l�hoz."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
-msgid "Password"
-msgstr "Jelsz�"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -8487,7 +8516,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8500,16 +8529,16 @@ msgstr ""
 "Ujjlenyomat:       %s\n"
 "Al��r�s:           %s"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr "BAD"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8530,12 +8559,12 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nem siker�lt �rtelmezni ezt az URL-t: `%s'"
 
-#: camel/camel-vee-folder.c:622
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nincs %s lev�l %s-ben"
 
-#: camel/camel-vee-folder.c:769 camel/camel-vee-folder.c:775
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "�j levelek keres�se az �sszes mapp�ban"
@@ -8563,12 +8592,12 @@ msgstr "Nem siker�lt �tnevezni a mapp�t: %s: Nincs ilyen mappa"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2265
+#: camel/providers/imap/camel-imap-store.c:2276
 msgid "Operation cancelled"
 msgstr "M�velet megszak�tva"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2268
+#: camel/providers/imap/camel-imap-store.c:2279
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "A kiszolg�l� v�ratlanul sz�tkapcsolt: %s"
@@ -8612,25 +8641,25 @@ msgid "Folder was destroyed and recreated on server."
 msgstr "A mappa megsemmis�lt �s �jra l�tre lett hozva a kiszolg�l�n"
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:522
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Megv�ltozott levelek keres�se"
 
-#: camel/providers/imap/camel-imap-folder.c:1830
-#: camel/providers/imap/camel-imap-folder.c:2311
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Ez a lev�l jelenleg nem el�rhet�"
 
-#: camel/providers/imap/camel-imap-folder.c:1987
-#: camel/providers/imap/camel-imap-folder.c:2064
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "�sszefoglal� adatok let�lt�se az �j levelekhez."
 
-#: camel/providers/imap/camel-imap-folder.c:1993
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "�j levelek keres�se"
 
-#: camel/providers/imap/camel-imap-folder.c:2348
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Nem tal�lhat� a lev�lt�rzs a FETCH v�laszban."
 
@@ -8683,6 +8712,12 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Lev�lolvas�s �s -t�rol�s IMAP kiszolg�l�kon."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Jelsz�"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -8738,7 +8773,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP kiszolg�l� nem t�mogatja a k�rt %s hiteles�t�si t�pust"
 
 #: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:470
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s hiteles�t�si t�pus nem t�mogatott"
@@ -8749,7 +8784,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sAdd meg %s@%s IMAP jelszav�t!"
 
 #: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:511
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Nem adt�l meg jelsz�t."
 
@@ -8770,67 +8805,81 @@ msgstr ""
 msgid "No such folder %s"
 msgstr "Nincs %s mappa."
 
-#: camel/providers/imap/camel-imap-store.c:1648
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A sz�l�mappa nem tartalmazhat almapp�kat"
 
-#: camel/providers/local/camel-local-provider.c:44
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Nem siker�lt megnyitni a postal�d�t: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
 msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "MH form�tum� lev�lk�nyvt�rak"
 
-#: camel/providers/local/camel-local-provider.c:51
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "A helyi levelek t�rol�sa MH-szer� lev�lk�nyvt�rakban"
 
-#: camel/providers/local/camel-local-provider.c:66
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Helyi k�zbes�t�s"
 
-#: camel/providers/local/camel-local-provider.c:67
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "A helyi levelek let�lt�se szabv�nyos mbox form�tum� t�rol�kb�l"
 
-#: camel/providers/local/camel-local-provider.c:78
-#: camel/providers/local/camel-local-provider.c:96
+#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Sz�r�k alkalmaz�sa az �j levelekre az INBOX-ban"
 
-#: camel/providers/local/camel-local-provider.c:84
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Maildir form�tum� lev�lk�nyvt�rak"
 
-#: camel/providers/local/camel-local-provider.c:85
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "A helyi levelek t�rol�sa  maildir k�nyvt�rakban"
 
-#: camel/providers/local/camel-local-provider.c:102
-msgid "Standard Unix mbox spools"
-msgstr "Szabv�nyos Unix mbox t�rol�k"
-
-#: camel/providers/local/camel-local-provider.c:103
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "A helyi levelek olvas�sa �s t�rol�sa szabv�nyos mbox spool f�jlokban"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:118
-msgid "Directory tree of mbox files"
-msgstr "Mbox f�jlok k�nyvt�rf�ja"
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Szabv�nyos Unix mbox t�rol�k"
 
-#: camel/providers/local/camel-local-provider.c:119
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "A helyi levelek olvas�sa �s t�rol�sa szabv�nyos mbox spool f�jlokban"
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s t�rol�gy�k�r nem abszol�t �tvonal"
@@ -8876,13 +8925,12 @@ msgstr "Nem siker�lt '%s' mappa�sszegz�f�jt t�r�lni: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nem siker�lt '%s' mappaindexf�jlt t�r�lni: %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nem siker�lt menteni az �sszefoglal�t: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nem siker�lt hozz�adni a levelet az �sszefoglal�hoz: ismeretlen ok"
 
@@ -8898,11 +8946,10 @@ msgstr "Nem lehet a levelet a maildir mapp�hoz f�zni: %s: %s "
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:334
+#: camel/providers/local/camel-mbox-folder.c:348
 #: camel/providers/local/camel-mh-folder.c:201
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:218
-#: camel/providers/local/camel-spool-folder.c:585
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8912,9 +8959,8 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:334
+#: camel/providers/local/camel-mbox-folder.c:348
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-spool-folder.c:585
 msgid "No such message"
 msgstr "Nincs ilyen lev�l"
 
@@ -8967,7 +9013,7 @@ msgid "not a maildir directory"
 msgstr "nem maildir k�nyvt�r"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nem siker�lt p�szt�zni ezt a mapp�t: `%s': %s"
@@ -8988,45 +9034,37 @@ msgstr "�j levelek keres�se"
 msgid "Checking for new messages"
 msgstr "�j levelek keres�se"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Mappa t�rol�sa"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nem siker�lt z�rolni %s k�nyvt�rat: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nem siker�lt megnyitni a postal�d�t: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Lev�l hozz�f�z�se megszak�tva"
 
-#: camel/providers/local/camel-mbox-folder.c:271
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nem siker�lt a levelet az mbox f�jlhoz hozz�f�zni: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:350
-#: camel/providers/local/camel-mbox-folder.c:382
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:601
-#: camel/providers/local/camel-spool-folder.c:633
-#: camel/providers/local/camel-spool-folder.c:645
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9035,13 +9073,11 @@ msgstr ""
 "Nem siker�lt bet�lteni a k�vetkez� levelet %2$s mapp�b�l: %1$s\n"
 "  %3$s"
 
-#: camel/providers/local/camel-mbox-folder.c:383
-#: camel/providers/local/camel-spool-folder.c:634
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "A mappa jav�thatatlanul rossznak n�z ki."
 
-#: camel/providers/local/camel-mbox-folder.c:395
-#: camel/providers/local/camel-spool-folder.c:646
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Lev�l�r�s sikertelen: rossz postafi�k?"
 
@@ -9084,84 +9120,78 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' mappa nem �res. Nem t�r�lhet�."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nem siker�lt megnyitni a mapp�t: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "V�gzetes lev�l�rtelmez�si hiba %ld poz�ci� k�zel�ben %s mapp�ban"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nem siker�lt ellen�rizni a mapp�t: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nem siker�lt megnyitni ezt a f�jlt: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nem siker�lt megnyitni az ideiglenes postafi�kot: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Az �sszefoglal� �s a mappa elt�r, m�g egyeztet�s ut�n is"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Hiba az ideiglenes postafi�k �r�sa k�zben: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Sikertelen �r�si m�velet az ideiglenes postafi�kba: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nem siker�lt lez�rni a forr�smapp�t %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nem siker�lt bez�rni ezt az ideiglenes mapp�t: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nem siker�lt �tnevezni ezt a mapp�t: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Az �sszefoglal� �s a mappa elt�r, m�g egyeztet�s ut�n is"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ismeretlen hiba: %s"
 
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Nem siker�lt �tnevezni ezt a mapp�t: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Hiba az ideiglenes postafi�k �r�sa k�zben: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Sikertelen �r�si m�velet az ideiglenes postafi�kba: %s: %s"
+
 #: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "MH lev�l hozz�f�z�se megszak�tva"
@@ -9181,52 +9211,58 @@ msgstr "`%s' nem k�nyvt�r."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nem siker�lt megnyitni az MH k�nyvt�r el�r�si �tj�t: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:518
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Nem siker�lt a levelet a spool f�jlhoz hozz�f�zni: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Spool mapp�t nem lehet �tnevezni"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "`%s' spool nem l�tezik, vagy  nem k�z�ns�ges f�jl."
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "%s t�rol�gy�k�r nem k�z�ns�ges k�nyvt�r"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "`%s/%s' mappa nem l�tezik."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr "A t�rol� nem t�mogatja az INBOX-ot"
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "%s spool lev�lf�jl"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Spool mapp�t nem lehet �tnevezni"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Spool mapp�t nem lehet �tnevezni"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Spool mapp�t nem lehet t�r�lni"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nem siker�lt szinkroniz�lni ezt az ideiglenes mapp�t: %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nem siker�lt p�szt�zni ezt a spool mapp�t: `%s': %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -9235,25 +9271,6 @@ msgstr ""
 "Nem siker�lt szinkroniz�lni ezt a spool mapp�t: %s: %s\n"
 "A mappa val�sz�n�leg s�r�lt, m�solat mentve `%s' n�ven"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Nem siker�lt besorolni: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "`%s' spool nem l�tezik, vagy  nem k�z�ns�ges f�jl."
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr "A t�rol� nem t�mogatja az INBOX-ot"
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, c-format
-msgid "Mail tree %s"
-msgstr "Lev�lfa %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET h�rcsoportok"
@@ -9375,7 +9392,7 @@ msgstr "Az �zenetek maradjanak meg a kiszolg�l�n is"
 msgid "Delete after %s day(s)"
 msgstr "T�rl�s a kiszolg�l�r�l %s nap m�lva"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -9460,7 +9477,7 @@ msgid "No such folder `%s'."
 msgstr "Nincs '%s' mappa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9513,7 +9530,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Lev�lk�ld�s a sendmail programon kereszt�l"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9651,17 +9668,17 @@ msgstr "Id�t�ll�p�s az AUTH k�r�sn�l: %s"
 msgid "STARTTLS response error"
 msgstr "Hib�s RSET v�lasz: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:460
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "%s SMTP kiszolg�l� nem t�mogatja a k�rt %s hiteles�t�si t�pust"
 
-#: camel/providers/smtp/camel-smtp-transport.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sAdd meg %s@%s SMTP jelszav�t"
 
-#: camel/providers/smtp/camel-smtp-transport.c:519
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9672,90 +9689,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP kiszolg�l�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:646
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP lev�lk�ld�s %s kiszolg�l�n �t"
 
-#: camel/providers/smtp/camel-smtp-transport.c:664
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "Nem lehet elk�ldeni a levelet: a felad� c�me �rv�nytelen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:669 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Lev�l k�ld�se"
 
-#: camel/providers/smtp/camel-smtp-transport.c:680
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/providers/smtp/camel-smtp-transport.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/providers/smtp/camel-smtp-transport.c:840
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "SMTP �dv�zlet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:871
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Id�t�ll�p�s a HELO k�r�sn�l: %s: nem v�gzetes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:891
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO v�lasz hiba: %s: nem v�gzetes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP hiteles�t�s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:945
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Hiba a SASL hiteles�t�si objektum l�trehoz�sakor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:962
-#: camel/providers/smtp/camel-smtp-transport.c:974
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Id�t�ll�p�s az AUTH k�r�sn�l: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:983
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH k�r�s sikertelen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1044
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Rossz hiteles�t�si v�lasz a kiszolg�l�t�l.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Id�t�ll�p�s a MAIL FROM k�r�sn�l: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1083
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Hib�s MAIL FROM v�lasz: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1107
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Id�t�ll�p�s az RCPT TO k�r�sn�l: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1123
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> sikertelen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1159
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Id�t�ll�p�s a DATA k�r�sn�l: %s: a lev�l nem ment el"
@@ -9763,38 +9780,38 @@ msgstr "Id�t�ll�p�s a DATA k�r�sn�l: %s: a lev�l nem ment el"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1173
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr "Hib�s DATA v�lasz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:1231
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Id�t�ll�p�s a DATA k�ld�s�n�l: a lev�l v�get �rt: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1245
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Rossz hiteles�t�si v�lasz a kiszolg�l�t�l"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1268
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Id�t�ll�p�s az RSET k�r�sn�l: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1282
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "Hib�s RSET v�lasz: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1305
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Id�t�ll�p�s a QUIT k�r�sn�l: %s: nem v�gzetes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1319
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Hib�s RSET v�lasz: %s"
@@ -9926,12 +9943,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "F�jl csatol�sa"
 
-#: composer/e-msg-composer.c:504
+#: composer/e-msg-composer.c:506
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Nem siker�lt l�trehozni a PGP al��r�s r�szt."
 
-#: composer/e-msg-composer.c:751
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9940,34 +9957,34 @@ msgstr ""
 "F�jlbeolvas�si hiba: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1010
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Figyelem!"
 
-#: composer/e-msg-composer.c:1014
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "A f�jl l�tezik, fel�l�rod?"
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "F�jlment�si hiba: %s"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "F�jlbet�lt�si hiba: %s"
 
-#: composer/e-msg-composer.c:1086
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "F�jlel�r�si hiba: %s"
 
-#: composer/e-msg-composer.c:1094
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Nem siker�lt bet�lteni a levelet a szerkeszt�b�l"
 
-#: composer/e-msg-composer.c:1101
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9976,7 +9993,7 @@ msgstr ""
 "Nem siker�lt keresni a f�jlban: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1108
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9985,7 +10002,7 @@ msgstr ""
 "Nem siker�lt csonkolni a  f�jlt: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9994,7 +10011,7 @@ msgstr ""
 "Hiba a levelek automatikus ment�se k�zben: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1219
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10003,7 +10020,7 @@ msgstr ""
 "f�jlokat.\n"
 "Szeretn�d megk�s�relni a vissza�ll�t�sukat?"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10013,32 +10030,43 @@ msgstr ""
 "\n"
 "Akarod menteni a v�ltoz�saidat?"
 
-#: composer/e-msg-composer.c:1372
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Figyelem: M�dos�tott lev�l"
 
-#: composer/e-msg-composer.c:1404
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "F�jl megnyit�s"
 
-#: composer/e-msg-composer.c:1553
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "F�jl beilleszt�se"
 
-#: composer/e-msg-composer.c:1807
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
 #, fuzzy
 msgid "Signature:"
 msgstr "_Al��r�s"
 
-#: composer/e-msg-composer.c:1848 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2056 composer/e-msg-composer.c:2669
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (alap�rtelmezett)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Lev�l �r�sa"
 
-#: composer/e-msg-composer.c:2686
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10046,7 +10074,7 @@ msgstr ""
 "Nem siker�lt l�trehozni a szerkeszt�ablakot:\n"
 "Nem lehetett aktiv�lni a c�mkiv�laszt� kontrollt."
 
-#: composer/e-msg-composer.c:2712 composer/e-msg-composer.c:2767
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10054,7 +10082,7 @@ msgstr ""
 "Nem siker�lt l�trehozni a szerkeszt�ablakot:\n"
 "A HTML-szerkeszt� komponens aktiv�l�sa sikertelen."
 
-#: composer/e-msg-composer.c:3479
+#: composer/e-msg-composer.c:3665
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be editted.)"
 "<b>"
@@ -10120,7 +10148,7 @@ msgstr "A t�rgy tartalmazza"
 msgid "Subject does not contain"
 msgstr "A t�rgy nem tartalmazza"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2275
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -10264,7 +10292,7 @@ msgstr "�ra"
 msgid "minute"
 msgstr "perc"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:189
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr " m�sodpercek"
 
@@ -10339,7 +10367,7 @@ msgstr " �ta"
 msgid "ago"
 msgstr "�ta"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1053
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
@@ -10581,8 +10609,8 @@ msgstr "Kifejez�s"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:74
-#: mail/mail-config.glade.h:61
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Fontos"
 
@@ -10663,7 +10691,7 @@ msgstr "V�lasz"
 msgid "Score"
 msgstr "Pontsz�m"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1580
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Felad�"
 
@@ -10924,11 +10952,11 @@ msgstr "Factory a levelez� �sszefoglal� komponens�hez."
 msgid "Font Preferences"
 msgstr "Bet�be�ll�t�sok"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:67
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
 msgid "Mail Accounts"
 msgstr "Postafi�kok"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
 msgid "Mail Preferences"
 msgstr "Levelez�s be�ll�t�sai"
 
@@ -11017,12 +11045,12 @@ msgstr "Nem siker�lt az Evolution levelez�be�ll�t� komponens�t inicializ�lni."
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nem siker�lt az Evolution mappainf� komponens�t inicializ�lni."
 
-#: mail/component-factory.c:1240 mail/component-factory.c:1271
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Kapcsol�d�s a kiszolg�l�hoz..."
 
-#: mail/component-factory.c:1281
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Nem siker�lt regisztr�lni a t�rol�t a h�jban"
 
@@ -11207,7 +11235,7 @@ msgstr "S_z�r� a levelez�list�ra (%s)"
 msgid "VFolder on M_ailing List (%s)"
 msgstr "V_Mappa a levelez�list�ra (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
 msgid "Default"
 msgstr "Alap�rtelmezett"
 
@@ -11280,19 +11308,19 @@ msgstr "Evolution News-szerkeszt�"
 msgid "Evolution Account Editor"
 msgstr "Evolution Postafi�k-szerkeszt�"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:162
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_G�p:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:132
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 msgid "User_name:"
 msgstr "_Felhaszn�l�n�v:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "�_tvonal:"
 
-#: mail/mail-account-gui.c:1816
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Nem hozhatsz l�tre k�t egyez� nev� postafi�kot."
 
@@ -11308,32 +11336,32 @@ msgstr "Nem t�r�l"
 msgid "Really delete account?"
 msgstr "T�nyleg t�rl�d a postafi�kot?"
 
-#: mail/mail-accounts.c:356 mail/mail-accounts.c:390
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Tilt�s"
 
-#: mail/mail-accounts.c:358 mail/mail-accounts.c:392
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Enged�lyez�s"
 
-#: mail/mail-accounts.c:635 mail/mail-accounts.c:639
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "T�nyleg t�r�lni akarod ezt a news-hozz�f�r�st?"
 
-#: mail/mail-accounts.c:734 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:52
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Akt�v"
 
-#: mail/mail-accounts.c:735 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Postafi�k neve:"
 
-#: mail/mail-accounts.c:736 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -11377,7 +11405,7 @@ msgstr ""
 "    '%s'\n"
 "�s friss�tve lettek."
 
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11389,7 +11417,7 @@ msgstr ""
 "k�ldhetn�l, fogadhatn�l vagy �rhatn�l.\n"
 "Szeretn�d most be�ll�tani?"
 
-#: mail/mail-callbacks.c:143
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11397,7 +11425,7 @@ msgstr ""
 "Be kell �ll�tanod egy azonos�t�t,\n"
 "miel�tt levelet k�ldesz."
 
-#: mail/mail-callbacks.c:157
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11406,7 +11434,7 @@ msgstr ""
 "miel�tt levelet k�ldesz."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:195
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11414,11 +11442,11 @@ msgstr ""
 "HTML form�tum� levelet k�ldesz, de ezek a c�mzettek nem akarnak HTML "
 "form�tum� leveleket kapni:\n"
 
-#: mail/mail-callbacks.c:210
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Mindenk�pp elk�ld�d?"
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11426,7 +11454,7 @@ msgstr ""
 "Nincs t�rgya a lev�lnek.\n"
 "T�nyleg elk�ldjem?"
 
-#: mail/mail-callbacks.c:296
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11434,11 +11462,11 @@ msgstr ""
 "Mivel a c�mlista �gy van be�ll�tva, hogy rejtse el a tagok c�m�t, a lev�l "
 "csak titkos c�mzetteket fog tartalmazni."
 
-#: mail/mail-callbacks.c:300
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "A lev�l csak titkos c�mzetteket tartalmaz."
 
-#: mail/mail-callbacks.c:304
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11448,15 +11476,15 @@ msgstr ""
 "fejl�c hozz�ad�s�val.\n"
 "M�gis elk�ld�d?"
 
-#: mail/mail-callbacks.c:416
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Meg kell adnod c�mzetteke, miel�tt elk�ldhetn�d a levelet."
 
-#: mail/mail-callbacks.c:498
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Be kell �ll�tanod egy azonos�t�t, miel�tt levelet k�ldesz."
 
-#: mail/mail-callbacks.c:643
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11464,28 +11492,28 @@ msgstr ""
 "Nem siker�lt megnyitni az ehhez a postafi�khoz tartoz� piszkozatok mapp�t.\n"
 "Szeretn�d haszn�lni az alap�rtelmezett piszkozatok mapp�t?"
 
-#: mail/mail-callbacks.c:1005
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "ismeretlen felad�"
 
-#: mail/mail-callbacks.c:1009
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%Y-%m-%d, %a keltez�ssel %%s ezt �rta:"
 
-#: mail/mail-callbacks.c:1461 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Lev�l(levelek) �thelyez�se m�s mapp�ba"
 
-#: mail/mail-callbacks.c:1463 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Lev�l(levelek) m�sol�sa m�s mapp�ba"
 
-#: mail/mail-callbacks.c:2119
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "T�nyleg szerkeszteni szeretn�d mind a %d levelet?"
 
-#: mail/mail-callbacks.c:2144
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11493,7 +11521,7 @@ msgstr ""
 "Csak a Piszkozatok mapp�ban l�v� \n"
 "leveleket lehet szerkeszteni."
 
-#: mail/mail-callbacks.c:2183
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11501,39 +11529,39 @@ msgstr ""
 "Csak az Elk�ld�tt mapp�ban l�v� \n"
 "leveleket lehet �jra elk�ldeni."
 
-#: mail/mail-callbacks.c:2197
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "T�nyleg �jra akarod k�ldeni mind a %d �zenetet?"
 
-#: mail/mail-callbacks.c:2223
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Nincs lev�l kijel�lve"
 
-#: mail/mail-callbacks.c:2268 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Fel�l�rod a f�jlt?"
 
-#: mail/mail-callbacks.c:2322
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Lev�l ment�se m�sk�nt..."
 
-#: mail/mail-callbacks.c:2324
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Levelek ment�se m�sk�nt..."
 
-#: mail/mail-callbacks.c:2395
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "A k�vetkez� olvasatlan lev�l megjelen�t�se"
 
-#: mail/mail-callbacks.c:2402
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2645
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11545,7 +11573,7 @@ msgstr ""
 "\n"
 "T�nyleg t�rl�d ezeket a leveleket?"
 
-#: mail/mail-callbacks.c:2758
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11554,28 +11582,28 @@ msgstr ""
 "Hiba a sz�r�inform�ci�k bet�lt�se k�zben:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2770
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Sz�r�k..."
 
-#: mail/mail-callbacks.c:2813
+#: mail/mail-callbacks.c:2833
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d oldal"
 
-#: mail/mail-callbacks.c:2866
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Lev�l nyomtat�sa"
 
-#: mail/mail-callbacks.c:2893
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2932
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Lev�l nyomtat�sa sikertelen"
 
-#: mail/mail-callbacks.c:3118 mail/mail-callbacks.c:3158
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "T�nyleg k�l�n ablakban akarod megnyitni mind a %d levelet?"
@@ -11597,7 +11625,7 @@ msgstr "Nincs le�r�s"
 msgid "Please specify a valid script name"
 msgstr "Meg kell adnod egy c�mkenevet"
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2812
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
 msgid "Unnamed"
 msgstr "N�vtelen"
 
@@ -11670,35 +11698,35 @@ msgid "Evolution Account Assistant"
 msgstr "Evolution Postafi�k var�zsl�"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:138
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 msgid "Work"
 msgstr "Munka"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:87
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Szem�lyes"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:129
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 msgid "To Do"
 msgstr "Teend�"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:65
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr "K�s�bb"
 
-#: mail/mail-config.c:623
+#: mail/mail-config.c:625
 #, c-format
 msgid "Account %d"
 msgstr "%d. postafi�k"
 
-#: mail/mail-config.c:2532
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Szolg�ltat�s ellen�rz�se"
 
-#: mail/mail-config.c:2610 mail/mail-config.c:2614
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Kapcsol�d�s a kiszolg�l�hoz..."
 
@@ -11765,59 +11793,63 @@ msgid "Always _carbon-copy (Cc) to:"
 msgstr "Mindig k�ldj�n m�solatot (Cc) ide:"
 
 #: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
 msgid "Attach original message"
 msgstr "Eredeti lev�l csatol�sa"
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Mell�klet"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Hiteles�t�s:"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:22
 msgid "Automatically _detect links"
 msgstr "_Hivatkoz�sok automatikus felismer�se"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "_Karakterk�szlet:"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Sz�nek"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "�j levelek keres�se"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Rosszul �rt szavak sz�ne"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr "Lev�l �r�sa"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Be�ll�t�sok"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11833,312 +11865,312 @@ msgstr ""
 "\n"
 "Kattints a \"Befejez�s\" gombra a be�ll�t�sok ment�s�hez."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Alap�rtelmezett"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Alap�rtelmezett viselked�s"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Default character _encoding:"
 msgstr "_Alap�rtelmezett karakterk�dol�s: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 msgid "Deleting Mail"
 msgstr "Lev�l t�rl�se"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Digit�lis azonos�t�k..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 msgid "Do not quote original message"
 msgstr "Ne id�zze az eredeti levelet"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "K�sz"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "Drafts _folder:"
 msgstr "_Piszkozatok mappa:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "E_nged�lyez�s"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 msgid "Email Accounts"
 msgstr "Postafi�kok"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Email _address:"
 msgstr "E-mail _c�m:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr "_Kuka �r�t�se kil�p�skor"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Parancs v�grehajt�sa..."
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr "_Fix sz�less�g�:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr "Bet�k be�ll�t�sai"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Format messages in _HTML"
 msgstr "�zenetek _HTML form�z�sa"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Digit�lis azonos�t� szerz�se..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr "_Id�zetek kiemel�se"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:60 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Azonos�t�"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Be�gyazott"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr "C�mk�k �s sz�nek"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr "K�pek bet�lt�se"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Levelez�s be�ll�t�sa"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Postafi�k helye"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Message Composer"
 msgstr "Lev�lszerkeszt�"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Message Display"
 msgstr "Lev�l megjelen�t�se"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP-kiszolg�l�:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "�rtes�t�s �j lev�lr�l"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "News Servers"
 msgstr "H�rcsoport-kiszolg�l�k"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr "K�perny�n haszn�lt bet�k"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Egy�b inform�ci�"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "S_zervezet:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _kulcs azonos�t�ja:"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "V�lassz egy sz�nt"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "K�rdez, ha csak _rejtett m�solat szerepel a c�mzettek k�z�tt"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Nyomtat�sn�l haszn�lt bet�k"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Eredeti lev�l id�z�se"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Id�zet"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Jelsz� megjegyz�se"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "V�laszc�m:"
 
-#: mail/mail-config.glade.h:97 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Levelek fogad�sa"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "_Fogad�s be�ll�t�sai"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "_Jelsz� megjegyz�se"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Sz�ks�ges inform�ci�"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "_Biztons�g"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "Biztons�gos MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr "V�laszd ki a fix sz�less�g� bet�t a HTML-hez"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr "V�laszd ki a fix sz�less�g� bet�t a HTML nyomtat�s�hoz"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr "V�laszd ki a v�ltoz� sz�less�g� bet�t a HTML-hez"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr "V�laszd ki a v�ltoz� sz�less�g� bet�t a HTML nyomtat�s�hoz"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "Select PGP program"
 msgstr "V�laszd ki a PGP programot"
 
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Lev�l k�ld�se"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "El_k�ld�tt levelek mapp�ja"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Elk�ld�tt levelek �s piszkozatok"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "A kiszolg�l� megk�veteli a _hiteles�t�st"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Kiszolg�l� be�ll�t�sa"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Kiszolg�l� _t�pusa: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Shortcuts _type:"
 msgstr "Ind�t�ikonok t�pusa:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "Signature #1"
 msgstr "1. al��r�s"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 msgid "Signature #2"
 msgstr "2. al��r�s"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Forr�s"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Forr�sinform�ci�"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:122
 msgid "Specify _filename:"
 msgstr "_F�jln�v megad�sa:"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "Spell Checking Language"
 msgstr "Nyelvek"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Spell _Checking"
 msgstr "Helyes�r�s-ellen�rz�s"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Szabv�nyos Unix mbox"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:126
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12146,11 +12178,11 @@ msgstr ""
 "�rd be azt a nevet, amellyel hivatkozni szeretn�l erre a postafi�kra.\n"
 "P�ld�ul: \"Munka\" vagy \"Otthon\""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:134
 msgid "V_ariable-width:"
 msgstr "V�_ltoz� sz�less�g�:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12160,219 +12192,203 @@ msgstr ""
 "\n"
 "A folytat�shoz kattints a \"Tov�bb\" gombra."
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:140
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Al��r�s"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "_Mindig t�ltse le a k�peket a h�l�zatr�l"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "M_indig �rja al� az ebb�l a postafi�kb�l kimen� leveleket"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Hiteles�t�si t�pus:"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:146
 msgid "_Authentication type: "
 msgstr "_Hiteles�t�si t�pus:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "Az �j _levelek automatikus lek�rdez�se"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Az �j _levelek automatikus lek�rdez�se"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr "_Hangjelz�s �j lev�l be�rkez�sekor"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_Tan�s�tv�nyazonos�t�:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:151
 msgid "_Confirm when expunging a folder"
 msgstr "_Meger�s�t�s a mappa tiszt�t�sakor"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:152
 msgid "_Default signature:"
 msgstr "_Alap�rtelmezett al��r�s:"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:153
 msgid "_Defaults"
 msgstr "_Alap�rt�kek"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Ne �rtes�tsen, ha �j lev�l �rkezik"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Enable"
 msgstr "Enged�lyez�s"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr "F_ix sz�less�g�:"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:159
 msgid "_Forward style:"
 msgstr "_Tov�bb�t�s st�lusa"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:160
 msgid "_Full name:"
 msgstr "_Teljes n�v:"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:162
 msgid "_HTML Mail"
 msgstr "_HTML lev�l"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:164
 msgid "_Identity"
 msgstr "_Szem�lyazonoss�g"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_K�pek bet�lt�se, ha a felad� szerepel a c�mjegyz�kben"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 msgid "_Make this my default account"
 msgstr "L_egyen ez az alap�rtelmezett postafi�k"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 msgid "_Mark messages as read after"
 msgstr "_V�rakoz�s a lev�l olvasottk�nt megjel�l�se el�tt:"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_N�v:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Soha ne t�ltse le a k�peket a h�l�zatr�l"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "_PGP program el�r�si �tja:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr "_Hangf�jl lej�tsz�sa �j �zenet be�rkez�sekor"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_K�rdez, ha HTML levelet k�ldesz olyan c�mre, aki nem akar ilyet kapni"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "K�rdez, ha �_res t�rggyal akarod elk�ldeni a levelet"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Receiving Mail"
 msgstr "_Levelek fogad�sa"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_V�lasz st�lusa:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Restore defaults"
 msgstr "_Alap�rt�kek"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Script:"
 msgstr "_Biztons�g"
 
-#: mail/mail-config.glade.h:178 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Biztons�g"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Sending Mail"
 msgstr "_Lev�l k�ld�se"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "_Show animated images"
 msgstr "Anim�lt k�pek megjelen�t�se"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "_Signatures"
 msgstr "_Al��r�s"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:183
 msgid "_Use secure connection (SSL):"
 msgstr "_Biztons�gos kapcsolat haszn�lata (SSL):"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:184
 msgid "_Variable-width:"
 msgstr "_V�ltoz� sz�less�g�:"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_minden"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:186
 msgid "color"
 msgstr "sz�n"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "le�r�s"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:191
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Nem siker�lt l�trehozni a PGP al��r�s r�szt."
-
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Nem siker�lt l�trehozni a PGP ellen�rz�s r�szt."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Nem siker�lt l�trehozni a PGP titkos�t�s r�szt."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Nem siker�lt l�trehozni a PGP visszafejt� r�szt."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Nem siker�lt l�trehozni az S/MIME al��r�s r�szt."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Nem siker�lt l�trehozni az S/MIME csak-tan�s�tv�ny r�szt."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nem siker�lt l�trehozni az S/MIME titkos�t� r�szt."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Nem siker�lt l�trehozni az S/MIME bor�t�k r�szt."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Nem siker�lt l�trehozni az S/MIME dek�dol� r�szt."
 
@@ -12480,52 +12496,52 @@ msgstr "Levelez�"
 msgid "View messages..."
 msgstr "�zenetek megtekint�se..."
 
-#: mail/mail-format.c:1831
+#: mail/mail-format.c:1832
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Az �zenetet digit�lisan al��rt�k. Tov�bbi inform�ci��rt kattints a lakat "
 "ikonra."
 
-#: mail/mail-format.c:1857
+#: mail/mail-format.c:1859
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nem siker�lt l�trehozni a PGP ellen�rz�s r�szt."
 
-#: mail/mail-format.c:1866
+#: mail/mail-format.c:1868
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Az �zenetet digit�lisan al��rt�k, �s az al��r�s hiteles."
 
-#: mail/mail-format.c:1874
+#: mail/mail-format.c:1876
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Az �zenetet digit�lisan al��rt�k, de nem bizony�that�, hogy hiteles."
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Mutat� FTP-helyre (%s)"
 
-#: mail/mail-format.c:2138
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Mutat� helyi f�jlra (%s), amely \"%s\" helyen �rv�nyes"
 
-#: mail/mail-format.c:2143
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Mutat� hely f�jlra (%s)"
 
-#: mail/mail-format.c:2172
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Mutat� t�voli adatra (%s)"
 
-#: mail/mail-format.c:2180
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Mutat� ismeretlen k�ls� adatra (\"%s\" t�pus)"
 
-#: mail/mail-format.c:2185
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Hib�s k�ls� t�rzsr�sz."
 
@@ -12825,10 +12841,6 @@ msgstr "Friss�t�s folyamatban..."
 msgid "Waiting..."
 msgstr "V�rakoz�s..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Megszak�tva"
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "A felhaszn�l� megszak�totta a m�veletet."
@@ -12868,7 +12880,7 @@ msgstr ""
 "�rd be azt a nevet, amellyel hivatkozni szeretn�l erre a postafi�kra.\n"
 "P�ld�ul: \"Munka\" vagy \"Otthon\""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:774
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
 msgid "Name:"
 msgstr "N�v:"
 
@@ -12925,7 +12937,6 @@ msgstr ""
 "    '%s'\n"
 "�s friss�tve lettek."
 
-#. Make this static, saves having to recompute it each time
 #: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
 #: my-evolution/e-summary-mail.c:733
 msgid "VFolders"
@@ -12957,63 +12968,63 @@ msgstr "(Nincs t�rgy)"
 msgid "%s - Message"
 msgstr "%s - �zenet"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Nem n�zett"
 
-#: mail/message-list.c:677
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "N�zett"
 
-#: mail/message-list.c:678
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Megv�laszolt"
 
-#: mail/message-list.c:679
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "T�bb l�thatatlan lev�l"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "T�bb lev�l"
 
-#: mail/message-list.c:684
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Legalacsonyabb"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Alacsonyabb"
 
-#: mail/message-list.c:689
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Magasabb"
 
-#: mail/message-list.c:690
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Legmagasabb"
 
-#: mail/message-list.c:1017
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1024
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Ma %l:%M %p"
 
-#: mail/message-list.c:1033
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Tegnap %l:%M %p"
 
-#: mail/message-list.c:1045
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1055
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%Y %d %b"
 
-#: mail/message-list.c:2435
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Lev�llista l�trehoz�sa"
 
@@ -17754,5227 +17765,5224 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds and Bradford"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libya"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisboa"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "London"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "London/City"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "London/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "London/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "London/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Lousiana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "Lubeck-Blankensee"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr "Lviv"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Mahacskala"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malmo/Sturup"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Airport"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Airport"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Airport"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Middle East"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnije Vodi"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Miyakejima Airport"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Airport"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Airport"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Moszkva Domogyedov�"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moszkva Seremetyev�"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "M�nchen"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "M�nster/Osnabr�ck"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmanszk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Airport"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoya Airport"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Naha Airport"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Airport"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama Airport"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "N�poly"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "N�poly"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "New Tokyo International Airport"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata Airport"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nyizsnij Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrk�ping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "�szak-Carolina"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "�szak-Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novoszibirszk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "N�rnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro Airport"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr "Odesa"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita Airport"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okayama Airport"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki Airport"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omszk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Osaka International Airport"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Oshima Airport"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "P�rizs"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "P�rizs/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "P�rizs/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "P�rizs/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "K�nai N�pk�zt�rsas�g"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "P�terv�r"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovszk-Kamcsatszkij"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodszk"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Apt"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Pr�ga"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pszkov"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr "Rivne"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Rij�d"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodosz"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "R�ma/Ciampino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "R�ma/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "R�ma/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rosztov-Na-Donu"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Oroszorsz�g"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Szamara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Szentp�terv�r"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Szarajev�"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Szaratov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Sendai Airport"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Sz�ul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Sz�ul/Kimp'O International Airport"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Sz�ul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Sanghaj"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Szmirna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Szocsi"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sz�fia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Sztavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "Szentp�terv�r"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "Szentp�terv�r / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr "Szimferopol"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Airport"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talinn"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Tanegashima Airport"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Teher�n-Mehrabad"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Temesv�r"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Marosv�s�rhely"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokyo International Airport"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokyo New International Airport"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori Airport"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama Airport"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Tsushima Airport"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Uljanovszk"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "Egyes�lt Arab Emir�tusok "
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumcsi"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr "Ungv�r"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "V�rna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Velence"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Velence"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech Airport"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vlagykikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vlagyivosztok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgogr�d"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronyezs"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser Airport"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Airport"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Vars�"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "B�cs"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Jakutszk"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Yamagata Airport"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube Airport"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao Airport"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Jekatyerinburg"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Juzsno-Szahalinszk"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Z�gr�b"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Z�rich"
 
@@ -23006,7 +23014,7 @@ msgstr "Nincs le�r�s"
 msgid "Mail summary"
 msgstr "�sszefoglal� a levelekr�l"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:409
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
 #: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Helyi mapp�k"
@@ -23016,45 +23024,45 @@ msgstr "Helyi mapp�k"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "LHBP:LHSY"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com -- A nap mond�sa"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "A nap mond�sa"
 
-#: my-evolution/e-summary-preferences.c:762
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "�j h�rforr�s hozz�ad�sa"
 
-#: my-evolution/e-summary-preferences.c:770
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Add meg a hozz�adand� h�rforr�s URL-j�t"
 
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Hiba az RDF let�lt�se k�zben"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "H�rforr�s"
 
-#: my-evolution/e-summary-shown.c:518
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr "Mindenki"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:527
+#: my-evolution/e-summary-shown.c:545
 msgid "Add"
 msgstr "Hozz�ad�s"
 
-#: my-evolution/e-summary-shown.c:542 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Megjelen�tve"
 
@@ -23094,7 +23102,7 @@ msgstr "�sszefoglal� nyomtat�sa"
 msgid "Printing of Summary failed"
 msgstr "Az �sszefoglal� nyomtat�sa sikertelen"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "A Vezet�i �sszefoglal� komponens nem tudta inicializ�lni a Bonob�t.\n"
 
@@ -24281,82 +24289,87 @@ msgid "C_elsius"
 msgstr "C_elsius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Minden h�r_forr�s:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "H�ny napot jelen�tsen meg a napt�r egyszerre?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Mutatott elemek ma_xim�lis sz�ma:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "H�rlet�lt�s be�ll�t�sai"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Egy h�n_ap"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "Egy _h�t"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "_Friss�t�si id� (m�sodperc):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "_Friss�t�si id� (m�sodperc):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "Mapp�k _teljes el�r�si �tj�nak megjelen�t�se"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "�sszes _feladat megjelen�t�se"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "A _mai feladatok megjelen�t�se"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "A h�m�rs�klet m�rt�kegys�ge:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Feladatok "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Id�j�r�s be�ll�t�sa"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "�_t nap"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Lev�l"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "H�rforr�sok"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "Egy _nap"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "�_temterv"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Id�j�r�s"
 
@@ -24712,21 +24725,26 @@ msgstr ""
 "%s import�l�sa\n"
 "%d. elem import�l�sa."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "V�lassz mapp�t"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' f�jl nem l�tezik."
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Evolution hiba"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Csak helyi mapp�kba tudsz import�lni"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24735,11 +24753,11 @@ msgstr ""
 "Nincs olyan import�l�, amely k�pes lenne kezelni\n"
 "%s-t"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Import�l�s folyamatban"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24748,17 +24766,17 @@ msgstr ""
 "%s import�l�sa.\n"
 "%s ind�t�sa"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Hiba %s ind�t�sakor"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Hiba %s bet�lt�sekor"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24767,31 +24785,31 @@ msgstr ""
 "%s import�l�sa\n"
 "1. elem import�l�sa."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "F�jln�v:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "V�lassz egy f�jlt"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "F�jlt�pus:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Adatok �s be�ll�t�sok import�l�sa kor�bbi programokb�l"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Egyetlen f�jl import�l�sa"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24799,24 +24817,24 @@ msgstr ""
 "V�rj...\n"
 "Megl�v� be�ll�t�sok keres�se"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Az okos import�l�k ind�t�sa"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Felad� %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "V�lassz mapp�t"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "V�laszd ki az import�l�land� adatok c�lk�nyvt�r�t"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import�l�s"
 
@@ -27191,6 +27209,101 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 
 #, fuzzy
+#~ msgid "Wenesday"
+#~ msgstr "Szerda"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "_M�sik szervez�"
+
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Ez a titkos�t� nem t�mogatja a nem k�dolt �zenetek al��r�s�t"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Add meg %s jelszavadat %s sz�m�ra"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Add meg %s jelszavadat"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Nem lehet al��rni a levelet: nincs al��rhat� sima sz�veg"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Nem lehet al��rni a levelet: nincs jelsz� megadva"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nem lehet al��rni a levelet: nem siker�lt cs�vezet�ket l�trehozni a GPG/"
+#~ "PGP-hez: %s"
+
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Nem lehet al��rni a levelet: nincs al��rhat� sima sz�veg"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Nem lehet ellen�rizni a levelet: nincs ellen�rizhet� sima sz�veg"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nem lehet ellen�rizni a levelet: nem siker�lt cs�vezet�ket l�trehozni a "
+#~ "GPG/PGP-hez: %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Nem lehet titkos�tani a levelet: nincs titkos�that� sima sz�veg"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Nem lehet titkos�tani a levelet: nincs jelsz� megadva"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nem lehet titkos�tani a levelet: nem siker�lt cs�vezet�ket l�trehozni a "
+#~ "GPG/PGP-hez: %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "Nem lehet visszafejteni a levelet: nincs visszafejthet� titkos sz�veg"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Nem lehet visszafejteni a levelet: nincs jelsz� megadva"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nem lehet visszafejteni a levelet: nem siker�lt cs�vezet�ket l�trehozni a "
+#~ "GPG/PGP-hez: %s"
+
+#~ msgid "Directory tree of mbox files"
+#~ msgstr "Mbox f�jlok k�nyvt�rf�ja"
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Nem siker�lt a levelet a spool f�jlhoz hozz�f�zni: %s: %s"
+
+#~ msgid "Spool `%s' does not exist or is not a regular file"
+#~ msgstr "`%s' spool nem l�tezik, vagy  nem k�z�ns�ges f�jl."
+
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Nem siker�lt besorolni: %s: %s"
+
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "`%s' spool nem l�tezik, vagy  nem k�z�ns�ges f�jl."
+
+#~ msgid "Mail tree %s"
+#~ msgstr "Lev�lfa %s"
+
+#~ msgid "Could not create a PGP signature context."
+#~ msgstr "Nem siker�lt l�trehozni a PGP al��r�s r�szt."
+
+#~ msgid "Could not create a PGP verification context."
+#~ msgstr "Nem siker�lt l�trehozni a PGP ellen�rz�s r�szt."
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Nem siker�lt l�trehozni a PGP titkos�t�s r�szt."
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Nem siker�lt l�trehozni a PGP visszafejt� r�szt."
+
+#~ msgid "Riga"
+#~ msgstr "Riga"
+
+#, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "C�mjegyz�k forr�sai"
 
@@ -27711,9 +27824,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "(Unknown)"
 #~ msgstr "(Ismeretlen)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "V�ratlan v�lasz a POP kiszolg�l�t�l: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "A felad� c�me nem tal�lhat� meg a lev�lben"
 
@@ -27768,9 +27878,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Mailbox Format"
 #~ msgstr "Postafi�k form�tuma"
 
-#~ msgid " (default)"
-#~ msgstr " (alap�rtelmezett)"
-
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "A lev�l �rv�nytelen c�mzetteket tartalmaz:"
 
@@ -27874,9 +27981,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "All _folders:"
 #~ msgstr "Min_den mappa:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "Minden h�r_forr�s:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "_Mapp�k megjelen�t�se:"
 
diff --git a/po/it.po b/po/it.po
index a6536ea67d..911e7ea92c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-03-13 12:27+01:00\n"
 "Last-Translator: Clara Tattoni  <clara.tattoni@libero.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
@@ -34,7 +34,7 @@ msgstr "Importa i file VCard in Evolution."
 msgid "File As"
 msgstr "Memorizza Come"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nome"
@@ -45,7 +45,7 @@ msgid "Email"
 msgstr "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Principale"
 
@@ -55,7 +55,7 @@ msgstr "Princ"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistente"
@@ -63,8 +63,8 @@ msgstr "Assistente"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Ufficio"
 
@@ -74,12 +74,12 @@ msgid "Bus"
 msgstr "Uff"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Richiamare"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Ditta"
 
@@ -90,8 +90,8 @@ msgstr "Ditta"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Casa"
 
@@ -106,18 +106,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Cellulare"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax Ufficio"
@@ -127,13 +127,13 @@ msgid "Bus Fax"
 msgstr "Fax Uff"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax Casa"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Ufficio2"
 
@@ -142,43 +142,43 @@ msgid "Bus 2"
 msgstr "Uff 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Casa 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Altro"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Altro fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Impaginatore"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
@@ -190,14 +190,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "Email 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Email 3"
@@ -335,7 +335,7 @@ msgstr "VCard per %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Ricerca in corso..."
 
@@ -356,32 +356,32 @@ msgstr "Caricamento in corso..."
 msgid "Error in search expression."
 msgstr "Errore nel criterio di ricerca."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Aggiunta di una card al server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Rimozione di una card dal server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Modifica di una card nel server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Riavvio della ricerca in corso."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Ricezione dei risultati della ricerca LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Errore nella rimozione di una card"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Impossibile interpretare URL `%s'"
@@ -428,103 +428,139 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Un semplice controllo di Bonobo che visualizza una rubrica."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "Sorgenti della Rubrica"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Controllo che visualizza una minicard per la rubrica di Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Visore di minicard per la rubrica di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Componente di Evolution per gestire i contatti."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fabbrica per il controllo delle Minicard per la rubrica"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Fabbrica per il visualizzatore di indirizzi della Rubrica"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Fabbrica per il popup di indirizzi della Rubrica"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabbrica per il controllo degli esempi della Rubrica"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Cartella contenente le informazioni dei contatti"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "Server LDAP contenente le informazioni dei contatti"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Nuova Lista di Contatti"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "Lista dei _Contatti"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Nuovo Contatto"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Nuova Lista di Contatti"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Impossibile connettersi al server LDAP."
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "Contact _List"
-msgstr "Lista dei _Contatti"
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Non in grado di autenticare al server IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "La risposta del server IMAP non contiene informazione %s"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Errore nel caricare le informazioni dei filtri:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "La risposta del server IMAP non contiene informazione %s"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL non � supportato in questa compilazione di Evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Impossibile inizializzare gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Altri Contatti"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubruca"
@@ -559,50 +595,59 @@ msgstr ""
 "Impossibile aprire questa rubrica. Controllare che \n"
 "il percorso esista e che si abbia il permesso di accedervi."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Digitare la password per %s (utente %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "finisce per"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "Email 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "La categoria �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualunque campo contiene"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Avanzato..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Qualunque Categoria"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI visualizzata dal Browser delle cartelle"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(nessuno)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Email principale"
 
@@ -648,104 +693,59 @@ msgstr "Disabilita Query"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Abilita Query (Pericoloso!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Impossibile connettersi al server LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Non in grado di autenticare al server IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr "Impossibile effettuare fork di sendmail: %s: posta non inviata"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "La risposta del server IMAP non contiene informazione %s"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL non � supportato in questa compilazione di Evolution)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Ultimato il"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "_Controlla tipi supportati"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Opzioni"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "_Rimuovere"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "_Rimuovere"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Opzioni"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -754,8 +754,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Sorgenti della Rubrica"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Avvisi Sonoro"
@@ -851,8 +851,8 @@ msgstr "Configurazione"
 msgid "Mappings"
 msgstr "Margini"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_ogni"
@@ -1035,15 +1035,15 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 "Questo � il numero massimo di card da scaricare. L'impostazione di un valore "
@@ -1071,8 +1071,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1105,7 +1105,7 @@ msgid "Using email address"
 msgstr "Indirizzo Email"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1113,7 +1113,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Aggiungi"
 
@@ -1161,7 +1161,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1279,10 +1279,12 @@ msgstr "Interfaccia per la selezione dei nomi della rubrica di Evolution."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fabbrica per l'interfaccia di selezione dei nomi della Rubrica"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Rimuovere"
 
@@ -1330,8 +1332,8 @@ msgstr ""
 "della rubrica di evolution.\n"
 "Per aiutarci a comprendere meglio ed infine risolvere il problema,\n"
 "per favore inviare una email a Jon Trowbridge <trow@ximian.com>\n"
-"con una descrizione dettagliata delle circostanze nelle quali questo errore "
-"\n"
+"con una descrizione dettagliata delle circostanze nelle quali questo "
+"errore \n"
 "si � verificato. Grazie"
 
 #: addressbook/gui/component/select-names/e-select-names.c:724
@@ -1415,7 +1417,7 @@ msgstr "Collaborazione"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Editor dei Contatti"
 
@@ -1424,7 +1426,7 @@ msgid "D_epartment:"
 msgstr "_Dipartimento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Dettagli"
 
@@ -1483,11 +1485,12 @@ msgstr "Vuole ricevere messaggi in _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Elimina"
 
@@ -1516,7 +1519,7 @@ msgid "_Web page address:"
 msgstr "Indirizzo pagina _Web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Stati Uniti d'America"
 
@@ -2021,12 +2024,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Latvia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libano"
 
@@ -2035,7 +2037,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
@@ -2044,12 +2046,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lituania"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Lussemburgo"
 
@@ -2082,7 +2084,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2107,7 +2109,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Messico"
 
@@ -2132,7 +2134,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marocco"
 
@@ -2157,7 +2159,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Olanda"
 
@@ -2170,12 +2172,12 @@ msgid "New Caledonia"
 msgstr "Nuova Caledonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nuova Zelanda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2192,7 +2194,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Isole Norfolk"
 
@@ -2201,17 +2203,17 @@ msgid "Northern Mariana Islands"
 msgstr "Isole Mariana Settentrionali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norvegia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2224,7 +2226,7 @@ msgid "Palestinian Territory"
 msgstr "Territorio Palestinese"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2233,12 +2235,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Nuova Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Per�"
 
@@ -2251,22 +2253,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portogallo"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
@@ -2275,7 +2277,7 @@ msgid "Reunion"
 msgstr "Reunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Romania"
 
@@ -2312,7 +2314,7 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome And Principe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Arabia Saudita"
 
@@ -2329,17 +2331,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapore"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovacchia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slovenia"
 
@@ -2352,7 +2354,7 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Sud Africa"
 
@@ -2361,7 +2363,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Georgia del Sud e Isole Sandwich meridionali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Spagna"
 
@@ -2382,7 +2384,7 @@ msgid "Sudan"
 msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Suriname"
 
@@ -2395,17 +2397,17 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Svezia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Svizzera"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
@@ -2442,7 +2444,7 @@ msgid "Tunisia"
 msgstr "Tunisia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turchia"
 
@@ -2463,7 +2465,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ucraina"
 
@@ -2472,7 +2474,7 @@ msgid "United Arab Emirates"
 msgstr "Emirati Arabi Uniti"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Gran Bretagna"
 
@@ -2481,7 +2483,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2494,12 +2496,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Viet Nam"
 
@@ -2520,12 +2522,12 @@ msgid "Western Sahara"
 msgstr "Sahara occidentale"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Iugoslavia"
 
@@ -2538,26 +2540,34 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Sicuro di voler cancellare\n"
+"questo contatto?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Cancellare il Contatto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Editor delle categorie non disponibile."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Questo contatto appartiene a queste categorie:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Salva Contatto come VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Impossibile trovare il widget per un campo: `%s'"
@@ -2584,11 +2594,11 @@ msgstr "E-mail"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2724,11 +2734,11 @@ msgid "contact-list-editor"
 msgstr "Editor della lista dei Contatti"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Editor della Lista dei Contatti"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Salva Lista come VCard"
 
@@ -2806,21 +2816,21 @@ msgid "Error getting book view"
 msgstr "Errore nell'avvio di %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Errore nella modifica della card"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Completato"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
@@ -2829,7 +2839,7 @@ msgid "Repository offline"
 msgstr "Deposito non in linea"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Permesso negato"
 
@@ -2847,79 +2857,94 @@ msgstr "Protocollo non supportato"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Annullato"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Autenticazione fallita"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autenticazione richiesta"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Altro errore"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Salvare le modifiche?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Errore nell'aggiungere la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Errore nell'aggiungere una card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Errore nella modifica della lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Errore nella rimozione della lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Errore nella rimozione di una card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 msgid "Display Cards?"
 msgstr "Mostra Card?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards"
 msgstr "Mostra Card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
 "be\n"
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
-"Si � richiesto che %d cars siano card.  Questo causa la visualizzazione di "
-"%d nuove finestre\n"
+"Si � richiesto che %d cars siano card.  Questo causa la visualizzazione di %"
+"d nuove finestre\n"
 "sullo schermo. Si desidera veramente visualizzare tutte queste card?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "Nessuna card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "Nessuna card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Nessuna card"
@@ -2984,102 +3009,108 @@ msgstr "Altro Telefono"
 msgid "Other Address"
 msgstr "Altro Indirizzo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Rubrica"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Salva come VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Nuovo Contatto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nuova Lista di Contatti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Visualizza Cartella..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Importa..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Cerca Contatti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Sorgenti della _Rubrica..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Impostazioni _Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Contatto Precedente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Invia un Messaggio al Contatto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Stampa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Stampa Busta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Copia nella Cartella..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Sposta nella Cartella..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Taglia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Incolla"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Elimina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3089,7 +3120,7 @@ msgstr "Vista _Corrente"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3097,7 +3128,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3245,7 +3276,7 @@ msgstr "Margini"
 msgid "Number of columns:"
 msgstr "Numero di colonne:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opzioni"
 
@@ -3255,7 +3286,7 @@ msgid "Orientation"
 msgstr "Orientazione"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Pagina"
 
@@ -3329,29 +3360,33 @@ msgstr "Larghezza:"
 msgid "_Font..."
 msgstr "_Carattere..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Appuntamento senza titolo"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Altezza"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normale"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Basso"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Non definito"
 
@@ -3393,45 +3428,37 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Fabbrica per il compositore di Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Componente dell'sommario esecutivo del calendario di Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Visore iTip/iMip del calendario di Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Componente di Evolution per gestire il calendario."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Fabbrica per il componente del Sommario del Calendario."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr ""
 "Fabbrica per il controllo di visualizzazione delle attivit� di Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Fabbrica per il controllo della vista iTip del calendario"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Fabbrica per il controllo del Calendario di esempio"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 "Fabbrica per centralizzare il componente dell'editor dei dialoghi del "
 "calendario"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Fabbrica per creare una fabbrica di editor di componenti"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3443,10 +3470,23 @@ msgstr "Servizio di notifica dell'avviso sonoro"
 msgid "Factory for the alarm notification service"
 msgstr "Fabbrica per il servizio di notifica dell'avviso sonoro"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "Inizio:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "Fine:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "ora non valida"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution "
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3486,7 +3526,7 @@ msgstr ""
 "Evolution visualizzer� invece un messaggio a video."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Attenzine"
@@ -3512,15 +3552,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Non chiedere pi� su questo programma in futuro."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Impossibile inizializzare GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "Impossibile inizializzare il servizio di notifica"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 "Impossibile creare la babbrica per il servizio di notifica dell'avviso sonoro"
@@ -3537,7 +3577,7 @@ msgstr "La descrizione contiene"
 msgid "Comment contains"
 msgstr "Il commento contiene"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Non corrispondenti"
 
@@ -3578,14 +3618,16 @@ msgstr ""
 "ORBit e di OAF"
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privato"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidenziale"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Pubblico"
 
@@ -3606,27 +3648,32 @@ msgid "W"
 msgstr "O"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libero"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Occupato"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Da cominciare"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "In corso"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Completato"
 
@@ -3641,11 +3688,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3660,12 +3708,14 @@ msgstr "Ricorre"
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "S�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "No"
 
@@ -3685,58 +3735,60 @@ msgstr "Vista Settimanale"
 msgid "Month View"
 msgstr "Vista Mensile"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Calendario"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Cartella contenente appuntamenti ed eventi"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Attivit�"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Cartella contente le cose da fare"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "New meeting"
 msgstr "Nuova riunione"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "_Meeting"
 msgstr "_Riunione"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "New task"
 msgstr "Nuova attivit�"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Attivit�"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nuovo appuntamento"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Appuntamento"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "New appointment"
 msgstr "Nuovo appuntamento"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "_Appointment"
 msgstr "_Appuntamento"
 
@@ -3947,7 +3999,7 @@ msgstr "Promemoria"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Indice:"
 
@@ -3976,7 +4028,7 @@ msgstr "termine dell'appuntamento"
 msgid "hour(s)"
 msgstr "Ora (e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minuto(i)"
 
@@ -4004,79 +4056,81 @@ msgstr "30 minuti"
 msgid "60 minutes"
 msgstr "60 minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Impostazioni Calendario e Attivit�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Colore attivit� scadute"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Colore attivit� di oggi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Giorni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Venerdi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Ore"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Lunedi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "D_om"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Sabato"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Mostra i _numeri delle settimane"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "_Inizio della giornata:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "D_om"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domenica"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Scadenze per oggi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "G_io"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "M_ar"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4105,81 +4159,96 @@ msgid "Tuesday"
 msgstr "Martedi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Mercoledi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Settimana lavorativa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ore (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 ore"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Chiedi conferma prima di cancellare"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_Comprimi fine settimana nella vista mensile"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Inizio attivit�: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Visualizzazione"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "_Fine della giornata:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Generale"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_Nascondi le attivit� completate dopo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "_Attivit� scadute:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_Sab"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Mostra i termini degli appuntamenti nelle viste mensili e settimanali"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Suddivisioni del tempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "M_ar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_Mer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "prima dell'inizio di un appuntamento"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4266,40 +4335,61 @@ msgstr " (Scadenza "
 msgid "Due "
 msgstr "Scadenza "
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Impossibile aggiornare l'elemento!"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
 msgstr "Impossibile aggiornare l'elemento!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Modifica Appuntamenti"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appuntamento - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Attivit� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Voce nell'agenda - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Nessuna descrizione"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Salva come..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Impossibile ottenere la versione corrente!"
 
@@ -4357,27 +4447,27 @@ msgstr "Delega a:"
 msgid "Enter Delegate"
 msgstr "Inserire Delegato"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Appuntamento"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Promemoria"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Ricorrenza"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Pianificazione"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Riunione"
 
@@ -4424,7 +4514,7 @@ msgid "Pu_blic"
 msgstr "Pub_blico"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Mostra ora come"
 
@@ -4446,19 +4536,19 @@ msgstr "Ora di _fine:"
 msgid "_Start time:"
 msgstr "_Ora di inizio:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "� richiesto un organizzatore."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "� richiesto almeno un partecipante."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Questa persona sta gi� partecipando alla riunione!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Delega a..."
 
@@ -4469,49 +4559,55 @@ msgstr "Partecipante"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Nome comune"
+msgid "Click here to add an attendee"
+msgstr "Fare click qui per aggiungere un partecipante"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delega"
+msgid "Common Name"
+msgstr "Nome comune"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegato A"
+msgid "Delegated From"
+msgstr "Delega"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Lingua"
+msgid "Delegated To"
+msgstr "Delegato A"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Membro"
+msgid "Language"
+msgstr "Lingua"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Ruolo"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stato"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
@@ -4526,14 +4622,10 @@ msgid "_Change Organizer"
 msgstr "_Cambia Organizzatore"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Invita altri..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Altro Organizzatore"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4725,7 +4817,7 @@ msgid "Progress"
 msgstr "In corso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4737,19 +4829,19 @@ msgstr "_Priorit�:"
 msgid "_Status:"
 msgstr "_Stato:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Di base"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Assegnato"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Descrizione:"
 
@@ -4761,23 +4853,78 @@ msgstr "Data di _inizio:"
 msgid "_Due Date:"
 msgstr "Sca_denza:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Rimozione degli elementi selezionati in corso"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Apri"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Salva come..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4785,20 +4932,20 @@ msgstr "Salva come..."
 msgid "_Print..."
 msgstr "S_tampa..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Taglia"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copia"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4806,35 +4953,36 @@ msgstr "_Copia"
 msgid "_Paste"
 msgstr "_Incolla"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Assegna Attivit�"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Inoltra come i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_Segna come Completato"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marka Attivit� Come Complete"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_Elimina le Attivit� Selezionate"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Aggiornamento elementi in corso"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Fare clic qui per aggiungere un'attivit�"
 
@@ -4842,47 +4990,48 @@ msgstr "Fare clic qui per aggiungere un'attivit�"
 msgid "Alarms"
 msgstr "Avvisi Sonoro"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Completato"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Ultimato il"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Scadenza"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Termine"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Posizione Geografica"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Priorit�"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Inizio"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Sommario"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Ordina attivit�"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4930,11 +5079,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -4974,7 +5125,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Rende note le Informazioni sulla Disponibilit�"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Configura %s"
@@ -4985,7 +5136,7 @@ msgid "_Configure Pilot..."
 msgstr "Configura %s"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "_Salva con Nome..."
 
@@ -5012,75 +5163,391 @@ msgid "Delete _All Occurrences"
 msgstr "Elimina _Tutte le Ricorrenze"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "I tool di GNOME Pilot non sembrano essere installati in questo sistema."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Errore nell'esecuzione di %s."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "Inizio Riunione: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "Inizio attivit�: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "Inizio informazioni di disponibilit�: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Inizio: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "Fine riunione: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "Fine informazioni di disponibilit�:"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "Fine: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "Attivit� Completata: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "Attivit� Da Completare Entro: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "Informazioni iCalendar"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "Errore iCalendar"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "Partecipante sconosciuto"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Controllate queste informazioni, e poi selezionate un'azione dal menu."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Nessuno</i>"
+
+#: calendar/gui/e-itip-control.c:903
+msgid "Status:"
+msgstr "Stato:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Accettata"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+msgid "Tentatively Accepted"
+msgstr "Accettato con tentativo"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Annullato"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "Impossibile aggiornare il file di calendario!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "Specificare un'operazione:"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Aggiornare"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "Accettare"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "Accettare con tentativo"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "Rifiutare"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "Invia Informazioni sulla Disponibilit�"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "Aggiorna stato risposta"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "Invia Informazioni Correnti"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Annulla"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> ha pubblicato informazioni riguardo una riunione."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Dettagli della Riunione"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> richiede la tua presenza ad una riunione."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "Proposta di Riunione"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> vuole aggiungersi ad una riunione esistente."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "Aggiornamento Riunione"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> vuole ricevere informazioni aggiornate sulla riunione."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "Richiesta di Aggiornamento sulla Riunione"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> ha risposto ad una richiesta di riunione."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "Risposta ad una Riunione"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> ha annullato una riunione."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "Annullamento Riunione"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> ha mandato un messaggio indecifrabile."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Messaggio di Richiesta Riunione Non Valido"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> ha pubblicato informazioni sulle proprie attivit�."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Informazioni sull'Attivit�"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> ha richiesto che venga eseguito un compito."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Proposta di Attivit�"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> vuole aggiungere informazioni ad una attivit� esistente."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Aggiornamento Attivit�"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> vuole ricevere informazioni aggiornate sull'attivit�."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Richiesta di Aggiornamento dell'Attivit�"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> ha risposto all'assegnamento di un compito."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Risposta all'Attivit�"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> ha annullato un'attivit�."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Annullamento Attivit�"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Messaggio di Attivit� Indecifrabile"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> ha pubblicato informazioni sulla disponibilit�."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Informazioni sulla Disponibilit�"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> richiede informazioni sulla disponibilit�."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Richiesta Disponibilit�"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> ha risposto a una richiesta di disponibilit�."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Risposta Disponibilit�"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Messaggio di Disponibilit� Indecifrabile"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "La cartella appare irrimediabilmente corrotta."
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "Il messaggio contiene solo richieste di tipo non supportato."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "L'allegato non contiene un messaggio di calendario valido"
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "L'allegato non ha nessun elemento di calendario visibile"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#, fuzzy
+msgid "There was an error on the CORBA system\n"
+msgstr "Si � verificato un errore nella ricezione dei dati da"
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "L'elemento non pu� essere spedito!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Aggiornamento completato\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Impossibile aggiornare il file di calendario!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Impossibile aggiornare lo stato del partecipante; l'elemento non esiste pi�"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Impossibile aggiornare lo stato del partecipante; lo stato non � valido!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "Impossibile aggiornare lo stato del partecipante!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Stato del partecipante aggiornato\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "Impossibile aggiornare lo stato del partecipante!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Rimozione Completata"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Elemento Spedito!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "L'elemento non pu� essere spedito!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Scegli Cartella"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Scegli Cartella"
@@ -5122,93 +5589,92 @@ msgstr "termine"
 msgid "date-start"
 msgstr "inizio"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Moderatori"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Partecipanti Richiesti"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Partecipanti Opzionali"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Non Partecipanti"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Individuale"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Gruppo"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Risorse"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Stanza"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Moderatore"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Partecipante Richiesto"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Partecipante Opzionale"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Non Partecipante"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Richiede Azione"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Accettata"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Annullato"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Tentativo"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Delegato"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "In Corso"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
@@ -5220,63 +5686,63 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Assente"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Nessuna informazione"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Opzioni"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Mostra s_olo le ore lavorative"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Vista _allargata"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "A_ggiorna Disponibilit�"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Tutto il Personale e le Risorse"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Tutto il _Personale e una Risorsa"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Personale _Richiesto"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Personale Richiesto e _una risorsa"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "_Inizio appuntamento ore:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "T_ermine dell' appuntamento ore:"
 
@@ -5295,17 +5761,22 @@ msgstr "Impossibile caricare le attivit� in `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Il metodo richiesto per caricare `%s' non � supportato"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Impossibile aprire la cartella in `%s'"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Ultimato il"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Rimozione degli elementi selezionati in corso"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 msgid "Expunging"
 msgstr "Eliminazione"
 
@@ -5317,17 +5788,17 @@ msgstr "Nuovo _Appuntamento..."
 msgid "_Delete this Appointment"
 msgstr "_Elimina questo Appuntamento"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Impossibile aprire la cartella in `%s'"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Il metodo richiesto per aprire `%s' non � supportato"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Apertura calendario %s"
@@ -5388,19 +5859,53 @@ msgstr "Ottobre"
 msgid "September"
 msgstr "Settembre"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "� richiesto almeno un partecipante"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "� necessario impostare un organizer."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr "Informazioni sul calendario"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "Informazioni sull'attivit�"
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr "Informazioni di Diario"
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr "Informazioni sulla disponibilit�"
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr "Informazioni di calendario"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Aggiornare"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Aggiorna Lista"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Devi essere un partecipante all'evento."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "Impossibile creare la fabbrica per l'editor dei componenti"
 
@@ -5589,12 +6094,45 @@ msgstr "Mese  selezionato (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Anno selezionato (%Y)"
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "Attivit�"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Stato: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Priorit�:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Percentuale Completata: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Categorie: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Contatti: "
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Stampa Calendario"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5632,8 +6170,8 @@ msgstr ""
 "\n"
 "Cancellare comunque queste attivit�?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Non chiedere pi� in futuro."
 
@@ -5696,6 +6234,11 @@ msgstr "Importa i file iCalendar in Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importa i file VCalendar in Evolution."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Promemoria"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5789,8 +6332,8 @@ msgstr "contiene? prevede che l'argomento 2 sia una stringa"
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 "contiene? prevede che l'argomento 1 sia \"qualsiasi\", \"sommario\", "
 "\"descrizione\""
@@ -6723,638 +7266,654 @@ msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Asia/Macao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Asia/Magadan"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Asia/Kabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarcanda"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Asia/Tehran"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantico/Azzorre"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantico/Bermuda"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlantico/Canarie"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantico/Capo_Verde"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlantico/Faeroe"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantico/Jan_Mayen"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlantico/Madeira"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantico/Reykjavik"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantico/South_Georgia"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlantico/Sant'Elena"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlantico/Stanley"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australia/Australia"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europa/Atene"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrado"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europe/Berlino"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europa/Brussels"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucarest"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhagen"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europa/Dublino"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibilterra"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisbona"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europa/Londra"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europa/Lussemburgo"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europa/Mosca"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europa/Parigi"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europa/Stoccolma"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europa/Vaticano"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europa/Vienna"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europa/Varsavia"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagabria"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europa/Zurigo"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Indiano/Antananarivo"
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Indiano/Chagos"
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Indiano/Natale"
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Indiano/Cocos"
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indiano/Comorre"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Indiano/Kerguelen"
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indiano/Mahe"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indiano/Maldive"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indiano/Mauritius"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indiano/Mayotte"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indiano/Reunion"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Pacifico/Apia"
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Pacifico/Auckland"
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Pacifico/Chatham"
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Pacifico/Pasqua"
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Pacifico/Efate"
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Pacifico/Enderbury"
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Pacifico/Fakaofo"
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Pacifico/Fiji"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Pacifico/Funafuti"
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Pacifico/Galapagos"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Pacifico/Gambier"
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Pacifico/Guadalcanal"
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Pacifico/Guam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Pacifico/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Pacifico/Johnston"
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Pacifico/Kiritimati"
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Pacifico/Kosrae"
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Pacifico/Kwajalein"
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Pacifico/Majuro"
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Pacifico/Marquesas"
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Pacifico/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Pacifico/Nauru"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Pacifico/Niue"
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Pacifico/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Pacifico/Noumea"
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Pacifico/Pago_Pago"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Pacifico/Palau"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Pacifico/Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Pacifico/Ponape"
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Pacifico/Port_Moresby"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Pacifico/Rarotonga"
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Pacifico/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Pacifico/Tahiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Pacifico/Tarawa"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Pacifico/Tongatap"
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Pacifico/Truk"
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Pacifico/Wake"
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Pacifico/Wallis"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Pacifico/Yap"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Questo numero non supporta la firma"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Questo numero non supporta si essere annullato"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Questo numero non supporta la verifica"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Questo numero non supporta la crittazione"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Questo numero non supporta la decrittazione"
 
@@ -7362,12 +7921,12 @@ msgstr "Questo numero non supporta la decrittazione"
 msgid "Unable to create cache path"
 msgstr "Impossibile creare il percorso per la cache"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Impossibile rimuovere la voce cache: %s: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7378,7 +7937,7 @@ msgstr ""
 "Ulteriori operazioni su questo server non saranno ripetute\n"
 "quando ci si riconnette alla rete."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7389,11 +7948,16 @@ msgstr ""
 "%s\n"
 "Le modifiche fatte a questa cartella non saranno risincronizzate."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Sincronizzazione con il server"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Archiviazione cartella '%s'"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "� necessario essere collegati per completare questa operazione"
 
@@ -7401,56 +7965,67 @@ msgstr "� necessario essere collegati per completare questa operazione"
 msgid "Syncing folders"
 msgstr "Sincronizzazione cartelle"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errore nel filtro di smistamento: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errore nell'esecuzione del filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Impossibile aprire la cartella per lo spool"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Impossibile operare sulla cartella per lo spool"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ricezione del messaggio %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Impossibile aprire il messaggio"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Errore al messaggio %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Sincronizzazione cartella"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Ricezione messaggio %d di %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Errore al messaggio %d di %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 msgid "Failed to retrieve message"
 msgstr "Errore di ricazione del messaggio"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Impossibile salvare messaggio %s nella cache: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Impossibile salvare messaggio %s nella cache: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errore nell'esecuzione della ricerca con filtro: %s: %s"
@@ -7482,27 +8057,106 @@ msgstr "(match-all) richiede un singolo risultato booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "� stata effettuata una ricerca su un header sconosciuto: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Impossibile aggiungere un messaggio a %s (operazione non supportata)"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Impossibile ricercare attraverso un'espressione in %s (operazione non "
 "supportata)"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Impossibile cercare attraverso l'uid in %s (operazione non supportata)"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Trasferimento dei messaggi in corso"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Copia messaggi in %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Annullato."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Risposta inaspettata dal server IMAP: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "� necessario fornire un nome di file."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Impossibile cifrare questo messaggio: mancano i destinatari"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Impossibile salvare messaggio %s nella cache: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Impossibile salvare messaggio %s nella cache: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Decodifica messaggio non riuscita."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+"Impossibile verificare questo messaggio: impossibile creare un file "
+"temporaneo: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7600,93 +8254,24 @@ msgstr "Errore nella scrittura del file temp di posta: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Errore nella copia del file temp di posta: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Digitare la %s passphrase per %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Digitare la %s passphrase"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Impossibile firmare questo messaggio: nessun testo da firmare"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr ""
-"Impossibile firmare questo messaggio: non � stata fornita nessuna password"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Impossibile firmare questo messaggio: impossibile creare una pipe verso "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Impossibile firmare questo messaggio: nessun testo da firmare"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Impossibile verificare questo messaggio: nessun testo da verificare"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Impossibile verificare questo messaggio: impossibile creare una pipe verso "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-"Impossibile verificare questo messaggio: impossibile creare un file "
-"temporaneo: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Impossibile cifrare questo messaggio: nessun testo da cifrare"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Impossibile cifrare questo messaggio: nessuna password � stata fornita"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Impossibile cifrare questo messaggio: impossibile creare una pipe verso "
-"GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Impossibile cifrare questo messaggio: mancano i destinatari"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Impossibile decifrare questo messaggio: nessun testo da decifrare"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr ""
-"Impossibile decifrare questo messaggio: nessuna password � stata fornita"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Impossibile decifrare questo messaggio: impossibile creare una password "
-"verso GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+#, fuzzy
+msgid "Failed to decrypt MIME part: parse error"
+msgstr "Impossibile decifrare: motivo sconosciuto"
 
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Questa parte del messaggio � firmata"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Altro errore"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7704,43 +8289,6 @@ msgstr "Impossibile caricare %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Impossibile caricare %s: nessun codice di inizializzazione nel modulo."
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s server %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s servizio per %s su  %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Connessione annullata"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Impossibile connettersi a %s (porta %d): %s"
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(host sconosciuto)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Operazione annullata"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Il server si � disconnesso inaspettatamente: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonimo"
@@ -7843,7 +8391,7 @@ msgstr ""
 " %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Cattiva risposta di autenticazione dal server."
 
@@ -7872,11 +8420,9 @@ msgid ""
 msgstr ""
 "Con questa ci si connette al server usando Kerberos 4 per l'autenticazione."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Password"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7904,52 +8450,52 @@ msgstr "autorizzazione POP prima di SMTP usando una sorgente non-pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compilazione dell'espressione regolare fallita: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necessita di un componente per lo username "
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necessita di un componente per l'host"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necessita di un componente per il percorso"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Sto risolvendo: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Errore nella ricerca del nome: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Ricerca dell'Host fallita: %s: host non trovato"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Ricerca dell'Host fallita: %s: motivo sconosciuto"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Sto risolvendo: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Ricerca dell'Host fallita: %s: host non trovato"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Ricerca dell'Host fallita: %s: motivo sconosciuto"
@@ -8013,12 +8559,12 @@ msgstr "Decodifica messaggio non riuscita."
 msgid "Failed to verify certificates."
 msgstr "Verifica certificati non riuscita."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Impossibile ottenere la cartella: Operazione non supportata in questo store"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Impossibile creare una cartella: Operazione non supportata in questo store"
@@ -8048,7 +8594,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8061,16 +8607,16 @@ msgstr ""
 "Impronta digitale:    %s\n"
 "Firma:                %s"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr "BENE"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr "MALE"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8089,15 +8635,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Impossibile interpretare URL `%s'"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non � presente il messaggio %s in %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Non � presente il messaggio: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Controlla se ci sono nuovi messaggio in tutte le cartelle"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8119,68 +8665,77 @@ msgstr "Impossibile rinominare la cartella %s: Operazione non valida"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossibile rinominare la cartella %s: Cartella inesistente"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Non � possibile copiare  messaggi da questa cartella cestino."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Operazione annullata"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Il server si � disconnesso inaspettatamente: %s"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Risposta inaspettata dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Comando IMAP fallito: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "La risposta del server � terminata troppo presto."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La risposta del server IMAP non contiene informazione %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Risposta OK inattesa dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Impossibile creare la directory %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Impossibile caricare il sommario di %s"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Cartella distrutta e ricreata sul server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Ricerca messaggi modificati"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Questo messaggio non � al momento disponibile"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Ricezione delle informazioni sul sommario per i nuovi messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Ricerca nuovi messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 
@@ -8233,34 +8788,85 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Per leggere e memorizzare la posta su server IMAP."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Password"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Con questa opzione ci si connette al server IMAP usando una password di "
 "testo semplice."
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP server %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s servizio per %s su  %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Connessione annullata"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Impossibile connettersi a %s (porta %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Impossibile connettersi al server POP.\\n\n"
+"Errore nell'invio della password: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operazione non supportata"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Autenticazione fallita"
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Il server IMAP %s non supporta il tipo di autenticazione richiesto %s "
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nessun supporto per il tipo di autenticazione %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sInserire la password IMAP per %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Non � stata inserita la password."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8271,72 +8877,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Non � presente la cartella %s"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Alla cartella madre non � permesso contenere sottocartelle"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Impossibile aprire la casella di posta: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Directory in formato MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Per memorizzare la posta locale in una directory tipo MH"
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Consegne locali"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Per ricevere la posta locale da mbox formato standard."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Applicare i filtri ai nuovi messaggi in INBOX"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Directory in formato Maildir"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Per memorizzare la posta locale in directory maildir."
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Spool standard Unix"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "Per leggere e memorizzare la posta in file standard mbox."
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr "Albero della directory dei file mbox"
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Spool standard Unix"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
-"Per accedere all' archivio di posta un albero di file mbox esterno.\n"
-"Questo permette di accedere direttamente a cartelle pine e elm.\n"
-"NOTA BENE: questo servizio � ancora sperimentale, prima � meglio assicurarsi "
-"di fare un backup delle cartelle di posta."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "Per leggere e memorizzare la posta in file standard mbox."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8362,7 +8983,7 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr "File di posta locale: %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossibile rinominare la cartella %s con %s: %s"
@@ -8382,34 +9003,32 @@ msgstr "Impossibile cancellare il sommario della cartella `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossibile cancellare il file indice della cartella `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Impossibile aggiornare il sommario: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 "Impossibile trovare messaggi da aggiungere al sommario: motivo sconosciuto"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Aggiunta di messaggio Maildir annullata"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Impossibile accodare il messaggio alla cartella maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8418,20 +9037,19 @@ msgstr ""
 "Impossibile prendere il messaggio: %s\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Messaggio assente"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Contenuto del messaggio non valido"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8442,13 +9060,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La cartella `%s' non esiste."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8464,7 +9082,7 @@ msgstr "`%s' non � una directory maildir."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Impossibile cancellare la cartella `%s': %s"
@@ -8473,8 +9091,8 @@ msgstr "Impossibile cancellare la cartella `%s': %s"
 msgid "not a maildir directory"
 msgstr "non � una directory maildir"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Impossibile esaminare la cartella `%s':%s"
@@ -8495,45 +9113,37 @@ msgstr "Controllo nuova posta"
 msgid "Checking for new messages"
 msgstr "Ricerca nuovi messaggi"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Salvataggio della cartella in corso"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Impossibile creare una cartella di lock in %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Impossibile aprire la casella di posta: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Aggiunta di un messaggio annullata"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Inpossibile accodare il messaggio al file mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8542,13 +9152,11 @@ msgstr ""
 "Impossibile prendere il messaggio: %s dalla cartella: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "La cartella appare irrimediabilmente corrotta."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fallita la costruziono del messaggio: mailbox corrotta?"
 
@@ -8591,152 +9199,152 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La Cartella `%s' non � vuota.  Non cancellata."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Impossibile aprire la cartella %s: %s "
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Errore fatale di simistamento della posta vicino alla posizione %ld nella "
 "cartella %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Impossibile controllare la cartella: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Impossibile aprire il file: %s: %s "
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Impossibile creare una mbox temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-"Sommario e cartella non corrispondono, nemmeno dopo una sincronizzazione"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Errore di scrittura nella mbox temporanea: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Scrittura fallita su casella di posta temporanea %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Impossibile chiudere la cartella sorgente %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossibile chiudere la cartella temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossibile rinominare la cartella: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
+"Sommario e cartella non corrispondono, nemmeno dopo una sincronizzazione"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore sconosciuto: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Impossibile rinominare la cartella: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Errore di scrittura nella mbox temporanea: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Scrittura fallita su casella di posta temporanea %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Aggiunta di un messaggio MH annullata"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Impossibile accodare il messaggio alla cartella mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' non � una directory."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Impossibile aprire il percorso della directory MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Inpossibile accodare il messaggio al file spool: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Le cartelle spool non possono essere rinominate"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Spool `%s' non esiste oppure non � un file regolare."
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "`%s' non � una directory maildir."
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La cartella `%s/%s' non esiste."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "File spool di posta %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Le cartelle spool non possono essere rinominate"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Le cartelle spool non possono essere rinominate"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Le cartelle spool non possono essere cancellate"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Impossibile sincronizzare cartella temporanea %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Impossibile sincronizzare cartella spool %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8745,25 +9353,6 @@ msgstr ""
 "Impossibile sincronizzare cartella spool %s: %s\n"
 "La cartella potrebbe essere corrotta, copia salvata in `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Impossibile trovare il file %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Spool `%s' non esiste oppure non � un file regolare."
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Mail a %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET news"
@@ -8772,12 +9361,22 @@ msgstr "USENET news"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Questo � un fornitore per la lettura e l'invio a newsgroups USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Impossibile creare la directory %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8877,7 +9476,7 @@ msgstr "Lasciare i messaggi sul server"
 msgid "Delete after %s day(s)"
 msgstr "Elimina dopo %s giorno(i)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8903,32 +9502,22 @@ msgstr ""
 "attraverso il protocollo APOP.  Potrebbe non funzionare per tutti gli utenti "
 "anche su server che affermano di supportarlo. "
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Operazione non supportata"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Autenticazione fallita"
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Impossibile connettersi al server POP su %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8936,27 +9525,27 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Non � presente il supporto per il meccaniscmo di autenticazione richiesto."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "SASL `%s' Login fallito: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr "Errore del protocollo SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr "Errore I/O: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPrego inserire la password del POP per %s@%s "
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8965,13 +9554,13 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Cartella `%s' non presente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9138,45 +9727,45 @@ msgstr "Autenticazione temporaneamente non riuscita"
 msgid "Authentication required"
 msgstr "Autenticazione richiesta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Errore nella risposta di benvenuto: %s: probabilmente non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Il messaggio non sembra avere un formato valido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Richiesta AUTH scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Errore nella risposta di DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Il server IMAP %s non supporta il tipo di autenticazione richiesto %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sInserire la password SMTP per %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9187,89 +9776,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Posta SMTP consegnata attraverso il programma %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Impossibile inviare il messaggio: l'indirizzo del mittente non � valido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Invio messaggio"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Impossibile inviare il messaggio: uno o pi� destinatari non validi."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "Saluti SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Richiesta di HELO scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Errore di risposta di HELO scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "Autenticazione SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Errore nel creare un oggetto di autenticazione SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Richiesta AUTH scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "Richiesta AUTH non riuscita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Cattiva risposta di autenticazione dal server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Richiesta MAIL FROM scaduta: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr "Errore nella risposta MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "La richiesta di RCPT TO: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> non riuscito"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "RIchiesta di DATA scaduta: %s: posta non inviata."
@@ -9277,37 +9866,37 @@ msgstr "RIchiesta di DATA scaduta: %s: posta non inviata."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr "Errore nella risposta di DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA ha inviato il segnale di tempo scaduto: terminazione del messaggio: %s "
 "posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr "Errore di risposta di DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Richiesta RSET scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr "Errore nella risposta di RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Richiesta QUIT scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr "Errore nella risposta di QUIT"
 
@@ -9380,53 +9969,53 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Consiglio visualizzazione automatica degli allegati"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Cliccare qui per la rubrica"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Da:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Rispondi-a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9439,7 +10028,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Allega un file"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Impossibile creare un contesto per la firma PGP."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9448,34 +10042,34 @@ msgstr ""
 "Errore di lettura del file: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Attenzione!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Il file esiste, sovrascriverlo?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errore di accesso al file: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Impossibile scaricare messaggi dall'editor"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9484,7 +10078,7 @@ msgstr ""
 "Impossibile cercare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9493,7 +10087,7 @@ msgstr ""
 "Impossibile troncare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9502,7 +10096,7 @@ msgstr ""
 "Errore nel salvataggio automatico del messaggio: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9511,7 +10105,7 @@ msgstr ""
 "precedente.\n"
 "Si desidera tentare di recuperarli?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9521,23 +10115,43 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Attenzione: Messaggio Modificato"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Inserici File"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Salva firma"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (predefinito)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Componi un nuovo messaggio"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9545,7 +10159,7 @@ msgstr ""
 "Impossibile creare una finestra di composizione:\n"
 "impossibile attivare il controllo del selettore di indirizzi."
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9553,6 +10167,12 @@ msgstr ""
 "Impossibile creare la finestra di composizione:\n"
 "Il componente HTML non � disponibile."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9613,7 +10233,7 @@ msgstr "L'oggetto contiene"
 msgid "Subject does not contain"
 msgstr "L'oggetto non contiene"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9757,7 +10377,7 @@ msgstr "Ora"
 msgid "minute"
 msgstr "Minuto"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr " secondi"
 
@@ -9832,7 +10452,7 @@ msgstr " fa"
 msgid "ago"
 msgstr "fa"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9844,6 +10464,21 @@ msgstr "<clicca qui per selezionare una data>"
 msgid "Filter Rules"
 msgstr "Regole dei Filtri"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Specifica nome del file:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Spool `%s' non esiste oppure non � un file regolare."
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Specificare un'operazione:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9863,7 +10498,7 @@ msgstr ""
 "posta."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Scegli Cartella"
 
@@ -9876,7 +10511,11 @@ msgstr ""
 "Errore nell'espressione regolare `%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
@@ -9906,7 +10545,7 @@ msgstr "se tutti i criteri sonon soddisfatti"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "se qualche criterio � soddisfatto"
 
 #: filter/filter-rule.c:780
@@ -9985,190 +10624,200 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Ditta"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "contiene"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Copia nella Cartella"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Data di Ricezione"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Data di spedizione"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Eliminato"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "non contiene"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "non finisce con"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "non esiste"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "non assomiglia a"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "non comincia per"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Non Esiste"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Bozza"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "finisce per"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr "Esegui un comado della shell"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Esistente"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "esiste"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Espressione"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "�"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is after"
 msgstr "� dopo"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "is before"
 msgstr "� prima"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr "� segnato"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "� maggiore di"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "� minore di"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "non �"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "is not Flagged"
 msgstr "non � segnato"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Mailing list"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Corpo del messaggio"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Header del messaggio"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Sposta nella Cartella..."
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Emetti un suono:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Leggi"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Corrispindenza con l'espressione regolare"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Risposto a"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Punteggio"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Mittente"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Imposta _Stato"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Dimensione (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "Assomiglia a"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Account Sorgente"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Specifica header"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "comincia per"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Oggetto"
 
@@ -10223,7 +10872,8 @@ msgid "Scanning %s"
 msgstr "Scansione di \"%s\""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Posta"
 
@@ -10239,10 +10889,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Rubrica"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10292,7 +10938,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution sta importando i vecchi dati di Netscape"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Cestino"
 
@@ -10429,31 +11077,31 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Cartella contente la posta"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Cestino Virtuale"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Cartella Cestino Virtuale"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Questa cartella non pu� contenere messaggi."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Propriet�..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Modifica le propriet� dei questa cartella"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10461,239 +11109,247 @@ msgstr ""
 "Alcune delle impostazioni della posta sembrano essere state corrotte, "
 "controllare che tutto sia a posto."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Non � stato impostato un sistema di trasporto per la posta"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Attenzione: Messaggio Modificato"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Nuovo Messaggio di Posta"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "Invia _Messaggio"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "Impossibile attivare il componente di configurazione della posta di "
 "Evolution."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Impossibile attivare il componente folder info di Evolution."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connessione al server..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Impossibile attivare lo storage nella shell"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriet� per \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Propriet�"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Impossibile creare una directory temporanea: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d nuovi"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d nascosti"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr "%d visibili"
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d selezionati"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr " %d non inviati"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d inviato/i"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d totali"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crea una Cartella _Virtuale dal Messaggio"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "Cartella Virtuale sull'_Oggetto"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "Cartella Virtuale sul _Mittente"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "Cartella Virtuale sui _Destinatari"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "Cartella Virtuale sulla Mailing _List"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filtro sull'_Oggetto"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filtro sul _Mittente"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filtro sui _Destinatari"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filtro sulla _Mailng List"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Modifica come Nuovo Messaggio..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "S_tampa"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Rispondi al Mittente"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Rispondi alla _Lista"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Rispondi a _Tutti"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completato"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Annulla"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Segna come _Letto"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Segna come _Non Letto"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Segna come _Importante"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Segna come _Nonimportante"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Ripristina"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Sposta nella Cartella..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Copia nella Cartella..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "Laurel"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Aggiungi Mittente alla _Rubrica"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Applica Filtri"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crea Rego_la dal Messaggio"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Cartella Virtuale sulla Mailng List"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtra sulla Mailng List (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Cartella Virtuale sulla Mailng List (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Predefinito"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Ricerca Informazioni Cartella"
 
@@ -10748,7 +11404,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Non sono state fornite tutte le informazioni richieste."
 
@@ -10758,83 +11414,111 @@ msgid "Evolution News Editor"
 msgstr "Editor dlle News di Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Editor degli Account di Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "_Username:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Percorso:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Radio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "� possibile creare due account con lo stesso nome."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Sicuro di voler cancellare questo account?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Non cancellare"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Cancellare veramente questo account?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Disabilita"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Abilita"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Sicuro di voler cancellare questo aaccount delle news?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Nome dell' _Account:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Rico"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Mail a %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Oggetto � %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Mail da %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "%s mailing list"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Aggiungi una regola di Filtro"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"Le seguenti vFolder:\n"
+"%sUsavano la cartella:\n"
+"    '%s'\n"
+"che ora � stata rimossa, e quindi sono state aggiornate."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10846,7 +11530,7 @@ msgstr ""
 "ricevere o scrivere posta.\n"
 "Si desidera configurarlo subito?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10854,7 +11538,7 @@ msgstr ""
 "� necessario configurare un' identit�\n"
 "prima di poter comporre una email."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10863,7 +11547,7 @@ msgstr ""
 "della posta prima di comporla."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10871,11 +11555,11 @@ msgstr ""
 "Il messaggio � in HTML, ma i seguenti destinatari non vogliono ricevere "
 "posta HTML:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Inviare comunque?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10883,7 +11567,7 @@ msgstr ""
 "Questo messaggio non ha l'oggetto.\n"
 "Inviare lo stesso?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10892,11 +11576,11 @@ msgstr ""
 "per nascondere gli indirizzi della lista, questo messaggio contiene solo "
 "destinatari Bcc."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Questo messaggio contiene solo destinatari Bcc."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10906,16 +11590,16 @@ msgstr ""
 "header simile ad A.\n"
 "Inviare lo stesso?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "� necessario specificare dei destinatari per inviare questo messaggio."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "� necessario configurare un' identit� prima di poter inviare questa email."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10923,28 +11607,28 @@ msgstr ""
 "Impossibile apreire la cartella delle bozze per questo account.\n"
 "Usare la cartella delle bozze predefinita?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "un mittente sconosciuto"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Il %a, %Y-%m-%d alle %H:%M, %%s ha scritto:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Sposta messaggio(i) in"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copia messaggio(i) in"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Sei sicuro di voler modificare tutti i %d messaggi?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10952,7 +11636,7 @@ msgstr ""
 "� possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10960,39 +11644,39 @@ msgstr ""
 "� possibile reinviare solo i messaggi\n"
 "salvati nella cartella Posta Inviata."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Sei sicuro di voler rispedire tutti i %d messaggi?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Nessun Messaggio Selezionato"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Sovrascrivere il file?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Salva messaggi con nome..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Mostra il prossimo messaggio non letto"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11005,7 +11689,7 @@ msgstr ""
 "\n"
 "Cancellare comunque questi messaggi?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11014,32 +11698,68 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d di %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "Lettera-USA"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Stampa Messaggio non riuscita"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Sicuro di voler aprire tutti i %d messaggi in finestre separate?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Nessuna descrizione disponibile"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Contatto senza nome"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Inviata"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Aggiungi criterio"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Salva firma"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11093,193 +11813,175 @@ msgstr ""
 "Questo nome � usato solo allo scopo di visualizzare."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Guida agli Account di Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "dopo"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"Impossibile raggiungere la casella di posta in entrata per il nuovo store:\n"
-"%s\n"
-"Non verr� creato alcun collegamento."
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Account"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Verifica Servizi"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Connessione al server..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Contatto senza nome"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "_Modifica"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Nuovo"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Controlla tipi supportati"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL non � supportato in questa compilazione di Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL non � supportato in questa compilazione di Evolution)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Cifra _sempre con la mia chiave quando invio posta cifrata"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Account %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Informazioni sull'Account"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gestione degli Account"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Annulla Operazione"
+msgid "Add Sc_ript"
+msgstr "Aggiungi criterio"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "Arkansas"
+msgid "Add new signature..."
+msgstr "Salva firma"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Cifra _sempre con la mia chiave quando invio posta cifrata"
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Firmare sempre i messaggi in uscita quando si usa questo account"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Sempre copia carbone _nascosta (Bcc) a:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Sempre _copia carbone (Cc) a:"
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "Arica"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Allegare un file al messaggio"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Allegato"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Controlla la posta _automaticamente"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Set di caratteri sconosciuto: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "C_hiudi"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Controllo Nuova Posta"
 
 #: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Colore attivit� di oggi"
+
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr "Composizione Messaggio"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11295,56 +11997,47 @@ msgstr ""
 "\n"
 "Cliccare su \"Fine\" per salvare le impostazioni."
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "Bari"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "Pr_edefinito"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Priorit� Predefinita:"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Codice dei caratteri predefinito: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Ricezione Posta"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "ID digitali..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Impossibile aprire il messaggio"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Completato"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Cartella delle _Bozze:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Abilita"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11365,39 +12058,34 @@ msgstr "Indirizzo _Email:"
 msgid "Empty _trash folders on exit"
 msgstr "_Svuota cestino all'uscita"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Esegui comando..."
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "finisce per"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propriet�"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Prendi ID digitale..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Evidenzia citazioni con"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Honolulu"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11451,67 +12139,63 @@ msgstr "Micronesia"
 msgid "NNTP Server:"
 msgstr "NNTP Server:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Notifica Nuova Posta"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "_Notiziari"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Informazioni Opzionali"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zzazione:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "ID della _chiave PGP/GPG:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Scegliere un colore"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Segnala l'invio di messaggi con solo destinatari _Bcc"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Stampa i contatti selezionati"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Impossibile aprire il messaggio"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citato"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Ri_corda questa password"
@@ -11545,117 +12229,120 @@ msgid "S_ecurity"
 msgstr "Sicurezza"
 
 #: mail/mail-config.glade.h:104
-#, fuzzy
-msgid "Same as text"
-msgstr "Somerset"
-
-#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME sicuro (S/MIME)"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Scegliere un file binario PGP"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "File con la firma:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Cancella tutto tranne la firma"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Cartella _messaggi inviati:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Messaggi Inviati e Bozze"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Il ser_ver richiede autenticazione"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Configurazione del Server"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Tipo di Server:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Collegamenti"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Salva firma"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Salva firma"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Sorgente"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Informazione Sorgenti"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Specifica nome del file:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Mbox standard per Unix"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "Firma _HTML:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabile"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11665,149 +12352,141 @@ msgstr ""
 "\n"
 "Cliccare \"successivo\" per cominciare."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Est"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_File con la firma:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "_Caricare sempre le immagini dalla rete"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Firma _sempre i messaggi in uscita quando viene usato questo account"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "Tipo di _Autenticazione: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 msgid "_Authentication type: "
 msgstr "Tipo di _Autenticazione: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "Controlla la posta _automaticamente"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "Controlla la posta _automaticamente"
+
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Emetti un suono quando arriva nuova posta"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "ID del _Certificato:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Chiedi conferma prima di eliminare definitivamente i messaggi"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Firma _HTML:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Predefiniti"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Non notificare l'arrivo di nuova posta"
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Nome del file:"
+msgid "_Enable"
+msgstr "Abilita"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "_Inoltra Messaggio"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 msgid "_Full name:"
 msgstr "_Nome e cognome:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Posta HTML"
 
-#: mail/mail-config.glade.h:160
-#, fuzzy
-msgid "_HTML Signature:"
-msgstr "Firma _HTML:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identit�"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Lingua"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_Carica le immagini se il mittente � nella rubrica"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Imposta come mio account _predefinito"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Segna i _messaggi come letti dopo"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Non caricare mai le immagini dalla rete"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "Percorso binario di _PGP:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Suona un file sonoro quando arriva nuova posta"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Chiedere conferma prima di inviare messaggi HTML a contatti che non li "
 "desiderano"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Segnala l'invio di messaggi _senza oggetto."
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Radio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11848,69 +12527,52 @@ msgstr "_File con la firma:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "Firma _HTML:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Usa conn_essione sicura (SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabile"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_ogni"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " colore"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "descrizione"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Impossibile creare un contesto per la firma PGP."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Impossibile creare un contesto per la verifica PGP."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Impossibile creare un contesto per la crittazione PGP."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Imposssibile creare un contesto per la decrittazione PGP."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Imposssibile creare un contesto per la firma S/MIME."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Imposssibile creare un contesto per S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Imposssibile creare un contesto per la crittazione S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Imposssibile creare un contesto per la busta S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Impossibile creare un contesto di codifica  S/MIME."
 
@@ -11953,99 +12615,136 @@ msgstr "Visualizzatore Esterno"
 msgid "Loading message content"
 msgstr "Caricamento del contenuto del messaggio"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "_Attivit� scadute:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Aprei il link nel Browser"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Copia la collocazione del Link"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Salva il Link come"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Salva Immagine con nome..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Impossibile interpretare il messaggio MIME.  Viene visualizzato il sorgente."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Indirizzo errato"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Da"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Rispondi-a"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "Posta"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Salva Messaggio con nome..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Questo messaggio ha una firma digitale.  Fare click sull'icona per avere "
+"ulteriori informazioni."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Impossibile creare un contesto per la verifica PGP."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Questo messaggio ha una firma digitale riscontrata come autentica."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Questo messaggio ha una firma digitale di cui non � possibile provare "
+"l'autenticit�."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntatore al file locale (%s) valido al sito \"%s\""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntatore a dati remoti (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Parte esterna del messaggio malformata."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Cartelle Locali"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Riconfigurazione cartella"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12054,27 +12753,27 @@ msgstr ""
 "Impossibile salvare le metainfo della cartella; probabilmente non \n"
 "sar� pi� possibile riaprire questa cartella: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Impossibile salvarele metainfo della cartella %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Impossibile cancellare imetadati della cartella %s: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiamento del formato della cartella da  \"%s\" a  \"%s\" "
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s pu� non essere stato riconfigurato perch� non � una cartella locale"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12082,11 +12781,11 @@ msgstr ""
 "Se non si riesce pi� ad aprire questa mailbox, pu� essere necessario\n"
 "ripararla manualmente."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Non � possibile modificare il formato di una cartella non locale."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Riconfigura /%s"
@@ -12144,81 +12843,73 @@ msgstr "Errore al messaggio %d di %d"
 msgid "Complete."
 msgstr "Completato."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sposta messaggii in %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copia messaggi in %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Spostamento in corso"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Copia in corso"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Lettura cartella %s in corso"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "Lettura store %s in corso"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Rimozione cartella %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Archiviazione cartella '%s'"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Aggiornamento cartella"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Eliminazione cartella"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Scaricamento del messaggio %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Ricezione di %d messaggio(i)"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvataggiodi %d messaggio(i)"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12227,7 +12918,7 @@ msgstr ""
 "Impossibile creare il file di output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12236,11 +12927,11 @@ msgstr ""
 "Errore nel salvare i messaggi in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Salvataggio Allegati"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12249,27 +12940,27 @@ msgstr ""
 "Impossibile creare il file di output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossibile srivere i dati: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnessione da %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Riconnessione a %s in corso"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Esecuzione di comando shell: %s"
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Cerca"
 
@@ -12340,10 +13031,6 @@ msgstr "Aggiornamento in corso..."
 msgid "Waiting..."
 msgstr "In Attesa..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Annullato."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Operazione annullata dall'utente."
@@ -12357,16 +13044,16 @@ msgstr "Inserire la Password per %s"
 msgid "Enter Password"
 msgstr "Inserire la Password"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Impossibile memorizzare la firma."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Salva firma"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12376,10 +13063,30 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Nome:"
+
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "Salva firma"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
 #, fuzzy
-msgid "Signature name:"
-msgstr "File con la firma:"
+msgid "Hide signature hint"
+msgstr "File con la firma HTML:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12394,17 +13101,17 @@ msgstr "Messaggio inoltrato"
 msgid "Forwarded Message"
 msgstr "Messaggio Inoltrato"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Impostazione vfolder %s in corso"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aggiornamento vfolder per %s in corso"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12417,89 +13124,94 @@ msgstr ""
 "    '%s'\n"
 "che ora � stata rimossa, e quindi sono state aggiornate."
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "VFolder"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "vFolder"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Modifica VFolder"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Si � cercato di editare una vfolder (%s) che non esiste."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Nuova Cartella Virtuale"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(nessun oggetto)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Messaggio"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Non visto"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Risposto"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Messaggi Multipli Non Visti"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Messaggi Multipli"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Il pi� basso"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Pi� basso"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Pi� alto"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Il pi� alto"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Oggi %I:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l %M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Generazione lista messaggi"
 
@@ -12520,10 +13232,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Contatto Originale:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Ricevuta"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Dimensione"
 
@@ -17235,5227 +17952,5224 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds and Bradford"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libia"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisbona"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "Londra"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "Londra/City"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "Londra/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "Londra/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "Londra/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Lousiana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "Lubeck-Blankensee"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr "Lviv"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malmo/Sturup"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Maurgarita"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marina di Ravenna"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marsiglia"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Citt� di Marshall"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AF"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Aeroporto"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Aeroporto"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Aeroporto"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Middle East"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "ilano/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Mauritilan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilene"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Miyakejima Aeroporto"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Aeroporto"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile Aeroporto Regionale"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Aeroporto"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Montpellier-Mediterranneo"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Mosca Domodedovo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Mosca Sheremetyevo"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "Monaco"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mikonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Aeroporto"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoya Aeroporto"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Naha Airport"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Airport"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchi"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama Airport"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Atlantico"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "Nuova Deli/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "New Tokyo Aeroporto Internazionale"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-Arpt JFK"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Cascate del Niagara"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nizze-Costa Azzurra"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata Aeroporto"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Northwest Territorie"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nuova Scozia"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro Aeroporto"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr "Odesa"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita Airport"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okayama Aeroporto"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki Aeroporto"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olimpia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Osaka Aeroporto Internazionale"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Oshima Aeroporto"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Parigi"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Parigi/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Parigi/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Parigi/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giov"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "Repubblica Popolare Cinese"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung Nord"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung Sud"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angele"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Apt"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portorose"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praga"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "edding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr "Rivne"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "ockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "oosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "ostov-Na-Donu"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "oswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Russia"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Aeroporto"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salisburgo"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samo"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Sendai Aeroporto"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O Aeroporto Internazionale"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Siviglia"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "Isole Marsh del Sud"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stoccolma (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stoccolma (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "San Pietroburgo"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "San Pietroburgo / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasburgo"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stoccarda"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvka"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr "Sympheropol"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Siracusa"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "aegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Aeroporto"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talinn"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna\""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Tanegashima Aeroporto"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebess"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Tehran-Mehrabad"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Salonicco"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo Eliporto"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokyo Aeroporto Internazionale"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokyo Nuovo Aeroporto Internazionale"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori Aeroporto"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama Aeroporto"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Tsushima Aeroporto"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "Emirati Arabi Uniti "
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr "Uzhgorod"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia Aeroporto Tech"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser Aeroporto"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Aeroporto"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendove"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Vienna"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barr"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow Aeroporto"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Yamagata Aeroporto"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube Aeroporto"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao Aeroporto"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknif"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagabria"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zacinto"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Zurigo"
 
@@ -22483,17 +23197,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Nessuna descrizione disponibile"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Sommario della Posta"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "VFolder"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Cartelle Locali"
 
@@ -22502,57 +23211,47 @@ msgstr "Cartelle Locali"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "LIRU:LIML"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Parola del Giorno"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Citazione del Giorno"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Aggiungere un notiziario"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Aggiungere la URL del notiziario RDF che si vuole aggiungere"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Nome:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Errore scaricando il file RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Notiziario"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
-#, fuzzy
-msgid "Add ->"
-msgstr "_Aggiungi"
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "<- Remove"
-msgstr "Rimuovere"
+msgid "Add"
+msgstr "A_ggiungi"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
@@ -22593,11 +23292,43 @@ msgstr "Stampa Sommario"
 msgid "Printing of Summary failed"
 msgstr "Stampa Sommario non riuscita"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 "Il componente del sommario esecutivo non riesce ad inizializzare Bonobo.\n"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "nodi"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "miglia"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometri"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Cielo limpido"
@@ -23749,101 +24480,107 @@ msgid "C_elsius"
 msgstr "C_elsius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Aggiungi not_iziario"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr ""
 "Quanti giorni contemporaneamente devono essere visualizzati dal calendario?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Numero ma_ssimo di oggetti mostrati:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Impostazioni Notiziari"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Un _mese"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "Una _settimana"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "Tempo per il r_efresh (secondi):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "Tempo _per il refresh (secondi):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "M_ostra il percorso completo per le cartelle"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Mostra _tutte le attivit�"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Mostra le attivit� di _oggi"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Mostra le temperature in:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Attivit� "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Impostazioni Meteo"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Cinque giorni"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Posta"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "_Notiziari"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Un giorno"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Pianifica"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Meteo"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Fabbrica per il compositore di Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Scegli Cartella"
+msgid "Folder Settings"
+msgstr "Impostazioni Posta"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "La shell di Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -23854,6 +24591,37 @@ msgstr "Mostra Dettagli"
 msgid "Cancel Operation"
 msgstr "Annulla Operazione"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Impossibile trasferire la cartella:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Come Cartella Inviati"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Bozze"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Posta in Arrivo"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Posta in Uscita"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Inviata"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Installazione di Evolution"
@@ -23967,6 +24735,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Sviluppato da"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Ultimato il"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Scegli Cartella"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Scegli Cartella"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Scegli Cartella"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Ultimato il"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -23996,20 +24789,20 @@ msgstr "Impossibile spostare una cartella in una delle sue suttostanti."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Specifica una cartella in cui copiare la cartella \"%s\":"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Copia cartella"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Specifica una cartella in cui copiare la cartella \"%s\":"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Sposta cartella"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24018,18 +24811,19 @@ msgstr ""
 "Impossibile cancellare la cartella:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Elimina \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Si vuole davvero rimuovere la cartella \"%s\"?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"Impossibile cancellare la cartella:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24038,16 +24832,16 @@ msgstr ""
 "Impossibile rinomincare la cartella:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rinominare la cartella \\\"%s\\\" in:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Rinomina cartella"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24066,7 +24860,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea nuova cartella"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -24074,7 +24868,7 @@ msgstr ""
 "Il tipo di cartella selezionata non � valido\n"
 "per l'operazione richiesta. "
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Nuovo..."
 
@@ -24126,21 +24920,26 @@ msgstr ""
 "Importazione %s\n"
 "Importazione dell'oggetto %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Scegli Cartella"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Il file %s non esiste"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Errore in Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "I dati possono solo essere importati in cartelle locali"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24149,11 +24948,11 @@ msgstr ""
 "Non c'� un importatore adatto a gestire\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importazione"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24162,17 +24961,17 @@ msgstr ""
 "Importazione di %s.\n"
 "Avvio di %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Errore nell'avvio di %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Errore nel caricare: %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24181,31 +24980,31 @@ msgstr ""
 "Importazione %s\n"
 "Importazione dell'oggetto 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automatico"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Nome del file:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Scegliere un file"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Tipo di file:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Importa dati e impostazioni da altri programmi"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Importa un file singolo"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24213,31 +25012,78 @@ msgstr ""
 "Attendere...\n"
 "Ricerca di impostazioni esistenti"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Avvio degli Importatori Intelligenti"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Da %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Scegli cartella"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Selezionare una cartella destinazione per importare questi dati"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importa"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Chiusura connessione..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Errore durante '%s':\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Sincronizzazione cartella"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Lettura cartella %s in corso"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Lettura cartella %s in corso"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Apri in %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Impossibile creare la cartella specificata:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -24251,8 +25097,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Impossibile avviare l'interfaccia Assistente Posta di Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nuovo"
@@ -24273,43 +25119,43 @@ msgstr "Il nome della cartella non pu� contenere barre (/)."
 msgid "'.' and '..' are reserved folder names."
 msgstr "I nomi di cartelle '.' e '..' sono riservati."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Impossibile trovare Bug Buddy nel tuo $PATH. "
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy non pu� essere eseguito."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Informazioni su Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Vai alla Cartella..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Selezionare la cartella che si desidera aprire"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Crea un nuovo collegamento"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Selezionare la cartella a cui si vuole che punti il collegamento:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "_Lavora Connesso"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "_Lavora Disconnesso"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Non connesso"
 
@@ -24344,7 +25190,7 @@ msgstr ""
 "Ximian Evolution � al momento disconnesso.  Cliccare questo bottone per "
 "connettersi."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24356,12 +25202,12 @@ msgstr ""
 "L'errore del sistema di attivazione �:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Impossibile impostare il local storage --%s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24372,23 +25218,19 @@ msgstr ""
 "� inaspettatamente terminato. Sar� necessario uscire e riavviare\n"
 "Evolution prima di poter accedere nuovamente a questi dati."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Argomenti non validi"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Impossibile registrare OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Database di Configurazione non trovato"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Errore generico"
 
@@ -24413,96 +25255,96 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Non rimuovere"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Rimnomina questo Gruppo di Collegamento"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Rinomina questo gruppo di collegamento come:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "Icone _Piccole"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra i collegamenti come icone piccole "
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "Icone _Grandi"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra i collegamenti come icone grandi"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Nuovo Gruppo..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Crea un nuovo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "_Rimuovi questo Gruppo..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "_Rinomina questo Gruppo..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Rinomina questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "_Nascondi la Barra dei Collegamenti"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Nascondi la barra dei collegamenti"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Rinomina collegamento"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Rinomina il collegamento selezionato come:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Aprire la cartella relativa a questo collegamento"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Aprire in una Nuova _Finestra"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 "Aprire la cartella relativa a questo collegamento in una nuova finestra"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Rinomina questo collegamento"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "Ri_muovere"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
 
@@ -24514,10 +25356,6 @@ msgstr "Errore di salvataggio dei collegamenti."
 msgid "Shortcuts"
 msgstr "Collegamenti"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Posta in Arrivo"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -24581,10 +25419,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completata)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<clicca qui per selezionare una cartella>"
 
@@ -24625,67 +25464,67 @@ msgstr ""
 "L'errore del sistema di attivazione �:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "Errore CORBA"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Interrotto"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Argomento non valido"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Ha gi� una shell"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Nessun proprietario"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Non trovato"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Tipo non supportato"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Schema non supportato"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Opreazione non supportata"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Esiste"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "URI non valida"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Ha delle sottocartelle"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Spazio sul dispositivo esaurito"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "La shell precedente � scomparsa"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 msgid "Test type"
 msgstr "Tipo di test"
 
@@ -24814,49 +25653,81 @@ msgstr "Non chiedere di nuovo"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution pu� importare dati dai seguenti file:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution sta ora terminando ..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Non chiedere di nuovo"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Impossibile inizializzare la shell di  Ximian Evolution."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Impossibile inizializzare la shell di  Ximian Evolution: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Disabilita la schermata di avvio"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Inizio importazione"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Avvio degli Importatori Intelligenti"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Inviare l'output del debugging di tutte i componenti ad un file"
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
 
@@ -24969,11 +25840,11 @@ msgstr "Mostra il contatto corrente"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Azioni"
 
@@ -25095,8 +25966,8 @@ msgstr "Elimina quest'oggetto"
 msgid "Delete this item"
 msgstr "Elimina quest'oggetto"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Barra dagli strimenti principale"
 
@@ -25136,7 +26007,7 @@ msgstr "Salva l'ogetto sol disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_File"
 
@@ -25201,19 +26072,19 @@ msgstr "Inoltra come i_Calendar"
 msgid "Forward this item via email"
 msgstr "Inoltra questo oggetto via email"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Ottieni le informazioni sull'ultima riunione"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "_Aggiorna Riunione"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "Pianifica una _Riunione"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Pianifica una Riunione su questo argomento"
 
@@ -25221,10 +26092,6 @@ msgstr "Pianifica una Riunione su questo argomento"
 msgid "Customise My Evolution"
 msgstr "Personalizza Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Annulla"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Annulla l'operazione corrente di posta"
@@ -25383,7 +26250,7 @@ msgstr "Lista per Discussioni"
 msgid "_Expunge"
 msgstr "_Elimina per Sempre"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Cartelle"
 
@@ -25788,7 +26655,7 @@ msgstr "Messaggio Precedente"
 msgid "_Quoted"
 msgstr "_Citato"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "S_trumenti"
 
@@ -25803,12 +26670,12 @@ msgstr "Chiudi questa finestra"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_Chiudi"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Visualizza"
 
@@ -25996,7 +26863,7 @@ msgstr "_Apri..."
 msgid "_Reply-To Field"
 msgstr "Campo _Rispondi-a:"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Aiuto"
 
@@ -26143,111 +27010,120 @@ msgid "Move this folder to another place"
 msgstr "Sposta questa cartella altrove"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Crea _Nuova cartella..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Apri in una Nuova Finestra"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Apre questa cartella in una nuova finestra"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Invia / Ricevi"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Invia la posta in coda e ricevi quella nuova"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Mostra informazioni su Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Invia un Bug Report"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "Invia un _Bug Report"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Inoltra un Bug Report usando Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Mostra/nasconde"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostra/nascondi la barra delle cartelle"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostra/nascondi la barra dei collegamenti"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Modifica il modo di funzionamento (connesso o disconnesso)."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Mostra la cartella selezionata"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ di Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_Informazioni su Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "Barra delle _Cartelle"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_Visualizza Cartella..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Importa..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Sposta..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nuovo"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Nuova Cartella"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "Impostazioni _Pilot..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Rinomina..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Invia / Ricevi"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Collegamento"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "_Barra dei Collegamenti"
 
@@ -26331,20 +27207,20 @@ msgstr ""
 "selezionare un fuso orario.\n"
 " Usare il tasto destro per rimpicciolire."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "Vista _Corrente"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 msgid "Custom View"
 msgstr "Vista personalizzata"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr "Salva la vista personalizzata"
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Definisci Viste"
 
@@ -26465,16 +27341,21 @@ msgstr "Cerca Editor"
 msgid "Save Search"
 msgstr "Salva Ricerca"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Salva Ricerca"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Aggiungi alle Ricerche Salvate"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Avanzato..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informazione"
@@ -26496,21 +27377,21 @@ msgstr "Messaggio"
 msgid "Don't show this message again."
 msgstr "Non mostrare questo messagio in futuro."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Trova Ora"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Annulla"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Annulla"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Trova Ora"
 
@@ -26536,377 +27417,323 @@ msgstr "init_corba(): impossibile inizializzare GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 
-#~ msgid "Connecting to LDAP server..."
-#~ msgstr "Connessione al server LDAP in corso..."
-
-#~ msgid "Waiting for connection to LDAP server..."
-#~ msgstr "In attesa di connesione al server LDAP..."
-
-#~ msgid "Edit Addressbook"
-#~ msgstr "Modifica Rubrica"
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Sorgenti della Rubrica"
 
-#~ msgid "A_uthenticate with server using:"
-#~ msgstr "A_utenticare con il server usando:"
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr "Impossibile effettuare fork di sendmail: %s: posta non inviata"
 
-#~ msgid "Account Name"
-#~ msgstr "Nome Account"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Componente dell'sommario esecutivo del calendario di Evolution."
 
-#~ msgid "Add Addressbook"
-#~ msgstr "Aggiungi rubrica"
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Fabbrica per il componente del Sommario del Calendario."
 
-#~ msgid "Advanced"
-#~ msgstr "Avanzato"
+#~ msgid "Sta_rt of day:"
+#~ msgstr "_Inizio della giornata:"
 
-#~ msgid "Base"
-#~ msgstr "Base"
+#~ msgid "_End of day:"
+#~ msgstr "_Fine della giornata:"
 
-#~ msgid "Check this if the server requires you to authenticate."
-#~ msgstr "Controllare questo se il server vi richiede l'autenticazione."
+#~ msgid "_Other Organizer"
+#~ msgstr "_Altro Organizzatore"
 
-#~ msgid ""
-#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
-#~ "server"
-#~ msgstr ""
-#~ "Evolution utilizzer� questo Nome Distintivo (DN) per autenticarsi con il "
-#~ "server"
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Questo numero non supporta si essere annullato"
 
-#~ msgid "Server Name"
-#~ msgstr "Nome del Server"
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Digitare la %s passphrase per %s"
 
-#~ msgid "The information below is required in order to add an addressbook.  "
-#~ msgstr ""
-#~ "Le informazioni sottostanti sono richieste per aggiungere una rubrica.  "
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Digitare la %s passphrase"
 
-#~ msgid "This information is not required for most ldap servers. "
-#~ msgstr ""
-#~ "Queste informazioni non sono richieste dala maggior parte dei server ldap.  "
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Impossibile firmare questo messaggio: nessun testo da firmare"
 
-#~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
+#~ msgid "Cannot sign this message: no password provided"
 #~ msgstr ""
-#~ "Queste informazioni sono usate dal server ldap per specificare quali nodi "
-#~ "usare in una ricerca.  Contattare il vostro amministratore di sistema per "
-#~ "ulteriori informazioni."
+#~ "Impossibile firmare questo messaggio: non � stata fornita nessuna password"
 
-#~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 #~ msgstr ""
-#~ "Questo � il nodo base per tutte le ricerche sul server ldap.  Contattare il "
-#~ "vostro amministratore di sistema per ulteriori informazioni."
-
-#~ msgid "This is the name of the server where your addressbook is located."
-#~ msgstr "Questo � il nome del server dove si trova la vostra rubrica."
-
-#~ msgid "This is the port that your ldap server uses."
-#~ msgstr "Questa � la porta che usa il server ldap."
+#~ "Impossibile firmare questo messaggio: impossibile creare una pipe verso "
+#~ "GPG/PGP: %s"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Altri Contatti"
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Impossibile firmare questo messaggio: nessun testo da firmare"
 
-#~ msgid "Name contains"
-#~ msgstr "Il nome contiene"
-
-#~ msgid "(none)"
-#~ msgstr "(nessuno)"
-
-#~ msgid "C_ontaining:"
-#~ msgstr "_Contenente:"
-
-#~ msgid "Show contacts matching the following criteria:"
-#~ msgstr "Mostra i contatti che soddisfano i seguenti criteri:"
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Impossibile verificare questo messaggio: nessun testo da verificare"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 #~ msgstr ""
-#~ "Sicuro di voler cancellare\n"
-#~ "questo contatto?"
-
-#~ msgid "Starting:"
-#~ msgstr "Inizio:"
-
-#~ msgid "Ending:"
-#~ msgstr "Fine:"
-
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Crea un nuovo appuntamento con il promemoria predefinito"
-
-#~ msgid "First day of wee_k:"
-#~ msgstr "Primo giorno della _settimana:"
-
-#~ msgid "_Other"
-#~ msgstr "_Altro"
-
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Fare click qui per aggiungere un partecipante"
-
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
+#~ "Impossibile verificare questo messaggio: impossibile creare una pipe "
+#~ "verso GPG/PGP: %s"
 
-#~ msgid "60%"
-#~ msgstr "60%"
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Impossibile cifrare questo messaggio: nessun testo da cifrare"
 
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr ""
+#~ "Impossibile cifrare questo messaggio: nessuna password � stata fornita"
 
-#~ msgid "90%"
-#~ msgstr "90%"
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Impossibile cifrare questo messaggio: impossibile creare una pipe verso "
+#~ "GPG/PGP: %s"
 
-#~ msgid "100%"
-#~ msgstr "100%"
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "Impossibile decifrare questo messaggio: nessun testo da decifrare"
 
-#~ msgid "_Delete this Task"
-#~ msgstr "_Elimina Questa Attivit�"
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr ""
+#~ "Impossibile decifrare questo messaggio: nessuna password � stata fornita"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "Inizio Riunione: <b>"
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Impossibile decifrare questo messaggio: impossibile creare una password "
+#~ "verso GPG/PGP: %s"
 
-#~ msgid "Task begins: <b>"
-#~ msgstr "Inizio attivit�: <b>"
+#~ msgid "%s server %s"
+#~ msgstr "%s server %s"
 
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Inizio informazioni di disponibilit�: <b>"
+#~ msgid "(unknown host)"
+#~ msgstr "(host sconosciuto)"
 
-#~ msgid "Begins: <b>"
-#~ msgstr "Inizio: <b>"
+#~ msgid "No such message: %s"
+#~ msgstr "Non � presente il messaggio: %s"
 
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Fine riunione: <b>"
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Non � possibile copiare  messaggi da questa cartella cestino."
 
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Fine informazioni di disponibilit�:"
+#~ msgid "Directory tree of mbox files"
+#~ msgstr "Albero della directory dei file mbox"
 
-#~ msgid "Ends: <b>"
-#~ msgstr "Fine: <b>"
+#~ msgid ""
+#~ "For accessing mail storedin an external tree of mbox files.\n"
+#~ "This will allow you to directly access pine and elm folders.\n"
+#~ "NOTE: This provider is still experimental so ensure you backup any mail "
+#~ "folders first."
+#~ msgstr ""
+#~ "Per accedere all' archivio di posta un albero di file mbox esterno.\n"
+#~ "Questo permette di accedere direttamente a cartelle pine e elm.\n"
+#~ "NOTA BENE: questo servizio � ancora sperimentale, prima � meglio "
+#~ "assicurarsi di fare un backup delle cartelle di posta."
 
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Attivit� Completata: <b>"
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Inpossibile accodare il messaggio al file spool: %s: %s"
 
-#~ msgid "Task Due: <b>"
-#~ msgstr "Attivit� Da Completare Entro: <b>"
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Impossibile trovare il file %s: %s"
 
-#~ msgid "iCalendar Information"
-#~ msgstr "Informazioni iCalendar"
-
-#~ msgid "iCalendar Error"
-#~ msgstr "Errore iCalendar"
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Spool `%s' non esiste oppure non � un file regolare."
 
-#~ msgid "An unknown person"
-#~ msgstr "Partecipante sconosciuto"
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Radio"
 
 #~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
 #~ msgstr ""
-#~ "<br> Controllate queste informazioni, e poi selezionate un'azione dal menu."
+#~ "Impossibile raggiungere la casella di posta in entrata per il nuovo "
+#~ "store:\n"
+#~ "%s\n"
+#~ "Non verr� creato alcun collegamento."
 
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Nessuno</i>"
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "_Modifica"
 
-#~ msgid "Status:"
-#~ msgstr "Stato:"
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Nuovo"
 
-#~ msgid "Tentatively Accepted"
-#~ msgstr "Accettato con tentativo"
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Annulla Operazione"
 
-#~ msgid "Choose an action:"
-#~ msgstr "Specificare un'operazione:"
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "Arkansas"
 
-#~ msgid "Update"
-#~ msgstr "Aggiornare"
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "Arica"
 
-#~ msgid "Accept"
-#~ msgstr "Accettare"
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "Bari"
 
-#~ msgid "Tentatively accept"
-#~ msgstr "Accettare con tentativo"
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Honolulu"
 
-#~ msgid "Decline"
-#~ msgstr "Rifiutare"
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "Somerset"
 
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Invia Informazioni sulla Disponibilit�"
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "File con la firma:"
 
-#~ msgid "Update respondent status"
-#~ msgstr "Aggiorna stato risposta"
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Cancella tutto tranne la firma"
 
-#~ msgid "Send Latest Information"
-#~ msgstr "Invia Informazioni Correnti"
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "Firma _HTML:"
 
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> ha pubblicato informazioni riguardo una riunione."
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Nome del file:"
 
-#~ msgid "Meeting Information"
-#~ msgstr "Dettagli della Riunione"
+#, fuzzy
+#~ msgid "_HTML Signature:"
+#~ msgstr "Firma _HTML:"
 
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> richiede la tua presenza ad una riunione."
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Lingua"
 
-#~ msgid "Meeting Proposal"
-#~ msgstr "Proposta di Riunione"
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Radio"
 
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> vuole aggiungersi ad una riunione esistente."
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Impossibile creare un contesto per la crittazione PGP."
 
-#~ msgid "Meeting Update"
-#~ msgstr "Aggiornamento Riunione"
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Imposssibile creare un contesto per la decrittazione PGP."
 
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> vuole ricevere informazioni aggiornate sulla riunione."
+#~ msgid "Moving"
+#~ msgstr "Spostamento in corso"
 
-#~ msgid "Meeting Update Request"
-#~ msgstr "Richiesta di Aggiornamento sulla Riunione"
+#~ msgid "Copying"
+#~ msgstr "Copia in corso"
 
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> ha risposto ad una richiesta di riunione."
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "File con la firma:"
 
-#~ msgid "Meeting Reply"
-#~ msgstr "Risposta ad una Riunione"
+#~ msgid "Riga"
+#~ msgstr "Riga"
 
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> ha annullato una riunione."
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_Aggiungi"
 
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Annullamento Riunione"
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "Rimuovere"
 
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> ha mandato un messaggio indecifrabile."
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Si vuole davvero rimuovere la cartella \"%s\"?"
 
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Messaggio di Richiesta Riunione Non Valido"
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Connessione al server LDAP in corso..."
 
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> ha pubblicato informazioni sulle proprie attivit�."
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "In attesa di connesione al server LDAP..."
 
-#~ msgid "Task Information"
-#~ msgstr "Informazioni sull'Attivit�"
+#~ msgid "Edit Addressbook"
+#~ msgstr "Modifica Rubrica"
 
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> ha richiesto che venga eseguito un compito."
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "A_utenticare con il server usando:"
 
-#~ msgid "Task Proposal"
-#~ msgstr "Proposta di Attivit�"
+#~ msgid "Account Name"
+#~ msgstr "Nome Account"
 
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> vuole aggiungere informazioni ad una attivit� esistente."
+#~ msgid "Add Addressbook"
+#~ msgstr "Aggiungi rubrica"
 
-#~ msgid "Task Update"
-#~ msgstr "Aggiornamento Attivit�"
+#~ msgid "Advanced"
+#~ msgstr "Avanzato"
 
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> vuole ricevere informazioni aggiornate sull'attivit�."
+#~ msgid "Base"
+#~ msgstr "Base"
 
-#~ msgid "Task Update Request"
-#~ msgstr "Richiesta di Aggiornamento dell'Attivit�"
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Controllare questo se il server vi richiede l'autenticazione."
 
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> ha risposto all'assegnamento di un compito."
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with "
+#~ "the server"
+#~ msgstr ""
+#~ "Evolution utilizzer� questo Nome Distintivo (DN) per autenticarsi con il "
+#~ "server"
 
-#~ msgid "Task Reply"
-#~ msgstr "Risposta all'Attivit�"
+#~ msgid "Server Name"
+#~ msgstr "Nome del Server"
 
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> ha annullato un'attivit�."
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr ""
+#~ "Le informazioni sottostanti sono richieste per aggiungere una rubrica.  "
 
-#~ msgid "Task Cancellation"
-#~ msgstr "Annullamento Attivit�"
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr ""
+#~ "Queste informazioni non sono richieste dala maggior parte dei server "
+#~ "ldap.  "
 
-#~ msgid "Bad Task Message"
-#~ msgstr "Messaggio di Attivit� Indecifrabile"
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "Queste informazioni sono usate dal server ldap per specificare quali nodi "
+#~ "usare in una ricerca.  Contattare il vostro amministratore di sistema per "
+#~ "ulteriori informazioni."
 
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> ha pubblicato informazioni sulla disponibilit�."
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
+#~ msgstr ""
+#~ "Questo � il nodo base per tutte le ricerche sul server ldap.  Contattare "
+#~ "il vostro amministratore di sistema per ulteriori informazioni."
 
-#~ msgid "Free/Busy Information"
-#~ msgstr "Informazioni sulla Disponibilit�"
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Questo � il nome del server dove si trova la vostra rubrica."
 
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> richiede informazioni sulla disponibilit�."
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Questa � la porta che usa il server ldap."
 
-#~ msgid "Free/Busy Request"
-#~ msgstr "Richiesta Disponibilit�"
+#~ msgid "Name contains"
+#~ msgstr "Il nome contiene"
 
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> ha risposto a una richiesta di disponibilit�."
+#~ msgid "C_ontaining:"
+#~ msgstr "_Contenente:"
 
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Risposta Disponibilit�"
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Mostra i contatti che soddisfano i seguenti criteri:"
 
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Messaggio di Disponibilit� Indecifrabile"
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Crea un nuovo appuntamento con il promemoria predefinito"
 
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Il messaggio contiene solo richieste di tipo non supportato."
+#~ msgid "First day of wee_k:"
+#~ msgstr "Primo giorno della _settimana:"
 
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "L'allegato non contiene un messaggio di calendario valido"
+#~ msgid "_Other"
+#~ msgstr "_Altro"
 
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "L'allegato non ha nessun elemento di calendario visibile"
+#~ msgid "_Delete this Task"
+#~ msgstr "_Elimina Questa Attivit�"
 
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr ""
 #~ "Impossibile trovare una delle tue identit� nella lista dei partecipanti!\n"
 
-#~ msgid "Event information"
-#~ msgstr "Informazioni sul calendario"
-
-#~ msgid "Task information"
-#~ msgstr "Informazioni sull'attivit�"
-
-#~ msgid "Journal information"
-#~ msgstr "Informazioni di Diario"
-
-#~ msgid "Free/Busy information"
-#~ msgstr "Informazioni sulla disponibilit�"
-
-#~ msgid "Calendar information"
-#~ msgstr "Informazioni di calendario"
-
 #~ msgid "Free/Busy information (%s to %s)"
 #~ msgstr "Informazioni sulla disponibilit� (da %s a %s)"
 
 #~ msgid "iCalendar information"
 #~ msgstr "Informazioni iCalendar"
 
-#~ msgid "Task"
-#~ msgstr "Attivit�"
-
-#~ msgid "Status: %s"
-#~ msgstr "Stato: %s"
-
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Percentuale Completata: %i"
-
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
-
-#~ msgid "Categories: %s"
-#~ msgstr "Categorie: %s"
-
-#~ msgid "Contacts: "
-#~ msgstr "Contatti: "
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Tipo non valido in body-contains, ci si aspettava una stringa"
 
@@ -26932,9 +27759,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Could not encrypt: encoding failed."
 #~ msgstr "Impossibile cifrare: codifica non riuscita."
 
-#~ msgid "Failed to decrypt: Unknown"
-#~ msgstr "Impossibile decifrare: motivo sconosciuto"
-
 #~ msgid "Please enter the NNTP password for %s@%s"
 #~ msgstr "Inserire la passwoed NNTP di %s@%s"
 
@@ -26983,8 +27807,8 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ "\n"
 #~ "Just leave it blank for the default"
 #~ msgstr ""
-#~ "� possibile selezionare una pagina HTML diversa per lo sfondo del Sommario "
-#~ "Esecutivo.\n"
+#~ "� possibile selezionare una pagina HTML diversa per lo sfondo del "
+#~ "Sommario Esecutivo.\n"
 #~ "\n"
 #~ "Lasciare in bianco per quella predefinita"
 
@@ -27084,36 +27908,15 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Filter on Mailing List"
 #~ msgstr "Filtra sulla Mailng List"
 
-#~ msgid "Default"
-#~ msgstr "Predefinito"
-
 #~ msgid "Indexing:"
 #~ msgstr "Indicizza:"
 
 #~ msgid "Mailbox Format"
 #~ msgstr "Formato della Mailbox"
 
-#~ msgid " (default)"
-#~ msgstr " (predefinito)"
-
-#~ msgid "Mail Settings"
-#~ msgstr "Impostazioni Posta"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Oggetto � %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Mail da %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "%s mailing list"
-
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Posta in Arrivo"
 
-#~ msgid "Account"
-#~ msgstr "Account"
-
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr "_Cifra sempre con la mia chiave quando invio posta cifrata"
 
@@ -27126,24 +27929,15 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Display"
 #~ msgstr "Visualizzazione"
 
-#~ msgid "Drafts"
-#~ msgstr "Bozze"
-
 #~ msgid "Edit..."
 #~ msgstr "Modifica..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "File con la firma HTML:"
-
 #~ msgid "News"
 #~ msgstr "News"
 
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Scegliere un Filtro per il file di Log..."
 
-#~ msgid "Sent"
-#~ msgstr "Inviata"
-
 #~ msgid "Sources"
 #~ msgstr "Sorgenti"
 
@@ -27165,24 +27959,9 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "seconds."
 #~ msgstr "secondi."
 
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "Questo messaggio ha una firma digitale.  Fare click sull'icona per avere "
-#~ "ulteriori informazioni."
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Evolution non riconosce questo tipo di firma digitale."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Questo messaggio ha una firma digitale riscontrata come autentica."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Questo messaggio ha una firma digitale di cui non � possibile provare "
-#~ "l'autenticit�."
-
 #~ msgid "Incomplete message written on pipe!"
 #~ msgstr "Messaggio incompleto scritto su una redirezione!"
 
@@ -27192,52 +27971,15 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Cannot initialize Evolution's Summary component."
 #~ msgstr "Impossibile inizializzare il componente Sommario di Evolution."
 
-#~ msgid " F"
-#~ msgstr " F"
-
-#~ msgid " C"
-#~ msgstr " C"
-
-#~ msgid "knots"
-#~ msgstr "nodi"
-
-#~ msgid "kph"
-#~ msgstr "kph"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "miglia"
-
-#~ msgid "kilometers"
-#~ msgstr "kilometri"
-
 #~ msgid "Factory for the Evolution notes component."
 #~ msgstr "Fabbrica per il componente delle note di Evolution."
 
 #~ msgid "Factory for the Notes control"
 #~ msgstr "Fabbrica per il controllo delle Note"
 
-#~ msgid "Outbox"
-#~ msgstr "Posta in Uscita"
-
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impossibile trasferire la cartella:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(Senza nome)"
 
diff --git a/po/ja.po b/po/ja.po
index 008a52a054..f6fd74c380 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20010612\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-02-12 20:57+0900\n"
 "Last-Translator: Takuo KITAME <kitame@debian.org>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -38,7 +38,7 @@ msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
 msgid "File As"
 msgstr "��̾"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "̾��"
@@ -49,7 +49,7 @@ msgid "Email"
 msgstr "�᡼��"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "�ץ饤�ޥ�"
 
@@ -59,7 +59,7 @@ msgstr "�ץ饤�ޥ�"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "�����������"
@@ -67,8 +67,8 @@ msgstr "�����������"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "�Ż�"
 
@@ -78,12 +78,12 @@ msgid "Bus"
 msgstr "�Ż�"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "�Ƥ��ᤷ"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "���"
 
@@ -94,8 +94,8 @@ msgstr "���"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "��"
 
@@ -110,18 +110,18 @@ msgstr "���"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "�����"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "��"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "�Ż��� FAX"
@@ -131,13 +131,13 @@ msgid "Bus Fax"
 msgstr "�Ż��� FAX"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "�Ȥ� FAX"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "�Ż� 2"
 
@@ -146,43 +146,43 @@ msgid "Bus 2"
 msgstr "�Ż� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "�� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "����¾"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "����¾�� FAX"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "�ݥ��٥�"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "�饸��"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "�ƥ�å���"
@@ -194,14 +194,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "�᡼��2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "�᡼��3"
@@ -339,7 +339,7 @@ msgstr "%s �� VCard"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -347,7 +347,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Bonobo �ν����������ޤ���Ǥ���"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "������..."
 
@@ -360,32 +360,32 @@ msgstr "�ɤ߹�����..."
 msgid "Error in search expression."
 msgstr "����������ɽ���ǥ��顼"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "LDAP �����Фإ����ɤ��ɲ���..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "LDAP �����Ф��饫���ɤ�����..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP �����Ф��饫���ɤ��ѹ���..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "������Ƽ¹���"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "LDAP �����η�̤������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "�����ɤκ����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "URL `%s' ����Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
@@ -434,104 +434,140 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "���ɥ쥹Ģ��ɽ������ Bonobo ����ȥ�����Υ���ץ�Ǥ�"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "���ɥ쥹Ģ�Υ�����"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɤ�ɽ�����륳��ȥ�����"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution ���ɥ쥹Ģ�ߥ˥����ɥӥ塼��"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Ϣ����򰷤������ Evolution ����ݡ��ͥ��"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "���ɥ쥹Ģ�ߥ˥����ɥ���ȥ�����Τ���Υե����ȥ�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "���ɥ쥹Ģ�Υ��ɥ쥹ɽ���Τ���Υե����ȥ�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "���ɥ쥹Ģ�Υ��ɥ쥹��ݥåץ��åפ��뤿��Υե����ȥ�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "����ץ륢�ɥ쥹Ģ����ȥ�����Τ���Υե����ȥ�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Ϣ����"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Ϣ�������Τ���ե����"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP ������"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "Ϣ�������Τ���LDAP������"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "����Ϣ����ꥹ��"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "Ϣ����ꥹ��(_C)"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "����Ϣ����"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "Ϣ����(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "����Ϣ����ꥹ��"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "LDAP �����Ф�ǧ�ڽ���ޤ���"
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "Ϣ����ꥹ��(_C)"
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"IMAP �����Ф�ǧ�ڽ���ޤ���\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"�ե��륿����Υ�������˥��顼:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs �ν����������ޤ���Ǥ���"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "¾��Ϣ����"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "���ɥ쥹Ģ�򳫤����Ȥ�����ޤ���"
@@ -566,50 +602,59 @@ msgstr ""
 "���Υ��ɥ쥹Ģ�򳫤����Ȥ�����ޤ���Ǥ���. �ѥ���¸�ߤ�, ����������\n"
 "����äƤ��뤫�ɤ��������å����Ƥ�������"
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (user %s) �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "�����Τ�Τǽ����"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "�᡼��2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "���ƥ����"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "�ե�����ɤ����Τ�Τ�ޤ�"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "�ܺ�..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "���٤ƤΥ��ƥ���"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "�ե�����֥饦����ɽ������ URI"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(�ʤ�)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "���פʥ᡼��"
 
@@ -655,106 +700,59 @@ msgstr "�������̵��"
 msgid "Enable Queries (Dangerous!)"
 msgstr "�������ͭ�� (�����Ǥ�!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "LDAP �����Ф�ǧ�ڽ���ޤ���"
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"IMAP �����Ф�ǧ�ڽ���ޤ���\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"̵�����ԲIJ�ʥȥ졼������:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "���"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "���ѤǤ��륿���פ�����å�(_C)"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "���ץ����"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "��� (_R)"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "��� (_R)"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "���ץ����"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -763,8 +761,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "���ɥ쥹Ģ�Υ�����"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "���顼��"
@@ -857,8 +855,8 @@ msgstr "����"
 msgid "Mappings"
 msgstr "�ޡ�����"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "��"
@@ -1039,14 +1037,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1067,8 +1065,8 @@ msgstr "����̾���ϥ�������Ȥ�ɽ���Ƥ��ޤ���ɽ�����뤿������Τ�ΤǤ���"
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1100,7 +1098,7 @@ msgid "Using email address"
 msgstr "�����͹��ʪ�ν���Ǥ�"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1108,7 +1106,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "�ɲ�(_A)"
 
@@ -1155,7 +1153,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1272,10 +1270,12 @@ msgstr "Evolution �Υ��ɥ쥹Ģ��̾�����򥤥󥿡��ե�����"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "���ɥ쥹Ģ��̾�����򥤥󥿡��ե������Τ���Υե����ȥ�"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "���"
 
@@ -1320,10 +1320,10 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 "Evolution �� �������륹�ȥ졼���Υ��ɥ쥹Ģ������Ǥ��ޤ��� ����Ϥ����餯 "
-"evolution-addressbook ����ݡ��ͥ�Ȥ�����å��夷�����Ȥˤ��ޤ��� "
-"��ꡢ������������򤷤����褹�뤿��ˡ�Jon Trowbridge <trow@ximian.com> "
-"�ޤǡ����Υ��顼�ξ����ˤĤ��Ƥξܺ٤�������᡼������äƤ������������������"
-"�ꤤ���ޤ���"
+"evolution-addressbook ����ݡ��ͥ�Ȥ�����å��夷�����Ȥˤ��ޤ��� ��ꡢ��"
+"����������򤷤����褹�뤿��ˡ�Jon Trowbridge <trow@ximian.com> �ޤǡ�����"
+"���顼�ξ����ˤĤ��Ƥξܺ٤�������᡼������äƤ�������������������ꤤ����"
+"����"
 
 #: addressbook/gui/component/select-names/e-select-names.c:724
 msgid ""
@@ -1406,7 +1406,7 @@ msgstr "���ϼ�"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Ϣ���襨�ǥ���"
 
@@ -1416,7 +1416,7 @@ msgid "D_epartment:"
 msgstr "����(_D):"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "�ܺ�"
 
@@ -1479,11 +1479,12 @@ msgstr "HTML �᡼����������(_H)"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "���(_D)"
 
@@ -1512,7 +1513,7 @@ msgid "_Web page address:"
 msgstr "�����֥ڡ�����URL(_W):"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "����ꥫ�罰��"
 
@@ -2017,12 +2018,11 @@ msgid "Laos"
 msgstr "�饪��"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "��ȥӥ�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
@@ -2031,7 +2031,7 @@ msgid "Lesotho"
 msgstr "�쥽��"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "��٥ꥢ"
 
@@ -2040,12 +2040,12 @@ msgid "Liechtenstein"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr ""
 
@@ -2078,7 +2078,7 @@ msgid "Mali"
 msgstr "�ޥ�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "�ޥ륿"
 
@@ -2103,7 +2103,7 @@ msgid "Mayotte"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "�ᥭ����"
 
@@ -2128,7 +2128,7 @@ msgid "Montserrat"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "����å�"
 
@@ -2153,7 +2153,7 @@ msgid "Nepal"
 msgstr "�ͥѡ���"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "������"
 
@@ -2166,12 +2166,12 @@ msgid "New Caledonia"
 msgstr "�˥塼����ɥ˥�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "�˥塼��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr ""
 
@@ -2188,7 +2188,7 @@ msgid "Niue"
 msgstr "�˥���"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr ""
 
@@ -2197,17 +2197,17 @@ msgid "Northern Mariana Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "�Υ륦����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "���ޡ���"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "�ѥ�������"
 
@@ -2221,7 +2221,7 @@ msgid "Palestinian Territory"
 msgstr "���Υ���ɳ���"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "�ѥʥ�"
 
@@ -2230,12 +2230,12 @@ msgid "Papua New Guinea"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "�ڥ롼"
 
@@ -2248,22 +2248,22 @@ msgid "Pitcairn"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "�ݡ�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "�ݥ�ȥ���"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "��������"
 
@@ -2272,7 +2272,7 @@ msgid "Reunion"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "�롼�ޥ˥�"
 
@@ -2309,7 +2309,7 @@ msgid "Sao Tome And Principe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "����������ӥ�"
 
@@ -2326,17 +2326,17 @@ msgid "Sierra Leone"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr ""
 
@@ -2349,7 +2349,7 @@ msgid "Somalia"
 msgstr "���ޥꥢ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "��եꥫ"
 
@@ -2358,7 +2358,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "���ڥ���"
 
@@ -2379,7 +2379,7 @@ msgid "Sudan"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "����ʥ�"
 
@@ -2392,17 +2392,17 @@ msgid "Swaziland"
 msgstr "���兩����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "���������ǥ�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr " ����"
 
@@ -2439,7 +2439,7 @@ msgid "Tunisia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "�ȥ륳"
 
@@ -2460,7 +2460,7 @@ msgid "Uganda"
 msgstr "�������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr ""
 
@@ -2469,7 +2469,7 @@ msgid "United Arab Emirates"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr ""
 
@@ -2478,7 +2478,7 @@ msgid "United States Minor Outlying Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr " ���륰����"
 
@@ -2491,12 +2491,12 @@ msgid "Vanuatu"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "�٥ͥ�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "�٥ȥʥ�"
 
@@ -2519,12 +2519,12 @@ msgid "Western Sahara"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "�������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "�桼������ӥ�"
 
@@ -2537,28 +2537,36 @@ msgid "Zimbabwe"
 msgstr "����Х֥�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"�����ˤ���Ϣ�����\n"
+"������Ƥ��������Ǥ���?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Ϣ����������ޤ���?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 #, fuzzy
 msgid "Category editor not available."
 msgstr "�����Ϥ���ޤ���"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "����Ϣ����Ϥ����Υ��ƥ���˽�°���Ƥ��ޤ�:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "VCard ����¸"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�ե������`%s'�Υ��������åȤ����Ĥ���ޤ���Ǥ���"
@@ -2585,12 +2593,12 @@ msgstr "�᡼��"
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 #, fuzzy
 msgid "list"
 msgstr "̸"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2726,11 +2734,11 @@ msgid "contact-list-editor"
 msgstr "Ϣ����ꥹ�ȥ��ǥ���"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Ϣ����ꥹ�ȥ��ǥ���"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "VCard ����¸"
@@ -2809,21 +2817,21 @@ msgid "Error getting book view"
 msgstr "%s �γ�����˥��顼��ȯ�����ޤ���"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "�����ɤ�����˥��顼��ȯ�����ޤ���"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "����"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "�����ʥ��顼"
 
@@ -2832,7 +2840,7 @@ msgid "Repository offline"
 msgstr "��ݥ��ȥꥪ�ե饤��"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "���Ĥ�����ޤ���"
 
@@ -2850,55 +2858,70 @@ msgstr "�ץ��ȥ���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "����󥻥뤷�ޤ���"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "ǧ�ڤ˼��Ԥ��ޤ���"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "ǧ�ڤ�ɬ�פȤ��Ƥ��ޤ�"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "����¾�Υ��顼"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "�ѹ�����¸�������Ǥ���?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "�ꥹ�Ȥ��ɲäǥ��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "�����ɤ��ɲäǥ��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "�ꥹ�Ȥν�����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "�ꥹ�Ȥκ����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "�����ɤκ����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "ɽ��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "ɽ��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2906,22 +2929,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "�����ɤʤ�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "�����ɤʤ�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "�����ɤʤ�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "�����ɤʤ�"
@@ -2986,102 +3009,108 @@ msgstr "����¾������"
 msgid "Other Address"
 msgstr "����¾�ν���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "���ɥ쥹Ģ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "VCard ����¸"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "����Ϣ����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "����Ϣ����ꥹ��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "�ե�����ذ�ư(_G)..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "����ݡ���..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "Ϣ����θ���(_S)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "���ɥ쥹Ģ�Υ�����(_A)..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Pilot ������(_M)..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Ϣ�����ž��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Ϣ����إ�å�����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "ɽ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "�ե�����إ��ԡ�(_C)..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "�ե�����ذ�ư(_M)..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "�ڼ��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "���ԡ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Ž���դ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3091,7 +3120,7 @@ msgstr "���ߤ�ɽ��(_C)"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3099,7 +3128,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3251,7 +3280,7 @@ msgstr "�ޡ�����"
 msgid "Number of columns:"
 msgstr "���:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "���ץ����"
 
@@ -3261,7 +3290,7 @@ msgid "Orientation"
 msgstr "����"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "�ڡ���"
 
@@ -3335,30 +3364,34 @@ msgstr "��:"
 msgid "_Font..."
 msgstr "�ե����(_F)..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "���ݥ���Ȥ��Խ�(_E)"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "�⤤"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "����"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "�㤤"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "̤���"
 
@@ -3404,43 +3437,35 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution �������¹ԥ��ޥꥳ��ݡ��ͥ��"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution ������ iTip/iMip �ӥ塼��"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "�������򰷤������ Evolution ����ݡ��ͥ��"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "���������ޥ꡼����ݡ��ͥ�ȤΤ���Υե����ȥ�"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "������ iTip �ӥ塼����ȥ�����Τ���Υե����ȥ�"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "����ץ륫��������ȥ�����Υե����ȥ�"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Evolution ����ݡ��ͥ�ȥ��ǥ�����������뤿��Υե����ȥ�"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3452,11 +3477,26 @@ msgstr "���顼�����Υ����ӥ�"
 msgid "Factory for the alarm notification service"
 msgstr "���顼�����Υ����ӥ��Τ���Υե����ȥ�"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "����"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "�������ǥ���"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 #, fuzzy
 msgid "invalid time"
 msgstr "�����(_E):"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, fuzzy, c-format
 msgid "Alarm on %s"
@@ -3496,7 +3536,7 @@ msgstr ""
 "�ˤ�ɽ�����ޤ���"
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�ٹ�"
@@ -3523,16 +3563,16 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "���٤ȼ��䤷�ʤ�"
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "GNOME �ν����������ޤ���Ǥ���"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 #, fuzzy
 msgid "Could not create the alarm notify service"
 msgstr "���顼�����Υ����ӥ��ե����ȥ���������ޤ���Ǥ���"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "���顼�����Υ����ӥ��ե����ȥ���������ޤ���Ǥ���"
 
@@ -3548,7 +3588,7 @@ msgstr "�������ޤ�"
 msgid "Comment contains"
 msgstr "�����Ȥ����Τ�Τ�ޤ�"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "�԰���"
 
@@ -3588,14 +3628,16 @@ msgstr ""
 "�������ӥ塼���������ޤ���Ǥ���. ORBit��OAF�����������å����Ƥ�������"
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "��Ū"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "��̩"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "����"
 
@@ -3616,27 +3658,32 @@ msgid "W"
 msgstr "��"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "�ӥ���"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "���Ϥ��Ƥ��ʤ�"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "������"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "��λ���ޤ���"
 
@@ -3651,11 +3698,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3670,12 +3718,14 @@ msgstr "�����֤�"
 msgid "Assigned"
 msgstr "�����ƺѤ�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "�Ϥ�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "������"
 
@@ -3695,62 +3745,64 @@ msgstr "��"
 msgid "Month View"
 msgstr "��"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "������"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "�ե�����ϥ��ݥ���Ȥȥ��٥�Ȥ�ޤ�Ǥޤ�"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "������"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "�ե������ ToDo ���ܤ�ޤ�"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "�˥塼���ۿ�����"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "���"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "����������"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "������(_T)"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "�������ݥ����"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "�������ݥ����(_A)"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "�������ݥ����"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "���ݥ����"
@@ -3813,9 +3865,8 @@ msgid ""
 "This is an email reminder, but Evolution does not yet support this kind of "
 "reminders.  You will not be able to edit the options for this reminder."
 msgstr ""
-"����� e�᡼�� ��ޥ�����Ǥ�����Evolution "
-"�Ϥޤ����μ�����󶡤��Ƥ��ޤ��󡣤��Υ�ޥ�������Ф��ƤΥ��ץ������Խ�����"
-"���Ȥ��Ǥ��ޤ���"
+"����� e�᡼�� ��ޥ�����Ǥ�����Evolution �Ϥޤ����μ�����󶡤��Ƥ��ޤ���"
+"���Υ�ޥ�������Ф��ƤΥ��ץ������Խ����뤳�Ȥ��Ǥ��ޤ���"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
@@ -3961,7 +4012,7 @@ msgstr "��¥��"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "���ޥ�:"
 
@@ -3990,7 +4041,7 @@ msgstr "���ݥ���Ȥν�λ"
 msgid "hour(s)"
 msgstr "��"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "ʬ"
 
@@ -4018,79 +4069,81 @@ msgstr "30 ʬ"
 msgid "60 minutes"
 msgstr "60 ʬ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "���顼��"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "�������ȥ�����������..."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "�����ڤ�ο�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "���������¤ο�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "ʬ��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "��(_N)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "���եʥӥ������ǽ��ֹ��ɽ��(_N)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "�����λϤޤ�(_R):"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "��(_N)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "���������¤Υ�����(_K):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "��(_H)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "��(_U)"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4119,82 +4172,97 @@ msgid "Tuesday"
 msgstr "������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "ʿ��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ���� (����/���)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "�����ƥ�κ�����˳�ǧ��Ȥ�(_A)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "���ɽ���ǽ�����ɽ�����ʤ�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "ɽ��������(_D)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "ɽ��(_D)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "��������(_E):"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "��(_F)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "����(_G)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "��λ�Ѥߥ������򱣤�(_H)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "��(_M)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "���¤�᤮�������ƥ�(_O)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "��(_S)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "���ݥ���Ȥν�λ���֤򽵴֤ȷ�֤�ɽ��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "��ʬ��(_V):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "��(_U)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "��(_W)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
-msgstr "���ݥ���Ȥγ�����"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
+msgstr "���ݥ���Ȥν�λ��"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
@@ -4276,41 +4344,61 @@ msgstr " (���� "
 msgid "Due "
 msgstr "���� "
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
 #, fuzzy
-msgid "Could not update object!"
+msgid "Could not update object"
 msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "���ݥ���Ȥ��Խ�"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "���ݥ���� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "�������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "���ޥ�Ϥ���ޤ���"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "��̾����¸..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4368,27 +4456,27 @@ msgstr "��Ǥ��:"
 msgid "Enter Delegate"
 msgstr "��Ǥ�������"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "���ݥ����"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "��¥��"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "�����֤�"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "�������塼��"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "���"
 
@@ -4438,7 +4526,7 @@ msgid "Pu_blic"
 msgstr "��Ū(_B)"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "���֤���ꤷ��ɽ��"
 
@@ -4460,20 +4548,20 @@ msgstr "�����(_E):"
 msgid "_Start time:"
 msgstr "���ϻ���(_S):"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 #, fuzzy
 msgid "An organizer is required."
 msgstr "��żԤ�ɬ�ܤǤ�"
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "��Ǥ��(_D)..."
 
@@ -4484,49 +4572,55 @@ msgstr "���ʼ�"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "����Ū��̾��"
+msgid "Click here to add an attendee"
+msgstr "���ʼԤ��ɲä���ˤϤ����򥯥�å�"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "��Ǥ��"
+msgid "Common Name"
+msgstr "����Ū��̾��"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "��Ǥ��"
+msgid "Delegated From"
+msgstr "��Ǥ��"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "����"
+msgid "Delegated To"
+msgstr "��Ǥ��"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "����"
+msgid "Language"
+msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "���"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "���ơ�����"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "����"
@@ -4541,14 +4635,10 @@ msgid "_Change Organizer"
 msgstr "��żԤ��ѹ�(_C)"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "¾�ξ���(_I)..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "¾�μ�ż�(_O)"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4736,7 +4826,7 @@ msgid "Progress"
 msgstr "������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4748,19 +4838,19 @@ msgstr "ͥ����(_P):"
 msgid "_Status:"
 msgstr "���ơ�����(_S):"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "����"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "����:"
 
@@ -4772,24 +4862,79 @@ msgstr "������(_R):"
 msgid "_Due Date:"
 msgstr "����(_D):"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, fuzzy, c-format
+msgid "100%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "���򤷤�Ϣ����������ޤ�"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "����(_O)"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "��̾����¸..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4797,20 +4942,20 @@ msgstr "��̾����¸..."
 msgid "_Print..."
 msgstr "����(_P)..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "�ڼ��(_U)"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "���ԡ�(_C)"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4818,35 +4963,36 @@ msgstr "���ԡ�(_C)"
 msgid "_Paste"
 msgstr "Ž���դ�(_P)"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "�����������"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "iCalender�Ȥ���ž��(_C)"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "��λ�Ȥ��ƥޡ���(_M)"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "��������λ�Ȥ��ƥޡ���(_M)"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "���򤷤�����������(_D)"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "���������ɲä���ˤϤ����򥯥�å�"
 
@@ -4854,47 +5000,48 @@ msgstr "���������ɲä���ˤϤ����򥯥�å�"
 msgid "Alarms"
 msgstr "���顼��"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "��λ���ޤ���"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "���"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "����"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "���"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "���ٷ���"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "ͥ����"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "������"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "���ޥ�"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "�������򥽡���"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4942,11 +5089,13 @@ msgstr "%b/%d"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "����"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "���"
 
@@ -4986,7 +5135,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "����/¿˻ ����θ���(_P)"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "����"
@@ -4997,7 +5146,7 @@ msgid "_Configure Pilot..."
 msgstr "����"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "��̾����¸(_S)..."
 
@@ -5024,73 +5173,407 @@ msgid "Delete _All Occurrences"
 msgstr "���٤Ƥν��������(_A)"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "%s ��¹���˥��顼"
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+#, fuzzy
+msgid "Meeting begins: <b>"
+msgstr "��Ľ�λ����(_E):"
+
+#: calendar/gui/e-itip-control.c:683
+#, fuzzy
+msgid "Task begins: <b>"
+msgstr "����: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "����/¿˻ ���󳫻�: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "����: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "��Ľ�λ����(_E):"
+
+#: calendar/gui/e-itip-control.c:707
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "����/¿˻ ���󳫻�: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+#, fuzzy
+msgid "Ends: <b>"
+msgstr "����: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (��� "
+
+#: calendar/gui/e-itip-control.c:735
+#, fuzzy
+msgid "Task Due: <b>"
+msgstr " (��� "
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "����������(_C):"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "������"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "An unknown person"
+msgstr "������������"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>�ʤ�</i>"
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "���ơ�����(_S):"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "��������"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "����"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "���ष��"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "̤��"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#, fuzzy
+msgid "Choose an action:"
+msgstr "��������������"
+
+#: calendar/gui/e-itip-control.c:972
+#, fuzzy
+msgid "Update"
+msgstr "�������򹹿�"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:1000
+#, fuzzy
+msgid "Accept"
+msgstr "��������"
+
+#: calendar/gui/e-itip-control.c:1001
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "����"
+
+#: calendar/gui/e-itip-control.c:1002
+#, fuzzy
+msgid "Decline"
+msgstr "���ष��"
+
+#: calendar/gui/e-itip-control.c:1026
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "����/¿˻ ����"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "����󥻥�"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "��ľ���"
+
+#: calendar/gui/e-itip-control.c:1122
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "��Ĥ����"
+
+#: calendar/gui/e-itip-control.c:1127
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "�����"
+
+#: calendar/gui/e-itip-control.c:1132
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "��Ĥι����׵�"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "��Ĥ˴ؤ�������"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> �ϲ�Ĥ򥭥�󥻥뤷�ޤ���"
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "��Ĥ򥭥�󥻥�"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, fuzzy, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> �ϲ�Ĥ򥭥�󥻥뤷�ޤ���"
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "�����ʲ�ĥ�å�����"
+
+#: calendar/gui/e-itip-control.c:1189
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.c:1194
+#, fuzzy, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "�����������"
+
+#: calendar/gui/e-itip-control.c:1199
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "�������򹹿�"
+
+#: calendar/gui/e-itip-control.c:1204
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "�ǿ��Υ�������������"
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "�������ι����׵�"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> �ϥ������γ�����Ƥ��������ޤ���"
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "�������˴ؤ�������"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> �ϥ������򥭥�󥻥뤷�ޤ���"
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "�������򥭥�󥻥�"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "�����ʥ�������å�����"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> �϶���/¿˻ �����������ޤ���"
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "����/¿˻ ����"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "����/¿˻ ���׵�"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ����˴ؤ����������ޤ���"
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "����/¿˻ ���ֿ�"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "������ ����/¿˻ ��å�����"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "�ե�����Dz�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "���Υ�å�������̤�б����׵��ޤ�Ǥ��ޤ�"
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#, fuzzy
+msgid "There was an error on the CORBA system\n"
+msgstr "�������ե�������ɤ߹�����˥��顼��ȯ�����ޤ���"
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Bug buddy �ϼ¹ԤǤ��ޤ���Ǥ���"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "������λ\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
-#, fuzzy
-msgid "Attendee status could not be updated!\n"
-msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:1674
+#, fuzzy
+msgid "Attendee status could not be updated!\n"
+msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "�����λ"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "�����ƥ������!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "�ե����������"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "�ե����������"
@@ -5132,93 +5615,92 @@ msgstr "���"
 msgid "date-start"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "��Ĺ"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "ɬ�׻��ü�"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Ǥ�ջ��ü�"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "�Ի��ü�"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "�Ŀ�"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "���롼��"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "�꥽����"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "����"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "��Ĺ"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "���üԤ�ɬ��"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Ǥ�ջ��ü�"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "�Ի��ü�"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "ư�ɬ��"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "��������"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "���ष��"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "����"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "��Ǥ����"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "������"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%Yǯ %m�� %d�� %A"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
@@ -5230,63 +5712,63 @@ msgstr "%Y/%m/%d (%a)"
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "���ե����γ�"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "����ʤ�"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "���ץ����(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "�Ż���λ��֤���ɽ��(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "�̾�����ɽ��(_Z)"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "�ե꡼/�ӥ��� �ι���(_U)"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "<<(_<)"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "��ư�ԥå����å�(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">>(_>)"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "���٤Ƥο͡��ȥ꥽����(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "���٤Ƥο͡��ȤҤȤĤΥ꥽����(_P)"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "�͡���ɬ��(_R)"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "�͡��ȤҤȤĤΥ꥽������ɬ��(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "��ij��ϻ���(_S):"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "��Ľ�λ����(_E):"
 
@@ -5305,17 +5787,22 @@ msgstr "'%s' �Υ��������ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' ���ɤ߹��ळ�Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "���"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "���򤷤�Ϣ����������ޤ�"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "�ե����������"
@@ -5328,17 +5815,17 @@ msgstr "�������ݥ����(_A)..."
 msgid "_Delete this Appointment"
 msgstr "���Υ��ݥ���Ȥ���(_D)"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' �򳫤����Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "�ե���� %s �򥪡��ץ���"
@@ -5399,19 +5886,58 @@ msgstr "10 ��"
 msgid "September"
 msgstr "9 ��"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "��żԤ�ɬ�ܤǤ�"
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "����������"
+
+#: calendar/gui/itip-utils.c:356
+#, fuzzy
+msgid "Task information"
+msgstr "����������"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "���ץ����"
+
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "����/¿˻ ����"
+
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "����������"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "�������򹹿�"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "�ꥹ�Ȥ򹹿�"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "���ǥ����ե����ȥꥳ��ݡ��ͥ�Ȥ��������ޤ���Ǥ���"
 
@@ -5600,12 +6126,49 @@ msgstr "���򤷤��� (%Y/%b)"
 msgid "Selected year (%Y)"
 msgstr "���򤷤�ǯ (%Y)"
 
+#: calendar/gui/print.c:2249
+#, fuzzy
+msgid "Task"
+msgstr "������(_T)"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "���ơ�����(_S):"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "ͥ����(_P):"
+
+#: calendar/gui/print.c:2338
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "���:"
+
+#: calendar/gui/print.c:2350
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2364
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"��̳ʬ��: "
+
+#: calendar/gui/print.c:2375
+#, fuzzy
+msgid "Contacts: "
+msgstr "Ϣ����(_N):"
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "���������"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5638,13 +6201,13 @@ msgid ""
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"�������Ϻ���˥ޡ�������Ƥ��뤹�٤ƤΥ�å�������õ�ޤ�������³�Ԥ���"
-"�ȡ������Υ�å������򸵤��᤻�ʤ��ʤ�ޤ���\n"
+"�������Ϻ���˥ޡ�������Ƥ��뤹�٤ƤΥ�å�������õ�ޤ�������³�Ԥ�"
+"��ȡ������Υ�å������򸵤��᤻�ʤ��ʤ�ޤ���\n"
 "\n"
 "�����ˤ����Υ�å�������õ�ޤ���?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "���٤ȼ��䤷�ʤ�"
 
@@ -5658,8 +6221,8 @@ msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
-"Evolution �ϥ������ե�����Υ������������, "
-"��ưŪ�˿������������ե�����ذ�ư���ޤ�"
+"Evolution �ϥ������ե�����Υ������������, ��ưŪ�˿������������ե������"
+"��ư���ޤ�"
 
 #: calendar/gui/tasks-migrate.c:108
 msgid ""
@@ -5668,10 +6231,10 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolution �ϥ������ե�����Υ������������, "
-"�������������ե�����ذ�ư���褦�Ȥ��ޤ���\n"
-"������, �����Ĥ��Υ������ϰ�ư���뤳�Ȥ�����ޤ���Ǥ���, "
-"�Ǥ��ΤǤ��Υץ������Ϥ��θ�Ƥӻ���Ǥ��礦"
+"Evolution �ϥ������ե�����Υ������������, �������������ե�����ذ�ư����"
+"���Ȥ��ޤ���\n"
+"������, �����Ĥ��Υ������ϰ�ư���뤳�Ȥ�����ޤ���Ǥ���, �Ǥ��ΤǤ��Υץ���"
+"���Ϥ��θ�Ƥӻ���Ǥ��礦"
 
 #: calendar/gui/tasks-migrate.c:120
 #, c-format
@@ -5679,8 +6242,8 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"`%s' �򳫤����Ȥ�����ޤ���Ǥ���; "
-"�������ե�������饿�����ե�����ذ�ư���륢���ƥब����ޤ���"
+"`%s' �򳫤����Ȥ�����ޤ���Ǥ���; �������ե�������饿�����ե�����ذ�ư��"
+"�륢���ƥब����ޤ���"
 
 #: calendar/gui/tasks-migrate.c:133
 #, c-format
@@ -5688,8 +6251,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 ""
-"`%s' ���ɤ߹����׵��夲���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���; "
-"�������ե�������饿�����ե�����ذ�ư���륢���ƥब����ޤ���"
+"`%s' ���ɤ߹����׵��夲���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���; �������ե������"
+"�饿�����ե�����ذ�ư���륢���ƥब����ޤ���"
 
 #: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
@@ -5710,6 +6273,11 @@ msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "��¥��"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5803,8 +6371,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -6788,659 +7356,674 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "�����������"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "��������"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr ""
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 #, fuzzy
 msgid "Asia/Muscat"
 msgstr "�����������"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr ""
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 #, fuzzy
 msgid "Asia/Omsk"
 msgstr "�����������"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "�����������"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 #, fuzzy
 msgid "Asia/Qatar"
 msgstr "��������"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr ""
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr ""
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr ""
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr ""
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr ""
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr ""
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr ""
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 #, fuzzy
 msgid "Atlantic/Bermuda"
 msgstr "�Хߥ塼��"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr ""
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 #, fuzzy
 msgid "Australia/Adelaide"
 msgstr "�������ȥ�ꥢ"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 #, fuzzy
 msgid "Australia/Brisbane"
 msgstr "�������ȥ�ꥢ"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 #, fuzzy
 msgid "Australia/Broken_Hill"
 msgstr "�������ȥ�ꥢ"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 #, fuzzy
 msgid "Australia/Darwin"
 msgstr "�������ȥ�ꥢ"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 #, fuzzy
 msgid "Australia/Hobart"
 msgstr "�������ȥ�ꥢ"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 #, fuzzy
 msgid "Australia/Lindeman"
 msgstr "�������ȥ�ꥢ"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 #, fuzzy
 msgid "Australia/Lord_Howe"
 msgstr "�������ȥ�ꥢ"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 #, fuzzy
 msgid "Australia/Melbourne"
 msgstr "�������ȥ�ꥢ"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 #, fuzzy
 msgid "Australia/Perth"
 msgstr "�������ȥ�ꥢ"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 #, fuzzy
 msgid "Australia/Sydney"
 msgstr "�������ȥ�ꥢ"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr ""
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 #, fuzzy
 msgid "Europe/Andorra"
 msgstr "����ɥ�"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 #, fuzzy
 msgid "Europe/Athens"
 msgstr "�ץ��ѥƥ�"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr ""
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr ""
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr ""
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr ""
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr ""
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr ""
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr ""
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr ""
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr ""
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr ""
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr ""
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr ""
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr ""
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr ""
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr ""
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr ""
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr ""
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr ""
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr ""
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 #, fuzzy
 msgid "Europe/Monaco"
 msgstr "��ʥ�"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr ""
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr ""
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 #, fuzzy
 msgid "Europe/Paris"
 msgstr "�ץ��ѥƥ�"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr ""
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr ""
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr ""
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr ""
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr ""
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr ""
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr ""
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr ""
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr ""
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr ""
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr ""
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 #, fuzzy
 msgid "Indian/Comoro"
 msgstr "���������"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 #, fuzzy
 msgid "Indian/Mahe"
 msgstr "�����"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr ""
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 #, fuzzy
 msgid "Indian/Mauritius"
 msgstr "�⡼�ꥷ�㥹"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr ""
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr ""
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "������Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "���ꥢ������Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "�٥�ե����Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "��沽�Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "���沽�Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
@@ -7451,12 +8034,12 @@ msgstr ""
 "���ϥե�������������ޤ���: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "����å���ǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7464,7 +8047,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7472,11 +8055,16 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "�ե���� '%s' ����¸��"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "����ư���λ���뤿��˥���饤��Ǻ�Ȥ��ʤ���Фʤ�ޤ���"
 
@@ -7484,57 +8072,68 @@ msgstr "����ư���λ���뤿��˥���饤��Ǻ�Ȥ��ʤ���Фʤ�ޤ���"
 msgid "Syncing folders"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "�ե��륿�ι�ʸ������˥��顼: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "�ե��륿�¹���˥��顼: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "���ס���ե�����򳫤����Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "���ס���ե������������뤳�Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "������ %d ������� (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "��å������򳫤����Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "��å����� %d �Ǽ��Ԥ��ޤ���"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "������ %d / %d �������"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "�ե��륿�����¹���˥��顼: %s: %s"
@@ -7566,25 +8165,102 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr "̤�ΤΥإå��ǥ������¹Ԥ��Ƥ��ޤ�: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "̤�б������: ����ɽ���Ǥθ���: %s ��"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "̤�б������: uid �Ǥθ���: %s ��"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "��å��������ư"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "%s �إ�å������򥳥ԡ���"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "����󥻥뤷�ޤ���"
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "POP�����Ф���ͽ�����ʤ�����������ޤ���: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "���ꤵ�줿�ե�����Ϥ���ޤ���"
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �����Ԥ����ꤵ��Ƥ��ޤ���"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "���Υ�å�����������Ǥ��ޤ���: ��ȥե����������Ǥ��ޤ���Ǥ���: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7681,92 +8357,29 @@ msgstr "�᡼���ȥե�����ν񤭹�����˥��顼: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "�᡼���ȥե�����Υ��ԡ���˥��顼: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "���ʤ��� %s �ѥ��ե졼�� ( %s ��) �����Ϥ��Ƥ�������"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "���ʤ��� %s �ѥ��ե졼�������Ϥ��Ƥ�������"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "���Υ�å������˽�̾����ޤ���: ��̾����ʿʸ�ƥ����Ȥ�����ޤ���"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "���Υ�å������˽�̾����ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"���Υ�å������˽�̾�Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "���Υ�å������˽�̾����ޤ���: ���ꥢ��̾����ʿʸ�ƥ����Ȥ�����ޤ���"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "��å�����������Ǥ��ޤ���: ��������ʿʸ�ƥ����Ȥ�����ޤ���"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"���Υ�å�����������Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "���Υ�å�����������Ǥ��ޤ���: ��ȥե����������Ǥ��ޤ���Ǥ���: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �Ź沽����ʿʸ�ƥ����Ȥ�����ޤ���"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"���Υ�å�������Ź沽�Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: "
-"%s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �����Ԥ����ꤵ��Ƥ��ޤ���"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "���Υ�å�����������Ǥ��ޤ���: ���椹��Ź沽�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "���Υ�å�����������Ǥ��ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
-"���Υ�å�����������Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "����¾�Υ��顼"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
-"%s ���ɤ߹��ळ�Ȥ�����ޤ���Ǥ���: "
-"���Υ����ƥ�Ǥϥ⥸�塼����ɤ߹��ߤ򥵥ݡ��Ȥ��Ƥ��ޤ���"
+"%s ���ɤ߹��ळ�Ȥ�����ޤ���Ǥ���: ���Υ����ƥ�Ǥϥ⥸�塼����ɤ߹��ߤ�"
+"�ݡ��Ȥ��Ƥ��ޤ���"
 
 #: camel/camel-provider.c:140
 #, c-format
@@ -7778,43 +8391,6 @@ msgstr "%s ������ɽ���ޤ���Ǥ���: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ������ɽ���ޤ���Ǥ���: �⥸�塼��Υ����ɤ����������Ƥ��ޤ���"
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s ������ %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s �����ӥ� (�桼��: %s �ۥ��� %s)"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "��³�ϥ���󥻥뤷�ޤ���"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "%s (�ݡ��� %d) ����³����ޤ���Ǥ���: %s"
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(̤�ΤΥۥ���)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "���ϥ���󥻥뤷�ޤ���"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "�����Ф�ͽ�����ʤ����Ǥ򤷤ޤ���: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "ƿ̾"
@@ -7863,8 +8439,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"�⤷�����Ф����ݡ��Ȥ��Ƥ���ʤ�, ���Υ��ץ����ϥ����奢�� CRAM-MD5 "
-"ǧ�ڤ�Ȥäƥ����Ф���³���ޤ�"
+"�⤷�����Ф����ݡ��Ȥ��Ƥ���ʤ�, ���Υ��ץ����ϥ����奢�� CRAM-MD5 ǧ�ڤ�"
+"�Ȥäƥ����Ф���³���ޤ�"
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -7875,8 +8451,8 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"�⤷�����Ф����ݡ��Ȥ��Ƥ���ʤ�, ���Υ��ץ����ϥ����奢�� DIGEST-MD5 "
-"��Ȥäƥ����Ф���³���ޤ�"
+"�⤷�����Ф����ݡ��Ȥ��Ƥ���ʤ�, ���Υ��ץ����ϥ����奢�� DIGEST-MD5 ��"
+"�Ȥäƥ����Ф���³���ޤ�"
 
 #: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
@@ -7920,7 +8496,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���"
 
@@ -7948,11 +8524,9 @@ msgid ""
 "Password Authentication."
 msgstr "���Υ��ץ����� Kerberos 4 ǧ�ڤ�Ȥäƥ����Ф���³���ޤ�"
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "�ѥ����"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7979,52 +8553,52 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "����ɽ�����Խ��˼���: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' �ϥ桼��̾����ݡ��ͥ�Ȥ�ɬ�פǤ�"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' �ϥۥ��ȥ���ݡ��ͥ�Ȥ�ɬ�פǤ�"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' �ϥѥ�����ݡ��ͥ�Ȥ�ɬ�פǤ�"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "�����: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "̾���θ����˼��Ԥ��ޤ���: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: �ۥ��Ȥϸ��Ĥ���ޤ���"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: ̤�Τ���ͳ�Ǥ�"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "�����: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: �ۥ��Ȥϸ��Ĥ���ޤ���"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: ̤�Τ���ͳ�Ǥ�"
@@ -8088,11 +8662,11 @@ msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
 msgid "Failed to verify certificates."
 msgstr "ǧ�ڤξ����˼��Ԥ��ޤ���"
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
 
@@ -8122,7 +8696,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8131,16 +8705,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8160,15 +8734,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' ����Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s �� %s �Τ褦�ʥ�å������Ϥ���ޤ���"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "���٤ƤΥե�����ο���᡼�������å����ޤ�"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8190,68 +8764,77 @@ msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���������Ǥ�"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���Τ褦�ʥե�����Ϥ���ޤ���"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "���Υ���Ȣ�ե���������å������򥳥ԡ����뤳�Ȥ�����ޤ���"
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "���ϥ���󥻥뤷�ޤ���"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "�����Ф�ͽ�����ʤ����Ǥ򤷤ޤ���: %s"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP �����Ф���ͽ�����ʤ�����������ޤ���: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ���ޥ�ɤϼ��Ԥ��ޤ���: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "�����Х쥹�ݥ󥹤Ϥ��ä��ʤ������ޤ���"
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP �����Ф���ͽ�����ʤ� OK ����������ޤ���: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "�ǥ��쥯�ȥ� %s ���������ޤ���Ǥ���: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s �Υ��ޥ꡼������ɽ���ޤ���Ǥ���"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "�ե�������˲�����ƺ�������ޤ���"
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "�ѹ����줿��å�������������"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "���Υ�å������ϸ������ѽ���ޤ���"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "������������������"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH �����˥�å��������Τ��դ��뤳�Ȥ�����ޤ���Ǥ���"
 
@@ -8304,33 +8887,84 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP �����Фǥ᡼����ɤ�������Ѥ��뤿��Τ�ΤǤ�"
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "�ѥ����"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "���Υ��ץ����ϥץ쥤��ƥ����ȥѥ���ɤ�Ȥä� IMAP �����Ф���³���ޤ�"
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP ������ %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s �����ӥ� (�桼��: %s �ۥ��� %s)"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "��³�ϥ���󥻥뤷�ޤ���"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "%s (�ݡ��� %d) ����³����ޤ���Ǥ���: %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"POP �����Ф���³����ޤ���\n"
+"�桼��̾��������˥��顼: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "ǧ�ڤ˼��Ԥ��ޤ���"
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s �� IMAP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "�ѥ���ɤ����Ϥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8341,70 +8975,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "mailbox�򳫤����Ȥ�����ޤ���: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "MH �����Υ᡼��ǥ��쥯�ȥ�"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "MH�饤���ʥ᡼��ǥ��쥯�ȥ�˥�������᡼�����¸"
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "���������ۿ�"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "ɸ�� mbox �����ǥ�������᡼������"
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "INBOX ��ˤ��뿷����å������إե��륿��Ŭ�Ѥ���"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "MH �����Υ᡼��ǥ��쥯�ȥ�"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 #, fuzzy
 msgid "For storing local mail in maildir directories."
 msgstr "qmail maildir �ǥ��쥯�ȥ�˥�������᡼�����¸"
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "ɸ��Ū�� UNIX �� mbox ���ס���"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "ɸ�� mbox �ե�����ˤ˥�������᡼�����¸���ɤ߽Ф�"
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "ɸ��Ū�� UNIX �� mbox ���ס���"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "ɸ�� mbox �ե�����ˤ˥�������᡼�����¸���ɤ߽Ф�"
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "��¸���줿�롼�� %s �����Хѥ��ǤϤ���ޤ���"
@@ -8430,7 +9083,7 @@ msgstr "��������ؤ���¸�� inbox ����Ƥޤ���"
 msgid "Local mail file %s"
 msgstr "��������᡼��ե����� %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�ե������ %s ���� %s ��̾���ѹ����뤳�Ȥ�����ޤ���Ǥ���: %s"
@@ -8451,34 +9104,32 @@ msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 "�ե�������饤��ǥå����ե����� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "���ޥ꡼�򥻡��ֽ���ޤ���Ǥ���: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "���ޥ�إ�å��������ɲä��뤳�Ȥ�����ޤ���: ̤�Τ���ͳ�Ǥ�"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "��å����� %d �Ǽ��Ԥ��ޤ���"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "maildir �����Υե�����إ�å��������ɲý���ޤ���: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8487,20 +9138,19 @@ msgstr ""
 "��å��������������ޤ���: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "��å����������Ƥ�̵���Ǥ�"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8511,13 +9161,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "�ե���� `%s' ��¸�ߤ��ޤ���"
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8533,7 +9183,7 @@ msgstr "`%s' �� maildir �����Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
@@ -8542,8 +9192,8 @@ msgstr "�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
 msgid "not a maildir directory"
 msgstr "maildir �����Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "�ե���� `%s' ����������ޤ���Ǥ���: %s"
@@ -8564,46 +9214,38 @@ msgstr "����᡼��Υ����å�"
 msgid "Checking for new messages"
 msgstr "������������������"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "�ե��������¸��"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s �Υե�������å���������뤳�Ȥ�����ޤ���: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "mailbox�򳫤����Ȥ�����ޤ���: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "���ϥ���󥻥뤷�ޤ���"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "mbox �ե�����˥�å��������ɲý���ޤ���: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8612,13 +9254,11 @@ msgstr ""
 "��å����� %s ��ե���� %s �����������ޤ���\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "�ե�����Dz�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "��å������β��˼��Ԥ��ޤ���: �ְ�ä��᡼��ܥå����Ǥ���?"
 
@@ -8661,175 +9301,156 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "�ե���� `%s' �϶��ǤϤ���ޤ���. ������ޤ���"
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "�ե�����򳫤����Ȥ�����ޤ���: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "�ݥ������ %ld �ն� �ե���� %s ����̿Ū�ʥ᡼�빽ʸ���ϥ��顼�Ǥ�"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "�ե����������å�����ޤ���: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "�ե�����򳫤����Ȥ�����ޤ���: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�ƥ�ݥ�� mailbox �򳫤����Ȥ�����ޤ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Ʊ�����ޤ�����, ���ޥ꡼�ȥե�������԰��פǤ�"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "���Υե���� %s ���Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "��ȥե�������Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "�ե�������͡������ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Ʊ�����ޤ�����, ���ޥ꡼�ȥե�������԰��פǤ�"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "̤�ΤΥ��顼: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "�ե�������͡������ޤ���Ǥ���: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "Ϣ����ˤإ�å�����������"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "mh �ե�����إ�å��������ɲý���ޤ���: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' �ϥǥ��쥯�ȥ�ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH �ǥ��쥯�ȥ�ѥ��򳫤����Ȥ�����ޤ���: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "���ס���ե�����˥�å��������ɲý���ޤ���: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "���ס���ե�����ϥ�͡���Ǥ��ޤ���"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "���ס���`%s' ��¸�ߤ��ʤ����̾�Υե�����ǤϤ���ޤ���"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "��¸���줿�롼�� %s ���̾�Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "�ե���� `%s/%s' ��¸�ߤ��ޤ���"
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "���ס���᡼��ե����� %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "���ס���ե�����ϥ�͡���Ǥ��ޤ���"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "���ס���ե�����ϥ�͡���Ǥ��ޤ���"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "���ס���ե�����Ϻ���Ǥ��ޤ���"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "�ƥ�ݥ��ե������Ʊ������ޤ���Ǥ��� %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "���ס���ե������Ʊ������ޤ���Ǥ��� %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "�ե��������ޤ���Ǥ���: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "���ס���`%s' ��¸�ߤ��ʤ����̾�Υե�����ǤϤ���ޤ���"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "%s �إ᡼��"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET news"
@@ -8838,12 +9459,22 @@ msgstr "USENET news"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "����� USENET �Υ˥塼�����롼�פ����������뤿��Υץ��Х����Ǥ�"
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "�ǥ��쥯�ȥ� %s ���������ޤ���Ǥ���: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s ��ͳ�� USENET News"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8947,7 +9578,7 @@ msgstr "�����Ф˥�å�������Ĥ�"
 msgid "Delete after %s day(s)"
 msgstr "%s ����˺������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8969,36 +9600,26 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"���Υ��ץ����� APOP �ץ��ȥ����ͳ�ǰŹ沽���줿�ѥ���ɤ�Ȥä� POP "
-"�����Ф���³���ޤ�. ����ϸ�ʿ�ʥ��ݡ��Ȥ��׵᤹�륵���Ф�, "
-"���٤ƤΥ桼���������ư���櫓�ǤϤ���ޤ���."
+"���Υ��ץ����� APOP �ץ��ȥ����ͳ�ǰŹ沽���줿�ѥ���ɤ�Ȥä� POP ����"
+"�Ф���³���ޤ�. ����ϸ�ʿ�ʥ��ݡ��Ȥ��׵᤹�륵���Ф�, ���٤ƤΥ桼��������"
+"��ư���櫓�ǤϤ���ޤ���."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "POP �����Ф���³����ޤ���\n"
 "�桼��̾��������˥��顼: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "ǧ�ڤ˼��Ԥ��ޤ���"
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "%s �� POP �����Ф���³����ޤ���Ǥ���"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -9006,27 +9627,27 @@ msgstr ""
 "POP �����Ф���³����ޤ���\n"
 "�׵ᤷ��ǧ�ڼ��ʤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "IMAP ���ޥ�ɤϼ��Ԥ��ޤ���: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "I/O ���顼"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s %s@%s �� POP3 �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -9035,13 +9656,13 @@ msgstr ""
 "POP �����Ф���³�Ǥ��ޤ���\n"
 "�ѥ���ɤ�������˥��顼: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "���Τ褦�ʥե���� `%s' �Ϥ���ޤ���"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9060,7 +9681,8 @@ msgstr "URL `%s' ����Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 #: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "sendmail �إѥ��פ��������ޤ���Ǥ���: %s: �᡼����������ޤ���Ǥ���"
+msgstr ""
+"sendmail �إѥ��פ��������ޤ���Ǥ���: %s: �᡼����������ޤ���Ǥ���"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
@@ -9203,45 +9825,45 @@ msgstr "���Ū��ǧ�ڤ˼��Ԥ��ޤ���"
 msgid "Authentication required"
 msgstr "ǧ�ڤ�ɬ�פȤ��Ƥ��ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "����������顼: %s: ���֤���̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "POP �����Ф���³����ޤ���\n"
 "�桼��̾��������˥��顼: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "���Υ�å������������������ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH �׵�Υ����ॢ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET �쥹�ݥ󥹥��顼: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s %s@%s �� SMTP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9252,90 +9874,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s ��ͳ�� SMTP �᡼����ۿ����ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "��å���������������ޤ���: �����ԤΥ��ɥ쥹������������ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "��������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "��å���������������ޤ���: �����Ԥ��������Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "��å���������������ޤ���: �����Ԥ��������Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO �쥹�ݥ󥹥��顼: %s: ��̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP ǧ��"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "SASL ǧ�ڥ��֥������Ȥ�������˥��顼��ȯ�����ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH �׵�Υ����ॢ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH �׵�˼��Ԥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
@@ -9343,39 +9965,39 @@ msgstr "DATA �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET �쥹�ݥ󥹥��顼: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA �����Υ����ॢ����: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET �׵�Υ����ॢ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET �쥹�ݥ󥹥��顼: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET �쥹�ݥ󥹥��顼: %s"
@@ -9449,65 +10071,70 @@ msgstr "MIME ������:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "���ɥ쥹Ģ�Τ���ˤ����ǥ���å�"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "���п�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "�ֿ���:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "��̾:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "��å������μ����Ԥ����Ϥ��ޤ�"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "��å������Υ����ܥ󥳥ԡ���������륢�ɥ쥹�����Ϥ��ޤ�"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 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-select-file.c:267
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "�ե������ź�դ��ޤ�"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "PGP ��̾����ƥ����Ȥ��������ޤ���Ǥ���"
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9516,34 +10143,34 @@ msgstr ""
 "�ե�������ɤ߹�����˥��顼: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "�ٹ�!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "�ե������¸�ߤ��ޤ�����񤭤��ޤ���?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "�ե��������¸��˥��顼: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "�ե�����Υ�������˥��顼: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "�ե�����Υ���������˥��顼: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "���ǥ��������å��������������ޤ���Ǥ���"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9552,7 +10179,7 @@ msgstr ""
 "�ե�����������Ǥ��ޤ���: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9561,7 +10188,7 @@ msgstr ""
 "�ե�������ڤ�ͤ�뤳�Ȥ�����ޤ���: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9570,7 +10197,7 @@ msgstr ""
 "��å������μ�ư��¸��˥��顼: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9578,7 +10205,7 @@ msgstr ""
 "Evolution �� ����Υ��å�������¸����Ƥ��ʤ��ե������ȯ�����ޤ�����\n"
 "������ꥫ�Хꤷ�Ƥߤޤ���?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9588,29 +10215,49 @@ msgstr ""
 "\n"
 "�ѹ�����¸���ޤ���?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "�ٹ�: �ѹ����줿��å�����"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "�ե�����򳫤�"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "�ե����������"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "��̾����¸"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (�ǥե����)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "��å�������������ޤ�"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -9619,6 +10266,12 @@ msgstr ""
 "�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
 "��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9679,7 +10332,7 @@ msgstr "��̾�����Τ�Τ�ޤ�"
 msgid "Subject does not contain"
 msgstr "��̾�����Τ�Τ�ޤޤʤ�"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9824,7 +10477,7 @@ msgstr "��"
 msgid "minute"
 msgstr "ʬ"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr " ��"
 
@@ -9899,7 +10552,7 @@ msgstr " ��"
 msgid "ago"
 msgstr "��"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%m�� %d�� %p %l:%M"
 
@@ -9911,6 +10564,21 @@ msgstr "<���դ����򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
 msgid "Filter Rules"
 msgstr "�ե��륿�롼��"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "��������̾:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "���ס���`%s' ��¸�ߤ��ʤ����̾�Υե�����ǤϤ���ޤ���"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "��������������"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9929,7 +10597,7 @@ msgstr ""
 "��äƥ᡼�����������ͭ���ʥե��������ꤷ�Ƥ�������"
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "�ե����������"
 
@@ -9942,7 +10610,11 @@ msgstr ""
 "����ɽ�� '%s' �ǥ��顼�Ǥ�:\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "�ƥ���"
 
@@ -9973,7 +10645,7 @@ msgstr "���٤Ƥδ�ब��ä���"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "�����Ĥ��δ�ब��ä���"
 
 #: filter/filter-rule.c:780
@@ -10052,194 +10724,203 @@ msgid "Beep"
 msgstr "�٥꡼��"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "���"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "�����Τ�Τ�ޤ�"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "�ե�����إ��ԡ�"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "���"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "�����Τ�Τ�ޤޤʤ�"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "�����Τ�Τǽ���ʤ�"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "��¸�ߤ��ʤ�"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "�����Τ�ΤΤ褦�Ǥʤ�"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "�����Τ�ΤǻϤޤ�ʤ�"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "��¸�ߤ��ʤ�"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "���"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "�����Τ�Τǽ����"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "��¸�ߤ���"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "��¸�ߤ���"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "ɽ��"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "�����Τ�ΤȰ��פ���"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "�ե饰"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "�����Τ�Τ���礭��"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "�����Τ�Τ�꾮����"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "�����Τ�ΤǤϤʤ�"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "�ե饰"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+msgid "Label"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "�᡼��󥰥ꥹ��"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "��å������إå�"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "�ե�����ذ�ư"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "���ڤ����:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "�����Ѥ�"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "����ɽ���Ȱ���"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "�ֿ���"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "��Ͽ"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "���ơ���������"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "�����Τ�ΤΤ褦�˸�����"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "���������������"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "����Υإå�"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "�����Τ�Τdz��Ϥ���"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "��̾"
 
@@ -10295,7 +10976,8 @@ msgid "Scanning %s"
 msgstr "%s ��������"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "�᡼��"
 
@@ -10311,10 +10993,6 @@ msgstr ""
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "���ɥ쥹Ģ"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10364,7 +11042,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "����Ȣ"
 
@@ -10500,266 +11180,276 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "�᡼���ޤ�ե����"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "���ۤ���Ȣ"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "���ۤ���Ȣ�ե����"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "���Υե�����ˤϥ�å������Ϥ���ޤ���"
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "�ץ��ѥƥ�..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "���Υե�����Υץ��ѥƥ����ѹ�"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "�᡼��ž���᥽�åɤ����꤬����ޤ���"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "�ٹ�: �ѹ����줿��å�����"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "�����᡼���å�����"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "��å�������᡼��(_M)"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolution �᡼�����ꥳ��ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution �ե�������󥳥�ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "�����Ф���³��..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "������ǥ��ȥ졼������Ͽ����ޤ���"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" �Υץ��ѥƥ�"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "�ץ��ѥƥ�"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "��ȥǥ��쥯�ȥ���������ޤ���Ǥ���: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "����%d��"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ","
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d �����"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d ̤����"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d ������"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "���%d��"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "��å��������鲾�ۥե���������(_V)"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "��̾�β��ۥե����(_S)"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "�����Ԥβ��ۥե����(_N)"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "�����Ԥβ��ۥե����(_R)"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "��̾�Υե��륿(_J)"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "�����ԤΥե��륿(_D)"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "�����ԤΥե��륿(_C)"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿(_M)"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "������å������Ȥ����Խ�..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "����(_P)"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "�����Ԥ��ֿ�(_R)"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "�ꥹ�Ȥ��ֿ�(_L)"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "�������ֿ�(_A)"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "ž��(_F)"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "��λ���ޤ���"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "���ꥢ"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "�����ѤߤȤ��ƥޡ���(_K)"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "̤�ɤȤ��ƥޡ���(_N)"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "���פȤ��ƥޡ���(_I)"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "����פȤ��ƥޡ���(_P)"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "������(_U)"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "�ե�����ذ�ư(_M)..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "�ե�����إ��ԡ�(_C)..."
 
-#: mail/folder-browser.c:1645
-msgid "Label"
-msgstr ""
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "�����Ԥ򥢥ɥ쥹Ģ���ɲ�"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "�ե��륿Ŭ��"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "��å���������롼������(_L)"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿 (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե���� (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "�ǥե����(_F)"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "�ե��������μ���"
 
@@ -10814,7 +11504,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "ɬ�פʾ���Τ��٤Ƥ����Ƥ��ޤ���"
 
@@ -10824,82 +11514,106 @@ msgid "Evolution News Editor"
 msgstr "Evolution �˥塼�����ǥ���"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution ��������ȥ��ǥ���"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "�ۥ���(_H):"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "�桼��̾(_U):"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "�ѥ�(_P):"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "�饸��"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Ʊ��̾���Υ�������Ȥ�2�ĺ����Ǥ��ޤ���"
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "�����ˤ��Υ�������Ȥ������Ƥ��������Ǥ���?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "������ʤ�"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "�����˥�������Ȥ������ޤ���?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "̵��"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "ͭ��"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "������ news ��������Ȥ������Ƥ��������Ǥ���?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "ͭ��"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "���������̾(_A):"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "%s �إ᡼��"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "��̾�� %s �Ǥ�"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "%s ����᡼��"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "%s �᡼��󥰥ꥹ��"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "�ե��륿�롼����ɲ�"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10911,7 +11625,7 @@ msgstr ""
 "ɬ�פ�����ޤ�\n"
 "�����ꤷ�ޤ���?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10919,7 +11633,7 @@ msgstr ""
 "���ʤ��ϥ᡼�������������˥桼�������\n"
 "����򤹤�ɬ�פ�����ޤ�"
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10928,17 +11642,17 @@ msgstr ""
 "����������򤹤�ɬ�פ�����ޤ�"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "�Ȥˤ�����������?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10946,32 +11660,32 @@ msgstr ""
 "���Υ�å������Ϸ�̾������ޤ���\n"
 "�������������ޤ���?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "���Υ�å������� Bcc �������ꤵ��Ƥ��ޤ���"
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "���Υ�å���������������Ŭ�ڤʼ����Ԥ���ꤷ�ʤ���Фʤ�ޤ���"
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "���Υ᡼��������������˥�������Ȥ����ꤷ�ʤ���Фʤ�ޤ���"
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10979,28 +11693,28 @@ msgstr ""
 "���Υ�������Ȥ���ƥե�����򳫤����Ȥ�����ޤ���\n"
 "�ǥե���Ȥ���ƥե������ȤäƤ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "������������"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%Yǯ%m��%d��(%a)��%H��%Mʬ�� %%s ۩��:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "��å��������ư���ޤ�: "
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "��å������򥳥ԡ����ޤ�: "
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������ %d ��å��������Խ����Ƥ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11008,7 +11722,7 @@ msgstr ""
 "�ɥ�եȥե���������¸���줿\n"
 "��å������������Խ����뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11016,51 +11730,51 @@ msgstr ""
 "�����ե�����Υ�å���������\n"
 "���������뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������ %d ��å�������������Ƥ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "���򤵤줿��å������Ϥ���ޤ���"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "�ե�������񤭤��ޤ���?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "��å���������̾����¸..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "��å���������̾����¸..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "����̤�ɥ�å�������ɽ�����ޤ�"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"�������Ϻ���˥ޡ�������Ƥ��뤹�٤ƤΥ�å�������õ�ޤ�������³�Ԥ���"
-"�ȡ������Υ�å������򸵤��᤻�ʤ��ʤ�ޤ���\n"
+"�������Ϻ���˥ޡ�������Ƥ��뤹�٤ƤΥ�å�������õ�ޤ�������³�Ԥ�"
+"��ȡ������Υ�å������򸵤��᤻�ʤ��ʤ�ޤ���\n"
 "\n"
 "�����ˤ����Υ�å�������õ�ޤ���?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11069,32 +11783,68 @@ msgstr ""
 "�ե��륿����Υ�������˥��顼:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "�ե��륿"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "������ %d / %d �������"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "�����������"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "��å������ΰ����˼��Ԥ��ޤ���"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "������ %d ��å��������̥�����ɥ��dz����Ƥ��������Ǥ���?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "����"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "̾���Τʤ�Ϣ����"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "����"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "�����ɲ�"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "��̾����¸"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11111,8 +11861,8 @@ msgid ""
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"�ʲ��˥᡼�륵���ФĤ��Ƥξ�������Ϥ��Ƥ����������⤷�褯ʬ����ʤ���Х�����"
-"������Ԥ����󥿡��ͥåȥץ��Х��������̤��ƤߤƤ���������"
+"�ʲ��˥᡼�륵���ФĤ��Ƥξ�������Ϥ��Ƥ����������⤷�褯ʬ����ʤ���Х���"
+"�ƥ�����Ԥ����󥿡��ͥåȥץ��Х��������̤��ƤߤƤ���������"
 
 #: mail/mail-config-druid.c:150
 msgid "Please select among the following options"
@@ -11144,175 +11894,157 @@ msgstr ""
 "���Ѥ���ޤ���"
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolution��������ȥ����������"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "�����"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "�ȡ���"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "��"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "���������"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "�����ӥ�������å���"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "�����Ф���³��..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "̾���Τʤ�Ϣ����"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ","
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "�Խ�(_E)"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "�˥塼��"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "���ѤǤ��륿���פ�����å�(_C)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "��������� %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "��������Ⱦ���"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "��������ȴ���"
 
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "�����ɲ�"
+
 #: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Advanced Options"
-msgstr "���򥭥�󥻥�"
+msgid "Add new signature..."
+msgstr "��̾����¸"
 
 #: mail/mail-config.glade.h:12
-msgid "Afrikaans"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
 
 #: mail/mail-config.glade.h:14
-#, fuzzy
-msgid "Alerts"
-msgstr "���顼��"
-
-#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "��å������إե������ź�դ��ޤ�"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "ź��"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "ǧ��"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "������ʸ�������ɥ��å�: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "�Ĥ���(_L)"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
@@ -11320,14 +12052,19 @@ msgstr "����᡼��Υ����å�"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "���������¤ο�"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "��å�������������ޤ�"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "����"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11343,55 +12080,47 @@ msgstr ""
 "\n"
 "\"��λ\" �򥯥�å������������¸���Ƥ�������"
 
-#: mail/mail-config.glade.h:37
-msgid "Dari"
-msgstr ""
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "�ǥե����(_F)"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "�ǥե����(_F)"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "�ǥե���ȤΥ���饯�����󥳡��ǥ���: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "�᡼��������"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "�ǥ����� ID..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "��å������򳫤����Ȥ�����ޤ���"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "��λ"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "��ƥե����:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "ͭ��(_E)"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11412,39 +12141,35 @@ msgstr "�Żҥ᡼�륢�ɥ쥹:"
 msgid "Empty _trash folders on exit"
 msgstr "��λ���˥���Ȣ����ˤ���(_E)"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "���ξ���ư���¹�:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "�����Τ�Τǽ����"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "�ץ��ѥƥ�"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "��å�������ž��"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "�ǥ�����ID �����..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "���Ѥ�Ĵ����(_H)"
 
-#: mail/mail-config.glade.h:59
-msgid "Hulu"
-msgstr ""
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11498,70 +12223,66 @@ msgstr "�ߥ����ͥ���"
 msgid "NNTP Server:"
 msgstr "NNTP ������:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "�˥塼���ե�����(_N)"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "���ץ����"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "���(_Z):"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP���� ID:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "���顼������"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "�������� Bcc �������ꤵ��Ƥ��ʤ������Τ餻��(_B)"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "�ץ�ƥ����åɥץ饤�Х���(PGP)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "���򤷤�Ϣ�����������ޤ�"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "��å������򳫤����Ȥ�����ޤ���"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "����"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
@@ -11596,120 +12317,124 @@ msgid "S_ecurity"
 msgstr "�������ƥ�"
 
 #: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "�����奢 MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "PGP �ץ�����������"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "��̾�ե�����:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "��̾�ʳ�����"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "�᡼���������"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "�����ѥ�å������ե����:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "�����Ѥ���ƥ�å�����"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "�����Ф�ǧ�ڤ�ɬ��(_A)"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Server _Type: "
 msgstr "�������:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "���硼�ȥ��å�"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "��̾����¸"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "��̾����¸"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "������"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "��������̾:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "ɸ��Ū�� UNIX �� mbox �ե�����"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "HTML��̾�ե�����(_H):"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "�ѿ�"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11719,148 +12444,141 @@ msgstr ""
 "\n"
 "\"��\" �򥯥�å����ƻϤ�Ƥ�������"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "��"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "HTML��̾�ե�����(_H):"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "��˲�����ͥåȤ����ɤ߹���"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "ǧ�ڼ���: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "ǧ�ڼ���: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "ǧ�� ID"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "�ե�����Ǥκ����ǧ"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "HTML��̾�ե�����(_H):"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "�ǥե����(_F)"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "�ե�����̾:"
+msgid "_Enable"
+msgstr "ͭ��"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "ž��"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "�ե�͡���(_F):"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML �᡼��"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "HTML��̾�ե�����(_H):"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "�桼������"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "����"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "�����Ԥ����ɥ쥹Ģ�ˤ�����������ɤ߹���"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "���Υ�������Ȥ��������ꤹ��(_D)"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "���λ��֥ץ�ӥ塼����ȥ�å����������Ѥߤˤ���(_M):"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "̾��(_N):"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "������ͥåȤ����ɤ߹��ޤʤ�"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "_PGP �ץ������Υѥ�:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "HTML �᡼���˾��Ǥ��ʤ������ HTML �᡼���������������Τ餻��"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "�������˷�̾�����ξ����Τ餻��(_E)"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "�饸��"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11901,70 +12619,53 @@ msgstr "HTML��̾�ե�����(_H):"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "HTML��̾�ե�����(_H):"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "�������ƥ����ݸ�줿��³ (_SSL) ��ɬ��"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "�ѿ�"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 #, fuzzy
 msgid "_every"
 msgstr "��"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " ���顼"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "����"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "PGP ��̾����ƥ����Ȥ��������ޤ���Ǥ���"
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "PGP ���ڥ���ƥ����Ȥ��������ޤ���Ǥ���"
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "PGP �Ź楳��ƥ����Ȥ��������ޤ���Ǥ���"
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "PGP ���楳��ƥ����Ȥ��������ޤ���Ǥ���"
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "S/MIME ��̾����ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "S/MIME ����ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "S/MIME �Ź楳��ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "S/MIME ����٥����ץ���ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME �ǥ����ɥ���ƥ����Ȥ��������ޤ���Ǥ���"
 
@@ -12007,100 +12708,134 @@ msgstr "�����ӥ塼��"
 msgid "Loading message content"
 msgstr "��å����������Ƥ��ɤ߹�����"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "���¤�᤮�������ƥ�(_O)"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "�֥饦���ǥ�󥯤򳫤�"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "���򥳥ԡ�"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "��󥯤���̾����¸"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "��������¸..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s ��ź��"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ��å���������Ͻ���ޤ���Ǥ���, ��������ɽ�����ޤ�"
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "�������ɥ쥹:"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "���п�"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "�ֿ���"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "�᡼��: "
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "��å���������̾����¸..."
+
+#: mail/mail-format.c:1832
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "PGP ���ڥ���ƥ����Ȥ��������ޤ���Ǥ���"
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "���Υ�å������ϥǥ������̾���줿��ΤǤ���, ������������ޤ���"
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ������ (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "��������ե����� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "��⡼�ȥǡ��� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "̤�Τγ����ǡ��� (\"%s\" ������) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "��������ե����"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "�ե������ƹ�����"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12109,27 +12844,27 @@ msgstr ""
 "�ե�����Υ᥿�������¸����ޤ���; ��Ϥ䤳�Υե�����򳫤�\n"
 "���Ȥ�����ʤ��ȵ��Ť��Ǥ��礦: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�ե�����Υ᥿����� %s ����¸�Ǥ��ޤ���: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "�ե�����Υ᥿�ǡ��� %s �������뤳�Ȥ�����ޤ���: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�ե���� \"%s\" �� \"%s\" �������ѹ����Ƥ��ޤ�"
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12137,11 +12872,11 @@ msgstr ""
 "�⤷���Υ᡼��ܥå����򳫤����ȤϤʤ��ʤ�\n"
 "��ư�Dz���������ɬ�פ����뤫�⤷��ޤ���"
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "��������ե�����ʳ��η������ѹ��Ǥ��ޤ���"
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s �����"
@@ -12199,81 +12934,73 @@ msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
 msgid "Complete."
 msgstr "��λ���ޤ���"
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "�ե�����إ�å���������¸��"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s �إ�å��������ư��"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s �إ�å������򥳥ԡ���"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "��ư��"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "���ԡ���"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ����Υե������������"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "��å�������ž��"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "�ե���� %s �򥪡��ץ���"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "��¸���줿 %s �򥪡��ץ���"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "�ե���� %s ������"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "�ե���� '%s' ����¸��"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "�ե�����򹹿���"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "�ե����������"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "������ %s �������"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d �̤Υ�å������������"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d �̤Υ�å���������¸��"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12282,7 +13009,7 @@ msgstr ""
 "���ϥե�������������ޤ���: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12291,11 +13018,11 @@ msgstr ""
 "�ե��������¸��˥��顼: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "ź�դ���¸��"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12304,27 +13031,27 @@ msgstr ""
 "���ϥե�������������ޤ���: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�ǡ�����񤭽Ф����Ȥ�����ޤ���Ǥ���: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s �Ȥ���³���ڤäƤ��ޤ�"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s �˺���³��"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "����(_S)"
 
@@ -12395,10 +13122,6 @@ msgstr "������..."
 msgid "Waiting..."
 msgstr "�Ե���..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "����󥻥뤷�ޤ���"
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
@@ -12412,16 +13135,16 @@ msgstr "%s �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
 msgid "Enter Password"
 msgstr "�ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "��̾�ե��������¸����ޤ���Ǥ���"
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "��̾����¸"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12431,10 +13154,30 @@ msgstr ""
 "\n"
 "�ѹ�����¸���ޤ���?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "̾��:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "��̾�ե�����:"
+msgid "Signature hint"
+msgstr "��̾����¸"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "HTML ��̾�ե�����:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12449,17 +13192,17 @@ msgstr "ž�����줿��å�����"
 msgid "Forwarded Message"
 msgstr "ž�����줿��å�����"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "���ۥե�����������: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "URI �β��ۥե�����򹹿���: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12468,90 +13211,95 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "���ۥե����"
+
+#: mail/mail-vfolder.c:784
 #, fuzzy
 msgid "vFolders"
 msgstr "�ե����"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "���ۥե�������Խ�"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "�������ۥե����"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(��̾�ʤ�)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - ������"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "̤��"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "����"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "�����Ѥ�"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "ʣ����̤�ɥ�å�����"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "ʣ���Υ�å�����"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "�Ǥ��㤤"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "�㤤"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "�⤤"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "�Ǥ�⤤"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "������ %p %l:%M"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "������ %p %l:%M"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%Yǯ %m�� %d��"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "��å������ꥹ�Ȥ������"
 
@@ -12574,10 +13322,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "����Ϣ����:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "������"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "������"
 
@@ -17733,5743 +18486,5738 @@ msgstr "��ȥӥ�"
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "�ݥ��٥�"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "�饪��"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 #, fuzzy
 msgid "Learmouth"
 msgstr "�쥽��"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "�ޥ͡�����"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "�ޡ�����"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "���"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "ǯ"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "�쥽��"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 #, fuzzy
 msgid "Lewistown"
 msgstr "�쥽��"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr ""
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Liberal"
 msgstr "��٥ꥢ"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Libya"
 msgstr "��٥ꥢ"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "�˥�������"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Lihue"
 msgstr "�˥���"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "�饪��"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limoges"
 msgstr "�Ǥ��㤤"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "��"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Lincoln"
 msgstr "����"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 #, fuzzy
 msgid "Lisboa"
 msgstr "��٥ꥢ"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "̸"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 #, fuzzy
 msgid "Litchfield"
 msgstr "�夤�����"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "NT ��������"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "���"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr ""
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "�ۥ󥸥�饹"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 #, fuzzy
 msgid "Los Alamos"
 msgstr "���顼��"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 #, fuzzy
 msgid "Lousiana"
 msgstr "�ܥĥ��"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "�饪��"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "����"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "�㤤"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "��ȥӥ�"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "3 ��"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "�ޥ���"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macapa"
 msgstr "�ޥ���"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "�ޥ��ɥ˥�"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "�ޥ͡�����"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "�ޥ��ɥ˥�"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "�饸��"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "���ʥ�"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "�ޥ͡�����"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "�ޥ͡�����"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "�ޥ饦��"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "�ޥ륿"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "�ޥ륿"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "�ޥ͡�����"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "�ޥ졼����"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "�ޥ���"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manchester"
 msgstr "����:"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "�ޥ͡�����"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "̸"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "�ᥤ��ġ���С�"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "��ʥ�"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "�᡼��"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "�ޥ륿"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "3 ��"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "�ޡ�����"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "�ޡ�����"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "�ޥ�"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "�ޥ륿"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "�ޡ�����"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "3 ��"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "����"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "̤�ɤȤ��ƥޡ���(_N)"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "�ޡ�����"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "�ޡ�����"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "����"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "�ޥ졼����"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "�ޥ��ɥ˥�"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mattoon"
 msgstr "�ޥ͡�����"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "�ޥ͡�����"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "����ݡ���"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "�����ե�����"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 #, fuzzy
 msgid "Mazu"
 msgstr "�ޥ���"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "�ޥ�"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "3 ��"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "���"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "�ޥ���"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "��"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 #, fuzzy
 msgid "Mehamn"
 msgstr "�ޥ͡�����"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "�ޥ륿"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "�ޥ��ɥ˥�"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 #, fuzzy
 msgid "Merced"
 msgstr "�᡼�ȥ�ˡ(_E)"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "������"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 #, fuzzy
 msgid "Merril Field"
 msgstr "���пͥե������(_F)"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "�ᥭ����"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 #, fuzzy
 msgid "Miami"
 msgstr "�ޥ�"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middle East"
 msgstr "�ߥɥ�͡���(_M):"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middleton Island"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "�ߥɥ�͡���(_M):"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "�ե������"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "�ե��������:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 #, fuzzy
 msgid "Milford"
 msgstr "����"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "%s �إ᡼��"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "����"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 #, fuzzy
 msgid "Minnesota"
 msgstr "�ߥ����ͥ���"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "�����Τ�ΤǤϤʤ�"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missoula"
 msgstr "Miss"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Missouri"
 msgstr "Miss"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitchell"
 msgstr "����:"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 #, fuzzy
 msgid "Mitilini"
 msgstr "�᡼��󥰥ꥹ��"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "��"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Modesto"
 msgstr "�¤α�̸"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "��ư"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Moldova"
 msgstr "������"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 #, fuzzy
 msgid "Molokai"
 msgstr "�ޥ饦��"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "��ʥ�"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "��ʥ�"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "������"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "��ʥ�"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "�ޥ͡�����"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montana"
 msgstr "�ܥĥ��"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "�¤���"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "��"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 #, fuzzy
 msgid "Montego Bay"
 msgstr "��󥴥�"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "��"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "��ʥ�"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "��"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "�ե����"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morelia"
 msgstr "��󥴥�"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "���"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "�ץ饤�ޥ�"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "��"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "����"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "��"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 #, fuzzy
 msgid "Mullan"
 msgstr "�ޥ͡�����"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 #, fuzzy
 msgid "Muncie"
 msgstr "6 ��"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 #, fuzzy
 msgid "Murcia"
 msgstr "�������ȥꥢ"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "�Ż�"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "knots"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 #, fuzzy
 msgid "Najran"
 msgstr "�С��졼��"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "̾��"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "�ٹ�"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "����"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "̾��"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Napoli"
 msgstr "�ޥ�"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "�˥å��͡���"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "�����ꥢ"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natchez"
 msgstr "����:"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 #, fuzzy
 msgid "Nebraska"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "����ʥ�"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Nevada"
 msgstr "����ʥ�"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bedford"
 msgstr "�˥塼���ե�����"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "�˥塼��������"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "Newcastle"
 msgstr "�˥塼��"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "�˥塼��������"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "Newfoundland"
 msgstr "�˥塼��������"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "�˥塼����ɥ˥�"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Iberia"
 msgstr "�˥塼����ɥ˥�"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "����"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Mexico"
 msgstr "�ᥭ����"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "������"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "��"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "�������ۥե����"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "�˥塼��"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "New York"
 msgstr "�������ۥե����"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "��ˡ:"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "���ڥ���"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nis"
 msgstr "�����Τ�ΤȰ��פ���"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "����"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "̾��"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "����"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norrkoping"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Adams"
 msgstr "����"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "��"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "�Υ륦����"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "����"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "����"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "�Υ륦����"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "����"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "��"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "�Υ륦����"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "����"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "���Ϥ��Ƥ��ʤ�"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "����"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "�ޥ륿"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "���֥���ȥ�"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "����"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "����"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "����¾"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "�ѥС�������"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "����¾"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 #, fuzzy
 msgid "Olbia"
 msgstr "����Х˥�"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 #, fuzzy
 msgid "Omaha"
 msgstr "���ޡ���"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "���ޡ���"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 #, fuzzy
 msgid "Omsk"
 msgstr "OK"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "����"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oostende"
 msgstr "���ʼ�"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oran"
 msgstr "���ޡ���"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "���"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 #, fuzzy
 msgid "Oregon"
 msgstr "���"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "���꡼�����"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orlando"
 msgstr "���꡼�����"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 #, fuzzy
 msgid "Oruro"
 msgstr "���顼"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr " ��"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 #, fuzzy
 msgid "Ostrava"
 msgstr "�������ȥ�ꥢ"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "��"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 #, fuzzy
 msgid "Oxford"
 msgstr "����"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "�ڡ���"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "�ݥ��٥�"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "�ݥ��٥�"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "�᡼������"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 #, fuzzy
 msgid "Pamplona"
 msgstr "���⥢����"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama City"
 msgstr "�ѥʥ�"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "����󥻥뤷�ޤ���"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "����"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Paphos"
 msgstr "�饪��"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 #, fuzzy
 msgid "Paris"
 msgstr "�ץ饤�ޥ�"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "�ѥ����"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "�ѥʥ�"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "������"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "���ڤ����:"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "����"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "���ɹ���"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "���������:"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "�ץ饤�ޥ�"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "�ץ饤�ޥ�"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "�ڥ롼"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "�ڥ롼"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "�ڥ롼"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "�ץ�ӥ塼"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 #, fuzzy
 msgid "Pisa"
 msgstr "�ѥ�������"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 #, fuzzy
 msgid "Plymouth"
 msgstr "��"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "ɽ������"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "���ޥ�����"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "�ץ��ѥƥ�"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponca City"
 msgstr "���åꥹ��"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponce"
 msgstr "�ʤ�"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "Ϣ����"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "�ݡ�����"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Port Alexander"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "ɽ������"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "�ץ�ӥ塼"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hardy"
 msgstr "�����ɤΰ���"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "�ݡ�����"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Portland"
 msgstr "�ݡ�����"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto"
 msgstr "�ݡ����ֹ�(_P):"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "������"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "��Ĺ"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "��Ĺ"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "��Ĺ"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "�ݡ�����"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poznan"
 msgstr "�ݡ�����"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Praha"
 msgstr "����Ȣ"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "����̸��"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "�����ץ�ӥ塼"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Pretoria"
 msgstr "��Ĺ"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "�ץ�ӥ塼"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "����"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Providence"
 msgstr "�ץ�ӥ塼�ڥ���(_P)"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "�ץ�ӥ塼"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "��"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Puebla"
 msgstr "����"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Pueblo"
 msgstr "����"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "����"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "���ޥ�����"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pula"
 msgstr "�ݡ�����"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "�ݡ�����"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 #, fuzzy
 msgid "Punta Cana"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "����"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quebec"
 msgstr "��̾"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 #, fuzzy
 msgid "Rapid City"
 msgstr "�ֿ���"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Rawlins"
 msgstr "��"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Reading"
 msgstr "����"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Recife"
 msgstr "������"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redding"
 msgstr "����"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "�����Ѥ�"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redmond"
 msgstr "��¥��"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "�ϰ�"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Rennes"
 msgstr "��¥��"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Reno"
 msgstr "���"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "�ϰ�"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "�롼��"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "ǯ"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reynosa"
 msgstr "���ɹ���"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "�ե������"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Rhode Island"
 msgstr "�¤κ�"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 #, fuzzy
 msgid "Riberalta"
 msgstr "��٥ꥢ"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "�˥å��͡���"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "�ϥ���"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "���"
 
-#: my-evolution/Locations.h:1881
-#, fuzzy
-msgid "Riga"
-msgstr "��:"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rijeka"
 msgstr "�����Ѥ�"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 #, fuzzy
 msgid "Rimini"
 msgstr "�롼�ޥ˥�"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rioja"
 msgstr "�饸��"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "�ѥС�������"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "��٥ꥢ"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 #, fuzzy
 msgid "Riyadh"
 msgstr "�����Ѥ�"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Roatan"
 msgstr "�롼�ޥ˥�"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 #, fuzzy
 msgid "Robore"
 msgstr "��"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "�ݡ�����"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rodos"
 msgstr "����"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Rogers"
 msgstr "�ե����"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "�롼�ޥ˥�"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 #, fuzzy
 msgid "Rosario"
 msgstr "�饸��"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Roseglen"
 msgstr "���"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "�ۥ���"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "�����֤�"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Russia"
 msgstr "�������ȥꥢ"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 #, fuzzy
 msgid "Rutland"
 msgstr "�֡�����"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 #, fuzzy
 msgid "Sacramento"
 msgstr "����"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 #, fuzzy
 msgid "Saginaw"
 msgstr "���ڥ���"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "�����ɤΰ���"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "���ڥ���"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Salalah"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salem"
 msgstr "��¸"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "���ޥꥢ"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "���ޥꥢ"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "���ޥꥢ"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salmon"
 msgstr "���⥢����"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salta"
 msgstr "�ޥ륿"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "��(_S)"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "���⥢����"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samos"
 msgstr "���⥢����"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "��(_N)"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 #, fuzzy
 msgid "Sana'A"
 msgstr "��"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "San Carlos"
 msgstr "��¸�����Ĥ���"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "��"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sandberg"
 msgstr "������"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sanderson"
 msgstr "������"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sanford"
 msgstr "��"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "�������ǥ���"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "��¸�����Ĥ���"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Juan"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "���ޥꥢ"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "������"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santarem"
 msgstr "����"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santorini"
 msgstr "����"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "���ơ�����"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 #, fuzzy
 msgid "Sarasota"
 msgstr "���⥢����"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "������"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "��(_N)"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "���ơ�����"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "���"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "����"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "���ޥꥢ"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "����"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "����ݡ��ȳ���"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "����"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "�������ǥ���"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "����"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "������"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "������"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Shearwater"
 msgstr "������"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "���������ǥ�"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "���������:"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Sheridan"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "������"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Shoreham"
 msgstr "��Ͽ"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "������"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 #, fuzzy
 msgid "Sidney"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Silver City"
 msgstr "�������ƥ�"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "������"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skopje"
 msgstr "���"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "������"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "����Х˥�"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "ʬ"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Snowshoe Lake"
 msgstr "�ˤ狼��"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Sochi"
 msgstr "��"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socorro"
 msgstr "��Ͽ"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Socotra"
 msgstr "��Ͽ"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 #, fuzzy
 msgid "Soda Springs"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sofia"
 msgstr "���ޥꥢ"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Somerset"
 msgstr "�ˤ狼��"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "������"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "Southampton"
 msgstr "����"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "��"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Carolina"
 msgstr "��եꥫ"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "South Dakota"
 msgstr "����"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "��"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "������"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "̸"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "���ڥ���"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "����"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "State College"
 msgstr "���:"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "����"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "����"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "���"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "Stephenville"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 #, fuzzy
 msgid "St. George"
 msgstr "����ȥإ����"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "���"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 #, fuzzy
 msgid "St Louis"
 msgstr "�Ӥ߹��ߤ���ߤ��ޤ�"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "������"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "�Υ륦����"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "St Paul"
 msgstr "���ơ�����"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "������"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "��Ͽ"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "���ޥ�"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 #, fuzzy
 msgid "Sutton"
 msgstr "��(_N)"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "����"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "������(_T)"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "�ޥ���"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 #, fuzzy
 msgid "Taejon"
 msgstr "����"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Taif"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Tainan"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Taiz"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr " ����"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr " ����"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 #, fuzzy
 msgid "Tampa"
 msgstr "����"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "�ѻ�"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "���ʥ�"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "�饪��"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 #, fuzzy
 msgid "Taoyuan"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Taranto"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "������(_T)"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Tarija"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "����"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "�ƥ�å���"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "�ƥ�å���"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "Texas"
 msgstr "������(_T)"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 #, fuzzy
 msgid "The Dalles"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "�ɾ�(���Ĥ�)"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "������"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tianjin"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Tijuana"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tirana"
 msgstr " ����"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "����"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "�ɾ�(���Ĥ�)"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "��Ū"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 #, fuzzy
 msgid "Tokunoshima Island"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 #, fuzzy
 msgid "Toledo"
 msgstr "���ؤ�"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "�ȥ�"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Topeka"
 msgstr "��:"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "��:"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torrance"
 msgstr "�ե��"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Torreon"
 msgstr "�ڹ��"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "����ݡ��ȳ���"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Toulouse"
 msgstr "�Ĥ���"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 #, fuzzy
 msgid "Trapani"
 msgstr "����"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "�ƥ�å���"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "����"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "��"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 #, fuzzy
 msgid "Trieste"
 msgstr "�ƥ���"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "�ȥ륳"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "������"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "������"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "��(_U)"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turaif"
 msgstr "�ȥ륳��"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "�ȥ륳��"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turku"
 msgstr "�ȥ륳"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 #, fuzzy
 msgid "Twenthe"
 msgstr "����"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "����"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "��(_U)"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "����ꥫ�罰��"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 #, fuzzy
 msgid "Unst"
 msgstr "̤��"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruapan"
 msgstr "����"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 #, fuzzy
 msgid "Uruguaiana"
 msgstr " ���륰����"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 #, fuzzy
 msgid "Utah"
 msgstr " "
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vadso"
 msgstr "�饸��"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "�ѿ�"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vagar"
 msgstr "�ݥ��٥�"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "�ޥ륿"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valencia"
 msgstr "������"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 #, fuzzy
 msgid "Valentine"
 msgstr "����饤��ɽ��"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 #, fuzzy
 msgid "Van"
 msgstr "�ޥ͡�����"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "����󥻥�"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 #, fuzzy
 msgid "Varadero"
 msgstr "�Х�Хɥ�"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Varna"
 msgstr "�ѿ�"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "��"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 #, fuzzy
 msgid "Venezia"
 msgstr "�٥ͥ�����"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 #, fuzzy
 msgid "Venice"
 msgstr "Unicode"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vermont"
 msgstr "��"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "����"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 #, fuzzy
 msgid "Vicenza"
 msgstr "�٥ͥ�����"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "�ե�����̾:"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "�������ȥ�ꥢ"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "�ե������"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volkel"
 msgstr "���"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 #, fuzzy
 msgid "Volk Field"
 msgstr "���пͥե������(_F)"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 #, fuzzy
 msgid "Waco"
 msgstr "��ʥ�"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 #, fuzzy
 msgid "Wallops Island"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "�ٹ�"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "��ŷ��"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Waterloo"
 msgstr "��ŷ��"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "��ŷ��"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 #, fuzzy
 msgid "Waterville"
 msgstr "���ƥ���"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Webster City"
 msgstr "�����֥�����"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "��"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "��ŷ��"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 #, fuzzy
 msgid "Wendover"
 msgstr "������"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "West Burke"
 msgstr "����"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "������"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westfield"
 msgstr "��"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "�������塼��"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "�˥å��͡���"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 #, fuzzy
 msgid "Wien"
 msgstr "��"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 #, fuzzy
 msgid "Williston"
 msgstr "̸"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 #, fuzzy
 msgid "Windsor"
 msgstr "����"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 #, fuzzy
 msgid "Winslow"
 msgstr "��"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 #, fuzzy
 msgid "Winter Park"
 msgstr "�ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 #, fuzzy
 msgid "Wisconsin"
 msgstr "�ߥ����ͥ���"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "��"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "���"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "�եå�:"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "�ʱ�"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "�ݡ�����"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 #, fuzzy
 msgid "Xiamen"
 msgstr "̾��"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 #, fuzzy
 msgid "Yao Airport"
 msgstr "����ݡ��Ȥ��ޤ���"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 #, fuzzy
 msgid "Yenbo"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zadar"
 msgstr "������"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 #, fuzzy
 msgid "Zagreb"
 msgstr "�ڡ���"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zanesville"
 msgstr "����󥻥뤷�ޤ���"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr ""
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 #, fuzzy
 msgid "Zurich"
 msgstr "�ȥ륳��"
@@ -23500,17 +24248,12 @@ msgstr "%B%d��%l��%Mʬ"
 msgid "No description"
 msgstr "����"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "�᡼�륵�ޥ�"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "���ۥե����"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "��������ե����"
 
@@ -23519,56 +24262,46 @@ msgstr "��������ե����"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com ����������"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "������"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "�˥塼���ۿ����ɲ�"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�ɲä������˥塼���ۿ��� URL ������"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "̾��:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "RDF �Υ������������˥��顼"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "�˥塼���ե�����"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
-msgstr "�ɲ�(_A)"
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "��� (_R)"
+msgid "Add"
+msgstr "�ɲ�(_D)"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "�ˤ狼��"
@@ -23611,10 +24344,46 @@ msgstr "���ޥ�����"
 msgid "Printing of Summary failed"
 msgstr "���ޥ�ΰ����˼��Ԥ��ޤ���"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "������������ݡ��ͥ�Ȥ� Bonobo �������Ǥ��ޤ���Ǥ���\n"
 
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " F"
+msgstr "�ڻ�"
+
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " C"
+msgstr "�ݻ�"
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "knots"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "�ޥ���"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "�����᡼�ȥ�"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "����"
@@ -24781,100 +25550,106 @@ msgid "C_elsius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "���٤ƤΥ˥塼���ۿ�(_F)"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "���٤˲���ʬ�Υ���������ɽ�����ޤ���?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "ɽ����������(_X):"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "�˥塼���ۿ�����"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "���(_H)"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "�콵��(_E)"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "�����ֳ�(��)(_E)"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "�����ֳ�(��)(_T)"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "�ե�����Υե�ѥ���ɽ��(_H)"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "���٤ƤΥ�������ɽ��(_A)"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "�����Υ�������ɽ��(_T)"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "������ "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "��ŷ��������"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "5����(_F)"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "�᡼�� (_M)"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "�˥塼���ե�����(_N)"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "����(_O)"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "�������塼��(_S)"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "��ŷ��(_W)"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Evolution ����ݡ����Τ���Υե����ȥ�"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "���̤ʥե����"
+msgid "Folder Settings"
+msgstr "����"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution ������"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -24885,6 +25660,39 @@ msgstr "�ܺ٤�ɽ��"
 msgid "Cancel Operation"
 msgstr "���򥭥�󥻥�"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"�ե����ž���Ǥ��ޤ���:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "�ե����������"
+
+#: shell/e-local-storage.c:174
+#, fuzzy
+msgid "Drafts"
+msgstr "���"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "����Ȣ"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "����Ȣ"
+
+#: shell/e-local-storage.c:177
+#, fuzzy
+msgid "Sent"
+msgstr "����"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution �Υ��󥹥ȡ���"
@@ -24991,6 +25799,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "���"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "���̤ʥե����"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "���̤ʥե����"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "���̤ʥե����"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "���"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -25020,20 +25853,20 @@ msgstr ""
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "�ե���� \"%s\" �򥳥ԡ�����ե��������ꤷ�ޤ�:"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "�ե�����Υ��ԡ�"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "�ե���� \"%s\" ���ư����ե��������ꤷ�ޤ�:"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "�ե�����ΰ�ư"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25042,18 +25875,17 @@ msgstr ""
 "�ե���������Ǥ��ޤ���:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" ����"
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "������ �ե���� \"%s\" �������Ƥ��������Ǥ���?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr "�ե�����������ޤ� '%s'"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25062,16 +25894,16 @@ msgstr ""
 "�ե�������͡���Ǥ��ޤ���:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "�ե���� \"%s\" ���͡���"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "�ե�������͡���"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -25090,7 +25922,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - �����ե�����κ���"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -25098,7 +25930,7 @@ msgstr ""
 "���򤷤��ե�����μ��̤��׵ᤵ�줿���Τ����\n"
 "ͭ���ǤϤ���ޤ���"
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "����..."
 
@@ -25118,12 +25950,11 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"Evolution "
-"�إ���ݡ��Ȥ������ե���������򤷤ơ��ꥹ�Ȥ���ե�������̤����򤷤Ƥ�������"
-"��\n"
+"Evolution �إ���ݡ��Ȥ������ե���������򤷤ơ��ꥹ�Ȥ���ե�������̤�����"
+"���Ƥ���������\n"
 "\n"
-"�⤷ʬ����ʤ��ʤ� \"��Ư\" �����򤹤뤳�Ȥ����衤Evolution "
-"�ϲ����ߤ�Ǥ��礦"
+"�⤷ʬ����ʤ��ʤ� \"��Ư\" �����򤹤뤳�Ȥ����衤Evolution �ϲ����ߤ��"
+"���礦"
 
 #: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
 msgid "Please select the information that you would like to import:"
@@ -25151,22 +25982,27 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "�����ƥ� %d �򥤥�ݡ�����"
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "�ե����������"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "�ե���� %s ��¸�ߤ��ޤ���"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25175,11 +26011,11 @@ msgstr ""
 "�������Ȥ�����륤��ݡ��Ȥ�����ޤ���\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "����ݡ�����"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25188,17 +26024,17 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "%s �򳫻Ϥ��ޤ�"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "%s �γ�����˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "%s �Υ�������˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25207,61 +26043,106 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "�����ƥ� 1 �򥤥�ݡ�����"
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "��Ư"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "�ե�����̾:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "�ե����������"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "�ե��������:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "���󥰥�ե�����򥤥�ݡ��Ȥ��ޤ�"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "%s ����:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "�ե����������"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "���Υǡ����򥤥�ݡ��Ȥ���������Υե���������򤷤Ƥ�������"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "����ݡ���"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "��³���Ĥ��Ƥ��ޤ�..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr "�ե������Ʊ����"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "�ե������Ʊ����"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "�ե������Ʊ����"
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution ���硼�ȥ��å�"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "�ե���� %s �򥪡��ץ���"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "�ե���� %s �򥪡��ץ���"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "%s �˳���..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"���ꤵ�줿�ե������������뤳�Ȥ�����ޤ���:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
@@ -25274,8 +26155,8 @@ msgstr "Evolution �᡼�륦�������ɥ��󥿡��ե������ν����������ޤ���"
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolution �᡼�륦�������ɥ��󥿡��ե������ν����������ޤ���"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "�˥塼��"
@@ -25297,45 +26178,45 @@ msgstr "���Υե�����ˤϥ�å������Ϥ���ޤ���"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy �Ϥ��ʤ��� $PATH �ˤϸ��Ĥ���ޤ���"
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy �ϼ¹ԤǤ��ޤ���Ǥ���"
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution �ˤĤ���..."
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "�ե�����ذ�ư..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "���������ե���������򤷤ޤ�"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "�������硼�ȥ��åȤ�������ޤ�"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "���硼�ȥ��åȤˤ������ե���������򤷤ޤ�:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 #, fuzzy
 msgid "_Work Online"
 msgstr "����饤����"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "���ե饤����(_W)"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "���ե饤����"
 
@@ -25356,8 +26237,8 @@ msgstr "(�ʤ�)"
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
-"Ximian Evolution "
-"�ϸ��ߥ���饤��Ǥ������ե饤��ˤ���ˤϤ��Υܥ���򥯥�å����Ƥ�������"
+"Ximian Evolution �ϸ��ߥ���饤��Ǥ������ե饤��ˤ���ˤϤ��Υܥ���򥯥��"
+"�����Ƥ�������"
 
 #: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
@@ -25367,10 +26248,10 @@ msgstr "Ximian Evolution �ϥ��ե饤�������Ǥ�"
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Ximian Evolution "
-"�ϸ��ߥ��ե饤��Ǥ�������饤��ˤ���ˤϤ��Υܥ���򥯥�å����Ƥ�������"
+"Ximian Evolution �ϸ��ߥ��ե饤��Ǥ�������饤��ˤ���ˤϤ��Υܥ���򥯥��"
+"�����Ƥ�������"
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25378,12 +26259,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�����������֤Υ��åȥ��åפ�����ޤ��� -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25391,23 +26272,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "�����ʰ����Ǥ�"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "OAF ����Ͽ����ޤ���"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "����ե����졼�����ǡ����١������ߤĤ���ޤ���"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "����Ū�ʥ��顼"
 
@@ -25432,95 +26309,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "������ޤ���"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "���硼�ȥ��åȥ��롼�פ��͡���"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "���򤵤줿���硼�ȥ��åȥ��롼�פ��͡���:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "��������������(_S)"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "��������������ǥ��硼�ȥ��åȤ�ɽ�����ޤ�"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "�礭����������(_L)"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "�礭����������ǥ��硼�ȥ��åȤ�ɽ�����ޤ�"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "�������롼��(_N)..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "�������硼�ȥ��åȥ��롼�פ�������ޤ�"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "���Υ��롼�פ���(_R)..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "���Υ��硼�ȥ��åȥ��롼�פ������ޤ�"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "���Υ��롼�פ��͡���(_N)..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "���Υ��硼�ȥ��åȥ��롼�פ��͡��ष�ޤ�"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "���硼�ȥ��åȥС��򱣤�(_H)"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "���硼�ȥ��åȥС��򱣤��ޤ�"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "���硼�ȥ��åȤ��͡���"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "���򤵤줿���硼�ȥ��åȤ��͡���:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "���Υ��硼�ȥ��åȤ˥�󥯤��줿�ե�����򳫤�"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "����������ɥ��dz���(_W)"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "���Υ��硼�ȥ��åȤ˥�󥯤��줿�ե�����򿷤���������ɥ��dz���"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "��͡���(_R)"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "���Υ��硼�ȥ��åȤ��͡���"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "���(_M)"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "���硼�ȥ��åȥС����餳�Υ��硼�ȥ��åȤ������ޤ�"
 
@@ -25532,10 +26409,6 @@ msgstr "���硼�ȥ��åȤ���¸��˥��顼��ȯ�����ޤ���"
 msgid "Shortcuts"
 msgstr "���硼�ȥ��å�"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "����Ȣ"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -25599,10 +26472,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ��λ)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<�ե���������򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
 
@@ -25632,78 +26506,78 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 #, fuzzy
 msgid "CORBA error"
 msgstr "I/O ���顼"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 #, fuzzy
 msgid "Invalid argument"
 msgstr "�����ʰ����Ǥ�"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 #, fuzzy
 msgid "No owner"
 msgstr "����"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 #, fuzzy
 msgid "Not found"
 msgstr "�����ɤ����Ĥ���ޤ���"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 #, fuzzy
 msgid "Unsupported type"
 msgstr "���ݡ��Ȥ��줿���̤�����å�(_C)"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 #, fuzzy
 msgid "Internal error"
 msgstr "����¾�Υ��顼"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 #, fuzzy
 msgid "Exists"
 msgstr "��¸�ߤ���"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 #, fuzzy
 msgid "Invalid URI"
 msgstr "����"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 #, fuzzy
 msgid "Has subfolders"
 msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 #, fuzzy
 msgid "No space left"
 msgstr "���򤵤줿��å������Ϥ���ޤ���"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "�ե��������:"
@@ -25774,8 +26648,8 @@ msgstr ""
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
-"\"����ݡ���\" �򥯥�å����� Evolution "
-"�إե�����Υ���ݡ��Ȥ򳫻Ϥ��Ƥ�������"
+"\"����ݡ���\" �򥯥�å����� Evolution �إե�����Υ���ݡ��Ȥ򳫻Ϥ��Ƥ���"
+"����"
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -25827,49 +26701,91 @@ msgstr "���Υ�å����������٤�ɽ�����ʤ�"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution �ϼ��Υǡ����򥤥�ݡ��ȤǤ��ޤ�:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution �Ϥ������޽�λ��Ǥ�..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, fuzzy, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"Ximian Evolution���롼�ץ������������ȤΤ��Υץ�ӥ塼��꡼����\n"
+"����������ɤ˻��֤�䤤�Ƥ���Ƥ��꤬�Ȥ��������ޤ���\n"
+"\n"
+"Ximian Evolution�Ϥޤ�̤�����Ǥ�. ����϶��դ��Ƥ��ޤ���, ��ǽ��\n"
+"�ޤ��ʤ��ä��ꡢȾʬ���餤������ȤǤ��Ƥ��ʤ��ä��ꤹ��Ȥ������ȤǤ���\n"
+"\n"
+"�⤷�Х�������С�bugzilla.ximian.com�ǥ�ݡ��Ȥ��Ƥ���������\n"
+"���Υץ������Ȥ�̵�ݾڤǡ��ܤ�äݤ����ʤοͤˤϸ����Ƥ��ޤ���\n"
+"\n"
+"�桹�Ϥ��ʤ����桹�����̤�ڤ��ळ�Ȥ�˾��Ǥ��ޤ��������Ʋ桹��\n"
+"Ǯ���ˤ��ʤ��ι׸����Ԥ������Ƥ��ޤ�!\n"
+
+#: shell/main.c:245
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution��������\n"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "���Υ�å����������٤�ɽ�����ʤ�"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution ������˥��������Ǥ��ޤ���"
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution ������ν�������Ǥ��ޤ���: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "���ץ�å�����̤�̵���ˤ���"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "����ݡ��ȳ���"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "����ݡ��ȳ���"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "���٤ƤΥ���ݡ��ͥ�ȤΥǥХå����Ϥ�ե����������"
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo ����ݡ��ͥ�ȥ����ƥ����������ޤ���"
 
@@ -25987,11 +26903,11 @@ msgstr "���߻���"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "ư��(_A)"
 
@@ -26113,8 +27029,8 @@ msgstr "���Υ����ƥ���Ĥ���"
 msgid "Delete this item"
 msgstr "���Υ����ƥ�������ޤ�"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "�ᥤ��ġ���С�"
 
@@ -26154,7 +27070,7 @@ msgstr "�ǥ������ˤ��ι��ܤ���¸���ޤ�"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "�ե�����(_F)"
 
@@ -26219,19 +27135,19 @@ msgstr "iCalender�Ȥ���ž��(_C)"
 msgid "Forward this item via email"
 msgstr "�᡼��Ǥ��Υ����ƥ��ž��"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "�ǿ��Υߡ��ƥ��󥰾�������"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "�ߡ��ƥ��󥰤Υ�ե�å���(_F)"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "�ߡ��ƥ��󥰤Υ������塼��(_M)"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "���Υ����ƥ�ؤΥߡ��ƥ��󥰤򥹥����塼��"
 
@@ -26239,10 +27155,6 @@ msgstr "���Υ����ƥ�ؤΥߡ��ƥ��󥰤򥹥����塼��"
 msgid "Customise My Evolution"
 msgstr "My Evolution �Υ������ޥ���"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "����󥻥�"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "���ߤΥ᡼�����򥭥�󥻥뤷�ޤ�"
@@ -26396,7 +27308,7 @@ msgstr "��å������ꥹ�Ȥ򥹥�åɲ����ޤ�"
 msgid "_Expunge"
 msgstr "�������(_E)"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "�ե����(_F)"
 
@@ -26812,7 +27724,7 @@ msgstr "���Υ�å�����"
 msgid "_Quoted"
 msgstr "����"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "�ġ���(_T)"
 
@@ -26827,12 +27739,12 @@ msgstr "���Υ�����ɥ����Ĥ��ޤ�"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "�Ĥ���(_C)"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "ɽ��(_V)"
 
@@ -27021,7 +27933,7 @@ msgstr "����(_O)..."
 msgid "_Reply-To Field"
 msgstr "�ֿ���ե������(_R)"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "�إ��(_H)"
 
@@ -27170,111 +28082,120 @@ msgid "Move this folder to another place"
 msgstr "�̤ξ��ؤ��Υե�������ư���ޤ�"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "�����ե���������(_N)..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "����������ɥ��dz���"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "�̤Υ�����ɥ��Ǥ��Υե�����򳫤��ޤ�"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "������"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "���塼�ˤ���᡼����������ƿ����᡼���������ޤ�"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution �ˤĤ��Ƥξ����ɽ�����ޤ�"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "�Զ���������"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "�Զ���������(_B)"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy��Ȥä��Զ���������"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "���ؤ�"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "�ե�����С���ɽ�����뤫�ɤ������ؤ��ޤ�"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "���硼�ȥ��åȥС���ɽ�����뤫�ɤ������ؤ��ޤ�"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "���ե饤���Ȥ��ɤ��������ؤ��ޤ�"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "���򤵤줿�ե������ɽ�����ޤ�"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution FAQ(_F)"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "Ximian Evolution �ˤĤ���(_A)..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "���ԡ�(_C)..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "�ե�����С�(_F)"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "�ե�����ذ�ư(_G)..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "����ݡ���..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "��ư(_M)..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "����(_N)"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "�����ե����(_N)"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "Pilot ������(_M)..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "��͡���(_R)..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "������(_S)"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "���硼�ȥ��å�(_S)"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "���硼�ȥ��åȥС�(_S)"
 
@@ -27355,25 +28276,25 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"�ޥ����κ��ܥ����Ȥä��ϿޤΥ��ꥢ����礷�ƥ����ॾ��������򤷤Ƥ���������"
-"\n"
+"�ޥ����κ��ܥ����Ȥä��ϿޤΥ��ꥢ����礷�ƥ����ॾ��������򤷤Ƥ�����"
+"����\n"
 "�ޥ����α��ܥ���ǽ̾����ޤ���"
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "���ߤ�ɽ��(_C)"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "���ߤ�ɽ��(_C)"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "ɽ�������"
 
@@ -27495,16 +28416,21 @@ msgstr "�������Խ�"
 msgid "Save Search"
 msgstr "��������¸"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "��������¸"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "��¸�����������ɲ�"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "�ܺ�..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "����"
@@ -27526,21 +28452,21 @@ msgstr "������"
 msgid "Don't show this message again."
 msgstr "���Υ�å����������٤�ɽ�����ʤ�"
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "����������"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "���ꥢ"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "���ꥢ"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "����������"
 
@@ -27566,6 +28492,185 @@ msgstr "init_corba(): GNOME ���������뤳�Ȥ�����ޤ���Ǥ���"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "���ɥ쥹Ģ�Υ�����"
+
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "̵�����ԲIJ�ʥȥ졼������:\n"
+#~ "%s"
+
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolution �������¹ԥ��ޥꥳ��ݡ��ͥ��"
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "���������ޥ꡼����ݡ��ͥ�ȤΤ���Υե����ȥ�"
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "�����λϤޤ�(_R):"
+
+#~ msgid "_End of day:"
+#~ msgstr "��������(_E):"
+
+#~ msgid "before the start of the appointment"
+#~ msgstr "���ݥ���Ȥγ�����"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "¾�μ�ż�(_O)"
+
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "���ꥢ������Ϥ��ΰŹ�򥵥ݡ��Ȥ��Ƥ��ޤ���"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "���ʤ��� %s �ѥ��ե졼�� ( %s ��) �����Ϥ��Ƥ�������"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "���ʤ��� %s �ѥ��ե졼�������Ϥ��Ƥ�������"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "���Υ�å������˽�̾����ޤ���: ��̾����ʿʸ�ƥ����Ȥ�����ޤ���"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "���Υ�å������˽�̾����ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "���Υ�å������˽�̾�Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: "
+#~ "%s"
+
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr ""
+#~ "���Υ�å������˽�̾����ޤ���: ���ꥢ��̾����ʿʸ�ƥ����Ȥ�����ޤ���"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "��å�����������Ǥ��ޤ���: ��������ʿʸ�ƥ����Ȥ�����ޤ���"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "���Υ�å�����������Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: "
+#~ "%s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr ""
+#~ "���Υ�å�������Ź沽�Ǥ��ޤ���: �Ź沽����ʿʸ�ƥ����Ȥ�����ޤ���"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "���Υ�å�������Ź沽�Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ�"
+#~ "��: %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "���Υ�å�����������Ǥ��ޤ���: ���椹��Ź沽�ƥ����Ȥ�����ޤ���"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "���Υ�å�����������Ǥ��ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "���Υ�å�����������Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: "
+#~ "%s"
+
+#~ msgid "%s server %s"
+#~ msgstr "%s ������ %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(̤�ΤΥۥ���)"
+
+#~ msgid "No such message: %s"
+#~ msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���: %s"
+
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "���Υ���Ȣ�ե���������å������򥳥ԡ����뤳�Ȥ�����ޤ���"
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "���ס���ե�����˥�å��������ɲý���ޤ���: %s: %s"
+
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "�ե��������ޤ���Ǥ���: %s: %s"
+
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "���ס���`%s' ��¸�ߤ��ʤ����̾�Υե�����ǤϤ���ޤ���"
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "�饸��"
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "�Խ�(_E)"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "�˥塼��"
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "���򥭥�󥻥�"
+
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "��̾�ե�����:"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "��̾�ʳ�����"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "HTML��̾�ե�����(_H):"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "�ե�����̾:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "HTML��̾�ե�����(_H):"
+
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "�饸��"
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "PGP �Ź楳��ƥ����Ȥ��������ޤ���Ǥ���"
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "PGP ���楳��ƥ����Ȥ��������ޤ���Ǥ���"
+
+#~ msgid "Moving"
+#~ msgstr "��ư��"
+
+#~ msgid "Copying"
+#~ msgstr "���ԡ���"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "��̾�ե�����:"
+
+#, fuzzy
+#~ msgid "Riga"
+#~ msgstr "��:"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "�ɲ�(_A)"
+
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "��� (_R)"
+
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "������ �ե���� \"%s\" �������Ƥ��������Ǥ���?"
+
 #~ msgid "Card: "
 #~ msgstr "̾��: "
 
@@ -27824,18 +28929,18 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgstr "���ξ����¿����LDAP�����ФǤ�ɬ�פȤ���ޤ���"
 
 #~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
 #~ msgstr ""
-#~ "���ξ����LDAP�����Ф������ǤɤΥΡ��ɤ򸡺�����Τ����ꤹ��Τ˻Ȥ��ޤ�����"
-#~ "�����ϥ����д����Ԥ�Ϣ�����ƤߤƤ���������"
+#~ "���ξ����LDAP�����Ф������ǤɤΥΡ��ɤ򸡺�����Τ����ꤹ��Τ˻Ȥ���"
+#~ "�����ܤ����ϥ����д����Ԥ�Ϣ�����ƤߤƤ���������"
 
 #~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
 #~ msgstr ""
-#~ "�����LDAP�����ФǤΤ��٤Ƥθ����Υ١����Ρ��ɤǤ����ܤ����ϥ����д����Ԥ�Ϣ��"
-#~ "���ƤߤƤ���������"
+#~ "�����LDAP�����ФǤΤ��٤Ƥθ����Υ١����Ρ��ɤǤ����ܤ����ϥ����д����Ԥ�"
+#~ "Ϣ�����ƤߤƤ���������"
 
 #~ msgid "This is the name of the server where your addressbook is located."
 #~ msgstr "����ϥ��ɥ쥹Ģ�����륵���Ф�̾���Ǥ���"
@@ -27846,12 +28951,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "_My server requires authentication"
 #~ msgstr "�����Ф�ǧ�ڤ�ɬ��(_M)"
 
-#~ msgid "Other Contacts"
-#~ msgstr "¾��Ϣ����"
-
-#~ msgid "(none)"
-#~ msgstr "(�ʤ�)"
-
 #~ msgid "Co_ntacts:"
 #~ msgstr "Ϣ����(_N):"
 
@@ -27876,13 +28975,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "_Mobile"
 #~ msgstr "�����(_M)"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "�����ˤ���Ϣ�����\n"
-#~ "������Ƥ��������Ǥ���?"
-
 #~ msgid "Create a new appointment"
 #~ msgstr "�������ݥ���Ȥ�������ޤ�"
 
@@ -27901,210 +28993,9 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "_Other"
 #~ msgstr "����¾(_O)"
 
-#~ msgid "Click here to add an attendee"
-#~ msgstr "���ʼԤ��ɲä���ˤϤ����򥯥�å�"
-
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
-
 #~ msgid "_Delete this Task"
 #~ msgstr "������������(_D)"
 
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "����/¿˻ ���󳫻�: <b>"
-
-#~ msgid "Begins: <b>"
-#~ msgstr "����: <b>"
-
-#, fuzzy
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "��Ľ�λ����(_E):"
-
-#, fuzzy
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "����/¿˻ ���󳫻�: <b>"
-
-#, fuzzy
-#~ msgid "Ends: <b>"
-#~ msgstr "����: <b>"
-
-#, fuzzy
-#~ msgid "Task Completed: <b>"
-#~ msgstr " (��� "
-
-#, fuzzy
-#~ msgid "iCalendar Information"
-#~ msgstr "����������(_C):"
-
-#, fuzzy
-#~ msgid "iCalendar Error"
-#~ msgstr "������"
-
-#, fuzzy
-#~ msgid "An unknown person"
-#~ msgstr "������������"
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>�ʤ�</i>"
-
-#, fuzzy
-#~ msgid "Choose an action:"
-#~ msgstr "��������������"
-
-#, fuzzy
-#~ msgid "Update"
-#~ msgstr "�������򹹿�"
-
-#, fuzzy
-#~ msgid "Accept"
-#~ msgstr "��������"
-
-#, fuzzy
-#~ msgid "Tentatively accept"
-#~ msgstr "����"
-
-#, fuzzy
-#~ msgid "Decline"
-#~ msgstr "���ष��"
-
-#, fuzzy
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "����/¿˻ ����"
-
-#, fuzzy
-#~ msgid "Send Latest Information"
-#~ msgstr "����������"
-
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
-
-#~ msgid "Meeting Information"
-#~ msgstr "��ľ���"
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "��Ĥ����"
-
-#~ msgid "Meeting Update"
-#~ msgstr "�����"
-
-#~ msgid "Meeting Update Request"
-#~ msgstr "��Ĥι����׵�"
-
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
-
-#~ msgid "Meeting Reply"
-#~ msgstr "��Ĥ˴ؤ�������"
-
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> �ϲ�Ĥ򥭥�󥻥뤷�ޤ���"
-
-#~ msgid "Meeting Cancellation"
-#~ msgstr "��Ĥ򥭥�󥻥�"
-
-#~ msgid "Bad Meeting Message"
-#~ msgstr "�����ʲ�ĥ�å�����"
-
-#~ msgid "Task Information"
-#~ msgstr "����������"
-
-#~ msgid "Task Proposal"
-#~ msgstr "�����������"
-
-#~ msgid "Task Update"
-#~ msgstr "�������򹹿�"
-
-#~ msgid "Task Update Request"
-#~ msgstr "�������ι����׵�"
-
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> �ϥ������γ�����Ƥ��������ޤ���"
-
-#~ msgid "Task Reply"
-#~ msgstr "�������˴ؤ�������"
-
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> �ϥ������򥭥�󥻥뤷�ޤ���"
-
-#~ msgid "Task Cancellation"
-#~ msgstr "�������򥭥�󥻥�"
-
-#~ msgid "Bad Task Message"
-#~ msgstr "�����ʥ�������å�����"
-
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> �϶���/¿˻ �����������ޤ���"
-
-#~ msgid "Free/Busy Information"
-#~ msgstr "����/¿˻ ����"
-
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
-
-#~ msgid "Free/Busy Request"
-#~ msgstr "����/¿˻ ���׵�"
-
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ����˴ؤ����������ޤ���"
-
-#~ msgid "Free/Busy Reply"
-#~ msgstr "����/¿˻ ���ֿ�"
-
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "������ ����/¿˻ ��å�����"
-
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "���Υ�å�������̤�б����׵��ޤ�Ǥ��ޤ�"
-
-#, fuzzy
-#~ msgid "Status: %s"
-#~ msgstr "���ơ�����(_S):"
-
-#, fuzzy
-#~ msgid "Percent Complete: %i"
-#~ msgstr "���:"
-
-#, fuzzy
-#~ msgid "URL: %s"
-#~ msgstr "URL:"
-
-#, fuzzy
-#~ msgid "Categories: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "��̳ʬ��: "
-
-#, fuzzy
-#~ msgid "Contacts: "
-#~ msgstr "Ϣ����(_N):"
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "̵���ʼ��̤���ʸ�˴ޤޤ�Ƥ��ޤ�, ʸ������Ԥ��Ƥ��ޤ�"
 
@@ -28168,7 +29059,8 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgstr "POP ������ %s �����å��������������ޤ���Ǥ���: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
 #~ msgstr "����� POP �����Ф���³��, Kerberos 4 ǧ�ڤ�Ȥ��ޤ�."
 
 #~ msgid "Could not authenticate to KPOP server: %s"
@@ -28180,9 +29072,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "(Unknown)"
 #~ msgstr "(̤��)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "POP�����Ф���ͽ�����ʤ�����������ޤ���: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "��å������� 'From' ���ɥ쥹�򸫤Ĥ��뤳�Ȥ�����ޤ���Ǥ���"
 
@@ -28229,27 +29118,12 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "Mailbox Format"
 #~ msgstr "�᡼��ܥå����η���"
 
-#~ msgid " (default)"
-#~ msgstr " (�ǥե����)"
-
-#~ msgid "Subject is %s"
-#~ msgstr "��̾�� %s �Ǥ�"
-
-#~ msgid "Mail from %s"
-#~ msgstr "%s ����᡼��"
-
-#~ msgid "%s mailing list"
-#~ msgstr "%s �᡼��󥰥ꥹ��"
-
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "���Υ�å���������Ŭ�ڤʼ����Ԥ�ޤ�Ǥ��ޤ�:"
 
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: ����Ȣ"
 
-#~ msgid "Account"
-#~ msgstr "���������"
-
 #, fuzzy
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
@@ -28263,9 +29137,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "Edit..."
 #~ msgstr "�Խ�..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML ��̾�ե�����:"
-
 #~ msgid "Select Filter Log file..."
 #~ msgstr "�ե��륿�������ե����������..."
 
@@ -28291,18 +29162,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "seconds."
 #~ msgstr " ��"
 
-#, fuzzy
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
-
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr "���Υ�å������ϥǥ������̾���줿��ΤǤ���, ������������ޤ���"
-
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "�¹ԥ��ޥ�Τ���� Evolution ����ݡ��ͥ��"
 
@@ -28313,57 +29172,21 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>��ŷ�������С�����³�Ǥ��ޤ���Ǥ���</b></dd>"
 
-#, fuzzy
-#~ msgid "F"
-#~ msgstr "�ڻ�"
-
-#, fuzzy
-#~ msgid "C"
-#~ msgstr "�ݻ�"
-
-#~ msgid "kph"
-#~ msgstr "kph"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "kilometers"
-#~ msgstr "�����᡼�ȥ�"
-
 #~ msgid "Al_l stations:"
 #~ msgstr "���٤Ƥξ��(_L)"
 
 #~ msgid "All _folders:"
 #~ msgstr "���٤ƤΥե����(_F):"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "���٤ƤΥ˥塼���ۿ�(_F)"
-
 #~ msgid "_Display folders:"
 #~ msgstr "ɽ������ե����(_D):"
 
-#~ msgid "_Display stations:"
-#~ msgstr "ɽ��������(_D)"
-
 #~ msgid "_Displayed feeds:"
 #~ msgstr "ɽ���Ѥߤ��ۿ�(_D)"
 
-#~ msgid "Outbox"
-#~ msgstr "����Ȣ"
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "�ե����ž���Ǥ��ޤ���:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(̾���ʤ�)"
 
@@ -28567,37 +29390,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "%s - Ximian Evolution %s [%s]"
 #~ msgstr "%s - Ximian Evolution %s [%s]"
 
-#~ msgid ""
-#~ "Hi.  Thanks for taking the time to download this preview release\n"
-#~ "of the Ximian Evolution groupware suite.\n"
-#~ "\n"
-#~ "Ximian Evolution is not yet complete. It's getting close, but there are\n"
-#~ "places where features are either missing or only half working. \n"
-#~ "\n"
-#~ "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
-#~ "This product comes with no warranty and is not intended for\n"
-#~ "individuals prone to violent fits of anger.\n"
-#~ "\n"
-#~ "We hope that you enjoy the results of our hard work, and we\n"
-#~ "eagerly await your contributions!\n"
-#~ msgstr ""
-#~ "Ximian Evolution���롼�ץ������������ȤΤ��Υץ�ӥ塼��꡼����\n"
-#~ "����������ɤ˻��֤�䤤�Ƥ���Ƥ��꤬�Ȥ��������ޤ���\n"
-#~ "\n"
-#~ "Ximian Evolution�Ϥޤ�̤�����Ǥ�. ����϶��դ��Ƥ��ޤ���, ��ǽ��\n"
-#~ "�ޤ��ʤ��ä��ꡢȾʬ���餤������ȤǤ��Ƥ��ʤ��ä��ꤹ��Ȥ������ȤǤ���\n"
-#~ "\n"
-#~ "�⤷�Х�������С�bugzilla.ximian.com�ǥ�ݡ��Ȥ��Ƥ���������\n"
-#~ "���Υץ������Ȥ�̵�ݾڤǡ��ܤ�äݤ����ʤοͤˤϸ����Ƥ��ޤ���\n"
-#~ "\n"
-#~ "�桹�Ϥ��ʤ����桹�����̤�ڤ��ळ�Ȥ�˾��Ǥ��ޤ��������Ʋ桹��\n"
-#~ "Ǯ���ˤ��ʤ��ι׸����Ԥ������Ƥ��ޤ�!\n"
-
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Ximian Evolution Team\n"
-#~ msgstr "Ximian Evolution��������\n"
-
 #~ msgid "F_ormat"
 #~ msgstr "�ե����ޥå�(_O)"
 
@@ -28620,7 +29412,8 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 
 #~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 #~ msgstr ""
-#~ "ͥ���٤� '�⤤', '����', '�㤤' ���뤤�� '̤���' �����򤷤ʤ���Фʤ�ޤ���"
+#~ "ͥ���٤� '�⤤', '����', '�㤤' ���뤤�� '̤���' �����򤷤ʤ���Фʤ�ޤ�"
+#~ "��"
 
 #~ msgid "before start of appointment"
 #~ msgstr "���ݥ���Ȥγ�����"
@@ -28628,12 +29421,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "after start of appointment"
 #~ msgstr "���ݥ���Ȥγ��ϸ�"
 
-#~ msgid "before end of appointment"
-#~ msgstr "���ݥ���Ȥν�λ��"
-
-#~ msgid "Evolution Shortcuts"
-#~ msgstr "Evolution ���硼�ȥ��å�"
-
 #~ msgid "Each account must have a different name."
 #~ msgstr "���줾�쥢������Ȥϰۤʤ�̾���Ǥʤ��ƤϤʤ�ޤ���"
 
@@ -28646,9 +29433,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "_Remember PGP Passphrase until exit"
 #~ msgstr "��λ����ޤ� PGP �ѥ��ե졼���򵭲�����(_R)"
 
-#~ msgid "Delete folder '%s'"
-#~ msgstr "�ե�����������ޤ� '%s'"
-
 #~ msgid "Rename"
 #~ msgstr "��͡���"
 
@@ -28735,9 +29519,5 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "Registering '%s'"
 #~ msgstr "'%s' �򥪡��ץ���"
 
-#, fuzzy
-#~ msgid "Synchronizing '%s'"
-#~ msgstr "�ե������Ʊ����"
-
 #~ msgid "All Attendees"
 #~ msgstr "���٤Ƥ��դ�ź��"
diff --git a/po/ko.po b/po/ko.po
index 05aee6f9ee..c9d4874a8e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.9\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2001-03-23 02:12+0900\n"
 "Last-Translator: ChiDeok, Hwang <hwang@mizi.co.kr>\n"
 "Language-Team: korean <ko@li.org>\n"
@@ -42,7 +42,7 @@ msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
 msgid "File As"
 msgstr "���Ϸ� ����:"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "�̸�"
@@ -53,7 +53,7 @@ msgid "Email"
 msgstr "�̸���"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr ""
 
@@ -64,7 +64,7 @@ msgstr "�μ�"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "����"
@@ -72,8 +72,8 @@ msgstr "����"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "����"
 
@@ -84,12 +84,12 @@ msgid "Bus"
 msgstr "�ٻ�"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "ȸ��"
 
@@ -101,8 +101,8 @@ msgstr "����"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "��"
 
@@ -120,18 +120,18 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "�޴���ȭ"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "�ڵ���"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "���� �ѽ�"
@@ -142,13 +142,13 @@ msgid "Bus Fax"
 msgstr "���� �ѽ�"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "�� �ѽ�"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "���� 2"
 
@@ -158,43 +158,43 @@ msgid "Bus 2"
 msgstr "�ٻ�"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "�� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "��Ÿ"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "��Ÿ �ѽ�"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "�߻�"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr ""
@@ -206,14 +206,14 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "�̸��� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "�̸��� 3"
@@ -360,7 +360,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -368,7 +368,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 #, fuzzy
 msgid "Searching..."
 msgstr "�˻�"
@@ -386,35 +386,35 @@ msgstr ""
 "ã�⸦ ���൵�� ����: %s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "�޷� �ҷ�����..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr ""
 "�ڷ��� �д��� ���� �߻�:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
@@ -462,110 +462,140 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "�ּҷ� �ҽ�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution �ּҷ� minicard ����"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "����ó�� ó���ϴ� Evolution ������Ʈ"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the Addressbook's address popup"
 msgstr "�ּҷ�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "�ּҷ�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 #, fuzzy
 msgid "Contacts"
 msgstr "����ó(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP ����"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "New Contact List"
+msgstr "�� ����ó"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "����ó(_C)"
+
+#: addressbook/gui/component/addressbook-component.c:581
 #, fuzzy
 msgid "New Contact"
 msgstr "�� ����ó"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "����ó(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
-msgid "New Contact List"
-msgstr "�� ����ó"
+msgid "Failed to connect to LDAP server"
+msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "����ó(_C)"
+msgid "Failed to authenticate with LDAP server"
+msgstr "KPOP �������� �����Ҽ� ����: %s"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "�ٸ� ����ó"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "�ּҷ��� ������ �����ϴ�"
@@ -591,51 +621,61 @@ msgid ""
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "�̸��� 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "���"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "����..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 #, fuzzy
 msgid "Any Category"
 msgstr "���:"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "���� Ž���Ⱑ ǥ���� URI"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(�̸� ����)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "�̸���"
 
@@ -684,95 +724,55 @@ msgstr ""
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "KPOP �������� �����Ҽ� ����: %s"
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr "KPOP �������� �����Ҽ� ����: %s"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-msgid "Could not query for schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "�Ϸ� ��¥"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "����"
+msgid "1234"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "����"
+msgid "1:00"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1234"
+msgid "2:30"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:5
-msgid "1:00"
+msgid "3268"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
+msgid "380"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
-msgid "3268"
+msgid "389"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:8
-msgid "380"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "389"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "5:00"
+msgid "666"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "636"
-msgstr ""
+#, fuzzy
+msgid "<- _Remove"
+msgstr "����"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "666"
-msgstr ""
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "����"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
@@ -782,8 +782,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "�ּҷ� �ҽ�"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "��"
@@ -876,8 +876,8 @@ msgstr "���� ����"
 msgid "Mappings"
 msgstr "����"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "����"
@@ -1060,14 +1060,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1087,8 +1087,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1120,7 +1120,7 @@ msgid "Using email address"
 msgstr "���ڿ��� �ּ�:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1128,7 +1128,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "�߰�(_A)"
 
@@ -1174,7 +1174,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1291,10 +1291,12 @@ msgstr "Evolution �ּҷ� �̸� ���� �������̽�"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "�ּҷ� �̸� ���� �������̽��� ���� ���丮"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "����"
 
@@ -1424,7 +1426,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "����ó ������"
 
@@ -1434,7 +1436,7 @@ msgid "D_epartment:"
 msgstr "�μ�(_D):"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "�ڼ���"
 
@@ -1497,11 +1499,12 @@ msgstr "HTML���� ���� ���(_H)"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "����(_D)"
 
@@ -1532,7 +1535,7 @@ msgid "_Web page address:"
 msgstr "Ȩ������ �ּ�:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 #, fuzzy
 msgid "United States"
 msgstr "�޼��� �μ�"
@@ -2060,12 +2063,11 @@ msgid "Laos"
 msgstr "�̸�(_L):"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
@@ -2074,7 +2076,7 @@ msgid "Lesotho"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr ""
 
@@ -2083,12 +2085,12 @@ msgid "Liechtenstein"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr ""
 
@@ -2124,7 +2126,7 @@ msgid "Mali"
 msgstr "����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 #, fuzzy
 msgid "Malta"
 msgstr "����"
@@ -2152,7 +2154,7 @@ msgid "Mayotte"
 msgstr "����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr ""
 
@@ -2178,7 +2180,7 @@ msgid "Montserrat"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr ""
 
@@ -2205,7 +2207,7 @@ msgid "Nepal"
 msgstr "�� ����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 #, fuzzy
 msgid "Netherlands"
 msgstr "��Ÿ�� ����(_T)"
@@ -2220,13 +2222,13 @@ msgid "New Caledonia"
 msgstr "�� ����ó"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 #, fuzzy
 msgid "New Zealand"
 msgstr "�� ����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr ""
 
@@ -2245,7 +2247,7 @@ msgid "Niue"
 msgstr "��"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr ""
 
@@ -2254,18 +2256,18 @@ msgid "Northern Mariana Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norway"
 msgstr "����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 #, fuzzy
 msgid "Pakistan"
 msgstr "���̱�"
@@ -2279,7 +2281,7 @@ msgid "Palestinian Territory"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 #, fuzzy
 msgid "Panama"
 msgstr "ij����"
@@ -2289,12 +2291,12 @@ msgid "Papua New Guinea"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 #, fuzzy
 msgid "Peru"
 msgstr "����"
@@ -2308,24 +2310,24 @@ msgid "Pitcairn"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 #, fuzzy
 msgid "Poland"
 msgstr "�ɶ���"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 #, fuzzy
 msgid "Portugal"
 msgstr "����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr ""
 
@@ -2335,7 +2337,7 @@ msgid "Reunion"
 msgstr "����:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr ""
 
@@ -2373,7 +2375,7 @@ msgid "Sao Tome And Principe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr ""
 
@@ -2391,17 +2393,17 @@ msgid "Sierra Leone"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr ""
 
@@ -2415,7 +2417,7 @@ msgid "Somalia"
 msgstr "����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr ""
 
@@ -2424,7 +2426,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 #, fuzzy
 msgid "Spain"
 msgstr "����"
@@ -2447,7 +2449,7 @@ msgid "Sudan"
 msgstr "��"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 #, fuzzy
 msgid "Suriname"
 msgstr "����"
@@ -2462,18 +2464,18 @@ msgid "Swaziland"
 msgstr "�ɶ���"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 #, fuzzy
 msgid "Sweden"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr ""
 
@@ -2514,7 +2516,7 @@ msgid "Tunisia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 #, fuzzy
 msgid "Turkey"
 msgstr "ȭ"
@@ -2537,7 +2539,7 @@ msgid "Uganda"
 msgstr "ij����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr ""
 
@@ -2546,7 +2548,7 @@ msgid "United Arab Emirates"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr ""
 
@@ -2555,7 +2557,7 @@ msgid "United States Minor Outlying Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr ""
 
@@ -2568,12 +2570,12 @@ msgid "Vanuatu"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 #, fuzzy
 msgid "Viet Nam"
 msgstr "������ �̸�"
@@ -2595,12 +2597,12 @@ msgid "Western Sahara"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr ""
 
@@ -2613,27 +2615,34 @@ msgid "Zimbabwe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "������ �� ������ ����⸦ ���Ͻʴϱ�?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "����ó�� �����ұ��?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "VCard�� ����"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "`%s'���ִ� ������ ������ �����ϴ�"
@@ -2660,11 +2669,11 @@ msgstr "�̸���"
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2801,12 +2810,12 @@ msgid "contact-list-editor"
 msgstr "����ó ������"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "����ó ������"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "VCard�� ����"
@@ -2887,22 +2896,22 @@ msgid "Error getting book view"
 msgstr "%s��(��) �д��� ���� �߻�"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 #, fuzzy
 msgid "Error modifying card"
 msgstr "%s��(��) �д��� ���� �߻�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "�� ������ ����"
 
@@ -2912,7 +2921,7 @@ msgid "Repository offline"
 msgstr "�������ο��� �۾�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "�㰡�� �ź�"
 
@@ -2932,63 +2941,78 @@ msgstr "�۵��� �������� ����"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "��ҵ�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
 #, fuzzy
+msgid "Authentication Failed"
+msgstr "���� ����."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "������ �ʿ���"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
 msgid "Other error"
 msgstr "����� ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "����Ȱ��� ���� �ϱ� ���Ͻʴϱ�?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 #, fuzzy
 msgid "Error adding list"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 #, fuzzy
 msgid "Error adding card"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #, fuzzy
 msgid "Error modifying list"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 #, fuzzy
 msgid "Error removing list"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
 "�ڷ��� �д��� ���� �߻�:\n"
 "%s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "ǥ��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "ǥ��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2996,22 +3020,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "���� ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "���� ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "���� ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "���� ����"
@@ -3088,105 +3112,112 @@ msgstr "�ٸ� ����ó"
 msgid "Other Address"
 msgstr "�ּ� Ȯ��"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#, fuzzy
+msgid "Addressbook"
+msgstr "�ּҷ� �߰�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "VCard�� ����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "�� ����ó"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "�� ����ó"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "������ ����(_G)..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "����ó ã��(_S)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "�ּҷ� �ҽ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "���� ����(_M)..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Forward Contact"
 msgstr "�ٸ� �ּҷ� ����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "���߿� �޼����� �����ϴ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "�μ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 #, fuzzy
 msgid "Print Envelope"
 msgstr "���� �μ�(_v)..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "������ ����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "������ �̵�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "�ڸ���"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "���̱�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "����"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3196,7 +3227,7 @@ msgstr "ī��: "
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3204,7 +3235,7 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3348,7 +3379,7 @@ msgstr "����"
 msgid "Number of columns:"
 msgstr "�� ��:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "����"
 
@@ -3358,7 +3389,7 @@ msgid "Orientation"
 msgstr "����"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "��"
 
@@ -3433,30 +3464,34 @@ msgstr "��:"
 msgid "_Font..."
 msgstr "�۲�..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "����� �����ϱ�"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "����"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "����"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "����"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "���Ǿȵ�"
 
@@ -3498,43 +3533,35 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "�ּҷ�"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3546,11 +3573,26 @@ msgstr "�˶� ���"
 msgid "Factory for the alarm notification service"
 msgstr "�˶� ����� ���� ���丮"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "����..."
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "����"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 #, fuzzy
 msgid "invalid time"
 msgstr "����ġ�� �ð�(_E):"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution ��ġ"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, fuzzy, c-format
 msgid "Alarm on %s"
@@ -3588,7 +3630,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "���"
@@ -3609,16 +3651,16 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "�׳��� �ʱ�ȭ �Ҽ� �����ϴ�"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 #, fuzzy
 msgid "Could not create the alarm notify service"
 msgstr "�˶� ��� ���丮�� ������� �����ϴ�"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "�˶� ��� ���丮�� ������� �����ϴ�"
 
@@ -3637,7 +3679,7 @@ msgstr "����:"
 msgid "Comment contains"
 msgstr "������������"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr ""
 
@@ -3677,14 +3719,16 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr ""
 
@@ -3705,28 +3749,33 @@ msgid "W"
 msgstr "��"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "�ٻ�"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "���� ����"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "������"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "�Ϸ��"
 
@@ -3738,11 +3787,12 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3757,12 +3807,14 @@ msgstr "�ݺ���"
 msgid "Assigned"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "�ƴϿ�"
 
@@ -3785,63 +3837,65 @@ msgstr "��"
 msgid "Month View"
 msgstr "��"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "�޷�"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "�۾�"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "���� ���"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "���� ���"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "�۾�"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "�� ���"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "�� ���"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "�� ���"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "���"
@@ -4063,7 +4117,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "���"
 
@@ -4093,7 +4147,7 @@ msgstr "��� ��"
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "��"
 
@@ -4121,86 +4175,85 @@ msgstr ""
 msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "����"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
 msgid "Calendar and Tasks Settings"
 msgstr "���� ����(_M)..."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "Days"
 msgstr "�����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "�ݿ���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #, fuzzy
 msgid "Hours"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
 msgid "Minutes"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "��"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "�����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#, fuzzy
-msgid "Sta_rt of day:"
-msgstr "���� ��¥(_r):"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, fuzzy
-msgid "Su_n"
-msgstr "��"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "�Ͽ���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_asks due today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "T_hu"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#, fuzzy
-msgid "T_ue"
-msgstr "ȭ"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4233,92 +4286,105 @@ msgid "Tuesday"
 msgstr "ȭ����"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Work Week"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #, fuzzy
 msgid "_24 hour"
 msgstr " �ѽð���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "_Display"
-msgstr "ǥ��"
+msgid "_Day begins:"
+msgstr "���� �ɼ�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #, fuzzy
-msgid "_End of day:"
-msgstr "�Ϸ��� ��:"
+msgid "_Display"
+msgstr "ǥ��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_Fri"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_General"
 msgstr "�Ϲ� ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "������ �޼��� ����(_D)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Mon"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Overdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #, fuzzy
 msgid "_Sat"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "��� ���ð� ����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "ũ��:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "ȭ"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
 msgid "_Wed"
 msgstr "��"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 #, fuzzy
-msgid "before the start of the appointment"
-msgstr "��ӽ�����"
+msgid "before every appointment"
+msgstr "��� ��������"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
@@ -4405,41 +4471,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "����� ���ϵ��� ������ ���� �����ϴ�"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
 #, fuzzy
-msgid "Could not update object!"
+msgid "Could not update object"
 msgstr "����� ���ϵ��� ������ ���� �����ϴ�"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "����� �����Ѵ�"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "��� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "���� ���� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4500,28 +4586,28 @@ msgstr "������"
 msgid "Enter Delegate"
 msgstr "������"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "���"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 #, fuzzy
 msgid "Scheduling"
 msgstr "����"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 #, fuzzy
 msgid "Meeting"
 msgstr "���� ���"
@@ -4575,7 +4661,7 @@ msgid "Pu_blic"
 msgstr "���� Ű(_b)"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Show Time As"
 msgstr "����"
@@ -4598,19 +4684,19 @@ msgstr "����ġ�� �ð�(_E):"
 msgid "_Start time:"
 msgstr "���� �ð�(_S):"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "����..."
@@ -4623,52 +4709,59 @@ msgstr "������"
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
 #, fuzzy
-msgid "Common Name"
-msgstr "�Ϸ� ��¥"
+msgid "Click here to add an attendee"
+msgstr "����ó�� �߰��ϱ�"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
 #, fuzzy
-msgid "Delegated From"
-msgstr "������"
+msgid "Common Name"
+msgstr "�Ϸ� ��¥"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
-msgid "Delegated To"
+msgid "Delegated From"
 msgstr "������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr ""
+#, fuzzy
+msgid "Delegated To"
+msgstr "������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 #, fuzzy
 msgid "Member"
 msgstr "����"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "����"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -4684,15 +4777,10 @@ msgid "_Change Organizer"
 msgstr "����:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "�ٸ� �̵��� �ʴ�(_I)..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#, fuzzy
-msgid "_Other Organizer"
-msgstr "����:"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4880,7 +4968,7 @@ msgid "Progress"
 msgstr "������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr ""
 
@@ -4892,20 +4980,20 @@ msgstr "�켱����(_P):"
 msgid "_Status:"
 msgstr "����(_S):"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 #, fuzzy
 msgid "Assignment"
 msgstr "�����"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "����:"
 
@@ -4917,25 +5005,80 @@ msgstr "���� ��¥(_r):"
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "����ó�� �����"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "_Open"
 msgstr "����"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4943,20 +5086,20 @@ msgstr "�ٸ� �̸����� ����..."
 msgid "_Print..."
 msgstr "�μ�(_P)..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "�ڸ���(_u)"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "����(_C)"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4964,37 +5107,38 @@ msgstr "����(_C)"
 msgid "_Paste"
 msgstr "���̱�(_P)"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "�����"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "�޷� �ҷ����̱�"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "�Ϸ� ǥ��"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "�Ϸ� ǥ��"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "�� ������ �����մϴ�"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "�۾���Ͽ� �߰��ϱ�"
@@ -5003,49 +5147,50 @@ msgstr "�۾���Ͽ� �߰��ϱ�"
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 #, fuzzy
 msgid "Complete"
 msgstr "�Ϸ��"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "�Ϸ� ��¥"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "������ ��"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "�������� ��ġ"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "�켱����"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "������ ��"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "���"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 #, fuzzy
 msgid "Task sort"
 msgstr "�۾�"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr ""
 
@@ -5090,11 +5235,13 @@ msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "����"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "����"
 
@@ -5137,7 +5284,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "����� ����"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "���� ����"
@@ -5148,7 +5295,7 @@ msgid "_Configure Pilot..."
 msgstr "���� ����"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "�ٸ��̸����� ����(_S)..."
 
@@ -5177,77 +5324,432 @@ msgid "Delete _All Occurrences"
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "���� ������ ����: %s: %s"
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+#, fuzzy
+msgid "Meeting begins: <b>"
+msgstr "ȸ�� ���� �ð�(_e):"
+
+#: calendar/gui/e-itip-control.c:683
+#, fuzzy
+msgid "Task begins: <b>"
+msgstr "�Ϸ��"
+
+#: calendar/gui/e-itip-control.c:688
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "����� ����"
+
+#: calendar/gui/e-itip-control.c:692
+#, fuzzy
+msgid "Begins: <b>"
+msgstr "ȸ�� ���� �ð�(_e):"
+
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "ȸ�� ���� �ð�(_e):"
+
+#: calendar/gui/e-itip-control.c:707
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "����� ����"
+
+#: calendar/gui/e-itip-control.c:711
+#, fuzzy
+msgid "Ends: <b>"
+msgstr "ȸ�� ���� �ð�(_e):"
+
+#: calendar/gui/e-itip-control.c:725
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "�Ϸ��"
+
+#: calendar/gui/e-itip-control.c:735
+#, fuzzy
+msgid "Task Due: <b>"
+msgstr "�Ϸ��"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "����� ����"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "�޷�"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "An unknown person"
+msgstr "�� ������ ����"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "����(_S):"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+#, fuzzy
+msgid "Accepted"
+msgstr "����"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "������"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#, fuzzy
+msgid "Declined"
+msgstr "�ݴ�"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#, fuzzy
+msgid "Choose an action:"
+msgstr "������ ��������"
+
+#: calendar/gui/e-itip-control.c:972
+#, fuzzy
+msgid "Update"
+msgstr "�۾�"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Ȯ��"
+
+#: calendar/gui/e-itip-control.c:1000
+#, fuzzy
+msgid "Accept"
+msgstr "����"
+
+#: calendar/gui/e-itip-control.c:1001
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "������"
+
+#: calendar/gui/e-itip-control.c:1002
+#, fuzzy
+msgid "Decline"
+msgstr "�ݴ�"
+
+#: calendar/gui/e-itip-control.c:1026
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "����� ����"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "����"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "��ҵ�"
+
+#: calendar/gui/e-itip-control.c:1117
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "����� ����"
+
+#: calendar/gui/e-itip-control.c:1118
+#, fuzzy
+msgid "Meeting Information"
+msgstr "���� ����"
+
+#: calendar/gui/e-itip-control.c:1122
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
+
+#: calendar/gui/e-itip-control.c:1123
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "���� ���"
+
+#: calendar/gui/e-itip-control.c:1127
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
+
+#: calendar/gui/e-itip-control.c:1128
+#, fuzzy
+msgid "Meeting Update"
+msgstr "ȸ�� ���� �ð�(_e):"
+
+#: calendar/gui/e-itip-control.c:1132
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
+
+#: calendar/gui/e-itip-control.c:1133
+#, fuzzy
+msgid "Meeting Update Request"
+msgstr "ȸ�� ���� �ð�(_e):"
+
+#: calendar/gui/e-itip-control.c:1156
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
+
+#: calendar/gui/e-itip-control.c:1157
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "���� ���"
+
+#: calendar/gui/e-itip-control.c:1161
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
+
+#: calendar/gui/e-itip-control.c:1162
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "������ ��������"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1167
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "�޼����� ����"
+
+#: calendar/gui/e-itip-control.c:1189
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "����� ����"
+
+#: calendar/gui/e-itip-control.c:1190
+#, fuzzy
+msgid "Task Information"
+msgstr "����"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1195
+#, fuzzy
+msgid "Task Proposal"
+msgstr "�۾��е�"
+
+#: calendar/gui/e-itip-control.c:1199
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
+
+#: calendar/gui/e-itip-control.c:1200
+#, fuzzy
+msgid "Task Update"
+msgstr "�۾�"
+
+#: calendar/gui/e-itip-control.c:1204
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
+
+#: calendar/gui/e-itip-control.c:1205
+#, fuzzy
+msgid "Task Update Request"
+msgstr "�۾�"
+
+#: calendar/gui/e-itip-control.c:1229
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
+
+#: calendar/gui/e-itip-control.c:1230
+#, fuzzy
+msgid "Task Reply"
+msgstr "ȸ��"
+
+#: calendar/gui/e-itip-control.c:1234
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
+
+#: calendar/gui/e-itip-control.c:1235
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "���� ���"
+
+#: calendar/gui/e-itip-control.c:1240
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "�޼����� ����"
+
+#: calendar/gui/e-itip-control.c:1259
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "����� ����"
+
+#: calendar/gui/e-itip-control.c:1260
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "����� ����"
+
+#: calendar/gui/e-itip-control.c:1264
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "����� ����"
+
+#: calendar/gui/e-itip-control.c:1265
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "�޼��� �μ�"
+
+#: calendar/gui/e-itip-control.c:1269
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
+
+#: calendar/gui/e-itip-control.c:1270
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "�޼��� �μ�"
+
+#: calendar/gui/e-itip-control.c:1275
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "�޼��� �μ�"
+
+#: calendar/gui/e-itip-control.c:1354
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Bug buddy�� �����Ҽ� �����ϴ�."
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 #, fuzzy
 msgid "Update complete\n"
 msgstr "�Ϸ�� ��¥:"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
+#: calendar/gui/e-itip-control.c:1671
 #, fuzzy
-msgid "Attendee status could not be updated!\n"
+msgid "Attendee status updated\n"
 msgstr "������ �ּ�"
 
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
-msgid "Attendee status updated\n"
+msgid "Attendee status could not be updated!\n"
 msgstr "������ �ּ�"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1709
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% �Ϸ�(_p):"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "���� ��¥"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "���� ����"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "���� ����"
@@ -5290,88 +5792,85 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 #, fuzzy
 msgid "Required Participants"
 msgstr "�� ������"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 #, fuzzy
 msgid "Optional Participants"
 msgstr "�� ������"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 #, fuzzy
 msgid "Non-Participants"
 msgstr "�� ������"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 #, fuzzy
 msgid "Group"
 msgstr "�׷� �̸�:"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 #, fuzzy
 msgid "Resource"
 msgstr "�������:"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "����"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "�� ������"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 #, fuzzy
 msgid "Needs Action"
 msgstr "���� ����"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-#, fuzzy
-msgid "Accepted"
-msgstr "����"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#, fuzzy
-msgid "Declined"
-msgstr "�ݴ�"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 #, fuzzy
 msgid "Delegated"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 #, fuzzy
 msgid "In Process"
 msgstr "������"
@@ -5379,14 +5878,14 @@ msgstr "������"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr ""
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr ""
@@ -5398,63 +5897,63 @@ msgstr ""
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "�繫�� ����"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "���� ����"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "����(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "ȸ�� ���� �ð�(_s):"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "ȸ�� ���� �ð�(_e):"
 
@@ -5473,17 +5972,22 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "`%s'���ִ� ������ ������ �����ϴ�"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "�Ϸ� ��¥"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "����ó�� �����"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "���� ����"
@@ -5498,17 +6002,17 @@ msgstr "�� ���..."
 msgid "_Delete this Appointment"
 msgstr "�� ����� �����մϴ�"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'���ִ� ������ ������ �����ϴ�"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "�޷� ����"
@@ -5570,19 +6074,58 @@ msgstr "�ÿ�"
 msgid "September"
 msgstr "����"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "����� ����"
+
+#: calendar/gui/itip-utils.c:356
+#, fuzzy
+msgid "Task information"
+msgstr "����"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "���� ����"
+
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "����� ����"
+
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "����� ����"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "�۾�"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "����"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "�˶� ��� ���丮�� ������� �����ϴ�"
@@ -5772,12 +6315,49 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
+#: calendar/gui/print.c:2249
+#, fuzzy
+msgid "Task"
+msgstr "�۾�"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "����(_S):"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "�켱����(_P):"
+
+#: calendar/gui/print.c:2338
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "�ۼ�Ʈ �Ϸ�"
+
+#: calendar/gui/print.c:2350
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "%s ����"
+
+#: calendar/gui/print.c:2364
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"���: "
+
+#: calendar/gui/print.c:2375
+#, fuzzy
+msgid "Contacts: "
+msgstr "����ó(_C)"
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr ""
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5809,8 +6389,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
@@ -5867,6 +6447,11 @@ msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
 msgid "Imports vCalendar files into Evolution"
 msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "������"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5957,8 +6542,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -6897,651 +7482,665 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "����"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "����"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr ""
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 #, fuzzy
 msgid "Asia/Muscat"
 msgstr "����"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr ""
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 #, fuzzy
 msgid "Asia/Omsk"
 msgstr "�����"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "�����"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr ""
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr ""
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr ""
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr ""
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr ""
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr ""
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr ""
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr ""
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr ""
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr ""
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr ""
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr ""
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr ""
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr ""
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr ""
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr ""
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr ""
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr ""
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr ""
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr ""
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr ""
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr ""
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 #, fuzzy
 msgid "Europe/Athens"
 msgstr "����"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr ""
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr ""
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr ""
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr ""
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr ""
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr ""
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr ""
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr ""
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr ""
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr ""
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr ""
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr ""
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr ""
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr ""
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr ""
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr ""
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr ""
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr ""
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr ""
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 #, fuzzy
 msgid "Europe/Monaco"
 msgstr "������"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr ""
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr ""
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 #, fuzzy
 msgid "Europe/Paris"
 msgstr "����"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr ""
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr ""
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr ""
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr ""
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr ""
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr ""
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr ""
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr ""
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr ""
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr ""
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr ""
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 #, fuzzy
 msgid "Indian/Comoro"
 msgstr "����"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr ""
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 #, fuzzy
 msgid "Indian/Mauritius"
 msgstr "����"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 #, fuzzy
 msgid "Indian/Mayotte"
 msgstr "����"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 #, fuzzy
 msgid "Indian/Reunion"
 msgstr "����:"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 
-#: camel/camel-cipher-context.c:209
-#, fuzzy
-msgid "Clearsigning is not supported by this cipher"
-msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
@@ -7553,14 +8152,14 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
 "%s ���丮�� ������ ���� �����ϴ�:\n"
 "%s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7568,7 +8167,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7576,11 +8175,16 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "%s ������ ����"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -7589,64 +8193,74 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "���� ����ȭ"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "���� ��� ����: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "���� ������ ����: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "�ּҷ��� ������ �����ϴ�"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "�ּҷ��� ������ �����ϴ�"
 
-#: camel/camel-filter-driver.c:911
-#, fuzzy
+#: camel/camel-filter-driver.c:908
+#, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "�޼��� %s�� ��������"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 #, fuzzy
 msgid "Cannot open message"
 msgstr ""
 "�޼����� ������ ����: %s\n"
 "  %s"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "���޵� �޽��� - %s"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 #, fuzzy
 msgid "Syncing folder"
 msgstr "���� ����ȭ"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "�޼����� ������ ÷���մϴ�"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "�޼����� ������ ÷���մϴ�"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "���� � ������ ����: %s: %s"
@@ -7676,30 +8290,106 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "ã�⸦ ���൵�� ����: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "ã�⸦ ���൵�� ����: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 #, fuzzy
 msgid "Moving messages"
 msgstr "�޼��� ����"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "�޽������� %s�� ����"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "��ҵ�."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "IMAP server�κ��� ����ġ���� �亯: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "�����ڰ� ������������"
+
+#: camel/camel-gpg-context.c:827
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr ""
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "�޼����� ������ ÷���մϴ�"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "�޼����� ������ ÷���մϴ�"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "�޼����� ������ ÷���մϴ�"
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "�ӽ� ������ ����� ����: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7795,84 +8485,23 @@ msgstr "���� �ӽ������� ������ �����߻�: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "���� �ӽ������� ������ �����߻�: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: camel/camel-pgp-context.c:621
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr ""
-"�޼����� ������ ����: %s\n"
-"  %s"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr ""
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr ""
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1004
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "�ӽ� ������ ����� ����: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "����� ����"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7888,43 +8517,6 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s ���� ���� %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "������ ��ҵ�"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(�𸣴� ȣ��Ʈ)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "�۾� ���"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr ""
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr ""
@@ -8018,7 +8610,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8046,11 +8638,9 @@ msgid ""
 "Password Authentication."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "��й�ȣ"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -8077,51 +8667,51 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "ȸ�� �ּ�:"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8185,12 +8775,12 @@ msgstr "�޼����� ������ ÷���մϴ�"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "������ ������ �����ϴ�: %s: %s"
@@ -8214,7 +8804,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8223,16 +8813,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8247,15 +8837,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "�׷� �޼��� ����: %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "�׷� �޼��� ����: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "�޼����� �� ������ �����մϴ�"
 
 #: camel/camel-vee-store.c:262
 #, fuzzy, c-format
@@ -8277,73 +8867,79 @@ msgstr "������ ������ �����ϴ�: %s: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-vtrash-folder.c:117
-#, fuzzy
-msgid "You cannot copy messages from this trash folder."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "�۾� ���"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
 msgstr ""
-"�޼����� ������ ����: %2$s �������� %1$s\n"
-"  %3$s"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP server�κ��� ����ġ���� �亯: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ������ ����: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "������ �亯�� �ʹ� ���� �������ϴ�."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP �����κ��� ����ġ���� OK�亯�� ��: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "�޽������� ����"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "�� �޽����� ���� ������ ���� �����ϴ�"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "�޽������� ����"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8401,32 +8997,81 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "��й�ȣ"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP ���� %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "SMTP ���� %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "������ ��ҵ�"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "KPOP �������� �����Ҽ� ����: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "�۵��� �������� ����"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "���� ����."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s Ÿ�� ������ ���� ����"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8434,70 +9079,87 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "%s���� ������ ����"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
-msgid "MH-format mail directories"
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s ���� ���� %s"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, c-format
+msgid "mailbox:%s (%s)"
+msgstr ""
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s ���� ���� %s"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:49
+msgid "MH-format mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 #, fuzzy
 msgid "Local delivery"
 msgstr "���� ����"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
+msgid "Standard Unix mbox spool or directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8523,7 +9185,7 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr "���� ���� ���� %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
@@ -8545,36 +9207,34 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "���޵� �޽��� - %s"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "���������� �޼����� �����ϼ� �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8583,20 +9243,19 @@ msgstr ""
 "�޼����� ������ ����: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "�׷� �޼��� ����"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8605,13 +9264,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "���� `%s'�� �������� �ʽ��ϴ�."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8627,7 +9286,7 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
@@ -8636,8 +9295,8 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -8660,47 +9319,39 @@ msgstr "�� ������ �ۼ��մϴ�"
 msgid "Checking for new messages"
 msgstr "�޽������� ����"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
 msgstr "���� ����ȭ"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "�۾� ���"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8709,13 +9360,11 @@ msgstr ""
 "�޼����� ������ ����: %2$s �������� %1$s\n"
 "  %3$s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -8752,197 +9401,188 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
+#, c-format
+msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr ""
+msgid "Could not close temp folder: %s"
+msgstr "�ӽ� ������ ������ ����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
+msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
-#, c-format
-msgid "Could not close source folder %s: %s"
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
-msgid "Could not close temp folder: %s"
+msgid "Unknown error: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
 msgstr "�ӽ� ������ ������ ����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:973
 #, c-format
-msgid "Could not rename folder: %s"
+msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:990
 #, c-format
-msgid "Unknown error: %s"
+msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "���߿� �޼����� �����ϴ�"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, fuzzy, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 "%s ���丮��\n"
 "������ ���� �����ϴٿ���: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, fuzzy, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "���������� �޼����� �����ϼ� �����ϴ�: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:115
+#: camel/providers/local/camel-spool-store.c:128
 #, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
+msgid "Spool `%s' is not a regular file or directory"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "���� `%s'�� �������� �ʽ��ϴ�."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "���� ���� ���� %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "���� ���� ���� %s"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "�ӽ� ������ ������ ����: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "�ӽ� ������ ������ ����: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, fuzzy, c-format
-msgid "Could not file: %s: %s"
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "USENET news"
 msgstr ""
-"���� ���� %s�� �� ���� �����ϴ�:\n"
-"%s"
 
-#: camel/providers/local/camel-spoold-store.c:117
-#, c-format
-msgid "Store `%s' does not exist or is not a directory"
+#: camel/providers/nntp/camel-nntp-provider.c:43
+msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
 msgstr ""
+"%s ���丮�� ������ ���� �����ϴ�:\n"
+"%s"
 
-#: camel/providers/local/camel-spoold-store.c:173
+#: camel/providers/nntp/camel-nntp-store.c:163
 #, c-format
-msgid "Mail tree %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "USENET news"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
+msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9048,7 +9688,7 @@ msgstr "������ ���� �����"
 msgid "Delete after %s day(s)"
 msgstr "�� ������ �����մϴ�"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr ""
 
@@ -9069,69 +9709,59 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "�۵��� �������� ����"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "���� ����."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "IMAP ������ ����: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "����� ����"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr ""
 
@@ -9292,41 +9922,41 @@ msgstr ""
 msgid "Authentication required"
 msgstr "������ �ʿ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
+#: camel/providers/smtp/camel-smtp-transport.c:461
 #, fuzzy, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "%s Ÿ�� ������ ���� ����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9334,89 +9964,89 @@ msgid ""
 "\n"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ���� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "�޼����� ����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "����:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9424,35 +10054,35 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr ""
 
@@ -9525,52 +10155,52 @@ msgstr "MIME ����:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "�ּҷ�"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "���� ���:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "ȸ�� �ּ�:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "�޴� ���:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "�޼����� ���� ����� �Է��ϼ���"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�޼����� �纻�� ���� ����� �ּҸ� �Է��ϼ���"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "���� ����:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9581,42 +10211,47 @@ msgstr "���� ��Ͽ��� ������ �޼����� �纻�� ���� ������� �ּҸ� �Է��ϼ���"
 msgid "Attach a file"
 msgstr "������ ÷���մϴ�"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
+
+#: composer/e-msg-composer.c:774
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "������ �д��� ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 #, fuzzy
 msgid "Warning!"
 msgstr "���"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "���� ������ ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ �д��� ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "���� ������ ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9625,7 +10260,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9634,7 +10269,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9643,13 +10278,13 @@ msgstr ""
 "%s�� �޽��� ������ ���� �߻�:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9659,31 +10294,50 @@ msgstr ""
 "\n"
 "����� ������ �����Ͻðڽ��ϱ�?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "���޵� �޽���"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "���� ����"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 #, fuzzy
 msgid "Insert File"
 msgstr "�ؽ�Ʈ ���� ����"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "����:"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+msgid "Set as default"
+msgstr ""
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "���� �޼����� �ۼ��մϴ�"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -9692,6 +10346,12 @@ msgstr ""
 "���� �Ż� ������ �Է��� �Ǿ����� �ʾұ⶧����\n"
 "�޽��� �ۼ�â�� ���� ���� �����ϴ�."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9764,7 +10424,7 @@ msgstr "����"
 msgid "Subject does not contain"
 msgstr "������������"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9915,7 +10575,7 @@ msgstr "��"
 msgid "minute"
 msgstr "��"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "��"
 
@@ -9985,7 +10645,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr ""
 
@@ -9997,6 +10657,21 @@ msgstr "<��¥�� �����ҷ��� ���� ��������>"
 msgid "Filter Rules"
 msgstr "�Ÿ��� ��Ģ"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "���� �̸�:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "���� `%s'�� �������� �ʽ��ϴ�."
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "������ ��������"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -10016,7 +10691,7 @@ msgstr ""
 "�ڷ� ���ư� ������ ����� ������ �����ϼ���."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "���� ����"
 
@@ -10029,7 +10704,11 @@ msgstr ""
 "���Խ� '%s'���� ����:\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "�׽�Ʈ"
 
@@ -10060,7 +10739,7 @@ msgstr "��� ������ �� ������ ��"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "� �����̶� ������ ��"
 
 #: filter/filter-rule.c:780
@@ -10141,192 +10820,201 @@ msgid "Beep"
 msgstr "ũ��"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "ȸ��"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "������ ����"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "���� ��¥"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "���� ��¥"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "������������"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "�������� ����"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "�������� ����"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "�ʰ�"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "ǥ��"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "�߿�"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "is before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+msgid "Label"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "�޼��� �Ӹ���"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "������ �̵�"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "�Ҹ� ����"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "�޴� ���"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "ȸ��"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "���� ����"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 #, fuzzy
 msgid "Size (kB)"
 msgstr "ũ��"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "Source Account"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "����"
 
@@ -10387,7 +11075,8 @@ msgid "Scanning %s"
 msgstr "\"%s\" ������ ��"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "����"
 
@@ -10401,11 +11090,6 @@ msgstr ""
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-#, fuzzy
-msgid "Addressbook"
-msgstr "�ּҷ� �߰�"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10453,7 +11137,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr ""
 
@@ -10590,282 +11276,292 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "���� ����"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "���� ����"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 #, fuzzy
 msgid "Properties..."
 msgstr "����(_P)..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "���޵� �޽���"
+
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "New Mail Message"
 msgstr "���� �޼���(_M)"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "���� �޼���(_M)"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "����ϴ� ��..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"������ ����"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "����"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "�ӽ� ���丮�� ���� ���� �����ϴ�: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "������"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d �ʸ���"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr " %d �ʸ���"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "�޽����κ��� ���� ���� ����(_V)"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "���񿡵��� ��������(_S)"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "�߼��ڿ����� ��������(_n)"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "�����ڿ����� ��������(_R)"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "���񿡴��� �Ÿ���(_S)"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "�߼��ο����� �Ÿ���(_n)"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "�����ο����� �Ÿ���(_R)"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "�޼��� �μ�"
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "�μ�(_P)"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "���� ������� ȸ��"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Reply to _List"
 msgstr "��ü ȸ��(_A)"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "��ü ȸ��(_A)"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "����(_F)"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "�Ϸ��"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "���(_l)"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "���� ������ ǥ��(_k)"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "���� ���� ������ ǥ��(_n)"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "�߿�"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "���� ���� ������ ǥ��"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "�ǻ츲(_U)"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "������ �̵�..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "������ ����(_C)..."
 
-#: mail/folder-browser.c:1645
-msgid "Label"
-msgstr ""
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "�ּҷ� �߰�"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "�Ÿ��� ����"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "�޽����κ��� �Ÿ��� ����(_C)"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "����"
+
+#: mail/folder-info.c:71
 #, fuzzy
 msgid "Getting Folder Information"
 msgstr "���� ����"
@@ -10921,7 +11617,7 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
@@ -10932,86 +11628,110 @@ msgid "Evolution News Editor"
 msgstr "Evolution ��ġ"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Host:"
 msgstr "ȣ��Ʈ:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "������̸�:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Path:"
 msgstr "���:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "ij����"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "������ �� ������ ����⸦ ���Ͻʴϱ�?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 #, fuzzy
 msgid "Don't delete"
 msgstr "�ǻ츲"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 #, fuzzy
 msgid "Really delete account?"
 msgstr "�⺻ �������� �ϱ�"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "���� ����"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "�Ÿ��� ����"
+
+#: mail/mail-autofilter.c:223
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "����"
+
+#: mail/mail-autofilter.c:239
+#, fuzzy, c-format
+msgid "Mail from %s"
+msgstr "���� ���:"
+
+#: mail/mail-autofilter.c:295
+#, fuzzy, c-format
+msgid "%s mailing list"
+msgstr "%s��(��) �д��� ���� �߻�"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "�Ÿ��� ��Ģ�� �߰�"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11019,135 +11739,135 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 #, fuzzy
 msgid "Send anyway?"
 msgstr "�̸��� ������"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 #, fuzzy
 msgid "an unknown sender"
 msgstr "�� ������ ����"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 #, fuzzy
 msgid "No Message Selected"
 msgstr "�޼����� �޾ҽ��ϴ�"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11155,40 +11875,76 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 #, fuzzy
 msgid "Filters"
 msgstr "���� �Ÿ���(_F)..."
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "�޼��� �μ�"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "�޼��� �μ��� ����"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "����:"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "�ٸ� ����ó"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "����"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "���� �߰�"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "����:"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11226,187 +11982,173 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Evolution ���� ������"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "��"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "�޴»��"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "��¥"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "����"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "�ٸ� ����ó"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 msgid " "
 msgstr ""
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "����"
+msgid " _Check for supported types "
+msgstr ""
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "����"
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid " _Check for supported types "
+msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of Evolution)"
+msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
-msgid "(SSL is not supported in this build of evolution)"
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
 #: mail/mail-config.glade.h:7
-msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Account Editor"
 msgstr "����"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "���� ����"
 
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "���� �߰�"
+
 #: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Advanced Options"
-msgstr "���� ���"
+msgid "Add new signature..."
+msgstr "����:"
 
 #: mail/mail-config.glade.h:12
-msgid "Afrikaans"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-#, fuzzy
-msgid "Alerts"
-msgstr "����"
-
-#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "÷��"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "�� ������ �ۼ��մϴ�"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "�ݱ�"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "�� ������ �ۼ��մϴ�"
 
 #: mail/mail-config.glade.h:29
+msgid "Color for _misspelled words:"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Composing Messages"
 msgstr "���� �޼����� �ۼ��մϴ�"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11416,54 +12158,46 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
-msgid "Dari"
-msgstr ""
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "����"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr ""
 "�޼����� ������ ����: %s\n"
 "  %s"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "�Ϸ�"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "�� ������ ����"
 
-#: mail/mail-config.glade.h:47
-msgid "E_nable"
-msgstr ""
-
 #: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
+msgid "E_nable"
 msgstr ""
 
 #: mail/mail-config.glade.h:49
@@ -11485,35 +12219,31 @@ msgstr "���ڿ��� �ּ�:"
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "����"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "���޵� �޽���"
 
-#: mail/mail-config.glade.h:57
-msgid "Get Digital ID..."
-msgstr ""
-
 #: mail/mail-config.glade.h:58
-msgid "Highlight _quotations with"
+msgid "Get Digital ID..."
 msgstr ""
 
 #: mail/mail-config.glade.h:59
-msgid "Hulu"
+msgid "Highlight _quotations with"
 msgstr ""
 
 #: mail/mail-config.glade.h:60
@@ -11571,71 +12301,67 @@ msgstr ""
 msgid "NNTP Server:"
 msgstr "LDAP ����"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "�� ��������(_N)"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Optional Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "����ó�� �μ��մϴ�"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr ""
 "�޼����� ������ ����: %s\n"
 "  %s"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Quoted"
 msgstr "�ο�(_Q)"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
@@ -11671,267 +12397,264 @@ msgid "S_ecurity"
 msgstr "����(_S)"
 
 #: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "PGP ���α׷� ������ ����"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "���� ����:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "���� ������ ��������"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "�޼����� ������ ����"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "�޼������� �ٽ� ������(_R)"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "������ ������ �䱸�մϴ�"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Server _Type: "
 msgstr "���� ����: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "���� ����(_S)"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "����:"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Source Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "���� �̸�:"
 
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
+msgstr ""
+
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
 #: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+msgid "Standard Unix mbox"
 msgstr ""
 
 #: mail/mail-config.glade.h:126
-msgid "Standard Unix mbox"
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr "�� ������ ����ų �̸��� �����ϼ���.���� \"����\"�̳� �Ǵ� \"��\"."
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "����:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "���̱�"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "����:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "���� ����:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "���� ����:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "�� ������ �ۼ��մϴ�"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "�� ������ �ۼ��մϴ�"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "����:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "����"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "���� �̸�:"
+msgid "_Enable"
+msgstr "��"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "�ٸ� �ּҷ� ����"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "��ü�̸�:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "�̸��� ������"
 
-#: mail/mail-config.glade.h:160
-#, fuzzy
-msgid "_HTML Signature:"
-msgstr "����:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
-msgid "_Language:"
-msgstr ""
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "�⺻ �������� �ϱ�"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "�޼��� �Ӹ���"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Name:"
 msgstr "�̸�:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP ���"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "ij����"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11971,75 +12694,54 @@ msgid "_Signatures"
 msgstr "����:"
 
 #: mail/mail-config.glade.h:183
-#, fuzzy
-msgid "_Text Signature:"
-msgstr "����:"
-
-#: mail/mail-config.glade.h:184
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 #, fuzzy
 msgid "_every"
 msgstr "����"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr "����"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 #, fuzzy
 msgid "description"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr ""
-
-#: mail/mail-crypto.c:113
-#, fuzzy
-msgid "Could not create a PGP encryption context."
-msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
-
-#: mail/mail-crypto.c:138
-#, fuzzy
-msgid "Could not create a PGP decryption context."
-msgstr ""
-"%s ���丮�� ������ ���� �����ϴ�:\n"
-"%s"
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
 msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
 msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
@@ -12083,143 +12785,177 @@ msgstr ""
 msgid "Loading message content"
 msgstr "�޽��� ������ �о�帲"
 
-#: mail/mail-display.c:1832
-msgid "Open Link in Browser"
+#: mail/mail-display.c:1553
+msgid "Overdue:"
 msgstr ""
 
 #: mail/mail-display.c:1833
+msgid "Open Link in Browser"
+msgstr ""
+
+#: mail/mail-display.c:1834
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "�����Ѱ� ����"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "������ ����(_f)... (��ĥ����)"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 #, fuzzy
 msgid "Save Image as..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s ÷��"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "��¥"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 #, fuzzy
 msgid "Bad Address"
 msgstr "���ڿ��� �ּ�:"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "������"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 #, fuzzy
 msgid "Reply-To"
 msgstr "ȸ�� �ּ�:"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "�޴»��"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 #, fuzzy
 msgid "Cc"
 msgstr "����:"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Bcc"
 msgstr "���� ����:"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "����"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "�ٸ��̸����� �޼��� ����..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr ""
+"%s ���丮�� ������ ���� �����ϴ�:\n"
+"%s"
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "���� ����"
+
+#: mail/mail-local.c:670
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "���� �缳��"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" ������ \"%s\" �������� �ٲٱ�"
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "%s ����"
@@ -12277,82 +13013,74 @@ msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 msgid "Complete."
 msgstr "�Ϸ��"
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "�޼����� ������ ����"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "�޽������� %s�� �̵�"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "�޽������� %s�� ����"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "�̵���"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "������"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "���޵� �޽���"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s ������ ����"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "%s ������ ����"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "%s ������ ����"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "���� �缳��"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "���� ����"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "�޼��� %s�� ��������"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "�޼������� ��������"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "�޽������� ����"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12361,7 +13089,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12370,11 +13098,11 @@ msgstr ""
 "%s�� �޽��� ������ ���� �߻�:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "÷�� ����"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12383,27 +13111,27 @@ msgstr ""
 "��� ������ ����� ����: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "�޾���"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "�˻�(_S)"
 
@@ -12486,10 +13214,6 @@ msgstr "������ ..."
 msgid "Waiting..."
 msgstr "��ٸ��� �� ..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "��ҵ�."
-
 #: mail/mail-session.c:222
 #, fuzzy
 msgid "User canceled operation."
@@ -12505,17 +13229,17 @@ msgstr ""
 msgid "Enter Password"
 msgstr "��й�ȣ"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "�ӽ� ������ ������ ����: %s"
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 #, fuzzy
 msgid "Save signature"
 msgstr "����:"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -12526,10 +13250,31 @@ msgstr ""
 "\n"
 "����� ������ �����Ͻðڽ��ϱ�?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+#, fuzzy
+msgid "Type the name by which you would like to refer to this signature."
+msgstr "�� ������ ����ų �̸��� �����ϼ���.���� \"����\"�̳� �Ǵ� \"��\"."
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "�̸�:"
+
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "����:"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
 #, fuzzy
-msgid "Signature name:"
-msgstr "���� ����:"
+msgid "Hide signature hint"
+msgstr "����:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12546,17 +13291,17 @@ msgstr "���޵� �޽���"
 msgid "Forwarded Message"
 msgstr "���޵� �޽���"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "%s ������ ����"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "%s ������ ����"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12565,92 +13310,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "���� ����"
+
+#: mail/mail-vfolder.c:784
 #, fuzzy
 msgid "vFolders"
 msgstr "����"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "�������� ����"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "�� ��������"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 #, fuzzy
 msgid "(No subject)"
 msgstr "����: (���� ����)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "�޼���"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "�������� �������� �޼���"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 #, fuzzy
 msgid "Generating message list"
 msgstr "�޽������� ����"
@@ -12673,10 +13423,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "�ٸ� ����ó"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "�޾���"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "ũ��"
 
@@ -17725,5652 +18480,5647 @@ msgstr ""
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "�߻�"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "�̸�(_L):"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "����"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "����"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "����"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "����"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "����"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr ""
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr ""
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr ""
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr ""
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "�߻�"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Lihue"
 msgstr "��"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "�̸�(_L):"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr ""
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "��"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Lincoln"
 msgstr "�����°�"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr ""
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "ȣ��Ʈ:"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "����"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "���� �ۼ�"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "London"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "��"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr ""
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr ""
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "�̸�(_L):"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "�����°�"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr ""
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr ""
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "���"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "���"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macapa"
 msgstr "���"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "������"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "����"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "����"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "����"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "ij����"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "����"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "����"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "����"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "����"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "����"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "���"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "�޼���"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "���"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manchester"
 msgstr "���:"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "����"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "���̱�"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "����"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "������"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "����"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "����"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "���"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "����"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "����"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "����"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "����"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "����"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 #, fuzzy
 msgid "Marquette"
 msgstr "����"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "���"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "����"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "���� ���� ������ ǥ��(_n)"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "����"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "����"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "���"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "����"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "����"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mattoon"
 msgstr "����"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "���"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "����"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "����"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 #, fuzzy
 msgid "Mazu"
 msgstr "���"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 #, fuzzy
 msgid "McAllen"
 msgstr "���"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "����"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "���"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "����"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "���"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 #, fuzzy
 msgid "Mehamn"
 msgstr "����"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "����"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "������"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "�ݿ���"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 #, fuzzy
 msgid "Merril Field"
 msgstr "�߽� �׸�(_F)"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "����"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 #, fuzzy
 msgid "Miami"
 msgstr "����"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr ""
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr ""
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "���� ����:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "��"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "�����°�"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 #, fuzzy
 msgid "Minnesota"
 msgstr "��"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "��"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr ""
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitchell"
 msgstr "���:"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "����"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "�޴���ȭ"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "�޴���ȭ"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Modesto"
 msgstr "���� ����"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "�̵�"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "�޴���ȭ"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Moldova"
 msgstr "������"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 #, fuzzy
 msgid "Molokai"
 msgstr "����"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "������"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "������"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "������"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "������"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "��(_M)"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montana"
 msgstr "����"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "���� ����"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "��"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "��(_M)"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "������"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "��"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "�۲�"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr ""
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "����"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "�켱����"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "�޴���ȭ"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "��"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "��"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 #, fuzzy
 msgid "Mullan"
 msgstr "����"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "�ٻ�"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "�۲�"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "�̸�"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "���"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "�� ����"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "�̸�"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Napoli"
 msgstr "����"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "����"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "����"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natchez"
 msgstr "���:"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr ""
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "ij����"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Nevada"
 msgstr "ij����"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "�۾�"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bedford"
 msgstr "�� ��������(_N)"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "�� ����"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "Newcastle"
 msgstr "����"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "�� ����"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "Newfoundland"
 msgstr "�� ����"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "�� ����ó"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Iberia"
 msgstr "�� ����ó"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "�޼���"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr ""
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "��Ÿ�� ����(_T)"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "��Ʈ"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "�� ��������"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "����"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "New York"
 msgstr "�� ��������"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "ũ��:"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "����"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "����"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "�̸�"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "����"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Adams"
 msgstr "��Ʈ(_t):"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "��Ʈ"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "����"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "��Ʈ(_t):"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "��Ʈ(_t):"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "����"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "��Ʈ(_t):"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "��Ʈ"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "����"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "��Ʈ"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "���� ����"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 #, fuzzy
 msgid "Oahu"
 msgstr "������"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "����"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "����"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "����"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "����"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "��Ÿ"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "��Ÿ"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "Ȯ��"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 #, fuzzy
 msgid "Omsk"
 msgstr "Ȯ��"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "����"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oostende"
 msgstr "������"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oran"
 msgstr "��ҵ�"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr ""
 "\n"
 "���: "
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 #, fuzzy
 msgid "Oregon"
 msgstr ""
 "\n"
 "���: "
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orlando"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 #, fuzzy
 msgid "Oruro"
 msgstr "����"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr "��"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "��"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr ""
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "��"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "�߻�"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "�߻�"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "���� ����(_M)..."
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama City"
 msgstr "ij����"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "��ҵ�"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "����"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Paphos"
 msgstr "�̸�(_L):"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 #, fuzzy
 msgid "Paris"
 msgstr "�μ�"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "����"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "��й�ȣ"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "ij����"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "�Ҹ� ����"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "�Ҹ� ����"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "����"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "����"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "����:"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "�μ�"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "�μ�"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "����"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "����"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "����"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "�̸�����"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 #, fuzzy
 msgid "Pine Bluff"
 msgstr "�̸���"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 #, fuzzy
 msgid "Pisa"
 msgstr "���̱�"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 #, fuzzy
 msgid "Plymouth"
 msgstr "��"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "���� �μ�(_v)..."
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "���"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "�޼��� �μ�"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "����"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponca City"
 msgstr "��ȭ ����"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponce"
 msgstr "�μ�"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "����ó(_C)"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Port Alexander"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "���� �μ�(_v)..."
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "�̸�����"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hardy"
 msgstr "�޷� �μ��ϱ�"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Portland"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto"
 msgstr "��Ʈ:"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "������"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "����"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "����"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "����"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poznan"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr ""
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "�μ� �̸�����"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Pretoria"
 msgstr "����"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "����"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "����"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Providence"
 msgstr "�̸�����"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "�̸�����"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "����"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Puebla"
 msgstr "���� Ű(_b)"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Pueblo"
 msgstr "���� Ű(_b)"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "����"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "���"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pula"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "����"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quebec"
 msgstr "����"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 #, fuzzy
 msgid "Rapid City"
 msgstr "ȸ��"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Reading"
 msgstr "�Ӹ���"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Recife"
 msgstr "�޾���"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redding"
 msgstr "�Ӹ���"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "����"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redmond"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "����:"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Rennes"
 msgstr "��Ģ �̸�: "
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Reno"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "����:"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "�ٽ� ����"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "����"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reynosa"
 msgstr "����"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "����"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "����"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "����"
 
-#: my-evolution/Locations.h:1881
-#, fuzzy
-msgid "Riga"
-msgstr "������:"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rijeka"
 msgstr "����"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "����"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "�μ�"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 #, fuzzy
 msgid "Riyadh"
 msgstr "����"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rodos"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Rogers"
 msgstr "����"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "����"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "ȣ��Ʈ:"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 #, fuzzy
 msgid "Rutland"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 #, fuzzy
 msgid "Sacramento"
 msgstr "�μ�"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 #, fuzzy
 msgid "Saginaw"
 msgstr "����"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "�޷� �μ��ϱ�"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "����"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salem"
 msgstr "����"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "����"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "����"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "����"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salmon"
 msgstr "����"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salta"
 msgstr "����"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "��"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "����"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samos"
 msgstr "�̸�(_L):"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "��"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 #, fuzzy
 msgid "Sana'A"
 msgstr "����"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "San Carlos"
 msgstr "������ ��ħ"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "����"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sandberg"
 msgstr "������"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sanderson"
 msgstr "������"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sanford"
 msgstr "����"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "����"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "������ ��ħ"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Juan"
 msgstr "��"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "����"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "������"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "����"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr ""
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "��"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "����"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "����"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "����..."
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "����"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "����"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "���� ��¥(_S):"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "�˻�"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "����"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "�˻�"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Shearwater"
 msgstr "������ ��"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "������"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "����:"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Sheridan"
 msgstr "��"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "ũ��"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "���־� ����"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 #, fuzzy
 msgid "Sidney"
 msgstr "�μ�"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Silver City"
 msgstr "����(_S)"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "�Ͽ���"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "ũ��"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skopje"
 msgstr "����"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "����"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "����"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "��"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Sochi"
 msgstr "��"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sofia"
 msgstr "����"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "ij����"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Somerset"
 msgstr "����"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "������"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "Southampton"
 msgstr "��"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "��"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr ""
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "��"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "������"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "����"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "����"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "���� ����ȭ"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "State College"
 msgstr "�Ϸ�� ��¥:"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "����..."
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "����..."
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "����"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "����"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 #, fuzzy
 msgid "St Louis"
 msgstr "���"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "������ ��"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "����"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "St Paul"
 msgstr "����"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "����"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "���"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 #, fuzzy
 msgid "Sutton"
 msgstr "��"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "����"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "�۾�"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "���"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 #, fuzzy
 msgid "Taejon"
 msgstr "���� ����"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr ""
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Tainan"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr "�۾�"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "����"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "����"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr ""
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "����"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "ij����"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "�̸�(_L):"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "�۾�"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "����"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "����"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "����"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "Texas"
 msgstr "�۾�"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "����"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "��"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "����"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "Ȱ��"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 #, fuzzy
 msgid "Toledo"
 msgstr "�޴»��"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "����"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Topeka"
 msgstr "��:"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "��:"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torrance"
 msgstr "��ҵ�"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr ""
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "���� ��¥(_S):"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Toulouse"
 msgstr "�ݱ�"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 #, fuzzy
 msgid "Trapani"
 msgstr "����"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "�̸�����"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "����"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "����"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 #, fuzzy
 msgid "Trieste"
 msgstr "�׽�Ʈ"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "ȭ"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "ȭ����"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "ȭ����"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "ȭ"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr ""
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "����"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turku"
 msgstr "ȭ"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 #, fuzzy
 msgid "Twenthe"
 msgstr "������"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "����"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "ȭ"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "�޼��� �μ�"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "ij����"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 #, fuzzy
 msgid "Utah"
 msgstr "÷��"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr ""
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "�ݱ�"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vagar"
 msgstr "�߻�"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "����"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valencia"
 msgstr "�޷�"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 #, fuzzy
 msgid "Van"
 msgstr "����"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "��ҵ�"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr ""
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "���̱�"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vermont"
 msgstr "��"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "�Ϲ� ����"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "���� �̸�:"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 #, fuzzy
 msgid "Volk Field"
 msgstr "�߽� �׸�(_F)"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 #, fuzzy
 msgid "Waco"
 msgstr "������"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "���"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "��Ÿ"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Waterloo"
 msgstr "��Ÿ"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "��Ÿ"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 #, fuzzy
 msgid "Waterville"
 msgstr "���"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Webster City"
 msgstr "�� ����Ʈ"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr ""
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "��Ÿ"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 #, fuzzy
 msgid "Wendover"
 msgstr "������"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "��Ÿ�� ����(_T)"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westfield"
 msgstr "�׽�Ʈ"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "����"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "����"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 #, fuzzy
 msgid "Winslow"
 msgstr "����"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 #, fuzzy
 msgid "Winter Park"
 msgstr "��й�ȣ"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 #, fuzzy
 msgid "Wisconsin"
 msgstr "��"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "������:"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "��Ÿ"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "�ɶ���"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "�����°�"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 #, fuzzy
 msgid "Xiamen"
 msgstr "�̸�"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 #, fuzzy
 msgid "Yao Airport"
 msgstr "������������"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zadar"
 msgstr "�޷�"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 #, fuzzy
 msgid "Zagreb"
 msgstr "��"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zanesville"
 msgstr "��ҵ�"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr ""
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr ""
 
@@ -23403,18 +24153,13 @@ msgstr "���� %l:%M %p"
 msgid "No description"
 msgstr "����:"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 #, fuzzy
 msgid "Mail summary"
 msgstr "���"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "���� ����"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 #, fuzzy
 msgid "Local Folders"
 msgstr "���� ����"
@@ -23424,58 +24169,48 @@ msgstr "���� ����"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "�̸�:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>�޷¸� �д��� ����</b>"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 #, fuzzy
 msgid "News Feed"
 msgstr "�� ��������(_N)"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr "���"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
-msgstr "�߰�(_A)"
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "����"
+msgid "Add"
+msgstr "�߰�"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "����"
@@ -23521,11 +24256,47 @@ msgstr "���"
 msgid "Printing of Summary failed"
 msgstr "�޼��� �μ��� ����"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "�۲�"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "�̵���"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "���� �Ÿ���(_F)..."
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "���� �Ÿ���(_F)..."
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -24705,112 +25476,118 @@ msgid "C_elsius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "�� ��������(_N)"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "One mont_h"
 msgstr "��"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "One w_eek"
 msgstr " ���־�"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "��� ��� ����(_H)"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "Show _all tasks"
 msgstr "����"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "����"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 #, fuzzy
 msgid "Tasks "
 msgstr "�۾�"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 #, fuzzy
 msgid "Weather settings"
 msgstr "������ �κ� ���"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "_Five days"
 msgstr "�ݿ���"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "_Mail"
 msgstr "����"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "_News Feeds"
 msgstr "�� ��������(_N)"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 #, fuzzy
 msgid "_One day"
 msgstr "������"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 #, fuzzy
 msgid "_Weather"
 msgstr "��Ÿ"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "�ּҷ�"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "���� ����"
+msgid "Folder Settings"
+msgstr "����..."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution ��."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -24823,6 +25600,37 @@ msgstr "�ڼ���"
 msgid "Cancel Operation"
 msgstr "���� ���"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr "������ ������ �����ϴ�: %s: %s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "���� ����"
+
+#: shell/e-local-storage.c:174
+#, fuzzy
+msgid "Drafts"
+msgstr "�ʰ�"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr ""
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr ""
+
+#: shell/e-local-storage.c:177
+#, fuzzy
+msgid "Sent"
+msgstr "����"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution ��ġ"
@@ -24913,6 +25721,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "�Ϸ� ��¥"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "���� ����"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "���� ����"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "���� ����"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "�Ϸ� ��¥"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -24944,57 +25777,56 @@ msgstr ""
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 #, fuzzy
 msgid "Copy folder"
 msgstr "������ ����"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 #, fuzzy
 msgid "Move folder"
 msgstr "������ �̵�"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "����"
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
+#: shell/e-shell-folder-commands.c:407
 #, fuzzy, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
+msgid "Really delete folder \"%s\"?"
+msgstr "���� ����"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "%s ������ ����"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "%s ������ ����"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, fuzzy, c-format
 msgid "The specified folder name is not valid: %s"
@@ -25013,13 +25845,13 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - �� ���� ����"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "���ο�..."
 
@@ -25063,22 +25895,27 @@ msgstr ""
 "%s�� �������� ��\n"
 "������ %d�� ������."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "���� ����"
+
+#: shell/e-shell-importer.c:498
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "���� `%s'�� �������� �ʽ��ϴ�."
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution ��ġ"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25087,11 +25924,11 @@ msgstr ""
 "������ ������ ���ִ� ������ �����ϴ�\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "��������"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25100,17 +25937,17 @@ msgstr ""
 "%s�� ��������.\n"
 "%s�� �����մϴ�"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25119,63 +25956,108 @@ msgstr ""
 "%s�� �������� ��\n"
 "������ 1�� ������."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "�ڵ�"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "���� �̸�:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "������ ��������"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "���� ����:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 #, fuzzy
 msgid "Import a single file"
 msgstr "��������"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "���� ���:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 #, fuzzy
 msgid "Select folder"
 msgstr "���� ����"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "��������"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr ""
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr "���� ����ȭ"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "���� ����ȭ"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "���� ����ȭ"
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution ��ġ"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "%s ������ ����"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "%s ������ ����"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "%s���� ����..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"���õ� ������ ������ �� �����ϴ�:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
@@ -25188,8 +26070,8 @@ msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 #, fuzzy
 msgid "New"
@@ -25215,47 +26097,47 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "�ý����� ��ο� Bug buddy�� ã���� �����ϴ�."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy�� �����Ҽ� �����ϴ�."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Evolution��..."
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "���� �̵�..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 #, fuzzy
 msgid "_Work Online"
 msgstr "�������ο��� �۾�"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 #, fuzzy
 msgid "_Work Offline"
 msgstr "�������ο��� �۾�"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "�������ο��� �۾�"
 
@@ -25287,7 +26169,7 @@ msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25295,12 +26177,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�ý��� ������ġ�� �����Ҽ� �����ϴ� -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25308,24 +26190,20 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "Ȯ��"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "���� ���� Druid"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "�Ϲ� ����"
 
@@ -25350,105 +26228,105 @@ msgstr ""
 msgid "Don't remove"
 msgstr "������������"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "���� ������(_S)"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "���� ���������� ���ื�� ����"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "ū ������(_L)"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "ū ���������� ���ื�� ����"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "�� �׷�(_N)..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "�� �׷�(_N)..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "���� ���� ���߱�(_H)"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "���� ���븦 ����ϴ�"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 #, fuzzy
 msgid "_Rename"
 msgstr "��Ģ �̸�: "
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 #, fuzzy
 msgid "Re_move"
 msgstr "����"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -25461,10 +26339,6 @@ msgstr ""
 msgid "Shortcuts"
 msgstr "���� ����(_S)"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr ""
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -25529,11 +26403,11 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:196
-#, fuzzy
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% �Ϸ�(_p):"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<������ �������� ���� ��������>"
 
@@ -25563,77 +26437,77 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 #, fuzzy
 msgid "CORBA error"
 msgstr "����� ����"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 #, fuzzy
 msgid "Invalid argument"
 msgstr "÷��"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 #, fuzzy
 msgid "No owner"
 msgstr "(�̸� ����)"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 #, fuzzy
 msgid "Not found"
 msgstr "������ �߰ߵ��� �ʾҽ��ϴ�"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "����� ����"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 #, fuzzy
 msgid "Internal error"
 msgstr "����� ����"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 #, fuzzy
 msgid "Exists"
 msgstr "����(_x)"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 #, fuzzy
 msgid "Invalid URI"
 msgstr "�޷�"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 #, fuzzy
 msgid "Has subfolders"
 msgstr "%s���� ������ ����"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 #, fuzzy
 msgid "No space left"
 msgstr "�޼����� �޾ҽ��ϴ�"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "���� ����:"
@@ -25765,51 +26639,85 @@ msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:95
+#: shell/main.c:97
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "���� ����(_M)..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"�����մϴ�\n"
+"Evolution ��\n"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
+
+#: shell/main.c:347
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Evolution ���� �ʱ�ȭ �Ҽ� �����ϴ�."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Evolution ���� �ʱ�ȭ �Ҽ� �����ϴ�."
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "���� ��¥(_S):"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "���� ��¥(_S):"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "���뺸 ������Ʈ �ý����� �ʱ�ȭ �Ҽ� �����ϴ�."
 
@@ -25934,11 +26842,11 @@ msgstr "���� �ð�"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "�ൿ(_A)"
 
@@ -26077,8 +26985,8 @@ msgstr "�� �׸� �����մϴ�"
 msgid "Delete this item"
 msgstr "�� �׸� �����մϴ�"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr ""
 
@@ -26121,7 +27029,7 @@ msgstr "�並 %s�� ����"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "����(_F)"
 
@@ -26194,20 +27102,20 @@ msgstr "�޷� �ҷ����̱�"
 msgid "Forward this item via email"
 msgstr "�� �޼����� �ٸ�������� �����մϴ�"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Meeting"
 msgstr "���� ���"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr ""
 
@@ -26216,11 +27124,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr "Evolution��..."
 
-#: ui/evolution-mail-global.xml.h:1
-#, fuzzy
-msgid "Cancel"
-msgstr "��ҵ�"
-
 #: ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
@@ -26386,7 +27289,7 @@ msgstr "������ �޼��� ���"
 msgid "_Expunge"
 msgstr "����(_E)"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "����(_F)"
 
@@ -26843,7 +27746,7 @@ msgstr "�޼��� �μ�"
 msgid "_Quoted"
 msgstr "�ο�(_Q)"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "����(_T)"
 
@@ -26858,12 +27761,12 @@ msgstr "�� â�� �ݽ��ϴ�"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "�ݱ�(_C)"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "����(_V)"
 
@@ -27057,7 +27960,7 @@ msgstr "����(_O)..."
 msgid "_Reply-To Field"
 msgstr "ȸ�� �ּ� �׸�(_R)"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "����(_H)"
 
@@ -27222,122 +28125,131 @@ msgid "Move this folder to another place"
 msgstr "%s��(��) �������� �̵�"
 
 #: ui/evolution.xml.h:18
-msgid "Open in New Window"
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "�� ������ ����"
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
 #: ui/evolution.xml.h:20
+msgid "Open in New Window"
+msgstr ""
+
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "������ �ޱ�"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "�и� ������ ������ �� ������ �����´�"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Evolution�� ���� ����"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "���� ����"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "���� ����(_B)"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy�� ���������� �մϴ�"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Toggle whether we are working offline."
 msgstr "�߽� �׸��� ������ �������� ����"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "���õ� ���� ����"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution��..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "Evolution��(_A)..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Copy..."
 msgstr "����(_C)"
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "������ ����(_G)..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Import..."
 msgstr "��������"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 #, fuzzy
 msgid "_Move..."
 msgstr "�̵�"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "���ο�(_N)"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "�� ��������(_N)"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "���� ����(_M)..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Rename..."
 msgstr "����(_O)..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "������ �ޱ�(_S)"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Shortcut"
 msgstr "���� ����(_S)"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "���� ����(_S)"
 
@@ -27434,21 +28346,21 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr ""
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "ī��: "
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr ""
 
@@ -27573,16 +28485,21 @@ msgstr "����ó ������"
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "�޷¿� �߰�"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "����..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "����"
@@ -27604,22 +28521,22 @@ msgstr "�޼���"
 msgid "Don't show this message again."
 msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "�"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "���(_l)"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 #, fuzzy
 msgid "Clear"
 msgstr "���(_l)"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 #, fuzzy
 msgid "Find Now"
 msgstr "�"
@@ -27646,6 +28563,127 @@ msgstr "init_corba(): �׳��� �ʱ�ȭ �� �� �����ϴ�"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "�ּҷ� �ҽ�"
+
+#, fuzzy
+#~ msgid "Sta_rt of day:"
+#~ msgstr "���� ��¥(_r):"
+
+#, fuzzy
+#~ msgid "_End of day:"
+#~ msgstr "�Ϸ��� ��:"
+
+#, fuzzy
+#~ msgid "before the start of the appointment"
+#~ msgstr "��ӽ�����"
+
+#, fuzzy
+#~ msgid "_Other Organizer"
+#~ msgstr "����:"
+
+#, fuzzy
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr ""
+#~ "�޼����� ������ ����: %s\n"
+#~ "  %s"
+
+#~ msgid "%s server %s"
+#~ msgstr "%s ���� ���� %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(�𸣴� ȣ��Ʈ)"
+
+#~ msgid "No such message: %s"
+#~ msgstr "�׷� �޼��� ����: %s"
+
+#, fuzzy
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr ""
+#~ "�޼����� ������ ����: %2$s �������� %1$s\n"
+#~ "  %3$s"
+
+#, fuzzy
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "���������� �޼����� �����ϼ� �����ϴ�: %s: %s"
+
+#, fuzzy
+#~ msgid "Could not file: %s: %s"
+#~ msgstr ""
+#~ "���� ���� %s�� �� ���� �����ϴ�:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "ij����"
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "���� ���"
+
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "���� ����:"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "���� ������ ��������"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "����:"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "���� �̸�:"
+
+#, fuzzy
+#~ msgid "_HTML Signature:"
+#~ msgstr "����:"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "ij����"
+
+#~ msgid "Moving"
+#~ msgstr "�̵���"
+
+#~ msgid "Copying"
+#~ msgstr "������"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "���� ����:"
+
+#, fuzzy
+#~ msgid "Riga"
+#~ msgstr "������:"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "�߰�(_A)"
+
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
+
 #~ msgid "Card: "
 #~ msgstr "ī��: "
 
@@ -27801,13 +28839,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "_My server requires authentication"
 #~ msgstr "������ ������ �䱸�մϴ�"
 
-#~ msgid "Other Contacts"
-#~ msgstr "�ٸ� ����ó"
-
-#, fuzzy
-#~ msgid "(none)"
-#~ msgstr "(�̸� ����)"
-
 #, fuzzy
 #~ msgid "Co_ntacts:"
 #~ msgstr "����ó(_C)"
@@ -27831,12 +28862,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "_Mobile"
 #~ msgstr "�޴���ȭ(_M)"
 
-#, fuzzy
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr "������ �� ������ ����⸦ ���Ͻʴϱ�?"
-
 #~ msgid "Create a new appointment"
 #~ msgstr "���ο� ��Ӹ� �����"
 
@@ -27853,163 +28878,9 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgstr "��Ÿ"
 
 #, fuzzy
-#~ msgid "Click here to add an attendee"
-#~ msgstr "����ó�� �߰��ϱ�"
-
-#, fuzzy
 #~ msgid "_Delete this Task"
 #~ msgstr "�� ������ �����մϴ�"
 
-#, fuzzy
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "����� ����"
-
-#, fuzzy
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "ȸ�� ���� �ð�(_e):"
-
-#, fuzzy
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "����� ����"
-
-#, fuzzy
-#~ msgid "Task Completed: <b>"
-#~ msgstr "�Ϸ��"
-
-#, fuzzy
-#~ msgid "iCalendar Information"
-#~ msgstr "����� ����"
-
-#, fuzzy
-#~ msgid "iCalendar Error"
-#~ msgstr "�޷�"
-
-#, fuzzy
-#~ msgid "An unknown person"
-#~ msgstr "�� ������ ����"
-
-#, fuzzy
-#~ msgid "Choose an action:"
-#~ msgstr "������ ��������"
-
-#, fuzzy
-#~ msgid "Update"
-#~ msgstr "�۾�"
-
-#, fuzzy
-#~ msgid "Accept"
-#~ msgstr "����"
-
-#, fuzzy
-#~ msgid "Tentatively accept"
-#~ msgstr "������"
-
-#, fuzzy
-#~ msgid "Decline"
-#~ msgstr "�ݴ�"
-
-#, fuzzy
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "����� ����"
-
-#, fuzzy
-#~ msgid "Send Latest Information"
-#~ msgstr "����"
-
-#, fuzzy
-#~ msgid "Meeting Information"
-#~ msgstr "���� ����"
-
-#, fuzzy
-#~ msgid "Meeting Proposal"
-#~ msgstr "���� ���"
-
-#, fuzzy
-#~ msgid "Meeting Update"
-#~ msgstr "ȸ�� ���� �ð�(_e):"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
-
-#, fuzzy
-#~ msgid "Meeting Reply"
-#~ msgstr "���� ���"
-
-#, fuzzy
-#~ msgid "Meeting Cancellation"
-#~ msgstr "������ ��������"
-
-#, fuzzy
-#~ msgid "Bad Meeting Message"
-#~ msgstr "�޼����� ����"
-
-#, fuzzy
-#~ msgid "Task Information"
-#~ msgstr "����"
-
-#, fuzzy
-#~ msgid "Task Proposal"
-#~ msgstr "�۾��е�"
-
-#, fuzzy
-#~ msgid "Task Update"
-#~ msgstr "�۾�"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
-
-#, fuzzy
-#~ msgid "Task Reply"
-#~ msgstr "ȸ��"
-
-#, fuzzy
-#~ msgid "Task Cancellation"
-#~ msgstr "���� ���"
-
-#, fuzzy
-#~ msgid "Bad Task Message"
-#~ msgstr "�޼����� ����"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "����� ����"
-
-#, fuzzy
-#~ msgid "Free/Busy Information"
-#~ msgstr "����� ����"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
-
-#, fuzzy
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "�޼��� �μ�"
-
-#, fuzzy
-#~ msgid "Status: %s"
-#~ msgstr "����(_S):"
-
-#, fuzzy
-#~ msgid "Percent Complete: %i"
-#~ msgstr "�ۼ�Ʈ �Ϸ�"
-
-#, fuzzy
-#~ msgid "URL: %s"
-#~ msgstr "%s ����"
-
-#, fuzzy
-#~ msgid "Categories: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "���: "
-
-#, fuzzy
-#~ msgid "Contacts: "
-#~ msgstr "����ó(_C)"
-
 #~ msgid "Message %s not found."
 #~ msgstr "�޼��� %s�� ã���� ����."
 
@@ -28023,10 +28894,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "Could not authenticate to KPOP server: %s"
 #~ msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#, fuzzy
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "IMAP server�κ��� ����ġ���� �亯: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "�޼������� ���� ����� �˾Ƴ����� ����"
 
@@ -28066,10 +28933,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgstr "����"
 
 #, fuzzy
-#~ msgid "HTML signature file:"
-#~ msgstr "����:"
-
-#, fuzzy
 #~ msgid "Select Filter Log file..."
 #~ msgstr "������ ��������"
 
@@ -28109,14 +28972,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgstr "���� ����(_M)..."
 
 #, fuzzy
-#~ msgid "inHg"
-#~ msgstr "�̵���"
-
-#, fuzzy
-#~ msgid "kilometers"
-#~ msgstr "���� �Ÿ���(_F)..."
-
-#, fuzzy
 #~ msgid "All _folders:"
 #~ msgstr "����"
 
@@ -28125,19 +28980,9 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgstr "�ٸ� ������ ǥ��"
 
 #, fuzzy
-#~ msgid "_Display stations:"
-#~ msgstr "���� �ɼ�"
-
-#, fuzzy
 #~ msgid "_Displayed feeds:"
 #~ msgstr "ǥ��"
 
-#, fuzzy
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr "������ ������ �����ϴ�: %s: %s"
-
 #~ msgid "(No name)"
 #~ msgstr "(�̸� ����)"
 
@@ -28299,14 +29144,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ "����, ����ó ������ �ϴ� �׷���� �������α׷�\n"
 #~ "���� �Դϴ�."
 
-#, fuzzy
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Ximian Evolution Team\n"
-#~ msgstr ""
-#~ "�����մϴ�\n"
-#~ "Evolution ��\n"
-
 #~ msgid "F_ormat"
 #~ msgstr "����(_o)"
 
@@ -28330,10 +29167,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgstr "��� ������"
 
 #, fuzzy
-#~ msgid "before end of appointment"
-#~ msgstr "��� ��������"
-
-#, fuzzy
 #~ msgid "Evolution Shortcuts"
 #~ msgstr "Evolution ���� ����(_s)"
 
@@ -28342,10 +29175,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgstr "���� ������ �ٸ��̸����� �����մϴ�"
 
 #, fuzzy
-#~ msgid "Delete folder '%s'"
-#~ msgstr "���� ����"
-
-#, fuzzy
 #~ msgid "_Import File..."
 #~ msgstr "������ ����(_G)..."
 
@@ -28391,10 +29220,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgstr "`%s'��(��) ����"
 
 #, fuzzy
-#~ msgid "Synchronizing '%s'"
-#~ msgstr "���� ����ȭ"
-
-#, fuzzy
 #~ msgid "%a %l:%M%p"
 #~ msgstr "���� %l:%M %p"
 
@@ -28447,10 +29272,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgstr "�޾���"
 
 #, fuzzy
-#~ msgid "My Evolution Settings"
-#~ msgstr "Evolution ��ġ"
-
-#, fuzzy
 #~ msgid "Printing of My Evolution failed"
 #~ msgstr "�޼��� �μ��� ����"
 
@@ -28647,11 +29468,11 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgstr "���޵� �޽��� (���� ����)"
 
 #~ msgid ""
-#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-#~ "%s<br><b>Subject:</b> %s<br>"
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
+#~ "s<br><b>Subject:</b> %s<br>"
 #~ msgstr ""
-#~ "-----���� �޽���-----<br><b>���� ���:</b> %s<br><b>�޴� ���:</b> "
-#~ "%s<br><b>����:</b> %s<br>"
+#~ "-----���� �޽���-----<br><b>���� ���:</b> %s<br><b>�޴� ���:</b> %"
+#~ "s<br><b>����:</b> %s<br>"
 
 #~ msgid "Evolution files successfully installed."
 #~ msgstr "Evolution ���ϵ��� ����� ��ġ�Ǿ��Ǿ����ϴ�."
diff --git a/po/lt.po b/po/lt.po
index d667d75e37..4afc2f69d5 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2001-10-28 22:33+0200\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Your language <komp_lt@konferencijos.lt>\n"
@@ -36,7 +36,7 @@ msgstr "Importuoja VCard bylas � Evolution."
 msgid "File As"
 msgstr "Saugoti kaip"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Vardas"
@@ -47,7 +47,7 @@ msgid "Email"
 msgstr "El. pa�tas"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Pagrindinis"
 
@@ -57,7 +57,7 @@ msgstr "Pagr"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asistento"
@@ -65,8 +65,8 @@ msgstr "Asistento"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Darbo"
 
@@ -76,12 +76,12 @@ msgid "Bus"
 msgstr "Darb"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Atsakiklis"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Kompanijos"
 
@@ -92,8 +92,8 @@ msgstr "Komp"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Nam�"
 
@@ -108,18 +108,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Mobilus"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Automobilinis"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Darbo faksas"
@@ -129,13 +129,13 @@ msgid "Bus Fax"
 msgstr "Darb faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Nam� faksas"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Darbo 2"
 
@@ -144,43 +144,43 @@ msgid "Bus 2"
 msgstr "Darb 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Nam� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Kitas"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Kitas faksas"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Ie�kas"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Teleksas"
@@ -192,14 +192,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "El. pa�tas 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "El. pa�tas 3"
@@ -337,7 +337,7 @@ msgstr "%s VCard"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -345,7 +345,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Negal�jau inicializuoti Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Ie�koma..."
 
@@ -358,32 +358,32 @@ msgstr "�keliama..."
 msgid "Error in search expression."
 msgstr "Klaida paie�kos i�rai�koje."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Pridedama kortel� � LDAP server�..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Pa�alinama kortel� i� LDAP serverio..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Taisoma kortel� LDAP serveryje..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Paie�ka pradedama i� naujo."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Gaunami LDAP paie�kos rezultatai..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Klaida pa�alinant kortel�"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Negal�jau i�nagrin�ti URL �%s�"
@@ -432,108 +432,142 @@ msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #, fuzzy
-msgid "Addressbook Settings"
-msgstr "Adres� knygel�s �altinis"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr "Evolution adres� knygel�s komponento gamykla."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#, fuzzy
-msgid "Configuration control for the Evolution Addressbook."
-msgstr "Evolution adres� knygel�s komponento gamykla."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #, fuzzy
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Evolution adres� knygel�s konduito konfig�ravimo �rankis\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution adres� knygel�s ma�� korteli� vaizduokl�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Evolution kontakt� tvarkymo komponentas."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Adres� knygel�s adreso vaizduokl�s gamykla"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the Addressbook's address popup"
 msgstr "Adres� knygel�s adreso ???? gamykla"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr "Evolution adres� knygel�s komponento gamykla."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontaktai"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Aplankas, kuriame laikoma kontakt� informacija"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "LDAP serveris, kuriame laikoma kontakt� informacija"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Naujas kontakt� s�ra�as"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "Kontakt� _s�ra�as"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Naujas kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Naujas kontakt� s�ra�as"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Negal�jau prisijungti prie LDAP serverio."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "Kontakt� _s�ra�as"
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Negal�jau autentikuotis � IMAP server�.\n"
+"%s\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Klaida, �keliant filtro informacij�:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Negal�jau inicializuoti gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Kiti kontaktai"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Negaliu atidaryti adres� knygel�s"
@@ -568,50 +602,59 @@ msgstr ""
 "Mes negal�jome atidaryti �ios adres� knygel�s. Pra�om patikrinti, ar\n"
 "kelias egzistuoja ir ar turi teises j� pasiekti."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "�vesk %s slapta�od� (vartotojas %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "baigiasi su"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "El. pa�tas 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija yra"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Bet kuris laukas turi savyje"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "I�sami..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Bet kuri kategorija"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, kur� rodys Aplank� nar�ykl�"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(jokio)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Pagrindinis el. pa�tas"
 
@@ -657,104 +700,58 @@ msgstr "U�drausti u�klausas"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Leisti u�klausas (Pavojinga!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Negal�jau prisijungti prie LDAP serverio."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Negal�jau autentikuotis � IMAP server�.\n"
-"%s\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Klaida, �keliant filtro informacij�:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "U�baigimo data"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr " _Patikrinti, kokie tipai palaikomi"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Parinktys"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr " _Pa�alinti"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr " _Pa�alinti"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Parinktys"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -763,8 +760,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Adres� knygel�s �altinis"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Persp�jimai"
@@ -858,8 +855,8 @@ msgstr "Konfig�ravimas"
 msgid "Mappings"
 msgstr "Para�t�s"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_kas"
@@ -1040,14 +1037,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1070,8 +1067,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1103,7 +1100,7 @@ msgid "Using email address"
 msgstr "El. pa�to adresas:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1111,7 +1108,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Prid�ti"
 
@@ -1158,7 +1155,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1275,10 +1272,12 @@ msgstr "Evolution adres� knygel�s vard� pasirinkimo s�saja."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Adres� knygel�s vard� pasirinkimo s�sajos gamykla"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Pa�alinti"
 
@@ -1402,7 +1401,7 @@ msgstr "Bendradarbiavimas"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Kontakt� redaktorius"
 
@@ -1412,7 +1411,7 @@ msgid "D_epartment:"
 msgstr "_Departamentas:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Detal�s"
 
@@ -1476,11 +1475,12 @@ msgstr "Nori gauti _HTML lai�kus"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_I�trinti"
 
@@ -1509,7 +1509,7 @@ msgid "_Web page address:"
 msgstr "_Tinklapio adresas:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Jungtin�s Valstijos"
 
@@ -2015,12 +2015,11 @@ msgid "Laos"
 msgstr "Laosas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Latvija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
@@ -2029,7 +2028,7 @@ msgid "Lesotho"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberija"
 
@@ -2038,12 +2037,12 @@ msgid "Liechtenstein"
 msgstr "Lichten�teinas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lietuva"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Liuksemburgas"
 
@@ -2076,7 +2075,7 @@ msgid "Mali"
 msgstr "Malis"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2101,7 +2100,7 @@ msgid "Mayotte"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Meksika"
 
@@ -2126,7 +2125,7 @@ msgid "Montserrat"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marokas"
 
@@ -2151,7 +2150,7 @@ msgid "Nepal"
 msgstr "Nepalas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Olandija"
 
@@ -2164,12 +2163,12 @@ msgid "New Caledonia"
 msgstr "Naujoji Kaledonija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Naujoji Zelandija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nikaragva"
 
@@ -2186,7 +2185,7 @@ msgid "Niue"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolko sala"
 
@@ -2195,17 +2194,17 @@ msgid "Northern Mariana Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norvegija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Omanas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistanas"
 
@@ -2218,7 +2217,7 @@ msgid "Palestinian Territory"
 msgstr "Palestinos teritorija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2227,12 +2226,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Naujoji Gvin�ja"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paragvajus"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2245,22 +2244,22 @@ msgid "Pitcairn"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Lenkija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugalija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rikas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Kvataras"
 
@@ -2269,7 +2268,7 @@ msgid "Reunion"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rumunija"
 
@@ -2306,7 +2305,7 @@ msgid "Sao Tome And Principe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudo Arabija"
 
@@ -2323,17 +2322,17 @@ msgid "Sierra Leone"
 msgstr "Siera Leon�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singap�ras"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovakija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slov�nija"
 
@@ -2346,7 +2345,7 @@ msgid "Somalia"
 msgstr "Somalis"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Piet� Afrikos respublika"
 
@@ -2355,7 +2354,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Ispanija"
 
@@ -2376,7 +2375,7 @@ msgid "Sudan"
 msgstr "Sudanas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinamas"
 
@@ -2389,17 +2388,17 @@ msgid "Swaziland"
 msgstr "Svazilendas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "�vedija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "�veicarija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taivanas"
 
@@ -2436,7 +2435,7 @@ msgid "Tunisia"
 msgstr "Tunisas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turkija"
 
@@ -2457,7 +2456,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraina"
 
@@ -2466,7 +2465,7 @@ msgid "United Arab Emirates"
 msgstr "Jungtiniai Arab� Emyratai"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Jungtin� Karalyst�"
 
@@ -2475,7 +2474,7 @@ msgid "United States Minor Outlying Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Urugvajus"
 
@@ -2488,12 +2487,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venesuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnamas"
 
@@ -2514,12 +2513,12 @@ msgid "Western Sahara"
 msgstr "Vakar� Sachara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jemenas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslavija"
 
@@ -2532,28 +2531,36 @@ msgid "Zimbabwe"
 msgstr "Zimbabv�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Ar tu tikrai nori\n"
+"i�trinti �� kontakt�?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "I�trinti kontakt�?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 #, fuzzy
 msgid "Category editor not available."
 msgstr "N�ra jokios apra�ymo."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "�is kontaktas priklauso �ioms kategorijoms:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "I�saugoti kaip VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2580,11 +2587,11 @@ msgstr "El. pa�tas"
 msgid "card.vcf"
 msgstr "kortele.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "s�ra�as"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2719,11 +2726,11 @@ msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Kontakt� s�ra�o redaktorius"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "I�saugoti kaip VCard"
@@ -2802,21 +2809,21 @@ msgid "Error getting book view"
 msgstr "Klaida pradedant %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Klaida modifikuojant kortel�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "S�km�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Ne�inoma klaida"
 
@@ -2825,7 +2832,7 @@ msgid "Repository offline"
 msgstr "Saugykla atsijungta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Pri�jimas u�draustas"
 
@@ -2843,55 +2850,70 @@ msgstr "Protokolas nepalaikomas"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Nutraukta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Autentikacija nepavyko."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autentikacija b�tina"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Kita klaida"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Ar nori i�saugoti pakeitimus?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Klaida pridedant s�ra��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Klaida pridedant kortel�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Klaida modifikuojant s�ra��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Klaida pa�alinant s�ra��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Klaida pa�alinant kortel�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Vaizdavimas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Vaizdavimas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2899,22 +2921,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "N�ra korteli�"
@@ -2979,102 +3001,108 @@ msgstr "Kitas telefonas"
 msgid "Other Address"
 msgstr "Kitas adresas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Adres� knygel�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "I�saugoti kaip VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Naujas kontaktas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Naujas kontakt� s�ra�as"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Eiti � aplank�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Importuoti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Ie�koti kontakt�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Adres� knygel�s �altiniai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot nuostatos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Persi�sti kontakt�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Si�sti lai�k� kontaktui"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Spausdinti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Spausdinti vok�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Kopijuoti � aplank�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Perkelti � aplank�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "I�kirpti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "�d�ti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "I�trinti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3084,7 +3112,7 @@ msgstr "_Esamas vaizdas"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 ",123,a,�,b,c,�,d,e,�,�,f,g,h,i,�,j,k,l,m,n,o,p,q,r,s,�,t,u,�,�,v,w,x,y,z,�"
@@ -3093,7 +3121,7 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 ",0,a,�,b,c,�,d,e,�,�,f,g,h,i,�,j,k,l,m,n,o,p,q,r,s,�,t,u,�,�,v,w,x,y,z,�"
@@ -3247,7 +3275,7 @@ msgstr "Para�t�s"
 msgid "Number of columns:"
 msgstr "Stulpeli� skai�ius:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Parinktys"
 
@@ -3257,7 +3285,7 @@ msgid "Orientation"
 msgstr "Orientacija"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Puslapis"
 
@@ -3331,30 +3359,34 @@ msgstr "Plotis:"
 msgid "_Font..."
 msgstr "�_riftas..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "K_eisti �vyk�"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Auk�tas"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normalus"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "�emas"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Neapibr��tas"
 
@@ -3397,45 +3429,36 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Evolution pa�to komponento gamykla."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution pa�to komponento."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution kalendoriaus iTip/iMip vaizduokl�"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution komponentas tvarkyti kalendoriui."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Kalendoriaus ap�valgos komponento gamykla."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "Testinio komponento gamykla."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Evolution kalendoriaus komponento gamykla."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3447,10 +3470,25 @@ msgstr "Aliarmo prane�imo tarnyba"
 msgid "Factory for the alarm notification service"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Nuostatos"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Indeksuojama:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "blogas laikas"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3490,7 +3528,7 @@ msgstr ""
 "u�uominos dialog�."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�sp�jimas"
@@ -3511,16 +3549,16 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Kit� kart� nebeklausti."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Negal�jau inicializuoti GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 #, fuzzy
 msgid "Could not create the alarm notify service"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
@@ -3537,7 +3575,7 @@ msgstr "Apra�ymas turi savyje"
 msgid "Comment contains"
 msgstr "Komentaras turi savyje"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Netinkantys"
 
@@ -3578,14 +3616,16 @@ msgstr ""
 "OAF."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Asmeni�kas"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Slaptas"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Vie�as"
 
@@ -3606,27 +3646,32 @@ msgid "W"
 msgstr "V"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Laisvas"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "U�imtas"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Neprad�ta"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Vykdoma"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "U�baigta"
 
@@ -3641,11 +3686,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3660,12 +3706,14 @@ msgstr "Pasikartojantis"
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Taip"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Ne"
 
@@ -3685,62 +3733,64 @@ msgstr "Savait�s rodinys"
 msgid "Month View"
 msgstr "M�nesio rodinys"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Aplankas, kuriame saugomi �vykiai ir susitikimai"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "U�duotys"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Aplankas, kuriame yra u�duotys"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "Naujien� �altini� nuostatos"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "Susitikimas"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "Nauja u�duotis"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_U�duotis"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Naujas �vykis"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Naujas �_vykis"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "Naujas �vykis"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "�vykis"
@@ -3948,7 +3998,7 @@ msgstr "U�uominos"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Ap�valga:"
 
@@ -3977,7 +4027,7 @@ msgstr "�vykio pabaig�"
 msgid "hour(s)"
 msgstr "valand�(as)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minut�(es)"
 
@@ -4005,79 +4055,81 @@ msgstr "30 minu�i�"
 msgid "60 minutes"
 msgstr "60 minu�i�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Persp�jimai"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Kalendoriaus ir u�duo�i� nuostatos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Spalva �iandienos u�duotims"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Spalva v�luojamoms u�duotims"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Dien�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Valand�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minu�i�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "_Sek"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "�e�tadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Rodyti savai�i� _numerius datos navigatoriuje"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "Dienos p_rad�ia:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "_Sek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "�ia_ndienos u�duotys:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "_Ket"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "_Ant"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4106,81 +4158,96 @@ msgid "Tuesday"
 msgstr "Antradienis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Tre�iadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Darbo savait�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 valand� (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 valand�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "P_apra�yti patvirtinimo trinant elementus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_Suspausti savaitgalius m�nesio rodinyje"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "_Rodyti stotis:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "Vaiz_davimas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "D_ienos pabaiga:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "Pe_n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Esm�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_Pasl�pti u�baigtas u�duotis po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Pir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "_V�luojamos u�duotys:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "�_e�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Rodyti �vyki� pa_baigos laikus savait�s ir m�nesio rodiniuose"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Laiko _dalijimas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_Ant"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_Tre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "prie� �vykio prad�i�"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4265,41 +4332,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Negal�jau tvarkingai atnaujinti byl�"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
 #, fuzzy
-msgid "Could not update object!"
+msgid "Could not update object"
 msgstr "Negal�jau tvarkingai atnaujinti byl�"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Keisti �vyk�"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "�vykis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "U�duotis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "�urnalo �ra�as -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "N�ra ap�valgos"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "I�saugoti kaip..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Nepavyko gauti esamos versijos!"
 
@@ -4357,27 +4444,27 @@ msgstr "Pavesti kam:"
 msgid "Enter Delegate"
 msgstr "�vesti, kam pavedama"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "�vykis"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "U�uomina"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Pasikartojimas"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Dienotvark�"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Susitikimas"
 
@@ -4427,7 +4514,7 @@ msgid "Pu_blic"
 msgstr "_Vie�as"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Rodyti laik� kaip"
 
@@ -4449,20 +4536,20 @@ msgstr "P_abaigos laikas:"
 msgid "_Start time:"
 msgstr "_Prad�ios laikas:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Organizatorius yra b�tinas."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 #, fuzzy
 msgid "At least one attendee is required."
 msgstr "Reikalingas bent vienas dalyvis"
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Tas asmuo jau dalyvauja susitikime!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Pavesti kam..."
 
@@ -4473,49 +4560,55 @@ msgstr "Dalyvis"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Bendras vardas"
+msgid "Click here to add an attendee"
+msgstr "Spausk �ia, kad prid�tum dalyv�"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Pavesta kieno"
+msgid "Common Name"
+msgstr "Bendras vardas"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Pavesta kam"
+msgid "Delegated From"
+msgstr "Pavesta kieno"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Kalba"
+msgid "Delegated To"
+msgstr "Pavesta kam"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Narys"
+msgid "Language"
+msgstr "Kalba"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Narys"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rol�"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "B�sena"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipas"
@@ -4530,14 +4623,10 @@ msgid "_Change Organizer"
 msgstr "_Keisti organizatori�:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "Pakv_iesti kitus..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Kitas organizatorius"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4726,7 +4815,7 @@ msgid "Progress"
 msgstr "Pa�anga"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4738,19 +4827,19 @@ msgstr "_Svarbumas:"
 msgid "_Status:"
 msgstr "_B�sena:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Esm�"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Priskyrimas"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Apra�ymas:"
 
@@ -4762,24 +4851,79 @@ msgstr "P_rad�ios data:"
 msgid "_Due Date:"
 msgstr "_Kada reikia:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:443
+#, fuzzy, c-format
+msgid "30%"
+msgstr "389"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:448
+#, fuzzy, c-format
+msgid "80%"
+msgstr "389"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "I�trinti pa�ym�tus kontaktus"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "Ati_daryti"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "I�saugoti kaip..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4787,20 +4931,20 @@ msgstr "I�saugoti kaip..."
 msgid "_Print..."
 msgstr "S_pausdinti..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_I�kirpti"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4808,35 +4952,36 @@ msgstr "_Kopijuoti"
 msgid "_Paste"
 msgstr "�_d�ti"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Priskirti u�duot�"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Persi�sti kaip i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_Pa�ym�ti u�baigta"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Pa�ym�ti u�duotis u�baigtomis"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_I�trinti pa�ym�tas u�duotis"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Spausk �ia, kad prid�tum u�duot�"
 
@@ -4844,47 +4989,48 @@ msgstr "Spausk �ia, kad prid�tum u�duot�"
 msgid "Alarms"
 msgstr "Persp�jimai"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "U�baigta"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "U�baigimo data"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Kada reikia"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Pabaigos data"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Geografin� vietov�"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Svarbumas"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Prad�ios data"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Ap�valga"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "U�duo�i� rikiavimas"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4932,11 +5078,13 @@ msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr " "
 
@@ -4976,7 +5124,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Konfig�ruoti aplank�..."
@@ -4987,7 +5135,7 @@ msgid "_Configure Pilot..."
 msgstr "Konfig�ruoti aplank�..."
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "I�_saugoti kaip..."
 
@@ -5014,73 +5162,427 @@ msgid "Delete _All Occurrences"
 msgstr "I�trinti _visus pasitaikymus"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Atrodo, kad GNOME Pilot �rankiai n�ra �diegti � �i� sistem�"
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Klaida vykdant %s."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+#, fuzzy
+msgid "Meeting begins: <b>"
+msgstr "Susitikimo pa_baigos laikas:"
+
+#: calendar/gui/e-itip-control.c:683
+#, fuzzy
+msgid "Task begins: <b>"
+msgstr " (U�baigta "
+
+#: calendar/gui/e-itip-control.c:688
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "_Skelbti laisvas/u�imtas informacij�"
+
+#: calendar/gui/e-itip-control.c:692
+#, fuzzy
+msgid "Begins: <b>"
+msgstr "Susitikimo pa_baigos laikas:"
+
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Susitikimo pa_baigos laikas:"
+
+#: calendar/gui/e-itip-control.c:707
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Susitikimo pa_baigos laikas:"
+
+#: calendar/gui/e-itip-control.c:711
+#, fuzzy
+msgid "Ends: <b>"
+msgstr "Susitikimo pa_baigos laikas:"
+
+#: calendar/gui/e-itip-control.c:725
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (U�baigta "
+
+#: calendar/gui/e-itip-control.c:735
+#, fuzzy
+msgid "Task Due: <b>"
+msgstr " (U�baigta "
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "kalendoriaus informacija"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Kalendorius"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "An unknown person"
+msgstr "ne�inomas siunt�jas"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "_B�sena:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Priimtas"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "Negalutinis"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Atmestas"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ne�inomas"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "Kalendoriaus byla negal�jo b�ti atnaujinta!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Pasirink veiksm�"
+
+#: calendar/gui/e-itip-control.c:972
+#, fuzzy
+msgid "Update"
+msgstr "Data"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Gerai"
+
+#: calendar/gui/e-itip-control.c:1000
+#, fuzzy
+msgid "Accept"
+msgstr "Priimtas"
+
+#: calendar/gui/e-itip-control.c:1001
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Negalutinis"
+
+#: calendar/gui/e-itip-control.c:1002
+#, fuzzy
+msgid "Decline"
+msgstr "Atmestas"
+
+#: calendar/gui/e-itip-control.c:1026
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "_Skelbti laisvas/u�imtas informacij�"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Susitikimo informacija"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Nutraukti"
+
+#: calendar/gui/e-itip-control.c:1117
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "Su�inoti naujausi� susitikimo informacij�"
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Susitikimo informacija"
+
+#: calendar/gui/e-itip-control.c:1122
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "Su�inoti naujausi� susitikimo informacij�"
+
+#: calendar/gui/e-itip-control.c:1123
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Susitikimas"
+
+#: calendar/gui/e-itip-control.c:1127
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "Su�inoti naujausi� susitikimo informacij�"
+
+#: calendar/gui/e-itip-control.c:1128
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Susitikimo pa_baigos laikas:"
+
+#: calendar/gui/e-itip-control.c:1132
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "Su�inoti naujausi� susitikimo informacij�"
+
+#: calendar/gui/e-itip-control.c:1133
+#, fuzzy
+msgid "Meeting Update Request"
+msgstr "Susitikimo pa_baigos laikas:"
+
+#: calendar/gui/e-itip-control.c:1156
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "Su�inoti naujausi� susitikimo informacij�"
+
+#: calendar/gui/e-itip-control.c:1157
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Susitikimas"
+
+#: calendar/gui/e-itip-control.c:1161
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "Gauti naujausi� informacij� apie u�duot�"
+
+#: calendar/gui/e-itip-control.c:1162
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Susitikimo informacija"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1167
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Ie�koti lai�ke"
+
+#: calendar/gui/e-itip-control.c:1189
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "Gauti naujausi� informacij� apie u�duot�"
+
+#: calendar/gui/e-itip-control.c:1190
+#, fuzzy
+msgid "Task Information"
+msgstr "Informacija"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1195
+#, fuzzy
+msgid "Task Proposal"
+msgstr "Susitikimas"
+
+#: calendar/gui/e-itip-control.c:1199
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "Gauti naujausi� informacij� apie u�duot�"
+
+#: calendar/gui/e-itip-control.c:1200
+#, fuzzy
+msgid "Task Update"
+msgstr "buvo po"
+
+#: calendar/gui/e-itip-control.c:1204
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "Gauti naujausi� informacij� apie u�duot�"
+
+#: calendar/gui/e-itip-control.c:1205
+#, fuzzy
+msgid "Task Update Request"
+msgstr "buvo po"
+
+#: calendar/gui/e-itip-control.c:1229
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "Gauti naujausi� informacij� apie u�duot�"
+
+#: calendar/gui/e-itip-control.c:1230
+#, fuzzy
+msgid "Task Reply"
+msgstr "Atsakyti"
+
+#: calendar/gui/e-itip-control.c:1234
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "Gauti naujausi� informacij� apie u�duot�"
+
+#: calendar/gui/e-itip-control.c:1235
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Nutraukti veiksm�"
+
+#: calendar/gui/e-itip-control.c:1240
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Kalendoriaus �inut�"
+
+#: calendar/gui/e-itip-control.c:1259
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "_Skelbti laisvas/u�imtas informacij�"
+
+#: calendar/gui/e-itip-control.c:1260
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "_Skelbti laisvas/u�imtas informacij�"
+
+#: calendar/gui/e-itip-control.c:1264
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1265
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "_Laisvas-u�si�m�s URL"
+
+#: calendar/gui/e-itip-control.c:1269
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "_Skelbti laisvas/u�imtas informacij�"
+
+#: calendar/gui/e-itip-control.c:1270
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "_Laisvas-u�si�m�s URL"
+
+#: calendar/gui/e-itip-control.c:1275
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Praeit� lai�k�"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
+
+#: calendar/gui/e-itip-control.c:1373
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "�iame lai�ke yra tik Bcc gav�jai."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#, fuzzy
+msgid "There was an error on the CORBA system\n"
+msgstr "�vyko klaida parsiun�iant naujien� �altin�"
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Elementas negal�jo b�ti i�si�stas!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Atnaujinimas u�baigtas\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Kalendoriaus byla negal�jo b�ti atnaujinta!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
-#, fuzzy
-msgid "Attendee status could not be updated!\n"
-msgstr "Dalyvio b�sena atnaujinta\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Dalyvio b�sena atnaujinta\n"
 
 #: calendar/gui/e-itip-control.c:1674
+#, fuzzy
+msgid "Attendee status could not be updated!\n"
+msgstr "Dalyvio b�sena atnaujinta\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Pa�alinimas u�baigtas"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Elementas i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "Elementas negal�jo b�ti i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Pasirink aplank�"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Pasirink aplank�"
@@ -5122,93 +5624,92 @@ msgstr "pabaigos-data"
 msgid "date-start"
 msgstr "prad�ios-data"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Pirmininkaujantys asmenys"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "B�tini dalyviai"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Neb�tini dalyviai"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Ne dalyviai"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Individas"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Grup�"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Resursas"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Kambarys"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Pirmininkas"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "B�tinas dalyvis"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Neb�tinas dalyvis"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Ne dalyvis"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Reikalauja veiksmo"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Priimtas"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Atmestas"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Negalutinis"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Pavestas"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "Vykdomas"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %Y m. %B %e"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
@@ -5220,63 +5721,63 @@ msgstr "%a %Y-%m-%d"
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Nesu darbe"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "N�ra informacijos"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Parinktys"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Rodyti tik _darbo valandas"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Rodyti _atitraukt�"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Atnaujinti Laisvas/U�imtas"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Automati�kai parinkti"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Visi �mon�s ir resursai"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Visi �_mon�s ir vienas resursas"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "_B�tini �mon�s"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "B�tini �mon�s ir _vienas resursas"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Susitikimo _prad�ios laikas:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Susitikimo pa_baigos laikas:"
 
@@ -5295,17 +5796,22 @@ msgstr "Negal�jau �kelti u�duo�i� � �%s�"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metodas, reikalingas �kelti �%s�, nepalaikomas"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Negal�jau atidaryti aplanko su �%s�"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "U�baigimo data"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "I�trinti pa�ym�tus kontaktus"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "I�valyti"
@@ -5318,17 +5824,17 @@ msgstr "Naujas �_vykis..."
 msgid "_Delete this Appointment"
 msgstr "_I�trinti �� �vyk�"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Negal�jau atidaryti aplanko su �%s�"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metodas, reikalingas atidaryti �%s�, nepalaikomas"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Atidaromas kalendorius i� %s"
@@ -5389,20 +5895,59 @@ msgstr "Spalis"
 msgid "September"
 msgstr "Rugs�jis"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "Reikalingas bent vienas dalyvis"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Turi b�ti nurodytas organizatorius."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "kalendoriaus informacija"
+
+#: calendar/gui/itip-utils.c:356
+#, fuzzy
+msgid "Task information"
+msgstr "Informacija"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "Neb�tina informacija"
+
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "_Skelbti laisvas/u�imtas informacij�"
+
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "kalendoriaus informacija"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Data"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Atnaujinti s�ra��"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Tu turi b�ti �vykio dalyvis."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
@@ -5592,12 +6137,49 @@ msgstr "Pasirinktas m�nuo (%Y %b)"
 msgid "Selected year (%Y)"
 msgstr "Pasirinkti metai (%Y)"
 
+#: calendar/gui/print.c:2249
+#, fuzzy
+msgid "Task"
+msgstr "_U�duotis"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_B�sena:"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Svarbumas:"
+
+#: calendar/gui/print.c:2338
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Procent� u�baigta"
+
+#: calendar/gui/print.c:2350
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2364
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Kategorijos: "
+
+#: calendar/gui/print.c:2375
+#, fuzzy
+msgid "Contacts: "
+msgstr "Ko_ntaktai:"
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Spausdinti kalendori�"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5636,8 +6218,8 @@ msgstr ""
 "\n"
 "Tikrai i�trinti tuos lai�kus?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Kit� kart� nebeklausti."
 
@@ -5699,6 +6281,11 @@ msgstr "Importuoja VCard bylas � Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importuoja VCard bylas � Evolution."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "U�uomina"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5792,8 +6379,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -6747,669 +7334,683 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Asistento"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Kvataras"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr ""
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 #, fuzzy
 msgid "Asia/Muscat"
 msgstr "Asistento"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr ""
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 #, fuzzy
 msgid "Asia/Omsk"
 msgstr "Priskirti u�duot�"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Priskirti u�duot�"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 #, fuzzy
 msgid "Asia/Qatar"
 msgstr "Kvataras"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr ""
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr ""
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr ""
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 #, fuzzy
 msgid "Asia/Singapore"
 msgstr "Singap�ras"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr ""
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr ""
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr ""
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 #, fuzzy
 msgid "Atlantic/Bermuda"
 msgstr "Bermudai"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 #, fuzzy
 msgid "Atlantic/Cape_Verde"
 msgstr "�aliasis ky�ulys"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 #, fuzzy
 msgid "Australia/Adelaide"
 msgstr "Australija"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 #, fuzzy
 msgid "Australia/Brisbane"
 msgstr "Australija"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 #, fuzzy
 msgid "Australia/Broken_Hill"
 msgstr "Australija"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 #, fuzzy
 msgid "Australia/Darwin"
 msgstr "Australija"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 #, fuzzy
 msgid "Australia/Hobart"
 msgstr "Australija"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 #, fuzzy
 msgid "Australia/Lindeman"
 msgstr "Australija"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 #, fuzzy
 msgid "Australia/Lord_Howe"
 msgstr "Australija"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 #, fuzzy
 msgid "Australia/Melbourne"
 msgstr "Australija"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 #, fuzzy
 msgid "Australia/Perth"
 msgstr "Australija"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 #, fuzzy
 msgid "Australia/Sydney"
 msgstr "Australija"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr ""
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 #, fuzzy
 msgid "Europe/Andorra"
 msgstr "Andora"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 #, fuzzy
 msgid "Europe/Athens"
 msgstr "Savyb�s"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr ""
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr ""
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr ""
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr ""
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr ""
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr ""
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr ""
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr ""
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 #, fuzzy
 msgid "Europe/Gibraltar"
 msgstr "Gibraltaras"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr ""
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr ""
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr ""
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr ""
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr ""
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr ""
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 #, fuzzy
 msgid "Europe/Luxembourg"
 msgstr "Liuksemburgas"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr ""
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr ""
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr ""
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 #, fuzzy
 msgid "Europe/Monaco"
 msgstr "Monakas"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr ""
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr ""
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 #, fuzzy
 msgid "Europe/Paris"
 msgstr "Savyb�s"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr ""
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr ""
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr ""
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr ""
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 #, fuzzy
 msgid "Europe/San_Marino"
 msgstr "San Marinas"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr ""
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr ""
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr ""
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr ""
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr ""
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr ""
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 #, fuzzy
 msgid "Indian/Comoro"
 msgstr "Komorai"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 #, fuzzy
 msgid "Indian/Mahe"
 msgstr "Indija"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 #, fuzzy
 msgid "Indian/Maldives"
 msgstr "Maldyvai"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 #, fuzzy
 msgid "Indian/Mauritius"
 msgstr "Mauricijus"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr ""
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr ""
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:209
-#, fuzzy
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
@@ -7421,12 +8022,12 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Negal�jau atidaryti ke�o katalogo: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7437,7 +8038,7 @@ msgstr ""
 "Tolimesni veiksmai �iame serveryje nebus i� tikro �vykdyti,\n"
 "tau v�l prisijungus prie tinklo."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7448,11 +8049,16 @@ msgstr ""
 "%s\n"
 "Pakeitimai, padaryti �iam aplankui, nebus v�l sinchronizuojami."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "V�l sinchronizuojama su serveriu"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "�ra�omas aplankas '%s'"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Tu turi dirbti prisijung�s, kad u�baigtum �� veiksm�"
 
@@ -7460,57 +8066,68 @@ msgstr "Tu turi dirbti prisijung�s, kad u�baigtum �� veiksm�"
 msgid "Syncing folders"
 msgstr "Sinchronizuojami aplankai"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Klaida nagrin�jant filtr�: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Klaida vykdant filtr�: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Negaliu atidaryti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Negaliu apdoroti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Gaunamas lai�kas %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Negaliu atidaryti lai�ko"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nes�km� ties lai�ku %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Sinchronizuojamas aplankas"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Gaunamas lai�kas %d i� %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Nepavyko i�koduoti lai�ko."
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Nepavyko i�koduoti lai�ko."
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Klaida vykdant filtro paie�k�: %s: %s"
@@ -7542,29 +8159,106 @@ msgstr "(match-all) reikalauja vienintelio loginio rezultato"
 msgid "Performing query on unknown header: %s"
 msgstr "Vykdoma u�klausa ne�inomai antra�tei: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Klaida vykdant paie�kos i�rai�k� �%s�:\n"
 "%s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Klaida vykdant paie�kos i�rai�k� �%s�:\n"
 "%s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Perkeliami lai�kai"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Lai�kai kopijuojami � %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Nutraukta."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Netik�tas atsakymas i� POP serverio: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Nenurodytas aplanko vardas."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Negaliu u��ifruoti �io lai�ko: nenurodyti jokie gav�jai."
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Nepavyko i�koduoti lai�ko."
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Nepavyko i�koduoti lai�ko."
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Nepavyko i�koduoti lai�ko."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Negal�jau sukurti laikinos bylos: %s"
+
 #: camel/camel-lock-client.c:111
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7660,87 +8354,23 @@ msgstr "Klaida �ra�ant laikin� pa�to byl�: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Klaida kopijuojant laikin� pa�to byl�: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Pra�au �vesti tavo %s slapta�od� d�l %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Pra�au �vesti tavo %s slapta�od�"
-
-#: camel/camel-pgp-context.c:621
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-#, fuzzy
-msgid "Cannot sign this message: no password provided"
-msgstr "Negaliu si�sti lai�ko: siunt�jo adresas neteisingas."
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:795
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
-
-#: camel/camel-pgp-context.c:987
-#, fuzzy
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1004
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "Negal�jau sukurti laikinos bylos: %s"
-
-#: camel/camel-pgp-context.c:1177
-#, fuzzy
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
-
-#: camel/camel-pgp-context.c:1187
-#, fuzzy
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Negaliu si�sti lai�ko: siunt�jo adresas neteisingas."
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Negaliu u��ifruoti �io lai�ko: nenurodyti jokie gav�jai."
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Negaliu i��ifruoti �io lai�ko: nenurodyti jokie gav�jai."
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Kita klaida"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7756,43 +8386,6 @@ msgstr "Negal�jau �kelti %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Negal�jau �kelti %s: Modulyje n�ra inicializacijos kodo."
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s serveris %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Jungtis nutraukta"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Negal�jau prisijungti prie %s (prievadas %d): %s"
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(ne�inomas hostas)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Veiksmas nutrauktas"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Serveris netik�tai atsijung�: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anoniminis"
@@ -7894,7 +8487,7 @@ msgid ""
 msgstr "Negal�jau sukurti pipe: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Blogas autentikacijos atsakymas i� serverio."
 
@@ -7926,11 +8519,9 @@ msgstr ""
 "Su �ia parinktimi jungiantis prie serverio bus naudojama Kerberos 4 "
 "autentikacija."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Slapta�odis"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7957,51 +8548,51 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nepavyko sukompiliuoti reguliarios i�rai�kos: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL �%s� turi b�ti su vartotojo vardu"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL �%s� turi b�ti su hostu"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL �%s� turi b�ti su keliu"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Atsakymo adresas:"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8064,12 +8655,12 @@ msgstr "Nepavyko i�koduoti lai�ko."
 msgid "Failed to verify certificates."
 msgstr "Nepavyko patikrinti sertifikat�."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
@@ -8098,7 +8689,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8107,16 +8698,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8136,15 +8727,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Negal�jau i�nagrin�ti URL �%s�"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "N�ra tokio lai�ko %s aplanke %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "N�ra tokio lai�ko: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Patikrinti, ar yra nauj� lai�k� visuose aplankuose"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8166,68 +8757,77 @@ msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Negaliu pervadinti aplanko: %s: N�ra tokio aplanko"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Tu negali kopijuoti lai�k� i� �io �iuk�li� aplanko."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Veiksmas nutrauktas"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Serveris netik�tai atsijung�: %s"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Netik�tas atsakymas i� IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Serverio atsakymas baig�si per anksti."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Netik�tas atsakymas OK i� IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Negal�jau sukurti katalogo %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nepavyko �kelti %s santraukos"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Aplankas serveryje buvo sunaikintas ir v�l sukurtas."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Ie�koma pakeist� lai�k�"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "�is lai�kas �iuo metu nepasiekiamas"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Ie�koma nauj� lai�k�"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Negal�jau rasti lai�ko teksto FETCH atsakyme"
 
@@ -8280,34 +8880,85 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pa�to skaitymui ir ra�ymui IMAP serveriuose."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Slapta�odis"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Su �ia parinktimi jungiantis prie IMAP serverio bus naudojamas paprasto "
 "teksto slapta�odis."
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP serveris %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "SMTP serveris %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Jungtis nutraukta"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Negal�jau prisijungti prie %s (prievadas %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Negal�jau prisijungti prie POP serverio.\n"
+"Klaida siun�iant vartotojo vard�: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Veiksmas nepalaikomas"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Autentikacija nepavyko."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP serveris %s nepalaiko pra�yto autentikacijos tipo %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nepalaikoma %s tipo autentikacija"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPra�om �vesti IMAP slapta�od� d�l %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Tu ne�vedei slapta�od�io."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8317,68 +8968,87 @@ msgstr ""
 "Negal�jau autentikuotis � IMAP server�.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "N�ra tokio aplanko %s"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "T�vinis aplankas negali tur�ti vaikini� aplank�"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Negaliu atidaryti pa�to d��ut�s: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "MH formato pa�to katalogai"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Vietinio pa�to laikymui MH tipo pa�to kataloguose."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Vietinis pristatymas"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Pa�to gavimui i� standartini� mbox formato byl�."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Pritaikyti filtrus naujiems lai�kams INBOX aplanke"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Maildir formato pa�to katalogai"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Vietinio pa�to laikymui maildir kataloguose."
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Standartin�s Unix mbox bylos"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "Vietinio pa�to skaitymui ir laikymui standartin�se mbox bylose"
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Standartin�s Unix mbox bylos"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "Vietinio pa�to skaitymui ir laikymui standartin�se mbox bylose"
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Saugyklos �aknis %s n�ra absoliutus kelias"
@@ -8404,7 +9074,7 @@ msgstr "Vietin�se saugyklose n�ra inbox"
 msgid "Local mail file %s"
 msgstr "Vietin� pa�to byla %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Negal�jau pervadinti aplanko �%s� � %s: %s"
@@ -8424,34 +9094,32 @@ msgstr "Negal�jau i�trinti aplanko santraukos bylos �%s�: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Negal�jau i�trinti aplanko indekso bylos �%s�: %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Negal�jau i�saugoti santraukos: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nepavyko prid�ti lai�ko � santrauk�: ne�inoma prie�astis"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Nes�km� ties lai�ku %d"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Negal�jau pridurti lai�ko prie maildir aplanko: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8460,20 +9128,19 @@ msgstr ""
 "Negaliu gauti lai�ko: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "N�ra tokio lai�ko"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Blogas lai�ko turinys"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8484,13 +9151,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "N�ra tokio aplanko �%s�."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8506,7 +9173,7 @@ msgstr "�%s� n�ra maildir katalogas."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Negal�jau i�trinti aplanko �%s�: %s"
@@ -8515,8 +9182,8 @@ msgstr "Negal�jau i�trinti aplanko �%s�: %s"
 msgid "not a maildir directory"
 msgstr "ne maildir katalogas"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -8539,46 +9206,38 @@ msgstr "Tikrinama, ar yra nauj� lai�k�"
 msgid "Checking for new messages"
 msgstr "Ie�koma nauj� lai�k�"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "�ra�omas aplankas"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Negaliu atidaryti pa�to d��ut�s: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Veiksmas nutrauktas"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Negaliu pridurti lai�ko prie mbox bylos: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8587,13 +9246,11 @@ msgstr ""
 "Negaliu gauti lai�ko: %s i� aplanko %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nepavyko sukurti lai�ko: Sugadinta pa�to d��ut�?"
 
@@ -8636,175 +9293,156 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Aplankas �%s� n�ra tu��ias. Nei�tryniau."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Negal�jau atidaryti aplanko: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Negal�jau patikrinti aplanko: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Negal�jau atidaryti bylos: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Negal�jau atidaryti laikinos pa�to bylos: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Santrauka ir aplankas nesutampa net po sinchronizavimo"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Klaida ra�ant � laikin� pa�to d��ut�: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Nepavyko ra�yti � laikin� pa�to d��ut�: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Negal�jau u�daryti �altinio aplanko %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Negal�jau u�daryti laikino aplanko:  %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Negal�jau pervadinti aplanko: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Santrauka ir aplankas nesutampa net po sinchronizavimo"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ne�inoma klaida: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Negal�jau pervadinti aplanko: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Klaida ra�ant � laikin� pa�to d��ut�: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Nepavyko ra�yti � laikin� pa�to d��ut�: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "Si�sti lai�k� kontaktui"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Negal�jau pridurti lai�ko prie mh aplanko: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "�%s� n�ra katalogas."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Negaliu atidaryti MH katalogo kelio: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Negaliu pridurti lai�ko prie mbox bylos: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Spool aplank� negalima pervadinti"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Spool'as �%s� neegzistuoja arba n�ra paprasta byla."
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "Saugyklos �aknis %s n�ra n�ra paprastas katalogas"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "N�ra tokio aplanko �%s/%s�."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool pa�to byla %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Spool aplank� negalima pervadinti"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Spool aplank� negalima pervadinti"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Spool aplank� negalima i�trinti"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Negal�jau atidaryti laikinos pa�to bylos %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Negal�jau u�daryti �altinio aplanko %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, fuzzy, c-format
-msgid "Could not file: %s: %s"
-msgstr "Nepavyko �kelti %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Spool'as �%s� neegzistuoja arba n�ra paprasta byla."
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Lai�kai � %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET naujienos"
@@ -8813,12 +9451,22 @@ msgstr "USENET naujienos"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Tai tiek�jas, naudojamas skaitant ir ra�ant � USENET naujien� grupes."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Negal�jau sukurti katalogo %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET naujienos per %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8923,7 +9571,7 @@ msgstr "Palikti lai�kus serveryje"
 msgid "Delete after %s day(s)"
 msgstr "I�trinti po %s dienos(�)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8950,32 +9598,22 @@ msgstr ""
 "slapta�odis per APOP protokol�. Tai gali veikti ne visiems vartotojams netgi "
 "serveriuose, kurie teigia, jog j� palaiko."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant vartotojo vard�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Veiksmas nepalaikomas"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Autentikacija nepavyko."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Negal�jau prisijungti prie POP serverio %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8983,27 +9621,27 @@ msgstr ""
 "Negaliu prisijungti prie POP serverio.\n"
 "Jis nepalaiko pra�yto autentikacijos mechanizmo."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "I/O klaida"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPra�om �vesti POP3 slapta�od� d�l %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -9012,13 +9650,13 @@ msgstr ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant slapta�od�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "N�ra tokio aplanko �%s�."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9183,45 +9821,45 @@ msgstr "Laikina autentikacijos nes�km�"
 msgid "Authentication required"
 msgstr "Autentikacija b�tina"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Atsakymo � pasisveikinim� klaida: %s: galb�t nelemtinga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant vartotojo vard�: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Baig�si AUTH u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET atsakymo klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP serveris %s nepalaiko pra�yto autentikacijos tipo %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPra�om �vesti SMTP slapta�od� d�l %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9231,90 +9869,90 @@ msgstr ""
 "Negal�jau autentikuotis � SMTP server�.\n"
 "%s\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP serveris %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP pa�to siuntimas per %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "Negaliu si�sti lai�ko: siunt�jo adresas neteisingas."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Siun�iamas lai�kas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "SMTP pasveikinimas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Baig�si HELO u�klausos laiko riba: %s: nelemtinga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO atsakymo klaida: %s: nelemtinga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP autentikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Klaida sukuriant SASL autentikacijos objekt�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Baig�si AUTH u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH u�klausa nepavyko."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Blogas autentikacijos atsakymas i� serverio.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Baig�si MAIL FROM u�klausos laiko riba: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM atsakymo klaida: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Baig�si RCPT TO u�klausos laiko riba: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Baig�si DATA u�klausos laiko riba: %s: pa�tas nei�si�stas"
@@ -9322,39 +9960,39 @@ msgstr "Baig�si DATA u�klausos laiko riba: %s: pa�tas nei�si�stas"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET atsakymo klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Baig�si DATA siuntimo laiko riba: lai�ko nutraukimas: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Blogas autentikacijos atsakymas i� serverio."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Baig�si RSET u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET atsakymo klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Baig�si QUIT u�klausos laiko riba: %s: nelemtinga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET atsakymo klaida: %s"
@@ -9428,52 +10066,52 @@ msgstr "MIME tipas:"
 msgid "Suggest automatic display of attachment"
 msgstr "Pasi�lyti automatin� priedo parodym�"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Paspausk �ia, jei reikia adres� knygel�s"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Nuo:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Atsakyti-kam:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "�vesk lai�ko gav�jus"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�vesk adresus, kurie gaus �io lai�ko carbon copy"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9486,7 +10124,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Prisegti byl�"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Negal�jau prisijungti prie POP serverio %s."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9495,34 +10138,34 @@ msgstr ""
 "Klaida skaitant byl� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "�sp�jimas!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Byla egzistuoja, u�ra�yti?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Klaida i�saugant byl�: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Klaida �keliant byl�: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Klaida prieinant prie bylos: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Nepavyko gauti lai�ko i� redaktoriaus"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9531,7 +10174,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9540,7 +10183,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9549,7 +10192,7 @@ msgstr ""
 "Klaida automati�kai i�saugant lai�k�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9557,7 +10200,7 @@ msgstr ""
 "Ximian Evolution rado nei�saugot� byl� i� praeitos sesijos.\n"
 "Ar nor�tum pabandyti jas atkurti?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9567,29 +10210,49 @@ msgstr ""
 "\n"
 "Ar nor�tum i�saugoti jo pakeitimus?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "�sp�jimas: Pakeistas lai�kas"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Atidaryti byl�"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "�terpti byl�"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "I�saugoti para��"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (�prasta)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Sukurti lai�k�"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9597,6 +10260,12 @@ msgstr ""
 "Negal�jau sukurti ra�ykl�s lango:\n"
 "Nepavyko aktyvuoti HTML redaktoriaus komponento."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9658,7 +10327,7 @@ msgstr "Tema savyje turi"
 msgid "Subject does not contain"
 msgstr "Tema savyje neturi"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9803,7 +10472,7 @@ msgstr "valanda"
 msgid "minute"
 msgstr "minut�"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "sekund�i�"
 
@@ -9877,7 +10546,7 @@ msgstr " "
 msgid "ago"
 msgstr " "
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %H:%M"
 
@@ -9889,6 +10558,21 @@ msgstr "<spausk �ia, kad pasirinktum dat�>"
 msgid "Filter Rules"
 msgstr "Filtravimo taisykl�s"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Stiliaus vardas:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Spool'as �%s� neegzistuoja arba n�ra paprasta byla."
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Pasirink veiksm�"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9907,7 +10591,7 @@ msgstr ""
 "Pra�au, gr��k atgal ir nurodyk tikr� aplank�, � kur� perkelti lai�kus."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Pasirink aplank�"
 
@@ -9920,7 +10604,11 @@ msgstr ""
 "Klaida reguliarioje i�rai�koje �%s�:\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Bandyti"
 
@@ -9951,7 +10639,7 @@ msgstr "jei visos s�lygos tenkinamos"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "jei kuri nors s�lyga tenkinama"
 
 #: filter/filter-rule.c:780
@@ -10030,193 +10718,202 @@ msgid "Beep"
 msgstr "Belizas"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Kompanijos"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "turi savyje"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Kopijuoti � aplank�"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Gavimo data"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Siuntimo data"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "I�trintas"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "neturi savyje"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "nesibaigia"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "neegzistuoja"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "neskamba pana�iai �"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "neprasideda su"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "neegzistuoja"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Juodra�tis"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "baigiasi su"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Egzistuoja"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "egzistuoja"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "I�rai�ka"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Svarbus"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "yra"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "buvo po"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "buvo prie�"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "yra didesnis u�"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "yra ma�esnis u�"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "n�ra"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "n�ra"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+msgid "Label"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Konferencija"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Lai�ko tekstas"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Lai�ko antra�t�"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Perkelti � aplank�"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Groti gars�:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Skaitytas"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Gav�jai"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regex tenkina"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Atsakytas"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "�vertis"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Siunt�jas"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Priskirti b�sen�"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Dydis (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "skamba pana�iai �"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "�altinio s�skaita"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Savita antra�t�"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "prasideda su"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdym�"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Tema"
 
@@ -10272,7 +10969,8 @@ msgid "Scanning %s"
 msgstr "Skanuojama %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Pa�tas"
 
@@ -10288,10 +10986,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Adres� knygel�"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10341,7 +11035,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuoja tavo senus Netscape duomenis"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "�iuk�l�s"
 
@@ -10480,268 +11176,278 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Aplankas, kuriame yra lai�kai"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Virtuali �iuk�lin�"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Virtualus �iuk�lin�s aplankas"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "�iame aplanke negali b�ti lai�k�."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Savyb�s..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Pakeisti �io aplanko savybes"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Tu nenustatei pa�to siuntimo metodo"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "�sp�jimas: Pakeistas lai�kas"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Naujas pa�to lai�kas"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Pa�to lai�kas"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Jungiamasi prie serverio..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Negaliu u�registruoti saugyklos apvalkale"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "�%s� savyb�s"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Savyb�s"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d nauji"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d pasl�pti"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d pa�ym�ti"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d nei�si�sti"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d i�si�sti"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d i� viso"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sukurti _virtual� aplank� i� lai�ko"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _Tem�"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_nt�j�"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _Gav�jus"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _Konferencij�"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_em�"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_unt�j�"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_v�jus"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filtras pagal K_onferencij�"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Taisyti kaip nauj� lai�k�..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siunt�jui"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Atsakyti � _konferencij�"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "P_ersi�sti"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "U�baigta"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "I�valyti"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Pa�ym�ti s_kaitytu"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Pa�ym�ti _neskaitytu"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Pa�ym�ti svarb_iu"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Pa�ym�ti nesva_rbiu"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "S_ugr��inti"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Perkelti � aplank�..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti � aplank�..."
 
-#: mail/folder-browser.c:1645
-msgid "Label"
-msgstr ""
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Prid�ti siunt�j� � adres� knygel�"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Pritaikyti filtrus"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Sukurti _taisykl� i� lai�ko"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "vAplankas pagal Konferencij�"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtras pagal Konferencij� (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "vAplankas pagal Konferencij� (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "�p_rastas"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Gaunama informacija apie aplank�"
 
@@ -10796,7 +11502,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Tu ne�vedei visos b�tinos informacijos."
 
@@ -10806,83 +11512,111 @@ msgid "Evolution News Editor"
 msgstr "Evolution naujien� tvarkykl�"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution s�skait� tvarkykl�"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Hostas:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "_Vartotojo vardas:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Kelias:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Radio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Tu negali sukurti dviej� aplank� tuo pa�iu vardu."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Ar tu tikrai nori i�trinti �i� s�skait�?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Nei�trinti"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Ar tikrai i�trinti s�skait�?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "I�jungti"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "�jungti"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Ar tu tikrai nori i�trinti �i� naujien� s�skait�?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "�jungta"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_S�skaitos vardas:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rikas"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Lai�kai � %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Tema yra %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Lai�kai nuo %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "%s konferencija"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Prid�ti filtro taisykl�"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"�emiau nurodyti vAplankai:\n"
+"%sNaudojo i�trint� aplank�:\n"
+"    '%s'\n"
+"Ir buvo atnaujinti."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10894,7 +11628,7 @@ msgstr ""
 "gauti ir ra�yti lai�kus.\n"
 "Ar nor�tum sutvarkyti j� dabar?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10902,7 +11636,7 @@ msgstr ""
 "Tu turi susitvarkyti asmenyb�,\n"
 "tik tada gal�si kurti lai�kus."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10911,7 +11645,7 @@ msgstr ""
 "tik tada gal�si kurti lai�kus."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10919,11 +11653,11 @@ msgstr ""
 "Tu siunti HTML formatuot� lai�k�, bet sekantys gav�jai nem�gsta HTML "
 "formatuoto pa�to:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Si�sti vistiek?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10931,7 +11665,7 @@ msgstr ""
 "�is lai�kas neturi temos.\n"
 "Tikrai si�sti?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10939,11 +11673,11 @@ msgstr ""
 "Kadangi kontakt� s�ra�as, kuriam tu siunti, yra sukonfig�ruotas sl�pti "
 "s�ra�o adresus, �iame lai�ke bus tik Bcc gav�jai."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "�iame lai�ke yra tik Bcc gav�jai."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -10951,15 +11685,15 @@ msgid ""
 "Send anyway?"
 msgstr "Gali b�ti, kad pa�to serveris"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Tu turi nurodyti gav�jus, kad gal�tum i�si�sti �� lai�k�."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Tu turi susitvarkyti s�skait�, tik tada gal�si i�si�sti �� lai�k�."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10967,28 +11701,28 @@ msgstr ""
 "Nepavyko atidaryti �ios s�skaitos juodra��i� aplanko.\n"
 "Ar nor�tum naudoti �prastin� juodra��i� aplank�?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "ne�inomas siunt�jas"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d %H:%M, %%s ra��:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Perkelti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopijuoti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ar tu tikrai nori taisyti visus %d lai�kus?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10996,7 +11730,7 @@ msgstr ""
 "Tu gali taisyti tik lai�kus, esan�ius \n"
 "Juodra��i� aplanke."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11004,39 +11738,39 @@ msgstr ""
 "Tu gali i� naujo pasi�sti lai�kus\n"
 "tik i� Sent aplanko."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ar tu tikrai nori v�l si�sti visus %d lai�kus?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Joks lai�kas nepa�ym�tas"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "U�ra�yti byl�?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "I�saugoti lai�k� kaip..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "I�saugoti lai�kus kaip..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Parodyti kit� neskaityt� lai�k�"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11048,7 +11782,7 @@ msgstr ""
 "\n"
 "Tikrai i�trinti tuos lai�kus?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11057,32 +11791,68 @@ msgstr ""
 "Klaida, �keliant filtro informacij�:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtrai"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Gaunamas lai�kas %d i� %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Spausdinti lai�k�"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Nepavyko atspausdinti lai�ko"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ar tu tikrai nori atidaryti visus %d lai�kus atskiruose languose?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "apra�ymas"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Bevardis kontaktas"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Si�sti"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Prid�ti s�lyg�"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "I�saugoti para��"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11133,189 +11903,176 @@ msgstr ""
 "�emiau esan�iame laukelyje. �is pavadinimas bus naudojamas tik vaizdavimui."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolution s�skait� pad�j�jas"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Dirbama"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togas"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "po"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "S�skaita"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Tikrinama paslauga"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Jungiamasi prie serverio..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Bevardis kontaktas"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "Keisti"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Nauja"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _Patikrinti, kokie tipai palaikomi"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "S�skaita"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "S�skaitos informacija"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "S�skaitos tvarkymas"
 
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "Prid�ti s�lyg�"
+
 #: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Nutraukti veiksm�"
+msgid "Add new signature..."
+msgstr "I�saugoti para��"
 
 #: mail/mail-config.glade.h:12
-msgid "Afrikaans"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Persp�jimai"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Visada pa_sira�yti siun�iamus lai�kus, kai naudojama �i s�skaita"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Prisegti byl� prie �io lai�ko"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priedas"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autentikacija"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automati�kai tikrinti pa�t� kas"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Ne�inoma koduot�: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_U�daryti"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Tikrinama, ar yra nauj� lai�k�"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Spalva v�luojamoms u�duotims"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "Sukurti lai�k�"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Konfig�ravimas"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11330,55 +12087,47 @@ msgstr ""
 "\n"
 "Paspausk �Baigti�, kad i�saugotum nuostatas."
 
-#: mail/mail-config.glade.h:37
-msgid "Dari"
-msgstr ""
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "�p_rastas"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "�p_rastas"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "�prasta koduot�: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Gaunamas pa�tas"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Negaliu atidaryti lai�ko"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Baigta"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Juodra��i� aplankas:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "�ju_ngti"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11399,39 +12148,35 @@ msgstr "El. pa�to adresas:"
 msgid "Empty _trash folders on exit"
 msgstr "_I�tu�tinti �iuk�li� aplankus i�einant"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "�vykdyti veiksmus"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "baigiasi su"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "S�skaitos savyb�s"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Persi�sti lai�kai"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Pary�kinti citatas su"
 
-#: mail/mail-config.glade.h:59
-msgid "Hulu"
-msgstr ""
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11485,69 +12230,65 @@ msgstr "Mikronezija"
 msgid "NNTP Server:"
 msgstr "NNTP serveris:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Pa�to nustatymas"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "Serveriai"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Neb�tina informacija"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zacija:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Pasirink spalv�"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Paklausti prie� siun�iant lai�kus vien tik su _Bcc gav�jais"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Spausdinti pa�ym�tus kontaktus"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Negaliu atidaryti lai�ko"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Cituojant"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Prisi_minti �� slapta�od�"
@@ -11581,100 +12322,109 @@ msgid "S_ecurity"
 msgstr "Saugumas"
 
 #: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Pasirink PGP"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Para�o byla:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "I�trinti visk�, i�skyrus para��"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Pa�to siuntimas"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "I�si�st� _lai�k� aplankas:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "I�si�sti lai�kai ir juodra��iai"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris reikalauja autentikacijos"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Serverio nustatymas"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Serverio _tipas:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Trump�s"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "I�saugoti para��"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "I�saugoti para��"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "�altinis"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "�altinio informacija"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stiliaus vardas:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Standartin� Unix mbox"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -11683,17 +12433,12 @@ msgstr ""
 "Pasirink pavadinim�, kuriuo nor�tum vadinti �iuos serverius. Pavyzd�iui, "
 "�Namai� ar �Darbas�."
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "_HTML para�as:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Kintamos krypties"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11703,146 +12448,139 @@ msgstr ""
 "\n"
 "Spausk �Pirmyn�, kad prad�tum."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Ryt�"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_HTML para�as:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "Vis_ada �kelti paveiksl�lius i� tinklo"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Visad_a pasira�yti siun�iamus lai�kus, kai naudojama �i s�skaita"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Autentikacijos tipas: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentikacijos tipas: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "_Automati�kai tikrinti pa�t� kas"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_Automati�kai tikrinti pa�t� kas"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Patvirtinti aplank� i�valym�"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "_HTML para�as:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "�p_rastas"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Bylos vardas:"
+msgid "_Enable"
+msgstr "�jungti"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Persi�sti kaip"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Pilnas vardas:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML lai�kuose"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "_HTML para�as:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Asmenyb�"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Kalba"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "�ke_lti paveiksl�lius, jei siunt�jas yra adres� knygel�je"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Pa_daryti �i� s�skait� �prastine"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Pa�ym�ti lai�kus skaitytais po"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Vardas:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Niekada ne�kelti paveiksl�li� i� tinklo"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP u��ifruoti"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Paklausti, kai siun�iamas HTML lai�kas kontaktams, kurie j� nenori"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Paklausti prie� siun�iant lai�kus su _tu��ia tema"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Radio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11883,76 +12621,53 @@ msgstr "_HTML para�as:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "_HTML para�as:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Naudoti s_augi� jungt� (SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Kintamos krypties"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_kas"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " spalva"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "apra�ymas"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-crypto.c:59
-#, fuzzy
-msgid "Could not create a PGP signature context."
-msgstr "Negal�jau prisijungti prie POP serverio %s."
-
-#: mail/mail-crypto.c:84
-#, fuzzy
-msgid "Could not create a PGP verification context."
-msgstr "Negal�jau prisijungti prie POP serverio %s."
-
-#: mail/mail-crypto.c:113
-#, fuzzy
-msgid "Could not create a PGP encryption context."
-msgstr "Negal�jau sukurti ra�ykl�s lango."
-
-#: mail/mail-crypto.c:138
-#, fuzzy
-msgid "Could not create a PGP decryption context."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
-"Negal�jau sukurti katalogo %s:\n"
-"%s"
 
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
 msgstr "Negal�jau sukurti ra�ykl�s lango."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
 msgstr "Negal�jau sukurti ra�ykl�s lango."
@@ -11996,101 +12711,141 @@ msgstr "I�orin� �i�rykl�"
 msgid "Loading message content"
 msgstr "�keliamas lai�ko turinys"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "_V�luojamos u�duotys:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Nuorod� atidaryti nar�ykl�je"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Kopijuoti nuorodos adres�"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "I�saugoti nuorod� kaip (FIXME)"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "I�saugoti paveiksl�l� kaip..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s priedas"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Negal�jau i�nagrin�ti MIME lai�ko. Rodomas �altinis."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Blogas adresas"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Nuo"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Atsakyti-kam"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kam"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Pa�to programa: "
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "I�saugoti lai�k� kaip..."
+
+#: mail/mail-format.c:1832
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"�is lai�kas yra pasira�ytas skaitmeniniu para�u, patikrinus nustatyta, kad "
+"jis autenti�kas"
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Negal�jau prisijungti prie POP serverio %s."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+"�is lai�kas yra pasira�ytas skaitmeniniu para�u, patikrinus nustatyta, kad "
+"jis autenti�kas"
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"�is lai�kas yra pasira�ytas skaitmeniniu para�u, bet neina patikrinti, ar "
+"jis autenti�kas"
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Rodykl� � FTP svetain� (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Rodykl� � vietin� byl� (%s), galiojanti svetain�je �%s�"
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Rodykl� � vietin� byl� (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Rodykl� � nutolusius duomenis (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Rodykl� � ne�inomus i�orinius duomenis (�%s� tipo)"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota i�orinio k�no dalis."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Ypatingi aplankai"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "I� naujo konfig�ruojamas aplankas"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12099,29 +12854,29 @@ msgstr ""
 "Negaliu i�saugoti metainfo. Tikriausiai tau daugiau\n"
 "nebepavyks atidaryti �io aplanko: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Negal�jau i�trinti aplanko:\n"
 "%s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Kei�iamas aplanko �%s� formatas � �%s�"
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s negalima perkonfig�ruoti, nes tai n�ra vietinis aplankas"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12129,11 +12884,11 @@ msgstr ""
 "Jei tu nebegali daugiau atidaryti �ios pa�to\n"
 "d��ut�s, tau teks sutaisyti j� rankut�mis."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Tu negali pakeisti nevietinio aplanko formato."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "V�l konfig�ruoti %s"
@@ -12191,81 +12946,73 @@ msgstr "Nes�km� ties lai�ku %d i� %d"
 msgid "Complete."
 msgstr "U�baigta."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Lai�kas i�saugomas � aplank�"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Lai�kai perkeliami � %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Lai�kai kopijuojami � %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Perkeliama"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Kopijuojama"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Persi�sti lai�kai"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "Atidaroma saugykla %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "�ra�omas aplankas '%s'"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Atnaujinamas aplankas"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "I�valomas aplankas"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Gaunamas lai�kas %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Gaunami %d lai�kai"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "I�saugomi %d lai�kai"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12274,7 +13021,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12283,11 +13030,11 @@ msgstr ""
 "Klaida i�saugant lai�kus �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "I�saugomas priedas"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12296,27 +13043,27 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Negal�jau �ra�yti duomen�: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atsijungiama nuo %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "V�l jungiamasi prie %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Ie�koti"
 
@@ -12387,10 +13134,6 @@ msgstr "Atnaujinama..."
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Nutraukta."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Vartotojas nutrauk� veiksm�."
@@ -12404,16 +13147,16 @@ msgstr "�vesk %s slapta�od�"
 msgid "Enter Password"
 msgstr "�vesk slapta�od�"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Negal�jau i�saugoti para�o bylos."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "I�saugoti para��"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12423,10 +13166,33 @@ msgstr ""
 "\n"
 "Ar nor�tum i�saugoti pakeitimus?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+#, fuzzy
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+"Pasirink pavadinim�, kuriuo nor�tum vadinti �iuos serverius. Pavyzd�iui, "
+"�Namai� ar �Darbas�."
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Vardas:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "Para�o byla:"
+msgid "Signature hint"
+msgstr "I�saugoti para��"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "HTML para�o byla:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12441,17 +13207,17 @@ msgstr "Persi�stas lai�kas"
 msgid "Forwarded Message"
 msgstr "Persi�stas lai�kas"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Kuriamas aplankas %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Atnaujinami vAplankai pagal uri: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12464,90 +13230,95 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "vAplankai"
+
+#: mail/mail-vfolder.c:784
 #, fuzzy
 msgid "vFolders"
 msgstr "Aplankai"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Keisti vAplank�"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Bandoma keisti neegzistuojant� vAplank� '%s'."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(N�ra temos)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Lai�kas"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Matytas"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Atsakytas"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Keletas nematyt� lai�k�"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Keletas lai�k�"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "�emiausias"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "�emesnis"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Auk�tesnis"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Auk��iausias"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "�iandien %H:%M"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %H:%M"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Generuojamas lai�k� s�ra�as"
 
@@ -12569,10 +13340,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Originalus kontaktas:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Gautas"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Dydis"
 
@@ -17746,5775 +18522,5770 @@ msgstr "Latvija"
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "_Didesnis"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 #, fuzzy
 msgid "La Verne"
 msgstr "�aliasis ky�ulys"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "Laosas"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 #, fuzzy
 msgid "Leesburg"
 msgstr "Liuksemburgas"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "Vad"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "Martinika"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "Pa�alinti"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "met�"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 #, fuzzy
 msgid "Lewisburg"
 msgstr "Liuksemburgas"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "Naujas s�ra�as"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr ""
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr ""
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Liberal"
 msgstr "Liberija"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Libya"
 msgstr "Liberija"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "Nigeris"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr ""
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "Laosas"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limoges"
 msgstr "�emiausias"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "m�nesis"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Lincoln"
 msgstr "gaunamas"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 #, fuzzy
 msgid "Lisboa"
 msgstr "Liberija"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "s�ra�as"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "Sukurti"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "London"
 msgstr "Tornado"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "Hond�ras"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 #, fuzzy
 msgid "Los Alamos"
 msgstr "Persp�jimai"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 #, fuzzy
 msgid "Lousiana"
 msgstr "Botsvana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "Laosas"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "siun�iamas"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "Liuksemburgas"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "Latvija"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "Kovas"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "Vadybininkas"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr ""
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "Makedonija"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "Vad"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "Makedonija"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "Kanada"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "Vad"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "Vad"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr ""
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "Vadybininkas"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "Malaizija"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "Vad"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manchester"
 msgstr "Tinka:"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "Vad"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "Migla"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "Pagrindin� �rankin�"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "Monakas"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "Pa�tas"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 #, fuzzy
 msgid "Maraba"
 msgstr "Mauritanija"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "Kovas"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "Mauritanija"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "Mauritanija"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "Malis"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "Mauritanija"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "Para�t�s"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 #, fuzzy
 msgid "Marquette"
 msgstr "Martinika"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 #, fuzzy
 msgid "Marseilles"
 msgstr "�vair�s"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "Mar�alo salos"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 #, fuzzy
 msgid "Marshalltown"
 msgstr "Mar�alo salos"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "Martinika"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Pa�ym�ti _neskaitytu"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Martinika"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "Martinika"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "Airija"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "Malaizija"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "Makedonija"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "Komorai"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mattoon"
 msgstr "Vad"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Vadybininkas"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "Siuntimas"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Kazachstanas"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 #, fuzzy
 msgid "McAllen"
 msgstr "Visi"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "Malis"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "Kovas"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McClellan"
 msgstr "�vair�s"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "Komp"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "Kovas"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "prie�"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 #, fuzzy
 msgid "Mehamn"
 msgstr "Vad"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "Makedonija"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "Penktadienis"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 #, fuzzy
 msgid "Merril Field"
 msgstr "_Nuo laukas"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "Meksika"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 #, fuzzy
 msgid "Miami"
 msgstr "Malis"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middle East"
 msgstr "Vi_durinis:"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "Vi_durinis:"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "Suomija"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "Bylos tipas:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 #, fuzzy
 msgid "Milford"
 msgstr "kol"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "Lai�kai � %s"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minatitlan"
 msgstr "Mauritanija"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "gaunamas"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 #, fuzzy
 msgid "Minnesota"
 msgstr "Mikronezija"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "n�ra"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missoula"
 msgstr "Miss"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Missouri"
 msgstr "Miss"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitchell"
 msgstr "Tinka:"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 #, fuzzy
 msgid "Mitilini"
 msgstr "Konferencija"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "Pr"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "Mobilus telefonas"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "Mobilus"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Modesto"
 msgstr "�emiausias"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "Perkelti"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "Mobilus"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Moldova"
 msgstr "Pirmadienis"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "Monakas"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "Monakas"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "Pirmadienis"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "Monakas"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "Vadybininkas"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montana"
 msgstr "Botsvana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "M�nesio rodinys"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 #, fuzzy
 msgid "Montego Bay"
 msgstr "Mongolija"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "M�nesis"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 #, fuzzy
 msgid "Monterrey"
 msgstr "Pertraukta"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "Monakas"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "M�nesio rodinys"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "�riftai"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morelia"
 msgstr "Mongolija"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organizacija"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "Pagrindinis"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "Mobilus"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "M�nesio rodinys"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "Pietry�i�"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "M�nesio rodinys"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 #, fuzzy
 msgid "Mullan"
 msgstr "Vad"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 #, fuzzy
 msgid "Muncie"
 msgstr "Bir�elis"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 #, fuzzy
 msgid "Murcia"
 msgstr "Mauritanija"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "Darb"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 #, fuzzy
 msgid "Muscatine"
 msgstr "Martinika"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "mazgai"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 #, fuzzy
 msgid "Najran"
 msgstr "Bahreinas"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "Vardas"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "�sp�jimas"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "Japonija"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "Vardas"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Napoli"
 msgstr "Malis"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "Prav"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "Italija"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natchez"
 msgstr "Tinka:"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 #, fuzzy
 msgid "Nebraska"
 msgstr "Nauja u�duotis"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "Grenada"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Nevada"
 msgstr "Grenada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "Nauja u�duotis"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bedford"
 msgstr "Naujien� �altinis"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "Naujas �_vykis"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "Newcastle"
 msgstr "Naujienos"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Naujoji Zelandija"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Naujoji Zelandija"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "Naujas �_vykis"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Iberia"
 msgstr "Naujoji Kaledonija"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "Naujas lai�kas"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Mexico"
 msgstr "Meksika"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "Olandija"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "�iaur�s"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "Naujas �_vykis"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "Nauja"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "New York"
 msgstr "Naujas vAplankas"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "I�matavimai:"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "Ispanija"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nis"
 msgstr "yra"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "Normalus"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "Vardas"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "Norfolko sala"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 #, fuzzy
 msgid "Norfolk NAS"
 msgstr "Norfolko sala"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norrkoping"
 msgstr "Dirbama"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Adams"
 msgstr "�iaur�s ryt�"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "�iaur�s"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "Norvegija"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "�iaur�s ryt�"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "�iaur�s ryt�"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "Norvegija"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "�iaur�s vakar�"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "�iaur�s"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "Norvegija"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "Pastaba"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "Neprad�ta"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "Tailandas"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Jamaika"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Oceanside"
 msgstr "Islandija"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "One"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "Atidaryti"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "Atidaryti"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "Kitas"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 #, fuzzy
 msgid "Ojika Island"
 msgstr "Kal�d� sala"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "Kal�d� sala"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "Kitas"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 #, fuzzy
 msgid "Olbia"
 msgstr "Albanija"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 #, fuzzy
 msgid "Omaha"
 msgstr "Omanas"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "Omanas"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "Orientacija"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oostende"
 msgstr "Dalyvis"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oran"
 msgstr "Omanas"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "Org"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 #, fuzzy
 msgid "Oregon"
 msgstr "Org"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "Airija"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orlando"
 msgstr "Airija"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 #, fuzzy
 msgid "Oruro"
 msgstr "Klaida"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr "sekund�"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 #, fuzzy
 msgid "Ostrava"
 msgstr "Australija"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "savait�"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 #, fuzzy
 msgid "Oxford"
 msgstr "kol"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "Puslapis"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "Ie�kas"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "Ie�kas"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "Pa�to nuostatos"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 #, fuzzy
 msgid "Pamplona"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama City"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Nutraukta"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "Japonija"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Paphos"
 msgstr "Laosas"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 #, fuzzy
 msgid "Paris"
 msgstr "Pagr"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr ""
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "Slapta�odis"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "Groti gars�:"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "Groti gars�:"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "Klausimas"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "I� naujo �kelti"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "Pasirinkimas:"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "Gruzija"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "Pagr"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philip"
 msgstr "Filipinai"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Filipinai"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 #, fuzzy
 msgid "Phillips"
 msgstr "Filipinai"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "Per�i�ra"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 #, fuzzy
 msgid "Pine Bluff"
 msgstr "Pine pa�tas"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 #, fuzzy
 msgid "Pisa"
 msgstr "Pakistanas"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 #, fuzzy
 msgid "Plymouth"
 msgstr "m�nesis"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "Spausdinti vok�"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "Spausdinti ap�valg�"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Spausdinti lai�k�"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "Savyb�s"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponca City"
 msgstr "Telefon� s�ra�as"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponce"
 msgstr "Joks"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "Kontaktai"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "Lenkija"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Spausdinti kalendori�"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "Spausdinti vok�"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "Per�i�ra"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Spausdinti kortel�"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Lenkija"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Portland"
 msgstr "Lenkija"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto"
 msgstr "_Prievadas:"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "Pa�anga"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "Sta�ias lapas"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Sta�ias lapas"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "Sta�ias lapas"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "Lenkija"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poza Rica"
 msgstr "Kosta Rika"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poznan"
 msgstr "Lenkija"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Praha"
 msgstr "Paragvajus"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Spaudinio per�i�ra"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Pretoria"
 msgstr "Gruzija"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "Praeitas"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "Tradicinis"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Providence"
 msgstr "_Valstija/Provincija:"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "Per�i�ra"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "Prof"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Puebla"
 msgstr "Vie�as"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Pueblo"
 msgstr "Vie�as"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 #, fuzzy
 msgid "Puerto Barrios"
 msgstr "Puerto Rikas"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 #, fuzzy
 msgid "Puerto Escondido"
 msgstr "Puerto Rikas"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "Puerto Rikas"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Puerto Rikas"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "Puerto Rikas"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "Puerto Rikas"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "Spausdinti ap�valg�"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pula"
 msgstr "Lenkija"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "Lenkija"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Spausdinti kalendori�"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "Klausimas"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quebec"
 msgstr "Tema"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 #, fuzzy
 msgid "Rapid City"
 msgstr "Atsakytas"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Rawlins"
 msgstr "Lietus"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Reading"
 msgstr "Antra�t�s"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Recife"
 msgstr "Gautas"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redding"
 msgstr "Antra�t�s"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "Skaitytas"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redmond"
 msgstr "U�uomina"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "Regionai"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Rennes"
 msgstr "U�uominos"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Reno"
 msgstr "Pa�alinti"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "Regionai"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "Taisykl�s"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "met�"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reynosa"
 msgstr "I� naujo �kelti"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Suomija"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Rhode Island"
 msgstr "Norfolko sala"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 #, fuzzy
 msgid "Riberalta"
 msgstr "Gibraltaras"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "Pravard�"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "Haitis"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "Rol�"
 
-#: my-evolution/Locations.h:1881
-#, fuzzy
-msgid "Riga"
-msgstr "De�in�je:"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rijeka"
 msgstr "Skaitytas"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 #, fuzzy
 msgid "Rimini"
 msgstr "Rumunija"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rioja"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "Nikaragva"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "Kal�d� sala"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "Liberija"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 #, fuzzy
 msgid "Riyadh"
 msgstr "Skaitytas"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Roatan"
 msgstr "Kroatija"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 #, fuzzy
 msgid "Robore"
 msgstr "prie�"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "Lenkija"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rodos"
 msgstr "Kambarys"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Rogers"
 msgstr "Aplankai"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "Rumunija"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "Komorai"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 #, fuzzy
 msgid "Rosario"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Roseglen"
 msgstr "Rol�"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "Hostas"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "Pasikartojimas"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Russia"
 msgstr "Austrija"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 #, fuzzy
 msgid "Rutland"
 msgstr "Butanas"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 #, fuzzy
 msgid "Sacramento"
 msgstr "Departamentas"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 #, fuzzy
 msgid "Saginaw"
 msgstr "Ispanija"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "San Marinas"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "San Marinas"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "Ispanija"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salem"
 msgstr "I�saugoti"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "Somalis"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "Somalis"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "Somalis"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salmon"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "�_e�"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samos"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "_Sek"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 #, fuzzy
 msgid "Sana'A"
 msgstr "Sm�lis"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 #, fuzzy
 msgid "San Angelo"
 msgstr "San Marinas"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "San Carlos"
 msgstr "San Marinas"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "Sm�lis"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sandberg"
 msgstr "Siunt�jas"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sanderson"
 msgstr "Siunt�jas"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 #, fuzzy
 msgid "San Diego"
 msgstr "San Marinas"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 #, fuzzy
 msgid "Sand Point"
 msgstr "San Marinas"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sanford"
 msgstr "Sm�lis"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 #, fuzzy
 msgid "San Francisco"
 msgstr "San Marinas"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "Pustoniai"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Joaquin"
 msgstr "San Marinas"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "I�saugoti ir u�daryti"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Juan"
 msgstr "San Marinas"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "Somalis"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 #, fuzzy
 msgid "San Miguel"
 msgstr "San Marinas"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 #, fuzzy
 msgid "San Nicholas Island"
 msgstr "Norfolko sala"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 #, fuzzy
 msgid "San Sebastian"
 msgstr "San Marinas"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 #, fuzzy
 msgid "Santa Maria"
 msgstr "San Marinas"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "Siunt�jas"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santarem"
 msgstr "Sm�lio audra"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santorini"
 msgstr "Sm�lio audra"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "B�sena"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 #, fuzzy
 msgid "Sarasota"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "�ri Lanka"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "_Sek"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "B�sena"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "Organizacija"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "Nuostatos"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "Somalis"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "Matytas"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "Pradedama importuoti"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "Paie�ka"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "Pustoniai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "Paie�ka"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "�e�tadienis"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "�e�tadienis"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Shearwater"
 msgstr "Prad�ios data"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "�vedija"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "Pasirinkimas:"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Sheridan"
 msgstr "Sudanas"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "Dydis"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Shoreham"
 msgstr "�vertis"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "Rodyti vien� savait�"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 #, fuzzy
 msgid "Sidney"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Silver City"
 msgstr "Saugumas"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "Dydis"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skopje"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "Si�sti lai�kai"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "Albanija"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "minu�i�"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Sochi"
 msgstr "Piet�"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socorro"
 msgstr "�vertis"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Socotra"
 msgstr "�vertis"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sofia"
 msgstr "Somalis"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Soldotna"
 msgstr "Slov�nija"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Somerset"
 msgstr "�vertis"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Siunt�jas"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "Southampton"
 msgstr "Pietry�i�"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "Piet�"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Carolina"
 msgstr "Piet� Afrikos respublika"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "South Dakota"
 msgstr "Pietry�i�"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "Piet�"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "Mar�alo salos"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "Siunt�jas"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "s�ra�as"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "Ispanija"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "Supaprastintas"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "State College"
 msgstr "U�baigimo data:"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "Nuostatos"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "Nuostatos"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "Stephenville"
 msgstr "Sei�eliai"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 #, fuzzy
 msgid "St. George"
 msgstr "Saugykla"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 #, fuzzy
 msgid "St Louis"
 msgstr "Sustabdyti �k�lim�"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Saugykla"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "Norvegija"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "St Paul"
 msgstr "B�sena"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 #, fuzzy
 msgid "Strevell"
 msgstr "Saugykla"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "Kal�d� sala"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "�e�tadienis"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "�vertis"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Liuksemburgas"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "Ap�valga"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 #, fuzzy
 msgid "Sutton"
 msgstr "_Sek"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Tradicinis"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "U�duotis"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "Gana"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 #, fuzzy
 msgid "Taejon"
 msgstr "Tada"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Taif"
 msgstr "Taivanas"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Tainan"
 msgstr "Taivanas"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Taivanas"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Taiz"
 msgstr "Taivanas"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr "Taivanas"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "Taivanas"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Taivanas"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 #, fuzzy
 msgid "Tampa"
 msgstr "Japonija"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "Popierius"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "Kanada"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "Laosas"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Taivanas"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Taranto"
 msgstr "Siuntimas"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "U�duotis"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Tarija"
 msgstr "Taivanas"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "Tradicinis"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "Teleksas"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "Teleksas"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "Texas"
 msgstr "U�duotis"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 #, fuzzy
 msgid "The Dalles"
 msgstr "Sei�eliai"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "Titulas"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "Ketvirtadienis"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tianjin"
 msgstr "Taivanas"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Tijuana"
 msgstr "Lietuva"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tirana"
 msgstr "Taivanas"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "Laisvas"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "Titulas"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "Asmeni�kas"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 #, fuzzy
 msgid "Tokunoshima Island"
 msgstr "Kal�d� sala"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 #, fuzzy
 msgid "Toledo"
 msgstr "Perjungti"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Topeka"
 msgstr "Vir�uje:"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 #, fuzzy
 msgid "Toronto"
 msgstr "Tornado"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "Vir�uje:"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torrance"
 msgstr "Pranc�zija"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Torreon"
 msgstr "Kor�jie�i�"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "Pradedama importuoti"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Toulouse"
 msgstr "U�daryti"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trabzon"
 msgstr "Gabonas"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 #, fuzzy
 msgid "Trapani"
 msgstr "Japonija"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "Teleksas"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "Orientacija"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "Praeitas"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 #, fuzzy
 msgid "Trieste"
 msgstr "Bandyti"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 #, fuzzy
 msgid "Trinidad"
 msgstr "Tornado"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "Turkija"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "Antradienis"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "Tunisas"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "_Ant"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turaif"
 msgstr "Turk�"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "Turk�"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turku"
 msgstr "Turkija"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 #, fuzzy
 msgid "Twenthe"
 msgstr "Negalutinis"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "Tipas"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "_Ant"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "Jungtiniai Arab� Emyratai"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 #, fuzzy
 msgid "Unst"
 msgstr "Nematytas"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruapan"
 msgstr "Japonija"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Urugvajus"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 #, fuzzy
 msgid "Utah"
 msgstr "-�"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vadso"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Kintamos krypties"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vagar"
 msgstr "Ie�kas"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valencia"
 msgstr "Slov�nija"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 #, fuzzy
 msgid "Valentine"
 msgstr "�i�r�ti viduje"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 #, fuzzy
 msgid "Van"
 msgstr "Vad"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "Nutraukti"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 #, fuzzy
 msgid "Varadero"
 msgstr "Kintamos krypties"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Varna"
 msgstr "Vanuatu"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "po"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 #, fuzzy
 msgid "Venezia"
 msgstr "Venesuela"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 #, fuzzy
 msgid "Venice"
 msgstr "Unikodas"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vermont"
 msgstr "m�nesis"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "Esm�"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 #, fuzzy
 msgid "Vicenza"
 msgstr "Venesuela"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "Bylos vardas:"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "Australija"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "Suomija"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volkel"
 msgstr "Rol�"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 #, fuzzy
 msgid "Volk Field"
 msgstr "_Nuo laukas"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 #, fuzzy
 msgid "Waco"
 msgstr "Monakas"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 #, fuzzy
 msgid "Wallops Island"
 msgstr "Folklendo salos"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "�sp�jimas"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "Orai"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Waterloo"
 msgstr "Orai"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "Orai"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 #, fuzzy
 msgid "Waterville"
 msgstr "Kategorijos"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 #, fuzzy
 msgid "Wausau"
 msgstr "Vanuatu"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Webster City"
 msgstr "Tinklapis"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "Tr"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Orai"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 #, fuzzy
 msgid "Wendover"
 msgstr "Siunt�jas"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "West Burke"
 msgstr "Vakar� Europos"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "Olandija"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westfield"
 msgstr "Vakar�"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "Dienotvark�"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "Kal�d� sala"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "Prav"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 #, fuzzy
 msgid "Wien"
 msgstr "Tr"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 #, fuzzy
 msgid "Williston"
 msgstr "s�ra�as"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 #, fuzzy
 msgid "Winchester"
 msgstr "Lichten�teinas"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 #, fuzzy
 msgid "Windsor"
 msgstr "Sm�lio audra"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 #, fuzzy
 msgid "Winslow"
 msgstr "dabar"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 #, fuzzy
 msgid "Winter Park"
 msgstr "�vesk slapta�od�"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 #, fuzzy
 msgid "Wisconsin"
 msgstr "Mikronezija"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "Tr"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "Honkongas"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "Pora�t�:"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "am�inai"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "Lenkija"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "Dirbama"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "Dirbama"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 #, fuzzy
 msgid "Xiamen"
 msgstr "Vardas"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 #, fuzzy
 msgid "Yao Airport"
 msgstr "Neimportuoti"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 #, fuzzy
 msgid "Yenbo"
 msgstr "Jemenas"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zadar"
 msgstr "Kalendorius"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 #, fuzzy
 msgid "Zagreb"
 msgstr "Puslapis"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zanesville"
 msgstr "Nutraukta"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 #, fuzzy
 msgid "Zaragoza"
 msgstr "Paragvajus"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 #, fuzzy
 msgid "Zurich"
 msgstr "Turk�"
@@ -23544,17 +24315,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "apra�ymas"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Pa�to ap�valga"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "vAplankai"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 #, fuzzy
 msgid "Local Folders"
 msgstr "Ypatingi aplankai"
@@ -23564,56 +24330,46 @@ msgstr "Ypatingi aplankai"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Dienos �odis"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Dienos citatos"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Prid�ti naujien� �altin�"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�vesk URL naujien� �altinio, kur� nori prid�ti"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Vardas:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Klaida parsiun�iant RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Naujien� �altinis"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr "Visi"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
-#, fuzzy
-msgid "Add ->"
-msgstr "Prid�ti"
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "<- Remove"
-msgstr " _Pa�alinti"
+msgid "Add"
+msgstr "Pri_d�ti"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Sniegas"
@@ -23656,11 +24412,47 @@ msgstr "Spausdinti ap�valg�"
 msgid "Printing of Summary failed"
 msgstr "Nepavyko atspausdinti ap�valgos"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " F"
+msgstr ", "
+
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " C"
+msgstr ", "
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "mazgai"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "mylios"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometrai"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Giedras dangus"
@@ -24815,100 +25607,106 @@ msgid "C_elsius"
 msgstr "C_elsijaus"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "_Visi naujien� �altiniai:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Kiek dien� kalendorius tur�t� rodyti i�kart?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Ma_ksimalus rodom� element� skai�ius:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Naujien� �altini� nuostatos"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Vienas _m�nuo"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "Viena _savait�"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "_Atnaujinimo laikas (sekund�mis):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "Atnaujinimo _laikas (sekund�mis):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "_Rodyti piln� aplank� keli�"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Rodyti _visas u�duotis"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Rodyti �ian_dienos u�duotis"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Rodyti temperat�ras laipsniais:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "U�duotys "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Or� nuostatos"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Farenheito"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Penkias dienas"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Pa�tas"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "_Naujien� �altiniai"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Vien� dien�"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Dienotvark�"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Orai"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Evolution pa�to komponento gamykla."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Ypatingi aplankai"
+msgid "Folder Settings"
+msgstr "Nuostatos"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution apvalkalas."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -24919,6 +25717,39 @@ msgstr "Rodyti detales"
 msgid "Cancel Operation"
 msgstr "Nutraukti veiksm�"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Negal�jau i�trinti aplanko:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Prid�ti vAplanko taisykl�"
+
+#: shell/e-local-storage.c:174
+#, fuzzy
+msgid "Drafts"
+msgstr "Juodra�tis"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Gauti lai�kai"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Siun�iami lai�kai"
+
+#: shell/e-local-storage.c:177
+#, fuzzy
+msgid "Sent"
+msgstr "Matytas"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution �diegimas"
@@ -25021,6 +25852,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "U�baigimo data"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Ypatingi aplankai"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Ypatingi aplankai"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Ypatingi aplankai"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "U�baigimo data"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -25050,20 +25906,20 @@ msgstr "Negalima perkelti aplanko � vien� i� jo palikuoni�."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Nurodyk aplank�, � kur� kopijuoti aplank� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Kopijuoti aplank�"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Nurodyk aplank�, � kur� perkelti aplank� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Perkelti aplank�"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25072,18 +25928,17 @@ msgstr ""
 "Negal�jau i�trinti aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "I�trinti \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Ar tu tikrai nori i�trinti aplank� '%s'?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr "I�trinti aplank� '%s'"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25092,16 +25947,16 @@ msgstr ""
 "Negal�jau pervadinti aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pervadinti aplank� �%s� �:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Pervadinti aplank�"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -25120,7 +25975,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution -- Sukurti nauj� aplank�"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -25128,7 +25983,7 @@ msgstr ""
 "Pasirinkto aplanko tipas yra netinkamas\n"
 "pra�yt�jam veiksmui."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Naujas..."
 
@@ -25182,22 +26037,27 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Pasirink aplank�"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "N�ra tokios bylos %s"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Tu gali importuoti tiktai � lokalius aplankus"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25206,11 +26066,11 @@ msgstr ""
 "N�ra importerio, kuris gal�t� suprasti\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importuojama"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25219,17 +26079,17 @@ msgstr ""
 "Importuojama %s.\n"
 "Pradedama %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Klaida pradedant %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Klaida �keliant %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25238,31 +26098,31 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automati�kas"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Bylos vardas:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Pasirink byl�"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Bylos tipas:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Importuoti duomenis ir nuostatas i� kit� program�"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Importuoti vien� byl�"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25270,31 +26130,76 @@ msgstr ""
 "Pra�ome palaukti...\n"
 "Ie�koma esam� nustatym�"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Paleid�iami inteligenti�ki importeriai"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Nuo %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Pasirink aplank�"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Pasirink aplank�, � kur� importuoti �iuos duomenis"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importuoti"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "U�daromos jungtys..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr "Sinchronizuojamas '%s'"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Sinchronizuojamas aplankas"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "Sinchronizuojamas '%s'"
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Atidaromas aplankas %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Atidaromas aplankas %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Atidaryti su %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Negaliu sukurti nurodyto aplanko:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
@@ -25307,8 +26212,8 @@ msgstr "Negal�jau inicializuoti Evolution apvalkalo."
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Negal�jau inicializuoti Evolution apvalkalo."
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nauja"
@@ -25330,44 +26235,44 @@ msgstr "�iame aplanke negali b�ti lai�k�."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ir '..' yra rezervuoti katalog� vardai."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nerastas tavo kelyje ($PATH)."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy negal�jo b�ti paleistas."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Apie Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Eiti � aplank�..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Pasirink aplank�, kur� nor�tum atidaryti"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Sukurti nauj� trump�"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Pasirink aplank� � kur� nor�tum, kad trump� rodyt�:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 #, fuzzy
 msgid "_Work Online"
 msgstr "Dirbti atsijungus"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "_Dirbti atsijungus"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Dirbti atsijungus"
 
@@ -25402,7 +26307,7 @@ msgstr ""
 "Ximian Evolution dabar yra atsijungusi.  Paspausk �� mygtuk�, kad dirbtum "
 "prisijungus."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25414,12 +26319,12 @@ msgstr ""
 "Klaida i� aktyvavimo sistemos yra:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25427,23 +26332,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "Gerai"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Blogi argumentai"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Negaliu u�siregistruoti OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Konfig�racijos duombaz� nerasta"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
@@ -25468,96 +26369,96 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Nepa�alinti"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Pervadinti trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Pervadinti pasirinkt� trumpi� grup� �:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Ma�os ikonos"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Rodyti trumpes kaip ma�as ikonas"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "_Didel�s ikonos"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Rodyti trumpes kaip dideles ikonas"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Nauja grup�..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Sukurti nauj� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "_Pa�alinti �i� grup�..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Pa�alinti �i� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "_Pervadinti �i� grup�..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Pervadinti �i� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "_Pasl�pti trumpi� juost�"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Pasl�pti trumpi� juost�"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Pervadinti trump�"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Pervadinti pasirinkt� trump� �:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Atidaryti aplank�, susiet� su �ia trumpe"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Atidaryti naujame _lange"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Atidaryti esam� lai�k� naujame lange"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "Pe_rvadinti"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Pervadinti �i� trump�"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "I�_trinti"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Pa�alinti �i� trump� i� trumpi� juostos"
 
@@ -25569,10 +26470,6 @@ msgstr "Klaida i�saugant trumpes."
 msgid "Shortcuts"
 msgstr "Trump�s"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Gauti lai�kai"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -25635,10 +26532,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% u�baigta)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<spausk �ia, kad pasirinktum aplank�>"
 
@@ -25679,68 +26577,68 @@ msgstr ""
 "Klaida i� aktyvavimo sistemos yra:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "CORBA klaida"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Pertraukta"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Blogas argumentas"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Jau turi savinink�"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "N�ra savininko"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Nerastas"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Nepalaikomas tipas"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Nepalaikoma schema"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Nepalaikomas veiksmas"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Vidin� klaida"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Egzistuoja"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "Blogas URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 #, fuzzy
 msgid "Has subfolders"
 msgstr "N�ra tokio aplanko %s"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Nebeliko vietos"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "Senesnysis savininkas numir�"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Bylos tipas:"
@@ -25862,50 +26760,100 @@ msgstr "Kit� kart� nebeklausti"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution gali importuoti duomenis i� �emiau nurodyt� byl�:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution baigia darb�..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, fuzzy, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"Sveiki. A�i� u� laik�, sugai�t� parsisi�sti �i� Evolution\n"
+"grupinio darbo rinkinio PER�I�ROS LAID�.\n"
+"\n"
+"Evolution dar n�ra baigta. Ji art�ja prie to, ta�iau yra viet�,\n"
+"kur ypatybi� tr�ksta arba jos tik pusiau veikia. Jei tu negali\n"
+"suprasti, kaip k� nors padaryti, tai galb�t tod�l, kad dar n�ra\n"
+"b�do tai padaryti! :-)\n"
+"\n"
+"Mes tikim�s, kad Evolution bus tinkama naudoti tau, bet vis dar\n"
+"jau�iame pareig� �sp�ti, kad ji gali: l��ti, prarasti tavo pa�t�,\n"
+"palikti veikian�ius nenaudojamus procesus, naudoti 100% CPU,\n"
+"si�sti nesiderinan�ias komandas � serverius, ir apskritai\n"
+"sug�dinti tave tavo draug� ir bendradarbi� akivaizdoje. Naudoti\n"
+"tik pagal nurodymus.\n"
+"\n"
+"Mes tikim�s, kad tau patiks m�s� sunkaus darbo vaisiai, ir\n"
+"laukiame tavo prisid�jimo!\n"
+
+#: shell/main.c:245
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"A�i�\n"
+"Ximian Evolution komanda\n"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Kit� kart� nebeklausti"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Negal�jau prieiti prie Ximian Evolution apvalkalo."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Negal�jau inicializuoti Ximian Evolution apvalkalo: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "U�drausti "
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Pradedama importuoti"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Paleid�iami inteligenti�ki importeriai"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Si�sti vis� komponent� derinimo i�vest� � byl�."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Negaliu inicializuoti Bonobo komponent� sistemos."
 
@@ -26021,11 +26969,11 @@ msgstr "esamas laikas"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Veiksmai"
 
@@ -26147,8 +27095,8 @@ msgstr "U�daryti �� element�"
 msgid "Delete this item"
 msgstr "I�trinti �� element�"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Pagrindin� �rankin�"
 
@@ -26189,7 +27137,7 @@ msgstr "I�saugoti �� element� � disk�"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Byla"
 
@@ -26256,19 +27204,19 @@ msgstr "Persi�sti kaip i_Calendar"
 msgid "Forward this item via email"
 msgstr "Persi�sti �� lai�k�"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Su�inoti naujausi� susitikimo informacij�"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "At_naujinti susitikim�"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "�traukti s_usitikim� � dienotvark�"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "�ra�yti susitikim� � dienotvark�"
@@ -26277,10 +27225,6 @@ msgstr "�ra�yti susitikim� � dienotvark�"
 msgid "Customise My Evolution"
 msgstr "Prisitaikyti Mano Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Nutraukti"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Nutraukti vykdom� pa�to operacij�"
@@ -26434,7 +27378,7 @@ msgstr "Gijomis suskirstytas lai�k� s�ra�as"
 msgid "_Expunge"
 msgstr "I�_valyti"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Aplankas"
 
@@ -26848,7 +27792,7 @@ msgstr "Praeit� lai�k�"
 msgid "_Quoted"
 msgstr "Cituojant"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "�ran_kiai"
 
@@ -26863,12 +27807,12 @@ msgstr "U�daryti �� lang�"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_U�daryti"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Rodyti"
 
@@ -27057,7 +28001,7 @@ msgstr "_Atidaryti..."
 msgid "_Reply-To Field"
 msgstr "_Atsakyti-kam laukas"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Pagalba"
 
@@ -27206,111 +28150,120 @@ msgid "Move this folder to another place"
 msgstr "Perkelti �� aplank� � kit� viet�"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Sukurti _nauj� aplank�..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Atidaryti naujame lange"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Atidaryti �� aplank� naujame lange"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Si�sti / Gauti"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "I�si�sti laukiant� pa�t� ir parsi�sti nauj� pa�t�"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Rodyti informacij� apie Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "I�si�sti klaidos prane�im�"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "I�_si�sti klaidos prane�im�"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Prane�ti apie klaid�, naudojant Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Perjungti"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Perjungti, ar rodyti aplank� juost�"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Perjungti, ar rodyti trumpi� juost�"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Perjungti, ar dirbama atsijungus."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Rodyti parinkt� aplank�"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_Apie Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Kopijuoti..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_Aplank� juosta"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_Eiti � aplank�..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Importuoti..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Perkelti..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Naujas"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Naujas aplankas"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "_Pilot nuostatos..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "Pe_rvadinti..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Si�sti / Gauti"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Trump�"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "_Trumpi� juosta"
 
@@ -27392,22 +28345,22 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Esamas vaizdas"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "Prisitaikyti"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 #, fuzzy
 msgid "Save Custom View"
 msgstr "Prisitaikyti"
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Apibr��ti vaizdus"
 
@@ -27529,16 +28482,21 @@ msgstr "Paie�kos redaktorius"
 msgid "Save Search"
 msgstr "I�saugoti paie�k�"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "I�saugoti paie�k�"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Prid�ti prie i�saugot� paie�k�"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "I�sami..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informacija"
@@ -27560,21 +28518,21 @@ msgstr "�inut�"
 msgid "Don't show this message again."
 msgstr "Kit� kart� neberodyti �ios �inut�s."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Ie�koti"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "I�valyti"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "I�valyti"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Ie�koti"
 
@@ -27600,6 +28558,174 @@ msgstr "init_corba(): negal�jau inicializuoti GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Adres� knygel�s �altinis"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Addressbook."
+#~ msgstr "Evolution adres� knygel�s komponento gamykla."
+
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "Klaida, �keliant filtro informacij�:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolution pa�to komponento."
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Kalendoriaus ap�valgos komponento gamykla."
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Dienos p_rad�ia:"
+
+#~ msgid "_End of day:"
+#~ msgstr "D_ienos pabaiga:"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "_Kitas organizatorius"
+
+#, fuzzy
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Pra�au �vesti tavo %s slapta�od� d�l %s"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Pra�au �vesti tavo %s slapta�od�"
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Negaliu si�sti lai�ko: siunt�jo adresas neteisingas."
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
+
+#, fuzzy
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Negaliu si�sti lai�ko: siunt�jo adresas neteisingas."
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "Negaliu i��ifruoti �io lai�ko: nenurodyti jokie gav�jai."
+
+#~ msgid "%s server %s"
+#~ msgstr "%s serveris %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(ne�inomas hostas)"
+
+#~ msgid "No such message: %s"
+#~ msgstr "N�ra tokio lai�ko: %s"
+
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Tu negali kopijuoti lai�k� i� �io �iuk�li� aplanko."
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Negaliu pridurti lai�ko prie mbox bylos: %s: %s"
+
+#, fuzzy
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Nepavyko �kelti %s: %s"
+
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Spool'as �%s� neegzistuoja arba n�ra paprasta byla."
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Radio"
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "Keisti"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Nauja"
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Nutraukti veiksm�"
+
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Para�o byla:"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "I�trinti visk�, i�skyrus para��"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "_HTML para�as:"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Bylos vardas:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "_HTML para�as:"
+
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Kalba"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Radio"
+
+#, fuzzy
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Negal�jau sukurti ra�ykl�s lango."
+
+#, fuzzy
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr ""
+#~ "Negal�jau sukurti katalogo %s:\n"
+#~ "%s"
+
+#~ msgid "Moving"
+#~ msgstr "Perkeliama"
+
+#~ msgid "Copying"
+#~ msgstr "Kopijuojama"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Para�o byla:"
+
+#, fuzzy
+#~ msgid "Riga"
+#~ msgstr "De�in�je:"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "Prid�ti"
+
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr " _Pa�alinti"
+
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Ar tu tikrai nori i�trinti aplank� '%s'?"
+
 #~ msgid "Card: "
 #~ msgstr "Kortel�: "
 
@@ -27830,8 +28956,8 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgstr "�i informacija neb�tina daugumai LDAP serveri�."
 
 #~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
 #~ msgstr ""
 #~ "�i informacija naudojama LDAP serveriui nurodant, kurios �akos naudojamos "
 #~ "paie�kai. Paklausk savo serverio administratoriaus d�l platesn�s "
@@ -27846,12 +28972,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "_My server requires authentication"
 #~ msgstr "_Mano serveris reikalauja autentikacijos"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Kiti kontaktai"
-
-#~ msgid "(none)"
-#~ msgstr "(jokio)"
-
 #~ msgid "Co_ntacts:"
 #~ msgstr "Ko_ntaktai:"
 
@@ -27876,13 +28996,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "_Mobile"
 #~ msgstr "_Mobilus"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "Ar tu tikrai nori\n"
-#~ "i�trinti �� kontakt�?"
-
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Moldovos respublika"
 
@@ -27904,171 +29017,15 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "_Other"
 #~ msgstr "Kit_a"
 
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Spausk �ia, kad prid�tum dalyv�"
-
 #~ msgid "The journal entry has changed. Send an updated version?"
 #~ msgstr "�urnalo �ra�as buvo pakeistas. Si�sti atnaujint� informacij�?"
 
 #~ msgid "_Delete this Task"
 #~ msgstr "_I�trinti �i� u�duot�"
 
-#, fuzzy
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Susitikimo pa_baigos laikas:"
-
-#, fuzzy
-#~ msgid "Task Completed: <b>"
-#~ msgstr " (U�baigta "
-
-#, fuzzy
-#~ msgid "iCalendar Information"
-#~ msgstr "kalendoriaus informacija"
-
-#, fuzzy
-#~ msgid "iCalendar Error"
-#~ msgstr "Kalendorius"
-
-#, fuzzy
-#~ msgid "An unknown person"
-#~ msgstr "ne�inomas siunt�jas"
-
-#, fuzzy
-#~ msgid "Choose an action:"
-#~ msgstr "Pasirink veiksm�"
-
-#, fuzzy
-#~ msgid "Update"
-#~ msgstr "Data"
-
-#, fuzzy
-#~ msgid "Accept"
-#~ msgstr "Priimtas"
-
-#, fuzzy
-#~ msgid "Tentatively accept"
-#~ msgstr "Negalutinis"
-
-#, fuzzy
-#~ msgid "Decline"
-#~ msgstr "Atmestas"
-
-#, fuzzy
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "_Skelbti laisvas/u�imtas informacij�"
-
-#, fuzzy
-#~ msgid "Send Latest Information"
-#~ msgstr "Susitikimo informacija"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "Su�inoti naujausi� susitikimo informacij�"
-
-#~ msgid "Meeting Information"
-#~ msgstr "Susitikimo informacija"
-
-#, fuzzy
-#~ msgid "Meeting Proposal"
-#~ msgstr "Susitikimas"
-
-#, fuzzy
-#~ msgid "Meeting Update"
-#~ msgstr "Susitikimo pa_baigos laikas:"
-
-#, fuzzy
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "Su�inoti naujausi� susitikimo informacij�"
-
-#, fuzzy
-#~ msgid "Meeting Reply"
-#~ msgstr "Susitikimas"
-
-#, fuzzy
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Susitikimo informacija"
-
-#, fuzzy
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Ie�koti lai�ke"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "Gauti naujausi� informacij� apie u�duot�"
-
-#, fuzzy
-#~ msgid "Task Information"
-#~ msgstr "Informacija"
-
-#, fuzzy
-#~ msgid "Task Update"
-#~ msgstr "buvo po"
-
-#, fuzzy
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "Gauti naujausi� informacij� apie u�duot�"
-
-#, fuzzy
-#~ msgid "Task Reply"
-#~ msgstr "Atsakyti"
-
-#, fuzzy
-#~ msgid "Task Cancellation"
-#~ msgstr "Nutraukti veiksm�"
-
-#, fuzzy
-#~ msgid "Bad Task Message"
-#~ msgstr "Kalendoriaus �inut�"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "_Skelbti laisvas/u�imtas informacij�"
-
-#, fuzzy
-#~ msgid "Free/Busy Information"
-#~ msgstr "_Skelbti laisvas/u�imtas informacij�"
-
-#, fuzzy
-#~ msgid "Free/Busy Request"
-#~ msgstr "_Laisvas-u�si�m�s URL"
-
-#, fuzzy
-#~ msgid "Free/Busy Reply"
-#~ msgstr "_Laisvas-u�si�m�s URL"
-
-#, fuzzy
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Praeit� lai�k�"
-
-#, fuzzy
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "�iame lai�ke yra tik Bcc gav�jai."
-
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "Negal�jau rasti nei vienos tavo asmenyb�s dalyvi� s�ra�e!\n"
 
-#, fuzzy
-#~ msgid "Status: %s"
-#~ msgstr "_B�sena:"
-
-#, fuzzy
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Procent� u�baigta"
-
-#, fuzzy
-#~ msgid "URL: %s"
-#~ msgstr "URL:"
-
-#, fuzzy
-#~ msgid "Categories: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Kategorijos: "
-
-#, fuzzy
-#~ msgid "Contacts: "
-#~ msgstr "Ko_ntaktai:"
-
 #~ msgid ""
 #~ "EMail: %s\n"
 #~ "Common Name: %s\n"
@@ -28129,10 +29086,11 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgstr "Negal�jau parsi�sti lai�ko i� POP serverio %s: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
 #~ msgstr ""
-#~ "Tai prisijungs prie POP serverio ir naudos Kerberos 4, kad autentikuot�si � "
-#~ "j�."
+#~ "Tai prisijungs prie POP serverio ir naudos Kerberos 4, kad autentikuot�si "
+#~ "� j�."
 
 #~ msgid "Could not authenticate to KPOP server: %s"
 #~ msgstr "Negal�jau autentikuotis � KPOP server�: %s"
@@ -28143,9 +29101,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "(Unknown)"
 #~ msgstr "(Ne�inoma)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Netik�tas atsakymas i� POP serverio: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Negal�jau rasti �Nuo� adreso lai�ke"
 
@@ -28189,24 +29144,9 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Filter on Mailing List"
 #~ msgstr "Filtras pagal Konferencij�"
 
-#~ msgid "Indexing:"
-#~ msgstr "Indeksuojama:"
-
 #~ msgid "Mailbox Format"
 #~ msgstr "Pa�to d��ut�s formatas"
 
-#~ msgid " (default)"
-#~ msgstr " (�prasta)"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Tema yra %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Lai�kai nuo %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "%s konferencija"
-
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "�iame lai�ke yra neteising� gav�j�"
 
@@ -28214,9 +29154,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "%s: Inbox"
 #~ msgstr "Gauti lai�kai"
 
-#~ msgid "Account"
-#~ msgstr "S�skaita"
-
 #~ msgid "Accounts"
 #~ msgstr "S�skaitos"
 
@@ -28229,9 +29166,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Edit..."
 #~ msgstr "Taisyti..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML para�o byla:"
-
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Pasirink Filtro log'o byl�..."
 
@@ -28260,24 +29194,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgstr "sekund�i�."
 
 #, fuzzy
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "�is lai�kas yra pasira�ytas skaitmeniniu para�u, patikrinus nustatyta, kad "
-#~ "jis autenti�kas"
-
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr ""
-#~ "�is lai�kas yra pasira�ytas skaitmeniniu para�u, patikrinus nustatyta, kad "
-#~ "jis autenti�kas"
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "�is lai�kas yra pasira�ytas skaitmeniniu para�u, bet neina patikrinti, ar "
-#~ "jis autenti�kas"
-
-#, fuzzy
 #~ msgid "Cannot initialize Evolution's Summary component."
 #~ msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
@@ -28293,47 +29209,18 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "�C"
 #~ msgstr "�C"
 
-#~ msgid "kph"
-#~ msgstr "kph"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "kilometers"
-#~ msgstr "kilometrai"
-
 #~ msgid "Al_l stations:"
 #~ msgstr "_Visos stotys:"
 
 #~ msgid "All _folders:"
 #~ msgstr "Visi _aplankai:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "_Visi naujien� �altiniai:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "_Rodyti aplankus:"
 
-#~ msgid "_Display stations:"
-#~ msgstr "_Rodyti stotis:"
-
 #~ msgid "_Displayed feeds:"
 #~ msgstr "Ro_domi �altiniai:"
 
-#~ msgid "Outbox"
-#~ msgstr "Siun�iami lai�kai"
-
-#, fuzzy
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Negal�jau i�trinti aplanko:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(Be pavadinimo)"
 
@@ -28445,46 +29332,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "%s - Ximian Evolution %s [%s]"
 #~ msgstr "%s - Ximian Evolution %s [%s]"
 
-#, fuzzy
-#~ msgid ""
-#~ "Hi.  Thanks for taking the time to download this preview release\n"
-#~ "of the Ximian Evolution groupware suite.\n"
-#~ "\n"
-#~ "Ximian Evolution is not yet complete. It's getting close, but there are\n"
-#~ "places where features are either missing or only half working. \n"
-#~ "\n"
-#~ "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
-#~ "This product comes with no warranty and is not intended for\n"
-#~ "individuals prone to violent fits of anger.\n"
-#~ "\n"
-#~ "We hope that you enjoy the results of our hard work, and we\n"
-#~ "eagerly await your contributions!\n"
-#~ msgstr ""
-#~ "Sveiki. A�i� u� laik�, sugai�t� parsisi�sti �i� Evolution\n"
-#~ "grupinio darbo rinkinio PER�I�ROS LAID�.\n"
-#~ "\n"
-#~ "Evolution dar n�ra baigta. Ji art�ja prie to, ta�iau yra viet�,\n"
-#~ "kur ypatybi� tr�ksta arba jos tik pusiau veikia. Jei tu negali\n"
-#~ "suprasti, kaip k� nors padaryti, tai galb�t tod�l, kad dar n�ra\n"
-#~ "b�do tai padaryti! :-)\n"
-#~ "\n"
-#~ "Mes tikim�s, kad Evolution bus tinkama naudoti tau, bet vis dar\n"
-#~ "jau�iame pareig� �sp�ti, kad ji gali: l��ti, prarasti tavo pa�t�,\n"
-#~ "palikti veikian�ius nenaudojamus procesus, naudoti 100% CPU,\n"
-#~ "si�sti nesiderinan�ias komandas � serverius, ir apskritai\n"
-#~ "sug�dinti tave tavo draug� ir bendradarbi� akivaizdoje. Naudoti\n"
-#~ "tik pagal nurodymus.\n"
-#~ "\n"
-#~ "Mes tikim�s, kad tau patiks m�s� sunkaus darbo vaisiai, ir\n"
-#~ "laukiame tavo prisid�jimo!\n"
-
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Ximian Evolution Team\n"
-#~ msgstr ""
-#~ "A�i�\n"
-#~ "Ximian Evolution komanda\n"
-
 #~ msgid "F_ormat"
 #~ msgstr "F_ormatas"
 
@@ -28527,9 +29374,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Summarizing folder"
 #~ msgstr "Daroma aplanko santrauka"
 
-#~ msgid "Delete folder '%s'"
-#~ msgstr "I�trinti aplank� '%s'"
-
 #~ msgid "Rename"
 #~ msgstr "Pervadinti"
 
@@ -28561,11 +29405,12 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgstr "Negal�jau atidaryti aplanko santraukos darymui: %s: %s"
 
 #~ 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."
+#~ "For connecting to POP servers. The POP protocol can also be used to "
+#~ "retrieve mail from certain web mail providers and proprietary email "
+#~ "systems."
 #~ msgstr ""
-#~ "Jungimuisi prie POP serveri�. POP protokolas taip pat gali b�ti naudojamas "
-#~ "parsi�sti pa�tui i� kai kuri� web pa�to tiek�j�."
+#~ "Jungimuisi prie POP serveri�. POP protokolas taip pat gali b�ti "
+#~ "naudojamas parsi�sti pa�tui i� kai kuri� web pa�to tiek�j�."
 
 #~ msgid "Elm mail"
 #~ msgstr "Elm pa�tas"
@@ -28573,9 +29418,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Persi�stas lai�kas:\n"
 
-#~ msgid "Synchronizing '%s'"
-#~ msgstr "Sinchronizuojamas '%s'"
-
 #~ msgid "This seems to be the first time you are running Evolution."
 #~ msgstr "Atrodo, kad tai pirmas kartas, kai tu pasileidai Evolution."
 
@@ -28930,8 +29772,8 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgstr "Pa�alinti s�lyg�"
 
 #~ msgid ""
-#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
-#~ "the server supports it."
+#~ "This option will connect to the server using a the PLAIN SASL mechanism "
+#~ "if the server supports it."
 #~ msgstr ""
 #~ "Su �ia parinktimi jungiantis prie serverio bus naudojamas PLAIN SASL "
 #~ "mechanizmas, jei serveris j� palaiko."
@@ -28939,9 +29781,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Edit Filter Rule"
 #~ msgstr "Keisti filtro taisykl�"
 
-#~ msgid "Add VFolder Rule"
-#~ msgstr "Prid�ti vAplanko taisykl�"
-
 #~ msgid "Edit VFolder Rule"
 #~ msgstr "Keisti vAplanko taisykl�"
 
diff --git a/po/lv.po b/po/lv.po
index abb097828f..f361b83c49 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution for latvian\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-01-22 00:27+0200\n"
 "Last-Translator: Peteris Krisjanis <peteris.krisjanis@ttc.lv>\n"
 "Language-Team: Latvian <ll10nt@ttc.lv>\n"
@@ -35,7 +35,7 @@ msgstr "Importē VKartes failus Evolution."
 msgid "File As"
 msgstr "Glabāt Kā"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nosaukums"
@@ -46,7 +46,7 @@ msgid "Email"
 msgstr "Epasts"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Primārais"
 
@@ -56,7 +56,7 @@ msgstr "Prim"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asistents"
@@ -64,8 +64,8 @@ msgstr "Asistents"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Bizness"
 
@@ -75,12 +75,12 @@ msgid "Bus"
 msgstr "Kopne"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Atzvanīšana"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Kompānija"
 
@@ -91,8 +91,8 @@ msgstr "Komp"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Mājas"
 
@@ -107,18 +107,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Mobīlais tel."
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fakss Darījumiem"
@@ -128,13 +128,13 @@ msgid "Bus Fax"
 msgstr "Fakss Dar."
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Mājas Fakss"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Bizness 2"
 
@@ -143,43 +143,43 @@ msgid "Bus 2"
 msgstr "Biz. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Mājas 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Citi"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Cits Fakss"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Peidžers"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telekss"
@@ -191,14 +191,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "Epasts 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Epasts 3"
@@ -336,7 +336,7 @@ msgstr "%s VKarte"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -344,7 +344,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Nevar inizializēt Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Meklējam..."
 
@@ -357,32 +357,32 @@ msgstr "Ielādējam..."
 msgid "Error in search expression."
 msgstr "Kļūda meklēšanas izteiksmē."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Pievienojam karti LDAP serverim..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Izņemam karti no LDAP servera..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Mainām karti no LDAP servera..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Parstartējam meklēšanu."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Saņemam LDAP meklēšanas rezultātus..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Kļūda izņemot vizītkarti"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Nevarēja noparsēt URL `%s'"
@@ -430,104 +430,140 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Vienkārša Bonobo kontrole, kas attēlo adrešu grāmatu"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "Adrešu Grāmatas Resursi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Kontrole, kas attēlo Evolution adrešu grāmatas minikarti."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution Adrešu Grāmatas minikaršu skatītājs"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Evolution komponente kontaktu vadīšanai."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Ražotne Adrešu Grāmatas Minikaršu kontrolei"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Ražotne Adrešu Grāmatas adrešu rādītājam "
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Ražotne Adrešu Grāmatas adrešu izlecējam"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Ražotne vienkāršai Adrešu grāmatas kontrolei"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Mape, kas satur informāciju par kontaktiem"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP Serveris"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "LDAP serveris, kas satur informāciju par kontaktiem"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Jauns Kontaktu Saraksts"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Kontaktu Saraksts"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Jauns Kontakts"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontaktēties"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Jauns Kontaktu Saraksts"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Nevar savienoties ar LDAP serveri."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "_Kontaktu Saraksts"
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Neiespējami autentificēties ar IMAP serveri.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP servera atbilde nesaturēja %s informāciju"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Kļūda ielādējot filtra informāciju:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP servera atbilde nesaturēja %s informāciju"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL nav vēl atbalstīts šajā evolution kompilējumā)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Nevar initicializēt gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Citi Kontakti"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Nevar atvērt adrešu gramatu"
@@ -562,50 +598,59 @@ msgstr ""
 "Mēs nespējām atvērt šo adrešu grāmatu. Lūdzu pārbaudiet\n"
 "vai šis ceļš eksistē un vai jums ir atļauja atvērt to."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ievadiet %s paroli (lietotājs %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "beidzas ar"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "Epasts 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija ir"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Jebkuršs lauks satur"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Paplašināts..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Jebkura Kategorija"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "URI ko Mapju Aplūks attēlos"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(nekas)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Primārais Epasts"
 
@@ -651,106 +696,59 @@ msgstr "Deaktivizēt Vaicājumus"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aktivizēt Vaicājumus (Bīstami)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Nevar savienoties ar LDAP serveri."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Neiespējami autentificēties ar IMAP serveri.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Nepareiza ierobežotās meklēšanas informācija:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP servera atbilde nesaturēja %s informāciju"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL nav vēl atbalstīts šajā evolution kompilējumā)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Izpildes Datums"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "_Pārbaudīt atbalstītos paņēmienus"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Opcijas"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "_Izņemt"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "_Izņemt"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Opcijas"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -759,8 +757,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Adrešu Grāmatas Resursi"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Brīdinājumi"
@@ -853,8 +851,8 @@ msgstr "Konfigurācija"
 msgid "Mappings"
 msgstr "Robežas"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_katru"
@@ -1035,14 +1033,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1060,13 +1058,13 @@ msgid ""
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
-"Šis vārds tiks lietots lai identificētu jūsu kontu. Tas ir tikai "
-"rādīšanas dēļ."
+"Šis vārds tiks lietots lai identificētu jūsu kontu. Tas ir tikai rādīšanas "
+"dēļ."
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1098,7 +1096,7 @@ msgid "Using email address"
 msgstr "Šī ir pas_ta adrese"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1106,7 +1104,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Pievienot"
 
@@ -1153,7 +1151,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1270,10 +1268,12 @@ msgstr "Evolution adrešu grāmatas vārda izvēles interfeiss."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Ražotne Adrešu grāmatas vārda izvēles interfeisam"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Izņemt"
 
@@ -1404,7 +1404,7 @@ msgstr "Kolabrācija"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Kontaktu Redaktors"
 
@@ -1413,7 +1413,7 @@ msgid "D_epartment:"
 msgstr "D_epartaments:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Detaļas"
 
@@ -1473,11 +1473,12 @@ msgstr "Grib saņemt _HTML pastu"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Dzēst"
 
@@ -1506,7 +1507,7 @@ msgid "_Web page address:"
 msgstr "_Tīmekļa lapaspuses adrese:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Amerikas Savienotās Valstis"
 
@@ -2012,12 +2013,11 @@ msgid "Laos"
 msgstr "Laosa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Latvija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Lebanona"
 
@@ -2026,7 +2026,7 @@ msgid "Lesotho"
 msgstr "Lesoto"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Libērija"
 
@@ -2035,12 +2035,12 @@ msgid "Liechtenstein"
 msgstr "Lihenšteina"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Lietuva"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luksemburga"
 
@@ -2073,7 +2073,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2098,7 +2098,7 @@ msgid "Mayotte"
 msgstr "Majota"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Meksika"
 
@@ -2124,7 +2124,7 @@ msgid "Montserrat"
 msgstr "Montserata"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Moroko"
 
@@ -2149,7 +2149,7 @@ msgid "Nepal"
 msgstr "Nepāla"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Nīderlande"
 
@@ -2162,12 +2162,12 @@ msgid "New Caledonia"
 msgstr "Jaunkaledonija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Jaunzēlande"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nikaragva"
 
@@ -2184,7 +2184,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolkas salas"
 
@@ -2193,17 +2193,17 @@ msgid "Northern Mariana Islands"
 msgstr "Ziemeļmarina"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norvēģija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Omāna"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistāna"
 
@@ -2216,7 +2216,7 @@ msgid "Palestinian Territory"
 msgstr "Palestīniešu Teritorija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2225,12 +2225,12 @@ msgid "Papua New Guinea"
 msgstr "Papua-Jaungvineja"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paragvaja"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2243,22 +2243,22 @@ msgid "Pitcairn"
 msgstr "Pitkērna"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugāle"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Riko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Katara"
 
@@ -2267,7 +2267,7 @@ msgid "Reunion"
 msgstr "Reinjona"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rumānija"
 
@@ -2304,7 +2304,7 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome Un Principa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudi Arābija"
 
@@ -2321,17 +2321,17 @@ msgid "Sierra Leone"
 msgstr "Sjerra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapūra"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovākija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slovēnija"
 
@@ -2344,7 +2344,7 @@ msgid "Somalia"
 msgstr "Somālija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Dienvidāfrika"
 
@@ -2353,7 +2353,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Armēnija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Spānija"
 
@@ -2374,7 +2374,7 @@ msgid "Sudan"
 msgstr "Sudāna"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinama"
 
@@ -2387,17 +2387,17 @@ msgid "Swaziland"
 msgstr "Šveice"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Zviedrija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Šveice"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taivāna"
 
@@ -2435,7 +2435,7 @@ msgid "Tunisia"
 msgstr "Tunisija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turcija"
 
@@ -2456,7 +2456,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraina"
 
@@ -2465,7 +2465,7 @@ msgid "United Arab Emirates"
 msgstr "Apvienotie Arābu Erimāti"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Apvienotā Karaliste"
 
@@ -2474,7 +2474,7 @@ msgid "United States Minor Outlying Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Urugvaja"
 
@@ -2487,12 +2487,12 @@ msgid "Vanuatu"
 msgstr "Vanatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venēcija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vjetnama"
 
@@ -2515,12 +2515,12 @@ msgid "Western Sahara"
 msgstr "Rietumu Sahāra"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jemena"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Dienvidslāvija"
 
@@ -2533,26 +2533,34 @@ msgid "Zimbabwe"
 msgstr "ZImbabve"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Vai jūs tiešām vēlaties\n"
+"dzēst šo kontaktu?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Dzēst Kontaktu?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Kategoriju redaktors nav pieejams."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Šis kontakts pieder šādām kategorijām:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Saglabāt Konaktu kā VKarti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nevar atrast vidžetu laukā: `%s'"
@@ -2579,11 +2587,11 @@ msgstr "E-pasts"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "saraksts"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2702,8 +2710,7 @@ msgstr "Locekļi"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Type an email address or drag a contact into the list below:"
-msgstr ""
-"Ievadiet epasta adresi vai arī iemetiet kontaktu apakšējajā sarakstā:"
+msgstr "Ievadiet epasta adresi vai arī iemetiet kontaktu apakšējajā sarakstā:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_Hide addresses when sending mail to this list"
@@ -2719,11 +2726,11 @@ msgid "contact-list-editor"
 msgstr "konaktu-saraksta-redaktors"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Kontaktu Saraksta Redaktors"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Saglabāt Sarakstu kā VKarti"
 
@@ -2801,21 +2808,21 @@ msgid "Error getting book view"
 msgstr "Kļūda sāknējot %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Kļūda mainot vizītkarti"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Veiksmīgi"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Nezināma kļūda"
 
@@ -2824,7 +2831,7 @@ msgid "Repository offline"
 msgstr "Repozitorijs nesaistes režīmā"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Atļauja liegta"
 
@@ -2842,55 +2849,70 @@ msgstr "Protokols nav atbalstīts"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Atsaukts"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Autentifikācija izjukusi."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Pieprasīta autentifikācija"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Cita kļūda"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Vai jūs vēlaties saglabāt izmaiņas?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Kļūda pievienojot sarakstu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Kļūda pievienojot vizītkarti"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Kļūda mainot sarakstu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Kļūda izņemot sarakstu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Kļūda izņemot vizītkarti"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Attēlot"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Attēlot"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2898,22 +2920,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "Nav vizītkaršu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "Nav vizītkaršu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "Nav vizītkaršu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Nav vizītkaršu"
@@ -2978,102 +3000,108 @@ msgstr "Cits Telefons"
 msgid "Other Address"
 msgstr "Cita Adrese"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Adrešu grāmata"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Saglabāt kā VKarti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Jauns Kontakts"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Jauns Kontaktu Saraksts"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Iet Uz Mapi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "I_mportēt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Meklēt Kontaktus"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Adrešu Grāmatas Avoti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot Uzstādījumi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Pārsūtīt Kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Sūtīt Vēstuli Kontaktam"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Drukāt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Drukāt Aploksni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Kopēt uz Mapi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Pārvietot uz _Mapi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izgriezt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopēt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Ievietot"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Dzēst"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3083,7 +3111,7 @@ msgstr "_Pašreizējais Skats"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3091,7 +3119,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3243,7 +3271,7 @@ msgstr "Robežas"
 msgid "Number of columns:"
 msgstr "Kolonu skaits:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opcijas"
 
@@ -3253,7 +3281,7 @@ msgid "Orientation"
 msgstr "Orientācija"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Lapa"
 
@@ -3327,29 +3355,33 @@ msgstr "Platums:"
 msgid "_Font..."
 msgstr "_Fonts..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Nenosaukta tikšanās"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Augsts"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normāls"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Zems"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Nedefinēts"
 
@@ -3392,43 +3424,35 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Evolution komponista ražotne."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution kalendāra kopsavilkuma komponente."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution kalendāra iTip/iMip skatītājs"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution komponente kalendāra vadīšanai."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Ražotne Kalendāra Kopsavilkuma komponentei."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Ražotne Evolution Uzdevumu kontrolei"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Ražotne vienkāršai Kalendāra kontrolei."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Ražotne kalendāra komponentes redaktora dialogu centralizēšanai"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "komponents"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3440,10 +3464,23 @@ msgstr "Brīdinājuma notifikācijas serviss"
 msgid "Factory for the alarm notification service"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "Sākums:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "Beigas:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "nepareizs laiks"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution "
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3484,7 +3521,7 @@ msgstr ""
 " normāls kaste."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Brīdinājums"
@@ -3511,15 +3548,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Neprasiet man vēlreiz."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Nevar initializēt GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3535,7 +3572,7 @@ msgstr "Apraksts satur"
 msgid "Comment contains"
 msgstr "Komentāri satur"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Nesakrītoši"
 
@@ -3574,14 +3611,16 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privāts"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Konfidenciāls"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Publisks"
 
@@ -3602,27 +3641,32 @@ msgid "W"
 msgstr "R"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Brīvs"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Aizņemts"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Nav iesākts"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Progresā"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Pabeigts"
 
@@ -3632,17 +3676,17 @@ msgid ""
 "\n"
 "45.436845,125.862501"
 msgstr ""
-"Ģeogrāfiskajai atrašanās vietai jābūt ievadītajai šādā formātā: "
-"\n"
+"Ģeogrāfiskajai atrašanās vietai jābūt ievadītajai šādā formātā: \n"
 "\n"
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3657,12 +3701,14 @@ msgstr "Periodisks"
 msgid "Assigned"
 msgstr "Asignēts"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Jā"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Nē"
 
@@ -3682,62 +3728,64 @@ msgstr "Nedēļas Skats"
 msgid "Month View"
 msgstr "Mēneša Skats"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalendārs"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Mape, kur atrodas informācija par satikšanām un notikumiem"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Uzdevumi"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Uzdevumu mape"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "Ziņas"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "Satikšanās"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "Jauns Uzdevums"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Uzdevums"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Jauna Tikšanās"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Jauna _Satikšanās"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "Jauna Tikšanās"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "Satikšanās"
@@ -3801,8 +3849,7 @@ msgid ""
 "reminders.  You will not be able to edit the options for this reminder."
 msgstr ""
 "Šis ir epasta atgādinātajs, bet Evolution vēl neatbalsta šāda veida "
-"atgādinājumus. Jums nebūs iespējams rediģēt opcijas šim "
-"atgādinājumam."
+"atgādinājumus. Jums nebūs iespējams rediģēt opcijas šim atgādinājumam."
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
@@ -3948,7 +3995,7 @@ msgstr "Atgādinājumi"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kopsavilkums:"
 
@@ -3977,7 +4024,7 @@ msgstr "satikšanās beigas"
 msgid "hour(s)"
 msgstr "stunda(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minūte(s)"
 
@@ -4005,79 +4052,81 @@ msgstr "30 minūtes"
 msgid "60 minutes"
 msgstr "60 minūtes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Kalendāra un Uzdevumu Uzstādījumi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Krāsa neizpildītajiem uzdevumiem"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Krāsas šodienas uzdevumiem"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Dienas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Piekdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Stundas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minūtes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Pirmdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "Sv"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Sesdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Parādīt nedēļas _numurus datuma navigātorā"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "Dienas Sā_kums:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "Sv"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Svēdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Šodien izpildāmie uzdevumi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "Ce_t"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "Ot_r"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4106,81 +4155,96 @@ msgid "Tuesday"
 msgstr "Otradiena"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Trešdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Darba Nedēļa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 stundu (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 stundu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pr_asīt apstiprinājumu kad dzēš priekšmetus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_Saspiest nedēļas mēneša skatā"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Uzdevums sākas: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Attēlot"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "Di_enas beigas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_Piek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Galvenais"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_Slēpt izpildītos uzdevumus pēc"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Pir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "N_okavētie uzdevumi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_Ses"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Parādīt tikšanos b_eigu laikus nedēļas un mēneša skatos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Laika _vienības:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "Ot_r"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_Tre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "pirms tikšanās sākuma"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4190,13 +4254,11 @@ msgstr "Satikšanās statuss ir izmainīts. Nosūtīt atjaunināto versiju?"
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo "
-"satikšanos?"
+"Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo satikšanos?"
 
 #: calendar/gui/dialogs/cancel-comp.c:62
 msgid "Are you sure you want to cancel and delete this task?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo uzdevumu?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo uzdevumu?"
 
 #: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
@@ -4220,8 +4282,7 @@ msgstr "Šis žurnāla ieraksts ir izdzēsts."
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
-"%s  Jūs esat veicis izmaiņas. Aizmirst šīs izmaiņas un aizvērt "
-"redaktoru?"
+"%s  Jūs esat veicis izmaiņas. Aizmirst šīs izmaiņas un aizvērt redaktoru?"
 
 #: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
@@ -4244,8 +4305,7 @@ msgstr "Žurnāla ieraksts tika izmainīts."
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
-"%s  Jūs esat veicat izmaiņas. Aizmirst šīs izmaiņas un atjaunināt "
-"redaktoru?"
+"%s  Jūs esat veicat izmaiņas. Aizmirst šīs izmaiņas un atjaunināt redaktoru?"
 
 #: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
@@ -4272,53 +4332,72 @@ msgstr " (Līdz "
 msgid "Due "
 msgstr "Līdz"
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
 msgstr "Nevar atjaunināt objektu!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Nevar atjaunināt objektu!"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Rediģēt Satikšanos"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "satikšanās - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Uzdevums - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnāla ieraksts - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Nav kopsavilkuma"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Saglabāt kā..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Nevar dabūt pašreizējo versiju!"
 
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties dzēst šo satikšanos '%s'?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo satikšanos '%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties dzēst šo noklusēto dokumentu?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo noklusēto dokumentu?"
 
 #: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
@@ -4327,21 +4406,17 @@ msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo uzdevumu '%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties dzēst šo nenosaukto uzdevumu?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo nenosaukto uzdevumu?"
 
 #: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties dzēst šo žurnāla ierakstu "
-"'%s'?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo žurnāla ierakstu '%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties dzēst šo nenosaukto žurnāla "
-"ierakstu?"
+"Vai jūs esat pārliecināts, ka vēlaties dzēst šo nenosaukto žurnāla ierakstu?"
 
 #: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
@@ -4356,8 +4431,7 @@ msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst %d uzdevumus?"
 #: calendar/gui/dialogs/delete-comp.c:142
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties izdzēst %d žurnāla ierakstus?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst %d žurnāla ierakstus?"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Addressbook..."
@@ -4371,27 +4445,27 @@ msgstr "Deleģēt Uz:"
 msgid "Enter Delegate"
 msgstr "Ievadīt Delegātu"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Satikšanās"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Atgādinājums"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Atkārtošanās"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Plānošana"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Satikšanās"
 
@@ -4438,7 +4512,7 @@ msgid "Pu_blic"
 msgstr "Pu_blisks"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Parādī Laiku Kā"
 
@@ -4460,19 +4534,19 @@ msgstr "B_eigu laiks:"
 msgid "_Start time:"
 msgstr "_Sākuma laiks:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Nepieciešams organizētajs"
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Jābūt vismaz vienam dalībniekam."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Šī persona jau apmeklē satikšanos!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Deleģēt Uz..."
 
@@ -4483,49 +4557,55 @@ msgstr "Apmeklētājs"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Parastais Vārds"
+msgid "Click here to add an attendee"
+msgstr "Klikšķiniet šeit lai pievienotu apmeklētāju"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Deleģēts No"
+msgid "Common Name"
+msgstr "Parastais Vārds"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Deleģēts Uz"
+msgid "Delegated From"
+msgstr "Deleģēts No"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Valoda"
+msgid "Delegated To"
+msgstr "Deleģēts Uz"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Loceklis"
+msgid "Language"
+msgstr "Valoda"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Loceklis"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Loma"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tips"
@@ -4540,14 +4620,10 @@ msgid "_Change Organizer"
 msgstr "_Mainīt Organizētāju"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Ielūgt Citus..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Cits Organizētajs"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4706,24 +4782,20 @@ msgstr "gads(-i)"
 #: calendar/gui/dialogs/send-comp.c:56
 #, fuzzy
 msgid "The meeting information has been created. Send it?"
-msgstr ""
-"Informācija par satikšanos ir izmainīta. Nosūtīt atjauninātu versiju?"
+msgstr "Informācija par satikšanos ir izmainīta. Nosūtīt atjauninātu versiju?"
 
 #: calendar/gui/dialogs/send-comp.c:59
 msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-"Informācija par satikšanos ir izmainīta. Nosūtīt atjauninātu versiju?"
+msgstr "Informācija par satikšanos ir izmainīta. Nosūtīt atjauninātu versiju?"
 
 #: calendar/gui/dialogs/send-comp.c:66
 #, fuzzy
 msgid "The task assignment information has been created. Send it?"
-msgstr ""
-"Informācija par uzdevumu ir izmainīta. Nosūtīt atjauninātu versiju?"
+msgstr "Informācija par uzdevumu ir izmainīta. Nosūtīt atjauninātu versiju?"
 
 #: calendar/gui/dialogs/send-comp.c:70
 msgid "The task information has changed. Send an updated version?"
-msgstr ""
-"Informācija par uzdevumu ir izmainīta. Nosūtīt atjauninātu versiju?"
+msgstr "Informācija par uzdevumu ir izmainīta. Nosūtīt atjauninātu versiju?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
@@ -4740,7 +4812,7 @@ msgid "Progress"
 msgstr "Progress"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4752,19 +4824,19 @@ msgstr "_Prioritāte:"
 msgid "_Status:"
 msgstr "_Statuss:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Pamata"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Uzticējums"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Apraksts:"
 
@@ -4776,23 +4848,78 @@ msgstr "Sākum_a Datums:"
 msgid "_Due Date:"
 msgstr "_Datuma laikā:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, fuzzy, c-format
+msgid "100%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Dzēšam "
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Atvērt"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Saglabāt kā..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4800,20 +4927,20 @@ msgstr "Saglabāt kā..."
 msgid "_Print..."
 msgstr "_Drukāt..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Izgriezt"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopēt"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4821,35 +4948,36 @@ msgstr "_Kopēt"
 msgid "_Paste"
 msgstr "_Ievietot"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Nozīmēt Uzdevumu"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Pārsūtīt kā iKalendāru"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "A_tzīmēt kā Izpildītus"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "A_tzīmēt Uzdevumus kā Izpildītus"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_Dzēst Izvēlētos Uzdevumus"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Atjaunināt objektus"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klikšķināt lai pievienotu uzdevumu"
 
@@ -4857,47 +4985,48 @@ msgstr "Klikšķināt lai pievienotu uzdevumu"
 msgid "Alarms"
 msgstr "Brīdinājumi"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Izpildīts"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Izpildes Datums"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Datuma Laikā"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Beigu Datums"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Ģeogrāfiskā Pozīcija"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioritāte"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Sākuma Datums"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Kopsavilkums"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Uzdevumu kārtošana"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4945,11 +5074,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -4989,7 +5120,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Publicēt Brīvs/Aizņemts Informāciju"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Konfigurācija"
@@ -5000,7 +5131,7 @@ msgid "_Configure Pilot..."
 msgstr "Konfigurācija"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "_Saglabāt Kā..."
 
@@ -5027,75 +5158,393 @@ msgid "Delete _All Occurrences"
 msgstr "Dzēst Visus G_adījumus"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot rīki nav uzstādīti šajā sistēmā."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Kļūda sāknējot %s."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "Satikšanās sākas: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "Uzdevums sākas: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "Brīvs/Aizņemts informācija sākas: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Sākas: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "Satikšanās beidzas: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "Brīvs/Aizņemts informācija beidzas: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "Beidzas: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "Uzdevums Pabeigts: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "Uzdevums Līdz: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "iCalendar informācija"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "iCalendar Kļūda"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "Nezināma persona"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Lūdzu apskatiet sekojošo informāciju un pēc tam izvēlieties darbību no "
+"izvēlnes zemāk."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Nekas</i>"
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "_Statuss:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Apstiprināts"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "Paigaidām akceptēt"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Noliegts"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "Kalendāra fails nevar tikt atjaunināts!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "Izvēlieties darbību:"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Atjaunot"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "Apstiprināt"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "Paigaidām akceptēt"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "Noliegt"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "Nosūtīt Brīvs/Aizņemts Informāciju"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "Atjaunināt respondenta statusu"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "Sūtīt Pēdīgo Informāciju"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Atsaukt"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> ir publicējis informāciju par tikšanos."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Informācija par Satikšanos"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> pieprasa tavu klātbūtni tikšanās."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "Satikšanās Iemesls"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> vēlas pievienot jau eksistējošai tikšanās."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "Atjaunināta Informācija Par Satikšanos"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> vēlas saņemt pēdīgo informāciju par tikšanos."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "Informācijas Par Satikšanos Atjaunināšanas Pieprasīšana"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> ir atbildējis uz tikšanās pieprasījumu."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "Atbilde Par Satikšanos"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> ir atsaucis tikšanos."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "Satikšanās Atcelšana"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, fuzzy, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> ir atsaucis tikšanos."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Slikta Satikšanās Ziņa"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> ir publicējis informāciju par uzdevumu."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Uzdevuma Informācija"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> pieprasa jums izpildīt uzdevumu."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Uzdevuma Priešlikums"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> vēlas pievienot jau eksistējošam uzdevumam."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Uzdevuma Atjaunināšana"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> vēlas saņemt pēdīgo informāciju par uzdevumu."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Uzdevuma Atjaunināšanas Pieprasījums"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> ir atbildējis uz uzdevuma nozīmēšanu."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Uzdevuma Atbilde"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> ir atcēlis uzdevumu."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Uzdevuma Atsaukums"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Slikts Uzdevuma Ziņojums"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> ir publicējis brīvs/aizņemts informāciju."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Brīvs/Aizņemts Informācija"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> pieprasa tavu brīvs/aizņemts informāciju."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Brīvs/Aizņemts Pieprasījums"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> ir atbildējis uz brīvs/aizņemts informāciju."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Brīvs/Aizņemts Atbilde"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Slikta Brīvs/Aizņemts Ziņa"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Šī mape izskatās ir neatgriezeniski sabojāta."
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "Ziņa satur tikai neatbalstītus pieprasījumus."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "Pievienojums nesatur atļautu kalendāra ziņu"
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "Pievienojumam nav skatāmu kalendāra priekšmetu"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Atjaunināšana izpildīta\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Kalendāra fails nevar tikt atjaunināts!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Apmeklētāja status nevar tikt atjaunināts tāpēc ka priekšmets vairāk "
 "neeksistē"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Apmeklētāja statuss nevar tikt atjaunināts sakarā ar nepareizo statusu!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "Apmeklētāja status nevar tikt atjaunināts!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Apmeklētāja status atjaunināts\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "Apmeklētāja status nevar tikt atjaunināts!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Izņemšana Pabeigta"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Priekšmets nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Izvēlēties Mapi"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Izvēlēties Mapi"
@@ -5137,93 +5586,92 @@ msgstr "datums-sākums"
 msgid "date-start"
 msgstr "datums-beigas"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Vadošās Personas"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Pieprasītie Dalībnieki"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Iespējamie Dalībnieki"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Nepiedalās"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Individuāli"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Resurss"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Istaba"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Krēsls"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Pieprasītais Dalībnieks"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Iespējamais Dalībnieks"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Nepiedalās"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Pieprasa Darbību"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Apstiprināts"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Noliegts"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Pagaidu"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Deleģēts"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "Procesā"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
@@ -5235,63 +5683,63 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Neatrodas Birojā"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Nav Informācijas"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Opcijas"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Parādīt Tikai _Darba Stundas"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Parādīt Sama_zinātu"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Atjaunināt Brīvs/Aizņemts Informāciju"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Autoizvēle"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Visi Cilvēki un Resursi"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Visi _Cilvēki un Viens Resurss"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "_Pieprasītie Cilvēki"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Pieprasītie Cilvēki un _Viens Resurss"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Satikšanās _sākuma laiks:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Satikšanās _beigu laiks:"
 
@@ -5310,17 +5758,22 @@ msgstr "Nevar ielādēt uzdevumus uz `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metode lai ielādētu `%s' nav atbalstīta"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Nevar atvērt mapi uz `%s'"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Izpildes Datums"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Dzēšam "
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "Dzēšam mapi"
@@ -5333,17 +5786,17 @@ msgstr "Jauna _Tikšanās...."
 msgid "_Delete this Appointment"
 msgstr "_Dzēst šo Tikšanos"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nevar atvērt mapi uz `%s'"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Pieprasītā metode, lai atvērtu `%s' nav atbalstīta"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Atvērt kalendāru uz %s"
@@ -5404,19 +5857,53 @@ msgstr "Oktobris"
 msgid "September"
 msgstr "Septembris"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Vismaz viens apmeklētajs ir vajadzīgs"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Jābūt norādītam organizētājam."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr "Notikuma informācija"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "Uzdevuma Informācija"
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr "Žurnāla informācija"
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr "Brīvs/Aizņemts informācija"
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr "Kalendāra informācija"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Atjaunot"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Atsvaidzināt Sarakstu"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Jums jābūt notikuma apmeklētājam."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "komponents"
@@ -5606,12 +6093,45 @@ msgstr "Izvēlētais mēnesis (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Izvēlētais gads (%Y)"
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "Uzdevums"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Status: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioritāte:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Procenti Izpidildīti: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Kategorijas: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Kontakti:"
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Drukāt Kalendāru"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5648,8 +6168,8 @@ msgstr ""
 "\n"
 "?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Neprasiet man vēlreiz."
 
@@ -5707,6 +6227,11 @@ msgstr "Importē VKartes failus Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importē VKartes failus Evolution."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Atgādinājums"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5812,8 +6337,8 @@ msgstr "satur"
 #: calendar/pcs/query.c:693
 #, fuzzy
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr "satur apraksts"
 
 #: calendar/pcs/query.c:735
@@ -6759,653 +7284,668 @@ msgid "Asia/Macao"
 msgstr "Āzija/Makao"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Āzija/Makao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Āzija/Magadana"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Āzija/Magadana"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Āzija/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Āzija/Muskats"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Āzija/Novosibirska"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Āzija/Omska"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Āzija/Kabula"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Āzija/Katara"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Āzija/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Āzija/Saigona"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Āzija/Sahalīna"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Āzija/Samarkanda"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Āzija/Seula"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Āzija/Šanhai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Āzija/Singapūra"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Āzija/Taipei"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Āzija/Taškenta"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Āzija/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Āzija/Teherāna"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Āzija/Tokijo"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Āzija/Vladivostoka"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantija/Bermuda"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantija/Kapoverde"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Austrālija/Adelaide"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Austrālija/Brisbāna"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 #, fuzzy
 msgid "Australia/Broken_Hill"
 msgstr "Austrālija"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Austrālija/Darvina"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Austrālija/Hobarta"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 #, fuzzy
 msgid "Australia/Lindeman"
 msgstr "Austrālija"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 #, fuzzy
 msgid "Australia/Lord_Howe"
 msgstr "Austrālija"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Austrālija/Melnburna"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Austrālija/Perta"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Austrālija/Sidneja"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdama"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europa/Andora"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europa/Atēnas"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europa/Belfāsta"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrada"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europa/Berlīne"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europa/Brisele"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukareste"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europa/Budapešta"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europa/Kopenhāgena"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europa/Dublina"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltārs"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbula"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaļingrada"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europa/Kijeva"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisabona"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ļubļana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europa/Londona"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luksemburga"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europa/Madride"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Euopa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europa/Minska"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europa/Monāko"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europa/Maskava"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europa/Parīze"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europa/Prāga"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europa/Rīga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marīno"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarājeva"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europa/Sofija"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europa/Stoholma"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallina"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikāns"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europa/Vīnw"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europa/Viļņa"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europa/Varšava"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreba"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europa/Cīrihe"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 #, fuzzy
 msgid "Indian/Comoro"
 msgstr "Komoros salas"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 #, fuzzy
 msgid "Indian/Mahe"
 msgstr "Indija"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 #, fuzzy
 msgid "Indian/Maldives"
 msgstr "Maldivu salas"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 #, fuzzy
 msgid "Indian/Mauritius"
 msgstr "Mauritānija"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 #, fuzzy
 msgid "Indian/Mayotte"
 msgstr "Majota"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 #, fuzzy
 msgid "Indian/Reunion"
 msgstr "Reinjona"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 #, fuzzy
 msgid "Pacific/Pitcairn"
 msgstr "Pitkērna"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 #, fuzzy
 msgid "Pacific/Port_Moresby"
 msgstr "Ports"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "ir"
 
-#: camel/camel-cipher-context.c:209
-#, fuzzy
-msgid "Clearsigning is not supported by this cipher"
-msgstr "ir"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "ir"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "ir"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "ir"
@@ -7417,12 +7957,12 @@ msgstr ""
 "Nevar izveidot izejas failu: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nevarēja atvērt keišdirektoriju: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7430,7 +7970,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7441,11 +7981,16 @@ msgstr ""
 "%s\n"
 "Izmaiņas, izdarītas šajā folderī, netiks pārsinhronizētas."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Pārsinhronizējamies ar serveri"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Glabājam mapi '%s'"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Jums ir jāstrādā tiešsaistē lai izpildītu šo operāciju"
 
@@ -7453,57 +7998,68 @@ msgstr "Jums ir jāstrādā tiešsaistē lai izpildītu šo operāciju"
 msgid "Syncing folders"
 msgstr "Sinhronizējam mapes"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Kļūda parsējot filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Kļūda palaižot filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Nespēj atvērt spool mapi"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Nespēj procesēt spool mapi"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dabūjam vēstuli %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Nevar atvērt vēstuli"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Problēma ar vēstuli %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "SInhronizējam mapi"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dabūjam vēstuli %d no %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Kļūda pie vēstules %d no %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Neizdevās atkodēt vēstuli"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Neizdevās keišot vēstuli %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Neizdevās keišot vēstuli %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Kļūda sāknējot filtra meklēšanu: %s: %s"
@@ -7534,25 +8090,102 @@ msgstr "visi"
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Pārvietojam vēstules"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Kopējam vēstules uz %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Atsaukts."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Negaidīta atbilde no POP servera: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Nav dots faila nosaukums."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Nevar kodēt šo vēstuli: nav norādīti saņēmēji"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Neizdevās keišot vēstuli %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Neizdevās keišot vēstuli %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Neizdevās atkodēt vēstuli"
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Nevar pārbaudīt šo vēstuli: nevarēja izveidot pagaidu failu: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7648,88 +8281,27 @@ msgstr "Kļūda rakstot pasta pagaidu failu: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Kļūda kopējot pasta pagaidu failu: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Lūdzu ievadiet jūsu %s paroles frāzi %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Lūdzu ievadiet jūsu %s paroles frāzi"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Nevar parakstīt šo vēstuli: nav parastā teksta ko parakstīt"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "Nevar parakstīt šo vēstuli: nav piedāvata parole"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Nevar parakstīt šo vēstuli: nevarēja izveidot kanālu ar GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Nevar pārbaudīt šo vēstuli, nav parastā teksta lai pārbaudītu"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Nevar pārbaudīt šo vēstuli: nevarēja izveidot kanālu uz GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "Nevar pārbaudīt šo vēstuli: nevarēja izveidot pagaidu failu: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Nevar kodēt šo vēstuli: nav parastā teksta ko kodēt"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Nevar kodēt šo vēstuli: nav piedāvada parole"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Nevar kodēt šo vēstuli: nevarēja izveidot kanālu ar GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Nevar kodēt šo vēstuli: nav norādīti saņēmēji"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Nevar atkodēt šo vēstuli: nav kodēta teksta ko atkodēt"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Nevar atkodēt šo vēstuli: nav piedāvāta parole"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Nevar atkodēt šo vēstuli: nevarēja izveidot kanālu ar GPG/PGP: %s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Šī ir digitāli parakstītā vēstules daļa"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Cita kļūda"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr ""
-"Nevarēja ielādet %s: Moduļu ielāde nav atbalstīta šajā sistēmā."
+msgstr "Nevarēja ielādet %s: Moduļu ielāde nav atbalstīta šajā sistēmā."
 
 #: camel/camel-provider.c:140
 #, c-format
@@ -7741,51 +8313,13 @@ msgstr "Nevar ielādēt %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nevar ielādēt %s: Nav initicializācijas koda modulī."
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s serveris %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s serviss priekš %s uz %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Konekcija pārtraukta"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Nevarēja savienoties ar %s (ports %d): %s"
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(nezināms resursdators)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Operācija atsaukta"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Serveris negaidīti atvienojās: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonymous lietotājs"
 
 #: camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
-msgstr ""
-"Šī opcija atļaus jums konektēties ar serveri ar anonymous lietotāju."
+msgstr "Šī opcija atļaus jums konektēties ar serveri ar anonymous lietotāju."
 
 #: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
@@ -7839,8 +8373,8 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"Šī opcija ļaus jums savienoties ar serveri lietojot drošo DIGEST-MD5 "
-"paroli, ja serveris atbalsta to."
+"Šī opcija ļaus jums savienoties ar serveri lietojot drošo DIGEST-MD5 paroli, "
+"ja serveris atbalsta to."
 
 #: camel/camel-sasl-digest-md5.c:810
 #, fuzzy
@@ -7887,7 +8421,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Slikta autentifikācijas atbilde no servera."
 
@@ -7898,8 +8432,7 @@ msgstr "NT Pieteikšanās"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr ""
-"Šī opcija ļaus jums pieslēgties serverim lietojot vienkāršu paroli"
+msgstr "Šī opcija ļaus jums pieslēgties serverim lietojot vienkāršu paroli"
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -7916,11 +8449,9 @@ msgid ""
 "Password Authentication."
 msgstr "Šī opcija savienos ar serveri lietojot Kerberos 4 autentifikāciju. "
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Parole"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7947,51 +8478,51 @@ msgstr "POP pirms SMTP autentifikācijas lietojot ne-pop avotu"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' nepieciešams lietotājvārda komponents"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' nepieciešams resursdatora komponents"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' nepieciešams ceļa komponents"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Sameklējam: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Nevar atrast nosaukumu: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Sameklējam: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8056,11 +8587,11 @@ msgstr "Neizdevās atkodēt vēstuli"
 msgid "Failed to verify certificates."
 msgstr "Neizdevās pārbaudīt sertifikātu"
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nevar dabūt mapi: Nepareiza operācija šajā glabātuvē"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nevar izveidot mapi: Nepareiza operācija šajā glabātuvē"
 
@@ -8083,7 +8614,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8092,16 +8623,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8116,15 +8647,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nevarēja noparsēt URL `%s'"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nav tādas vēstules %s iekš %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Nav tādas vēstules: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Pārbaudam jaunas vēstules visās mapēs"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8146,68 +8677,77 @@ msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Jūs nevarat kopēt vēstules no šīs atkritumkastes mapes."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Operācija atsaukta"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Serveris negaidīti atvienojās: %s"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Negaidīta atbilde no IMAP servera: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Servera atbilde beidzās pārāk ātri."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP servera atbilde nesaturēja %s informāciju"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Negaidīta OK atbilde no IMAP servera: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nevar izveidot direktoriju %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nevar ielādēt %s kopsavilkumu"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mape tika iznīcināta un pārizveidota uz servera."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Meklējam izmainītās vēstules"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Šī vēstule šobrīd nav pieejama"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Meklējam jaunās vēstules"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8260,32 +8800,83 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Lai lasītu un glabātu pastu uz IMAP serveriem."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Parole"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Šī opcija savienos ar IMAP serveri lietojot parastu teksta paroli."
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP serveris %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s serviss priekš %s uz %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Konekcija pārtraukta"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Nevarēja savienoties ar %s (ports %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Nevar savienoties ar POP serveri.\n"
+"Kļūda sūtot lietotajvārdu: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operācija nav atbalstīta"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Autentifikācija izjukusi."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP serveris %s neatbalsta pieprasīto autentifikācijas tipu %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Neatbalstīts autentifikācijas tips %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sLūdzu ievadi IMAP paroli %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Jūs neievadījāt paroli."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8296,73 +8887,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Nav tādas mapes %s"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Vecāku mapei nav atļauts saturēt apakšmapes"
 
-#: camel/providers/local/camel-local-provider.c:48
-msgid "MH-format mail directories"
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, c-format
+msgid "mailbox:%s (%s)"
+msgstr ""
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:49
+msgid "MH-format mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:50
 #, fuzzy
 msgid "For storing local mail in MH-like mail directories."
 msgstr "direktoriji."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Lokāla piegāde"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Attiecināt"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 #, fuzzy
 msgid "For storing local mail in maildir directories."
 msgstr "direktoriji."
 
-#: camel/providers/local/camel-local-provider.c:100
-#, fuzzy
-msgid "Standard Unix mbox spools"
-msgstr "Standarts"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
 #, fuzzy
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "failus."
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+msgid "Standard Unix mbox spool or directory"
+msgstr "Standarts"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "failus."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Glabātuves sakne %s nav absolūtais ceļš"
@@ -8388,7 +8996,7 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr "Lokālā pasta fails %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
@@ -8408,34 +9016,32 @@ msgstr "Nevarēja izdzēst mapes kopsavilkuma failu `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nevarēja izdzēst mapes indeksa failu `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 #, fuzzy
 msgid "Unable to add message to summary: unknown reason"
 msgstr "nezināms"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8444,20 +9050,19 @@ msgstr ""
 "Nevar dabūt vēstuli: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Nav tādas vēstules"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Nepareizs vēstules saturs"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8468,13 +9073,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mape '%s' neeksistē."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8490,7 +9095,7 @@ msgstr "`%s nav maildir direktorija."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nevarēja izdzēst mapi `%s': %s"
@@ -8499,8 +9104,8 @@ msgstr "Nevarēja izdzēst mapi `%s': %s"
 msgid "not a maildir directory"
 msgstr "nav maildir direktorija"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nevarēja skanēt mapi `%s': %s"
@@ -8521,46 +9126,38 @@ msgstr "Pārbaudam jauno pastu"
 msgid "Checking for new messages"
 msgstr "Meklējam jaunās vēstules"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Glabājam mapi"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Pasts"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nevar pievienot vēstuli mbox failam: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8569,13 +9166,11 @@ msgstr ""
 "Nevar dabūt vēstuli: %s no mapes %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Šī mape izskatās ir neatgriezeniski sabojāta."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vēstules konstrukcija neveiksmīga: Sabojāta pastkaste?"
 
@@ -8618,174 +9213,155 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mape `%s' nav tukša. Netika izdzēsta."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nevarēja atvērt mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nevarēja pārbaudīt mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nevar atvērt failu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Kopsavilkuma un mapes nesakrišana, pat pēc sinhronizācijas"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Kļūda rakstot pagaidu pastkastē: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Kopsavilkuma un mapes nesakrišana, pat pēc sinhronizācijas"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nezināma kļūda: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
-msgid "MH append message cancelled"
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Nevarēja atvērt mapi: %s: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Kļūda rakstot pagaidu pastkastē: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-mh-folder.c:175
+msgid "MH append message cancelled"
+msgstr ""
+
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' nav direktorija."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nevar atvērt MH direktorijas ceļu: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
-msgid "Cannot append message to spool file: %s: %s"
+msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr ""
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "Glabātuves sakne %s nav regulāra direktorija"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mape `%s/%s' neekistē."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Glabājam mapi '%s'"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Nevar atvērt failu: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Glabātuves sakne %s nav regulāra direktorija"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Pasts uz %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET ziņas"
@@ -8795,18 +9371,27 @@ msgstr "USENET ziņas"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "ir."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Nevar izveidot direktoriju %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET Ziņas caur %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
-"Šī opcija autentificēsies ar NNTP serveri lietojot vienkārša teksta "
-"paroli."
+"Šī opcija autentificēsies ar NNTP serveri lietojot vienkārša teksta paroli."
 
 #: camel/providers/nntp/camel-nntp-summary.c:234
 #, fuzzy, c-format
@@ -8905,7 +9490,7 @@ msgstr "Atstāt vēstules uz servera"
 msgid "Delete after %s day(s)"
 msgstr "Dzēst pēc %s dienas (ām)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8928,32 +9513,22 @@ msgid ""
 "claim to support it."
 msgstr "visi."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Nevar savienoties ar POP serveri.\n"
 "Kļūda sūtot lietotajvārdu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Operācija nav atbalstīta"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Autentifikācija izjukusi."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Nevarēja savienoties ar POP serveri uz %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 #, fuzzy
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8962,27 +9537,27 @@ msgstr ""
 "\n"
 " Nē."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "I/O kļūda"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sLūdzu ievadiet %s@%s POP3 paroli"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8991,13 +9566,13 @@ msgstr ""
 "Kļūda savienojoties ar POP serveri.\n"
 "Kļūda sūtot paroli: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nav tādas mapes `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9164,45 +9739,45 @@ msgstr "Pagaidu autentifikācijas problēma"
 msgid "Authentication required"
 msgstr "Pieprasīta autentifikācija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Apsveikuma atbildes kļūda: %s: iespējami ne fatāla"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Nevar savienoties ar POP serveri.\n"
 "Kļūda sūtot lietotajvārdu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Ziņa varētu būt pareizi noformēta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET atbildes kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP serveris %s neatbalsta pieprasīto autentifikācijas tipu %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sLūdzu ievadiet %s@%s SMTP paroli"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9213,92 +9788,92 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP serveris %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP pasta nosūtīšana caur  %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "Nevar nosūtīt adresi: sūtītāja adrese nav pareiza."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Sūtam vēstuli"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 #, fuzzy
 msgid "Cannot send message: no recipients defined."
 msgstr "nē."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "nē."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "SMTP Apsveikums"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO pieprasījums iztecējis: %s: ne fatāli"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO atbildes kļūda: %s: ne fatāli"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikācija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 #, fuzzy
 msgid "Error creating SASL authentication object."
 msgstr "Kļūda."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH neveiksmīgs pieprasījums."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Slikta autentifikācijas atbilde no servera.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM pieprasījums iztecējis: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM atbildes kļūda: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO pieprasījums iztecējis: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA pieprasījums iztecējis: %s: pasts nav nosūtīts"
@@ -9306,39 +9881,38 @@ msgstr "DATA pieprasījums iztecējis: %s: pasts nav nosūtīts"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET atbildes kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-"DATA sūtijums iztecējis: vēstules pārtraukšana: %s: pasts nav nosūtīts"
+msgstr "DATA sūtijums iztecējis: vēstules pārtraukšana: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Slikta autentifikācijas atbilde no servera."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET atbildes kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT pieprasījums iztecējis: %s: ne fatāli"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET atbildes kļūda: %s"
@@ -9412,52 +9986,52 @@ msgstr "MIME tips:"
 msgid "Suggest automatic display of attachment"
 msgstr "Ieteikt automātisku pievienojuma attēlošanu"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Uz adrešu grāmatu"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "No:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Atbildēt Kam:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Subjekts:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Ievadiet vēstules saņēmējus"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ievadiet adreses kuras saņems vēstules kopiju"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 #, fuzzy
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
@@ -9469,7 +10043,12 @@ msgstr "saraksts."
 msgid "Attach a file"
 msgstr "Pievienot failu"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Nevarēja izveidot PGP paraksta kontekstu."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9478,34 +10057,34 @@ msgstr ""
 "Kļūda kāmēr lasot failu %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Brīdinājums!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Fails eksistē, pārrakstīt?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Kļūda saglabājot failu: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Kļūda ielādējot failu: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Kļūda atverot failu: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Nespēju saņemt vēstuli no redaktora"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9514,7 +10093,7 @@ msgstr ""
 "Nevar meklēt failā: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9523,7 +10102,7 @@ msgstr ""
 "Nevar samazināt failu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9532,16 +10111,15 @@ msgstr ""
 "Kļūda automātiski glabājot vēstuli: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
-"Ximian Evolution ir atradis nesaglabātus failus no iepriekšējās "
-"sesijas.\n"
+"Ximian Evolution ir atradis nesaglabātus failus no iepriekšējās sesijas.\n"
 "Vai jūs gribētu tos atjaunot?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9551,29 +10129,49 @@ msgstr ""
 "\n"
 "Vai tu vēlies saglabāt izmaiņas?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Brīdinājums: Mainīta Vēstule"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Atvērt failu"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Ievietot failu"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Saglabāt parakstu"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr "(noklusētais)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Uzrakstīt vēstuli"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -9582,6 +10180,12 @@ msgstr ""
 "\n"
 " HTML komponents."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 #, fuzzy
 msgid ""
@@ -9643,7 +10247,7 @@ msgstr "Subjekts satur"
 msgid "Subject does not contain"
 msgstr "Subjekts nesatur"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9788,7 +10392,7 @@ msgstr "stunda"
 msgid "minute"
 msgstr "stundas"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "sekundes"
 
@@ -9863,7 +10467,7 @@ msgstr " atpakaļ"
 msgid "ago"
 msgstr "atpakaļ"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9875,6 +10479,21 @@ msgstr "<klikšķini šeit lai izvēlētos datumu>"
 msgid "Filter Rules"
 msgstr "Filtra Noteikumi"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Stila nosaukums:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Glabātuves sakne %s nav regulāra direktorija"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Izvēlieties darbību:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9893,7 +10512,7 @@ msgstr ""
 "Dodaties atpakaļ un izvēlieties pareizu mapi uz kurieni nosūtīt pastu."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Izvēlēties Mapi"
 
@@ -9906,7 +10525,11 @@ msgstr ""
 "Kļūda neregulārajā izteiksmē '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Tests"
 
@@ -9936,7 +10559,7 @@ msgstr "ja visi kritēriji sakrīt"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "ja jebkuršs kritērijs sakrīt"
 
 #: filter/filter-rule.c:780
@@ -10015,194 +10638,204 @@ msgid "Beep"
 msgstr "Belema"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Kompānija"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "satur"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Kopēt uz Mapi"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Saņemšanas datums"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Nosūtīšanas Datums"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Dzēsts"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "nesatur"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "nebeidzas ar"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "neeksistē"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "neskan kā"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "nesākas ar"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Neeksistē"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Melnraksts"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "beidzas ar"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Eksistē"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "eksistē"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Izteiksme"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Svarīgs"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "ir"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "bija pēc"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "bija pirms"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "Karogots"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "ir lielāks par"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "ir mazāks par"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "nav"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Karogots"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "_Lielāks"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Adresātu saraksts"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Ziņojuma Rumpis"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Ziņojuma Iesākums"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Pārvietot uz Mapi"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Spēlēt Skaņu:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Lasīt"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Saņēmēji"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Atbildēts uz"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Rezultāts"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Sūtītajs"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Uzstādīt Statusu"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Izmērs (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "skan kā"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Avota Konts"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Specifisks iesākums"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "sākas ar"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Apturēt Procesēšanu"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Subjekts"
 
@@ -10257,7 +10890,8 @@ msgid "Scanning %s"
 msgstr "Skanējam %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Pasts"
 
@@ -10273,10 +10907,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Eim"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Adrešu grāmata"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10326,7 +10956,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importē jūsu vecos Netscape datus"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Atkritumkaste"
 
@@ -10463,31 +11095,31 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Mape, kura satur pastu"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Virtuālā Atkritumkaste"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Virtuālās Atkritumkastes mape"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Šī mape nevar saturēt ziņojumus."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Rekvizīti..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Izmainīt šīs mapes rekvizītus"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10495,238 +11127,247 @@ msgstr ""
 "Kādi no pasta uzstādījumiem ir nepareizi, lūdzu pārbaudiet vai viss ir "
 "kārtībā."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 #, fuzzy
 msgid "You have not set a mail transport method"
 msgstr "uzstādīt"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Brīdinājums: Mainīta Vēstule"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Jauna Pasta Ziņojums"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Pasta Vēstule"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nevar initializēt Evolution pasta komponenti."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nevar initializēt Evolution pasta konfigurācijas komponentu."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nevar initializēt Evolution mapes informatīvo komponentu."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Savienojamies ar serveri..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Nevar reģistrēt glabātuvi ar čaulu"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr " \"%s\" Rekvizīti"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Rekvizīti"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nevar izveidot pagaidu direktoriju: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d jauni"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d slēpti"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d izvēlēti"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d nenosūtīti"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d nosūtīti"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d kopā"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Izveidot _Virtuālu Mapi No Vēstules"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "VMape ar Subjektu"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "VMape ar Sūtītāju"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "Vmape a_r Saņēmējiem"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "VMape ar Adresātu sarakstu"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filtrs uz Subjektu"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filtrs uz Sūtītāju"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filtrs uz Saņēmējiem"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filtrs uz Adresātu Sarakstu"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "R_ediģēt kā Jaunu Ziņojumu..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_Drukāt"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Atbildēt Sūtītājam"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Atbildēt uz _Sarakstu"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Atbildēt _Visiem"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Pārsūtīt"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Pabeigts"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Tīrs"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "A_tzīmēt kā Lasītu"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Atzīmēt kā _Neizlasītu"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Atzīmēt kā _Svarīgu"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Atzīmēt _kā Nesvarīgu"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Atdzēst"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Pārvietot uz _Mapi..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Kopēt uz Mapi..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "_Lielāks"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Pievienot Sūtītāju Adrešu Grāmatai"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Attiecināt Filtrus"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Izveidot Noteikumu No Vēstules"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VMape Pasta Sarakstei"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrs Pasta Sarakstei (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VMape Pasta Sarakstam (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "Nokl_usētais"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Dabūjam Informāciju par Mapi"
 
@@ -10782,7 +11423,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 #, fuzzy
 msgid "You have not filled in all of the required information."
 msgstr "visi."
@@ -10793,84 +11434,108 @@ msgid "Evolution News Editor"
 msgstr "Evolution Ziņu Redaktors"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution Kontu Redaktors"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Resursdators:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "_Lietotājvārds:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Ceļš:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Radio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 #, fuzzy
 msgid "You may not create two accounts with the same name."
 msgstr "ar."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst šo kontu?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Nedzēst"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Tiešām dzēst kontu?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Izslēgt"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Aktivizēt"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst ziņu kontu?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aktivizēts"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Kont_a vārds:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Riko"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Pasts uz %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Subjekts ir %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Pasts no %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "%s epasta sarakste"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Pievienot Filtra Noteikumus"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 #, fuzzy
 msgid ""
 "You have not configured the mail client.\n"
@@ -10883,7 +11548,7 @@ msgstr ""
 "\n"
 " tagad?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 #, fuzzy
 msgid ""
 "You need to configure an identity\n"
@@ -10892,7 +11557,7 @@ msgstr ""
 "\n"
 " pirms."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 #, fuzzy
 msgid ""
 "You need to configure a mail transport\n"
@@ -10902,18 +11567,18 @@ msgstr ""
 " pirms."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 #, fuzzy
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr "HTML HTML"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Sūtīt jebkurā gadījumā?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10921,18 +11586,18 @@ msgstr ""
 "Šai vēstulei nav virsraksta\n"
 "Patiešām nosūtīt?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 #, fuzzy
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr "saraksts ir saraksts Bcc."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Šī vēstule satur tikai Bcc adresātus."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -10942,16 +11607,16 @@ msgstr ""
 "ir Kam\n"
 " Sūtīt?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Jums jānorāda saņēmēji, lai nosūtītu šo vēstuli."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 #, fuzzy
 msgid "You must configure an account before you can send this email."
 msgstr "pirms."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10959,29 +11624,28 @@ msgstr ""
 "Nevar atvērt melnraksta mapi šim kontam.\n"
 "Vai jūs vēlaties lietot noklusēto melnrakstu mapi?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "nezināms nosūtītājs"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d at %H:%M, %%s rakstīja:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Pārvietot vēstule(s) uz"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopēt vēstule(s) uz"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties rediģēt visas %d vēstules?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties rediģēt visas %d vēstules?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
@@ -10990,7 +11654,7 @@ msgstr ""
 "\n"
 " Melnraksti."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10998,39 +11662,39 @@ msgstr ""
 "Jūs varat pārsūtīt vēlreiz tikai\n"
 "tās vēstules, kas Nosūtīts mapē."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Vai jūs vēlaties pārsūtīt vēlreiz visas %d vēstules?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Nav Izvēlēta Vēstule"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Pārrakstīt failu?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Saglabāt Vēstuli Kā..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Saglabāt Vēstules Kā..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Parādīt nākošo neizlasīto vēstuli"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 #, fuzzy
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
@@ -11042,7 +11706,7 @@ msgstr ""
 "\n"
 "?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11051,33 +11715,69 @@ msgstr ""
 "Kļūda ielādējot filtra informāciju:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Dabūjam vēstuli %d no %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Drukāt Vēstuli"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-Vēstule"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Vēstules drukāšana neizdevās"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties atvērt visas %d vēstules "
-"atsevišķos logos?"
+"Vai jūs esat pārliecināts, ka vēlaties atvērt visas %d vēstules atsevišķos "
+"logos?"
+
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Nav apraksta"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Nenosaukts Kontakts"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Nosūtīts"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Pievienot kritēriju"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Saglabāt parakstu"
 
 #: mail/mail-config-druid.c:146
 msgid ""
@@ -11085,8 +11785,8 @@ msgid ""
 "below do not need to be filled in,\n"
 "unless you wish to include this information in email you send."
 msgstr ""
-"Lūdzu zemāk ievadiet jūsu vārdu un epasta adresi. \"Optionālie\" lauki "
-"var tikt neaizpildīti,\n"
+"Lūdzu zemāk ievadiet jūsu vārdu un epasta adresi. \"Optionālie\" lauki var "
+"tikt neaizpildīti,\n"
 "kāmēr jūs nevēlaties iekļaut šo informāciju epastā ko nosūtāt."
 
 #: mail/mail-config-druid.c:148
@@ -11124,198 +11824,182 @@ msgid ""
 "space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"Jūs gandrīz esat pabeiguši epasta konfigurācijas procesu. ar "
-"ienākošais\n"
+"Jūs gandrīz esat pabeiguši epasta konfigurācijas procesu. ar ienākošais\n"
 " izejošais\n"
 "\n"
 "."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolution Kontu Asistents"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Korka"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Galvenais"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "pēc"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Konts"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Pārbaudam Servisu"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Savienojamies ar serveri..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Nenosaukts Kontakts"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "R_ediģēt"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Jauna"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Pārbaudīt atbalstītos paņēmienus"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL nav vēl atbalstīts šajā evolution kompilējumā)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL nav vēl atbalstīts šajā evolution kompilējumā)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Konts %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Kontu Informācija"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Kontu Pārvaldība"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Atsaukt Operāciju"
+msgid "Add Sc_ript"
+msgstr "Pievienot kritēriju"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "Āfrika/Lagosa"
+msgid "Add new signature..."
+msgstr "Saglabāt parakstu"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Vienmēr parak_stīt izejošās vēstules kad lieto šo kontu"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "Austrija"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Pievienot failu vēstulei"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Pievienojums"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autentifikācija"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Nezināma rakstzīmju kopa: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "Aiz_vērt"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Pārbaudīt Jauno Pastu"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Krāsas šodienas uzdevumiem"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "Uzrakstīt vēstuli"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Konfigurācija"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11331,56 +12015,47 @@ msgstr ""
 "\n"
 "Klikšķināt \"Beigt\" lai saglabātu jūsu uzstādījumus."
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "Bahrēna"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "Nokl_usētais"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Noklusētais"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Noklusētais simbolu kodējums:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Pasta Ienešana"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Digitālie IDs..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Nevar atvērt vēstuli"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Izdarīs"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Melnrakstu mape:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "A_ktivizēt"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11401,40 +12076,35 @@ msgstr "Epasta adrese:"
 msgid "Empty _trash folders on exit"
 msgstr "_Iztukšot atkritumkastes izejot"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Aktivizēt darbības"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "beidzas ar"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Rekvizīti"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Pārsūtītās vēstules"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Dabūt Digitālo ID..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Izcelt citātus ar"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Tuvalu"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11488,71 +12158,66 @@ msgstr "Mikronēzija"
 msgid "NNTP Server:"
 msgstr "NNTP Serveris:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Pasta Konfigurācija"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "Ziņas"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Optionāla Informācija"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Orani_zācija:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _Atslēgas ID:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Izvēlies krāsu"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
-"Norādīt,  kad sūta vēstuleas tikai ar norādītiem _Bcc saņēmējiem"
+msgstr "Norādīt,  kad sūta vēstuleas tikai ar norādītiem _Bcc saņēmējiem"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Drukāt izvēlētos kontaktus"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Nevar atvērt vēstuli"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citēts"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Atc_eries šo paroli"
@@ -11587,117 +12252,120 @@ msgstr "Drošība"
 
 #: mail/mail-config.glade.h:104
 #, fuzzy
-msgid "Same as text"
-msgstr "Somerseta"
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Drošais MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Izvēlieties PGP bināri"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Paraksta fails:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Izdzēst visu, bet ne parakstu"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Sūtam Epastu"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Nosūtīto _ziņu mape:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Nosūtītās ziņas un Ziņu Paraugi"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris pieprasa autentikāciju"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Servera Konfigurācija"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Servera _Tips:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Saīsinājumi"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Saglabāt parakstu"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Saglabāt parakstu"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Avots"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Avota Informācija:"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stila nosaukums:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Standarta Unix mbox"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "_HTML Paraksts:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Mainīgs"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11707,145 +12375,138 @@ msgstr ""
 "\n"
 "Klikšķiniet \"Nākošais\" lai sāktu."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Austrumu"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_HTML Paraksts:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "_Vienmēr ielādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Vienmēr parakstīt izejošās vēstules lietojot šo kontu"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Autentifikācijas Tips:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentifikācijas Tips:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_Automātiski parbaudīt jauno pastu"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_Sertifikāta ID:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Apstiprināt, kad Izdzēš mapi"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "_HTML Paraksts:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Noklusētais"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Faila nosaukums:"
+msgid "_Enable"
+msgstr "Aktivizēt"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Pārsūtīt Kā"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Pilns Vārds:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML pastā"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "_HTML Paraksts:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitāte"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Valoda"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_Ielādēt attēlus, ja sūtītājs ir adrešu grāmatā"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Uzstādīt šo kā manu noklusēto kontu"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Atzīmēt vēstules kā Lasītas pēc"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "Vārds:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Nekad nelādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "_PGP programmas ceļš:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Norādīt, kad sūta HTML vēstules kontaktiem, kuri to nevēlas"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Norādīt, kad sūta vēstules ar tukšu subj_ektu."
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Radio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11886,69 +12547,52 @@ msgstr "_HTML Paraksts:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "_HTML Paraksts:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Lietot dr_ošu savienojumu (SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Mainīgs"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_katru"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr "krāsa"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "apraksts"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "zinulogs1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Nevarēja izveidot PGP paraksta kontekstu."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Nevarēja izveidot PGP pārbaudes kontekstu."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Nevarēja izveidot PGP enkripcijas kontekstu."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Nevarēja izveidot PGP dekripcijas kontekstu."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Nevarēja izveidot S/MIME paraksta kontekstu."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Nevarēja izveidot S/MIME tikaisert kontekstu."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nevarēja izveidot S/MIME enkripcijas kontekstu."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Nevarēja izveidot S/MIME aploksnes kontekstu."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Nevarēja izveidot S/MIME atkodēšanas kontekstu."
 
@@ -11991,127 +12635,164 @@ msgstr "Ārējais Skatītājs"
 msgid "Loading message content"
 msgstr "Ielādējam vēstules saturu"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "N_okavētie uzdevumi:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Kopēt Saiti Pārlūkprogrammā"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Kopēt Saites Lokāciju"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Saglabāt Saiti kā (FIXME)"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Saglabāt attēlu kā..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s pievienojums"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nevar noparsēt MIME vēstuli. Attēlojam kā avotu."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datums"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Nepareiza Adrese"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "No"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Atbildēt-Uz"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kam"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Pastnieks: "
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Saglabāt Vēstuli Kā..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Šī vēstule ir digitāli parakstīta. Klikšķiniet uz slēdzenes ikonu, lai "
+"uzzinātu vairāk."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Nevarēja izveidot PGP pārbaudes kontekstu."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Šī vēstule ir digitāli parakstīta un ir autentiska."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Šī vēstule ir digitāli parakstīta bet nevar tikt pārbaudīta, vai ir "
+"autnetiska."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Norāde uz FTP saiti (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Norāde uz lokālu failu (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Norāde uz nezināmiem ārējiem datiem (\"%s\" tips)"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Lokālās Mapes"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Pārkonfigurēt mapi"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s varētu netikt pārkonfigurēta, jo tā nav vietējā mape"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 #, fuzzy
 msgid ""
 "If you can no longer open this mailbox, then\n"
@@ -12120,11 +12801,11 @@ msgstr ""
 "Ja nē\n"
 "."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Pārkonfigurēt /%s"
@@ -12182,81 +12863,73 @@ msgstr "Kļūda pie %d vēstules no %d"
 msgid "Complete."
 msgstr "Izpildīts."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Saglabājam vēstuli mapē"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Pārvietojam vēstules uz %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopējam vēstules uz %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Pārvietojam"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Kopējam"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanējam mapes \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Pārsūtītās vēstules"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atveram mapi %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "Atveram glabātuvi %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Izņemam mapi %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Glabājam mapi '%s'"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Atjauninām mapi"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Dzēšam mapi"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Saņemam vēstuli %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Saņemam %d vēstule(s)"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Saglabājam %d vēstuli(es)"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12265,7 +12938,7 @@ msgstr ""
 "Nevar izveidot izejas failu: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12274,11 +12947,11 @@ msgstr ""
 "Kļūda glabājot vēstules uz: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Saglabājam pievienojumu"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12287,27 +12960,27 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nevarēja ierakstīt datus: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atvienojamies no %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Pārvienojamies ar %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Meklēt"
 
@@ -12378,10 +13051,6 @@ msgstr "Atjauninām..."
 msgid "Waiting..."
 msgstr "Gaidām..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Atsaukts."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Lietotājs atsauca operāciju."
@@ -12395,16 +13064,16 @@ msgstr "Ievadiet %s Paroli"
 msgid "Enter Password"
 msgstr "Ievadiet Paroli"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Nevarēju noglabāt paraksta failu."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Saglabāt parakstu"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12414,10 +13083,30 @@ msgstr ""
 "\n"
 "Vai saglabāt jūsu izmaiņas?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Nosaukums:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "Paraksta fails:"
+msgid "Signature hint"
+msgstr "Saglabāt parakstu"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "HTML paraksta fails:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12432,17 +13121,17 @@ msgstr "Pārsūtīta vēstule"
 msgid "Forwarded Message"
 msgstr "Pārsūtīta Vēstule"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Uzstādām vmapi: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12451,89 +13140,94 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "VMapes"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "vMapes"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Rediģēt VMapi"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Jauna VMape"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Nav subjekta)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Vēstule"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Neredzēta"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Redzēta"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Atbildēta"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Vairākas Neredzētas Ziņas"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Vairākas Ziņas"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Zemākais"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Zemāk"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Augstāk"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Augstākais"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Šodien %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Vakardiena %I:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Izveidojam vēstuļu sarakstu"
 
@@ -12556,10 +13250,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Oriģinālais Kontakts:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Saņemts"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Izmērs"
 
@@ -17669,5722 +18368,5719 @@ msgstr "Latvija"
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "_Lielāks"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 #, fuzzy
 msgid "La Verne"
 msgstr "Kapoverde"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "Lebanona"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 #, fuzzy
 msgid "Learmouth"
 msgstr "Lesoto"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 #, fuzzy
 msgid "Leesburg"
 msgstr "Luksemburga"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "Men."
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 #, fuzzy
 msgid "Lemmon"
 msgstr "Lebanona"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "Izņemt"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "gadi"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 #, fuzzy
 msgid "Lewisburg"
 msgstr "Luksemburga"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "Lesoto"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 #, fuzzy
 msgid "Lewistown"
 msgstr "Lesoto"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 #, fuzzy
 msgid "Lexington"
 msgstr "Lebanona"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Liberal"
 msgstr "Libērija"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Libya"
 msgstr "Libērija"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "Nigērija"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Lihue"
 msgstr "Niue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "Laosa"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limoges"
 msgstr "Zemākais"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "mēnesis"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Lincoln"
 msgstr "ienākošais"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linca"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 #, fuzzy
 msgid "Lisboa"
 msgstr "Libērija"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "saraksts"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermora"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpūle"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingstona"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "NT Pieteikšanās"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "Komp"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "Londona"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "Lodona/Sitija"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "Londona/Gatvika"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "Londona/Herthrova"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "London/Stansteda"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "Hondura"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 #, fuzzy
 msgid "Long Beach"
 msgstr "Garš"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 #, fuzzy
 msgid "Los Alamos"
 msgstr "Brīdinājumi"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Losandželosa"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 #, fuzzy
 msgid "Lousiana"
 msgstr "Botsvana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "Lebanona"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Lutona"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "Luksemburga"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "Latvija"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "Marts"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macapa"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "Monāko"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "Men."
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "Maķedonija"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "Maldivu salas"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madride (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madride (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "Kanāda"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "Men."
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "Men."
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "Malavī"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "Menedžeris"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "Malaizija"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Mančestera"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhatana"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "Maķedonija"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "Ievietot"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "Galvenā rīkjosla"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "Monāko"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "Pasts"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 #, fuzzy
 msgid "Maraba"
 msgstr "Mauritānija"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "Marts"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "Mauritānija"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "Mauritānija"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "Pasts"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribora"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "Mauritānija"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "Robežas"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 #, fuzzy
 msgid "Marquette"
 msgstr "Martinika"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseļa"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "Maršala Salas"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 #, fuzzy
 msgid "Marshalltown"
 msgstr "Maršala Salas"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "Datums"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Atzīmēt kā _Neizlasītu"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Robežas"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "Martinika"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "Īrija"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "Marts"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "Maķedonija"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "Komoros salas"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mattoon"
 msgstr "Men."
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Menedžeris"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "Majota"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Kazahstāna"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 #, fuzzy
 msgid "Mazu"
 msgstr "Makau"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "Pasts"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "Marts"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McClellan"
 msgstr "Islande"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "Komp"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Makgregora"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "Marts"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "pirms"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 #, fuzzy
 msgid "Mehamn"
 msgstr "Men."
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melnburna"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memfisa"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memfisa-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "Maķedonija"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "Piekdiena"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 #, fuzzy
 msgid "Merril Field"
 msgstr "_No Lauka"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "Meksika"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Majamī"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Tuvie Austrumi"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middleton Island"
 msgstr "Slomona Salas"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "_Vidusvārds:"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "Somija"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "Faila tips:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 #, fuzzy
 msgid "Milford"
 msgstr "priekš"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Miltona"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minatitlan"
 msgstr "Mauritānija"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "ienākošais"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Miniapolisa"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Miniapolisa [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Miniapolisa [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 #, fuzzy
 msgid "Minnesota"
 msgstr "Mikronēzija"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "nav"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Misissipī"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missoula"
 msgstr "Miss"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missūrī"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr ""
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 #, fuzzy
 msgid "Mitilini"
 msgstr "Adresātu saraksts"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "Pr"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "Mobilais Telefons"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 #, fuzzy
 msgid "Mobile Regional Airport"
 msgstr "Mobīlais tel."
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "Mobīlais tel."
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Modesto"
 msgstr "Regulāra migla"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 #, fuzzy
 msgid "Mo I Rana"
 msgstr "Pr I"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "Pārvietot"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "Mobīlais tel."
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Moldova"
 msgstr "Pirmdiena"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 #, fuzzy
 msgid "Molokai"
 msgstr "Malavī"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "Monāko"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "Monāko"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "Pirmdiena"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "Monāko"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "Menedžeris"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montana"
 msgstr "Mēnesis"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "Regulārs sniegs"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Mēneša Skats"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 #, fuzzy
 msgid "Montego Bay"
 msgstr "Mongolija"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "Montserata"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 #, fuzzy
 msgid "Monterrey"
 msgstr "Montserata"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 #, fuzzy
 msgid "Montgomery"
 msgstr "Montserata"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "Monāko"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "Mēneša Skats"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "Montserata"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morelia"
 msgstr "Mongolija"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organizācija"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "Primārais"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "Mobīlais tel."
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "Mēneša Skats"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "Dienvidaustrumu"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Mēneša Skats"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 #, fuzzy
 msgid "Mullan"
 msgstr "Men."
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "Minhene"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 #, fuzzy
 msgid "Muncie"
 msgstr "Jūnijs"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 #, fuzzy
 msgid "Murcia"
 msgstr "Mauritānija"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmanska"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "Ms."
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 #, fuzzy
 msgid "Muscatine"
 msgstr "Martinika"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "pēdas"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 #, fuzzy
 msgid "Najran"
 msgstr "Bahrēna"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "Laosa"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "Brīdinājums"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "Nepāla"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "Ziņas"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napolī"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "Iesauka"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "Katara"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natchez"
 msgstr "Nesakrītoši"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 #, fuzzy
 msgid "Nebraska"
 msgstr "Jauns Uzdevums"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "Grenada"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "Jauns Uzdevums"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bedford"
 msgstr "Ziņas"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "_Jauna Mape"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 #, fuzzy
 msgid "New Braunfels"
 msgstr "Jauns"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 #, fuzzy
 msgid "New Brunswick"
 msgstr "Jauns"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Ņūkāsla"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Jaunzēlande"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Jaunzēlande"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 #, fuzzy
 msgid "New Hampshire"
 msgstr "Jauns"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "Jaunkaledonija"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Iberia"
 msgstr "Jaunkaledonija"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "Jauna Vēstule"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Mexico"
 msgstr "Meksika"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "Jaunzēlande"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 #, fuzzy
 msgid "New Orleans-Lakefront"
 msgstr "Jauns"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 #, fuzzy
 msgid "New Orleans NAS"
 msgstr "Jauns"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "Ziemeļu"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 #, fuzzy
 msgid "New Port Richey"
 msgstr "Jauns Ports"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "_Jauna Mape"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 #, fuzzy
 msgid "New Tokyo International Airport"
 msgstr "Jauns Starptautisks"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "Jauna"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "Ņujorka"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 #, fuzzy
 msgid "New York-JFK Arpt"
 msgstr "Jauns"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 #, fuzzy
 msgid "New York-La Guardia"
 msgstr "Jauns"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagāras Ūdenskritums"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 #, fuzzy
 msgid "Nice-Cote d'Azur"
 msgstr "Jauks"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "Dimensijas:"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "Spānija"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nis"
 msgstr "ir"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 #, fuzzy
 msgid "N Las Vegas"
 msgstr "Z"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 #, fuzzy
 msgid "N Myrtle Beach"
 msgstr "Z"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "Normāls"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "Nosaukums"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "Norfolkas salas"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 #, fuzzy
 msgid "Norfolk NAS"
 msgstr "Norfolkas salas"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norrkoping"
 msgstr "Strādā"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Adams"
 msgstr "Ziemeļaustrumu"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "Ziemeļu"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "Ziemeļkarolīna"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "Norvēģija"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "Ziemeļaustrumu"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "Ziemeļaustrumu"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "Norvēģija"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "Franču Dienvidu Teritorijas"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "Ziemeļu"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "Norvēģija"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "Piezīme"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirska"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "Nav iesākts"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "Taizeme"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Jamaika"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Oceanside"
 msgstr "Islande"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "Viens"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Odesa"
 msgstr "Viens"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "Redzēta"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "Atvērt"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "Citi"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 #, fuzzy
 msgid "Ojika Island"
 msgstr "Kuka Salas"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahomsitija"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "Britu Virdžīnu Salas"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "Citi"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 #, fuzzy
 msgid "Olbia"
 msgstr "Albānija"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 #, fuzzy
 msgid "Omaha"
 msgstr "Omāna"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "Omāna"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omska"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "Orientācija"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oostende"
 msgstr "Apmeklētājs"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oran"
 msgstr "Omāna"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "Francija"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 #, fuzzy
 msgid "Oregon"
 msgstr "Org"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "Īrija"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 #, fuzzy
 msgid "Orlando (Orlando International)"
 msgstr "Starptautisks"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 #, fuzzy
 msgid "Oruro"
 msgstr "Kļūda"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 #, fuzzy
 msgid "Osaka International Airport"
 msgstr "Starptautisks"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr "sekunde"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 #, fuzzy
 msgid "Ostrava"
 msgstr "Austrālija"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Otava"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "nedēļa"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oksforda"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "Lapa"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 #, fuzzy
 msgid "Palacios"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "Papīrs"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 #, fuzzy
 msgid "Palmdale"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "Peidžers"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "Pasta Uzstādījumi"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 #, fuzzy
 msgid "Pamplona"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama City"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Atsaukts"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "Papīrs"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Paphos"
 msgstr "Laosa"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Parīze"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Parīze/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Parīze/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Parīze/Orlī"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasko"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "Spēlēt Skaņu:"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "Spēlēt Skaņu:"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "Jautājums"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "Pārlādēt"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "Izvēle:"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "Armēnija"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "Prim"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburga"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philip"
 msgstr "Filipīnas"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Filipīnas"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 #, fuzzy
 msgid "Phillips"
 msgstr "Filipīnas"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Fēniksa"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "Pirmsapskats"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 #, fuzzy
 msgid "Pine Bluff"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 #, fuzzy
 msgid "Pisa"
 msgstr "ir"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisko"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pitsburga"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 #, fuzzy
 msgid "Plymouth"
 msgstr "mēnesis"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "Drukāt aploksni"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "Drukāt Kopsavilkumu"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Drukāt Vēstuli"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 #, fuzzy
 msgid "Point Piedras Blanca"
 msgstr "Punkts"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "Filtri"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponca City"
 msgstr "Telefonu Saraksts"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponce"
 msgstr "Izdarīs"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "_Kontaktēties"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Drukāt Kalendāru"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 #, fuzzy
 msgid "Port Alsworth"
 msgstr "Ports"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "Drukāt Aploksni"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 #, fuzzy
 msgid "Port-Au-Prince"
 msgstr "Ports"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 #, fuzzy
 msgid "Port Elizabeth"
 msgstr "Ports"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "Pirmsapskats"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Drukāt vizītkarti"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 #, fuzzy
 msgid "Port Heiden"
 msgstr "Ports"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Portland"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "Progress"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "Portrets"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Portrets"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "Portrets"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poza Rica"
 msgstr "Kostarika"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poznan"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Praha"
 msgstr "Paragvaja"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "Daļēji smalks lietus"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Drukāšanas Pirmsapskats"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Pretoria"
 msgstr "Armēnija"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "Pirmsapskats"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Price-Carbon"
 msgstr "Pitkērna"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "Tradicionālā"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Providence"
 msgstr "_Rajons/Štats/Province:"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "Pirmsapskats"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "Prof"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskova"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 #, fuzzy
 msgid "Pucallpa"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Puebla"
 msgstr "Publisks"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Pueblo"
 msgstr "Publisks"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 #, fuzzy
 msgid "Puerto Barrios"
 msgstr "Puerto Riko"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 #, fuzzy
 msgid "Puerto Escondido"
 msgstr "Puerto Riko"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "Puerto Riko"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Puerto Riko"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "Puerto Riko"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "Puerto Riko"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "Drukāt Kopsavilkumu"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pula"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Drukāt Kalendāru"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "Jautājums"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Kvebeka"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Kvebeksitija"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabata"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 #, fuzzy
 msgid "Rapid City"
 msgstr "Atbildēts uz"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Rawlins"
 msgstr "Lietus"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Reading"
 msgstr "Pozīcijas"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Rebun Island"
 msgstr "Bouveta Sala"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Recife"
 msgstr "Saņemts"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redding"
 msgstr "Pozīcijas"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "Lasīt"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redmond"
 msgstr "Atgādinājums"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "Reģioni"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Rennes"
 msgstr "Atgādinājumi"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Reno"
 msgstr "Reinjona"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "Reinjona"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "Noteikumi"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "Atbildēt"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reynosa"
 msgstr "Pārlādēt"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Somija"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Rhode Island"
 msgstr "Faroe Salas"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 #, fuzzy
 msgid "Riberalta"
 msgstr "Gibraltārs"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "Iesauka"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "Haiti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "Loma"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Rīga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rijeka"
 msgstr "Lasīt"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 #, fuzzy
 msgid "Rimini"
 msgstr "Rumānija"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rioja"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "Nikaragva"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "Britu Virdžīnu Salas"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "Libērija"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 #, fuzzy
 msgid "Riverside/March AFB"
 msgstr "Marts"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Libērija"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 #, fuzzy
 msgid "Riyadh"
 msgstr "Lasīt"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Roatan"
 msgstr "Horvātija"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 #, fuzzy
 msgid "Robore"
 msgstr "pirms"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rokčestera"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rokforda"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rodos"
 msgstr "Istaba"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Rogers"
 msgstr "Mapes"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "Rumānija"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "Istaba"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 #, fuzzy
 msgid "Rosario"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Rizenburga"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Roseglen"
 msgstr "Loma"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "Resursdators"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Rozvela"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Roterdama"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Rusella"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Krievija"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 #, fuzzy
 msgid "Rutland"
 msgstr "Butāna"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 #, fuzzy
 msgid "Sacramento"
 msgstr "Pievienojums"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 #, fuzzy
 msgid "Saginaw"
 msgstr "Spānija"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saint Paul"
 msgstr "Sentlūsija"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "Sd"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salem"
 msgstr "Saglabāt"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "Somālija"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "Somālija"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "Somālija"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salmon"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 #, fuzzy
 msgid "Salvador"
 msgstr "Elsalvadora"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Zalcburga"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samos"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "Sv"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 #, fuzzy
 msgid "San Angelo"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "San Carlos"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "Sudāna"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sandberg"
 msgstr "Sūtītajs"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sanderson"
 msgstr "Sūtītajs"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diēgo"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 #, fuzzy
 msgid "Sand Point"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sanford"
 msgstr "priekš"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "Sanfrancisko"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "Ēnojums"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Joaquin"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "Saglabāt"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 #, fuzzy
 msgid "San Jose del Cabo"
 msgstr "del"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Juan"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Sanktpētersburga"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "Somālija"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 #, fuzzy
 msgid "San Miguel"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 #, fuzzy
 msgid "San Nicholas Island"
 msgstr "Norfolkas salas"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 #, fuzzy
 msgid "San Salvador"
 msgstr "Elsalvadora"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 #, fuzzy
 msgid "San Sebastian"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 #, fuzzy
 msgid "Santa Ana"
 msgstr "Sentlūsija"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Krūza"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 #, fuzzy
 msgid "Santa Maria"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santa Monica"
 msgstr "Sentlūsija"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "Sūtītajs"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santarem"
 msgstr "Katara"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 #, fuzzy
 msgid "Santiago"
 msgstr "Sentlūsija"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santorini"
 msgstr "San Marīno"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "Status"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 #, fuzzy
 msgid "Sao Luiz"
 msgstr "Sentlūsija"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarājeva"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 #, fuzzy
 msgid "Sarasota"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "Šri Lanka"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "Sv"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "Status"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "Organizācija"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "Uzstādījumi"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "Somālija"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "Redzēta"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "Sākam importu"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 #, fuzzy
 msgid "Seoul E Ab"
 msgstr "A"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 #, fuzzy
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Starptautisks"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "Meklēšana"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "Ēnojums"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "Meklēšana"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "Sesdiena"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "Sesdiena"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Shearwater"
 msgstr "Sākuma Datums"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "Zviedrija"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "Izvēle:"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Sheridan"
 msgstr "Sudāna"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "Izmērs"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Shoreham"
 msgstr "Rezultāts"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "Parādīt"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 #, fuzzy
 msgid "Sidney"
 msgstr "Izmērs"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silversitija"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindala"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "Nosūtīts"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "Filtri"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Soči"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socorro"
 msgstr "Rezultāts"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Socotra"
 msgstr "Rezultāts"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofija"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndala"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerseta"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Sūtītajs"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "Dienvidu"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "Dienvidkarolīna"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "South Dakota"
 msgstr "Dienvidaustrumu"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "Dienvidu"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "Maršala Salas"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "Sūtītajs"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "saraksts"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "Spānija"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "Vienkāršā"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "State College"
 msgstr "Izpildes Datums:"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "Sākums:"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "Sākums:"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "Stephenville"
 msgstr "Seišelas"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 #, fuzzy
 msgid "St. George"
 msgstr "St. Helena"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 #, fuzzy
 msgid "St Louis"
 msgstr "Sentlūsija"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stoholma (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stoholma (Broma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stoktona"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Šri Lanka"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "Norvēģija"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "Santpaula"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "Santpētersburga"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "Slomona Salas"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "Sesdiena"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Štutgarte"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "Rezultāts"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Luksemburga"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "Kopsavilkums"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutona"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sidneja"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 #, fuzzy
 msgid "Sympheropol"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Tradicionālā"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriza"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuka"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Takoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 #, fuzzy
 msgid "Taejon"
 msgstr "Tad"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taifa"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainana"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Taivāna"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiza"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Lidosta"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talina"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talina"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 #, fuzzy
 msgid "Tampa"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "Papīrs"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "Taivāna"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taosa"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Taivāna"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Taranto"
 msgstr "Taivāna"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "Tests"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Tarija"
 msgstr "Taivāna"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "Tradicionālā"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "Tokelau"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "Telekss"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Teksasa"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 #, fuzzy
 msgid "The Dalles"
 msgstr "Seišelas"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "Amats"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "Ceturdiena"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tianjin"
 msgstr "Taivāna"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Tijuana"
 msgstr "Lietuva"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirāna"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "Laiks"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "Amats"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "Privāts"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokačī GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunošimas Sala"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokušima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokijo Heliosta"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokijo Internacionālā Lidosta"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokijas Jaunā Internacionālā Lidosta"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluka"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torpa"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Toreona"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Totori Lidosta"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Tulūza"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Tovnsvila"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trabzon"
 msgstr "Gabona"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapānī"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Treleva"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trentona"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Treviko"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 #, fuzzy
 msgid "Treviso/S.Angelo"
 msgstr "D"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Triesta"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidada"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripolī"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "Turcija"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "Otradiena"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "Otradiena"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "Tips"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turaif"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "gads"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "Tad"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsana"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "Apvienotie Arābu Erimāti"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unsta"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruapan"
 msgstr "Japāna"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Urugāna"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Jūta"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utika"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vadso"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Mainīgs"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagara"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdeza 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencija"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentīna"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburga"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valeja"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Vana"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vankuvera"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandela"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vastertas"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venēcija"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venēcija"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermiliona"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermonta"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "Galvenais"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Viksburga"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Viktorija"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Viļņa"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virdžīnija"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virdžīnijas Pludmale"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virdžīnijas Tehniskā Lidosta"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "Austrālija"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visbija"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitorija"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkāzs"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostoka"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "Īrija"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograda"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkela"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 #, fuzzy
 msgid "Volk Field"
 msgstr "_No Lauka"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voroneža"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Vako"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 #, fuzzy
 msgid "Wallops Island"
 msgstr "Maršala Salas"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "Brīdinājums"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Varšava"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Vašigtona"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Vašingtona/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "Laikapstākļi"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Vaterlo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "Laikapstākļi"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Vatervilla"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Vakeša"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Vausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Vebstersitija"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "Tr"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Velingtona"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Laikapstākļi"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Vendovera"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "Rietumu Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "West Burke"
 msgstr "Rietumeuropas"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Vesterlande"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Vestfilda"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "Satikšanās"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "Ziemassvētku Sala"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "Iesauka"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 #, fuzzy
 msgid "Wien"
 msgstr "Tr"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Vilingstona"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Vilmingtona"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Vinčestera"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Vinipega"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Vinslova"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr ""
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Viskonsīna"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "ir"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "Honkonga"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "Kājene:"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "visu laiku"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "Polija"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "Strādā"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "Strādā"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Ksiamena"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Jakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Jukašima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Jakutska"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Janktona"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Jekaterinburga"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Joro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Josu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Jukona"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Juma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadara"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreba"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakintos"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesvila"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Cīriha"
 
@@ -23413,17 +24109,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Nav apraksta"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Pasta kopsavilkums"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "VMapes"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Lokālās Mapes"
 
@@ -23432,59 +24123,49 @@ msgstr "Lokālās Mapes"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Dienas Vārds"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Dienas Citāti"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Pievienot"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 #, fuzzy
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "URL"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Nosaukums:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Kļūda lejuplādējot RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 #, fuzzy
 msgid "News Feed"
 msgstr "Ziņas"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
-#, fuzzy
-msgid "Add ->"
-msgstr "_Pievienot"
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "<- Remove"
-msgstr "_Izņemt"
+msgid "Add"
+msgstr "Pievieno_t"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Lietavas"
@@ -23525,11 +24206,43 @@ msgstr "Drukāt Kopsavilkumu"
 msgid "Printing of Summary failed"
 msgstr "Kopsavilkuma Drukāšana neveiksmīga"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "komponents"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "pēdas"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "jūdzes"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometri"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Tīras debesis"
@@ -24682,104 +25395,110 @@ msgid "C_elsius"
 msgstr "C_elsijs"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Visi:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Cik dienas kalendāram vajadzētu parādīt vienlaicīgi?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Parādītais maksimums priekšmetu skaits:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 #, fuzzy
 msgid "News Feed Settings"
 msgstr "Ziņas"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Viens _mēnesis"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "Viena n_edēļa"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 #, fuzzy
 msgid "R_efresh time (seconds):"
 msgstr "sekundes:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "Refresh _time (seconds):"
 msgstr "Atjaunināt sekundes:"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "Parādīt pilnu ceļu mapēm"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Parādīt _visus uzdevumus"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Parādī_t šodienas uzdevumus"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Parādīt temeratūras:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Uzdevumi"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Laikapstākļu uztādījumi"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fārenheits"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Piecas dienas"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Pasts"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "_News Feeds"
 msgstr "Ziņas"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Viena diena"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Saraksts"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Laikapstākļi"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Evolution komponista ražotne."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Speciālas Mapes"
+msgid "Folder Settings"
+msgstr "Pasta Uzstādījumi"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution kommandrinda."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -24790,6 +25509,37 @@ msgstr "Parādīt Detaļas"
 msgid "Cancel Operation"
 msgstr "Atsaukt Operāciju"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Nevar pārsūtīt mapi:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Izvēlēties Mapi"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Melnraksti"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Outbox"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Nosūtīts"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution installācija"
@@ -24805,8 +25555,7 @@ msgstr ""
 #: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
-"Lūdzu spiežiet uz \"Labi\" lai instalētu failus, vai \"Atcelt\" lai "
-"izietu."
+"Lūdzu spiežiet uz \"Labi\" lai instalētu failus, vai \"Atcelt\" lai izietu."
 
 #: shell/e-setup.c:171
 msgid "Could not update files correctly"
@@ -24905,6 +25654,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Piedāvā jums"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Izpildes Datums"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Speciālas Mapes"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Speciālas Mapes"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Speciālas Mapes"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Izpildes Datums"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -24934,20 +25708,20 @@ msgstr ""
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Norādiet mapi uz kurieni kopēt mapi \"%s\":"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Kopēt mapi"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Norādiet mapi uz kuru pārvietot mapi \"%s\":"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Pārvietot mapi"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24956,18 +25730,19 @@ msgstr ""
 "Nevar izdzēst mapi:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Dzēst \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Vai jūs esat pārliecināti ka vēlaties izņemt \"%s\" mapi?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"Nevar izdzēst mapi:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24976,16 +25751,16 @@ msgstr ""
 "Nevar pārsaukt mapi:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pārdēvēt \"%s\" mapi par:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Pārdēvēt mapi"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -25004,7 +25779,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Izveidot jaunu mapi"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -25012,7 +25787,7 @@ msgstr ""
 "Izvēlētās mapes tips neder\n"
 "pieprasītajai operācijai."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Jauns..."
 
@@ -25032,12 +25807,11 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"Izvēlieties failu, ko jūs vēlaties importēt Evolution, un tad "
-"izvēlieties\n"
+"Izvēlieties failu, ko jūs vēlaties importēt Evolution, un tad izvēlieties\n"
 "kāda tipa fails tas ir no saraksta.\n"
 "\n"
-"Jūs varat izvēlēties \"Automātiski\" ja jūs precīzi nezinat un "
-"Evolution mēģinās to noteikt."
+"Jūs varat izvēlēties \"Automātiski\" ja jūs precīzi nezinat un Evolution "
+"mēģinās to noteikt."
 
 #: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
 msgid "Please select the information that you would like to import:"
@@ -25065,21 +25839,26 @@ msgstr ""
 "Improtējam %s\n"
 "Importējām priekšmetu %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Izvēlēties Mapi"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fails %s neeksistē"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Evolution Kļūda "
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Jūs varat tikai importēt uz lokālajām mapēm"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25088,11 +25867,11 @@ msgstr ""
 "Nav importētāja kurš spētu tikt galā ar\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importējam"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25101,17 +25880,17 @@ msgstr ""
 "Importējam %s.\n"
 "Sākam %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Kļūda sāknējot %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Kļūda ielādējot %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25120,31 +25899,31 @@ msgstr ""
 "Importējam %s\n"
 "Importējam priekšmetu 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automātisks"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Faila nosaukums:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Izvēlieties failu"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Faila tips:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Importēt datus un uzstādijumus no vecākām programmām"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Importēt vienu failu"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25152,31 +25931,78 @@ msgstr ""
 "Lūdzu uzgaidiet...\n"
 "Skannējam jau eksistējošajiem uzstādijumiem"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Startējam Inteliģentos Importētājus"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "No %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Izvēlieties mapi"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Izvēlieties gala mērķa direktoriju lai importētu šos datus"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importēt"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Aizvērt savienojumus..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Kļūda kamēr '%s':\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "SInhronizējam mapi"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Atveram mapi %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Atveram mapi %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Atvērt ar %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Nevar izveidot norādīto mapi:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -25190,8 +26016,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Nevarēja startēt Evolution Pastnieka Asistenta interfeisu\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Jauna"
@@ -25212,43 +26038,43 @@ msgstr "Mapes nosaukums nevar saturēt slīpzīmes."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' un '..' ir rezervēti mapju nosaukumi."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy netika atrasts jūsu $PATH"
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nevar tikt palaists"
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Par Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Ej uz mapi..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Izvēlies mapi kuru tu vēlies atvērt"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Izveidot jaunu saīsinājumu"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Izvēlieties mapi uz kuru jūs gribat saīsinājumu:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "_Strādāt Tiešsaistē"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "_Strādāt Nesaistē"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Strādāt Nesaistē"
 
@@ -25280,10 +26106,10 @@ msgstr "Ximian Evolution ir nesaistes režīmā iešanas procesā."
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Ximian Evolution pašreiz ir nesaistes režīmā. Klikšķiniet uz šīs "
-"pogas lai strādātu tiešsaistē."
+"Ximian Evolution pašreiz ir nesaistes režīmā. Klikšķiniet uz šīs pogas lai "
+"strādātu tiešsaistē."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25295,12 +26121,12 @@ msgstr ""
 "Kļūda no aktivizēšanas sistēmas ir:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nevar uzstādīt vietējo glabātuvi -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25311,23 +26137,19 @@ msgstr ""
 "ir pēkšņi aizvēries. Jums vajadzēs Evolution un pārstartēt\n"
 "lai tiktu atkal pie datiem."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Nepareizi argrumenti"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Nevar reģistrēties uz OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Konfigurāciju Datubāze nav atrasta"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Vispārēja kļūda"
 
@@ -25352,95 +26174,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Nepārvietot"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Pārdēvēt Saīsinājumu Grupu"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Pārdēvēt izvēlēto saīsinājumu grupu par:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Mazas Ikonas"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Parādīt saīsinājumus kā mazas ikonas"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "_Lielas Ikonas"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Parādīt saīsinājumus kā lielas ikonas"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Jauna Grupa..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Izveidot jaunu saīsinājumu grupu"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "_Izņemt šo Grupu..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Izņemt šo saīsinājumu grupu"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "_Pārsaukt šo Grupu..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Pārdēvēt saīsinājumu grupu"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "_Paslēpt Saīsinājumu Joslu"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Paslēpt saīsinājumjoslu"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Pārdēvēt saīsinājumu"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Pārdēvēt izvēlēto saīsinājumu par:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Atvērt mapi saistītu ar šo saīsinājumu"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Atvērt _Jaunā Logā"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Atvērt mapi, saistītu ar šo īsinājumu jaunā logā"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Pārsaukt"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Pārdēvēt šo saīsinājumu"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "_Izņemt"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Izņemt šo saīsinājumu no saīsinājumu joslas"
 
@@ -25452,10 +26274,6 @@ msgstr "Kļūda glabājot saīsinājumus."
 msgid "Shortcuts"
 msgstr "Saīsinājumi"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Inbox"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -25519,10 +26337,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% izpildīts)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
 
@@ -25563,67 +26382,67 @@ msgstr ""
 "Kļūda no aktivizēšanas sistēmas ir:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "COBRA kļūda"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Pārtraukts"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Nepareizs arguments"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Jau ir īpašnieks"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Nav īpašnieka"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Nav atrasts"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Neatbalstīts tips"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Neatbalstīta shēma"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Neatbalstīta operācija"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Iekšēja kļūda"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Izejam"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "Nepareizs URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Ir apakšmapes"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Nav brīvas vietas"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "Vecais īpašnieks ir 'miris'"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Faila tips:"
@@ -25635,8 +26454,7 @@ msgstr "Aktīvie savienojumi"
 #: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
 msgstr ""
-"Klikšķiniet Labi lai aizvērtu šos savienojumus un ietu nesaistes "
-"režīmā"
+"Klikšķiniet Labi lai aizvērtu šos savienojumus un ietu nesaistes režīmā"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "Host"
@@ -25754,50 +26572,81 @@ msgstr "Neprasiet man vēlreiz"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution var importēt datus no sekojošiem failiem:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution tagad iziet ..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Neprasiet man vēlreiz"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nevar atvērt Ximian Evolution čaulu."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nevar initializēt Ximian Evolution čaulu: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Deaktivizēt splash ekrānu"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Sākam importu"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Startējam Inteliģentos Importētājus"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
-msgstr ""
-"Sūtīt visu atkļudošanas informāciju no visiem komponentiem uz failu."
+msgstr "Sūtīt visu atkļudošanas informāciju no visiem komponentiem uz failu."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nevar initializēt Bonobo komponentu sistēmu."
 
@@ -25911,11 +26760,11 @@ msgstr "pašreizējais laiks"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Darbības"
 
@@ -26037,8 +26886,8 @@ msgstr "Aizvērt šo priekšmetu"
 msgid "Delete this item"
 msgstr "Dzēst šo priekšmetu"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Galvenā rīkjosla"
 
@@ -26078,7 +26927,7 @@ msgstr "Saglabāt šo priekšmetu uz diska"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Fails"
 
@@ -26143,19 +26992,19 @@ msgstr "Pārsūtīt kā iKalendāru"
 msgid "Forward this item via email"
 msgstr "Pārsūtīt šo priekšmetu caur epastu"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Dabūt pēdīgo informāciju par tikšanos"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "Atjaunināt _Datus Par Tikšanos"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "Plānot _Tikšanos"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Plānot tikšanos šim priekšmetam"
 
@@ -26163,10 +27012,6 @@ msgstr "Plānot tikšanos šim priekšmetam"
 msgid "Customise My Evolution"
 msgstr "Pārveidot Manu Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Atsaukt"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Atcelt pašreizējo pasta operāciju"
@@ -26209,8 +27054,7 @@ msgstr "Parādīt vēstules pirmsapskata logu"
 
 #: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
-"Pierakstīties vai atrakstīties uz/no mapēm uz attālinātajiem serveriem"
+msgstr "Pierakstīties vai atrakstīties uz/no mapēm uz attālinātajiem serveriem"
 
 #: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
@@ -26288,14 +27132,12 @@ msgstr "Izvēlēties _Pavedienu"
 #: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
-"Izvēlēties visas un vienīgi tikai tās vēstules, kuras nav pašlaik "
-"izvēlētas"
+"Izvēlēties visas un vienīgi tikai tās vēstules, kuras nav pašlaik izvēlētas"
 
 #: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
-"Izvēlēties visas vēstules no tā paša pavediena, kur atrodas izvēlētā "
-"vēstule"
+"Izvēlēties visas vēstules no tā paša pavediena, kur atrodas izvēlētā vēstule"
 
 #: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
@@ -26325,7 +27167,7 @@ msgstr "Sasaistīts Vēstuļu saraksts"
 msgid "_Expunge"
 msgstr "_Izdzēst"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Mape"
 
@@ -26740,7 +27582,7 @@ msgstr "Iepriekšējā Vēstule"
 msgid "_Quoted"
 msgstr "Citēts"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Rīki"
 
@@ -26755,12 +27597,12 @@ msgstr "Aizvērt šo logu"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_Aizvērt"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Skatīt"
 
@@ -26947,7 +27789,7 @@ msgstr "_Atvērt"
 msgid "_Reply-To Field"
 msgstr "_tbildēt-_Uz Lauks"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Palīdzība"
 
@@ -27096,111 +27938,120 @@ msgid "Move this folder to another place"
 msgstr "Pārvietot šo mapi uz citurieni"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Izveidot _Jaunu Mapi..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Atvērt Jaunā Logā"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Atvērt šo mapi citā logā"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Sūtīt / Saņemt"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Sūtīt sarindoto pastu un saņemt jaunu pastu"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Parādīt informāciju par Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Nosūtīt Kļūdu Ziņojumu"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "Nosūtīt _Kļūdu Ziņojumu"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Nosūtīt kļūdu ziņojumu izmantojot Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Norādīt"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Norādīt, vai tiek rādīta mapes josla"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Norādīt, vai tiek rādīta saīsinājumu josla"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Norādīt, vai mēs strādājam nesaistes režīmā."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Parādīt izvēlēto mapi"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution VUJ"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_Par Ximian Evolution"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Kopēt"
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_Mapes Josla"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_Iet Uz Mapi..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "I_mportēt..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Pārvietot..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Jauns"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Jauna Mape"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "_Pilot Uzstādījumi..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "Pā_rsaukt..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Sūtīt / Saņemt"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "Ī_sinājumikona"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "Ī_sinājumikonas Josla"
 
@@ -27285,21 +28136,21 @@ msgstr ""
 "laika zonu.\n"
 " Lietojiet labo peles taustiņu lai samazinātu."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Pašreizējais Skats"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "_Pašreizējais Skats"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "_Definēt Skatus"
 
@@ -27421,16 +28272,21 @@ msgstr "Meklēšanas Redaktors"
 msgid "Save Search"
 msgstr "Saglabāt Meklēšanu"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Saglabāt Meklēšanu"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Pievienot Saglabātajiem Meklējumiem"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Paplašināts..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informācija"
@@ -27452,21 +28308,21 @@ msgstr "Vēstule"
 msgid "Don't show this message again."
 msgstr "Nerādīt šo ziņu vēlreiz."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Atrast Tagad"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Tīrs"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Tīrs"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Atrast Tagad"
 
@@ -27492,6 +28348,182 @@ msgstr "init_corba(): nevar initializēt GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nevar initializēt Bonobo"
 
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Adrešu Grāmatas Resursi"
+
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "Nepareiza ierobežotās meklēšanas informācija:\n"
+#~ "%s"
+
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolution kalendāra kopsavilkuma komponente."
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Ražotne Kalendāra Kopsavilkuma komponentei."
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Dienas Sā_kums:"
+
+#~ msgid "_End of day:"
+#~ msgstr "Di_enas beigas:"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "_Cits Organizētajs"
+
+#, fuzzy
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "ir"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Lūdzu ievadiet jūsu %s paroles frāzi %s"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Lūdzu ievadiet jūsu %s paroles frāzi"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Nevar parakstīt šo vēstuli: nav parastā teksta ko parakstīt"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Nevar parakstīt šo vēstuli: nav piedāvata parole"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Nevar parakstīt šo vēstuli: nevarēja izveidot kanālu ar GPG/PGP: %s"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Nevar pārbaudīt šo vēstuli, nav parastā teksta lai pārbaudītu"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Nevar pārbaudīt šo vēstuli: nevarēja izveidot kanālu uz GPG/PGP: %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Nevar kodēt šo vēstuli: nav parastā teksta ko kodēt"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Nevar kodēt šo vēstuli: nav piedāvada parole"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Nevar kodēt šo vēstuli: nevarēja izveidot kanālu ar GPG/PGP: %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "Nevar atkodēt šo vēstuli: nav kodēta teksta ko atkodēt"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Nevar atkodēt šo vēstuli: nav piedāvāta parole"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Nevar atkodēt šo vēstuli: nevarēja izveidot kanālu ar GPG/PGP: %s"
+
+#~ msgid "%s server %s"
+#~ msgstr "%s serveris %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(nezināms resursdators)"
+
+#~ msgid "No such message: %s"
+#~ msgstr "Nav tādas vēstules: %s"
+
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Jūs nevarat kopēt vēstules no šīs atkritumkastes mapes."
+
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Nevar atvērt failu: %s: %s"
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Radio"
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "R_ediģēt"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Jauna"
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Atsaukt Operāciju"
+
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "Āfrika/Lagosa"
+
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "Austrija"
+
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "Bahrēna"
+
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Tuvalu"
+
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "Somerseta"
+
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Paraksta fails:"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Izdzēst visu, bet ne parakstu"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "_HTML Paraksts:"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Faila nosaukums:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "_HTML Paraksts:"
+
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Valoda"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Radio"
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Nevarēja izveidot PGP enkripcijas kontekstu."
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Nevarēja izveidot PGP dekripcijas kontekstu."
+
+#~ msgid "Moving"
+#~ msgstr "Pārvietojam"
+
+#~ msgid "Copying"
+#~ msgstr "Kopējam"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Paraksta fails:"
+
+#~ msgid "Riga"
+#~ msgstr "Rīga"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_Pievienot"
+
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "_Izņemt"
+
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Vai jūs esat pārliecināti ka vēlaties izņemt \"%s\" mapi?"
+
 #~ msgid "Card: "
 #~ msgstr "Karte:"
 
@@ -27765,16 +28797,16 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgstr "Šī informācija netiek prasīta no vairākuma ldap serveru."
 
 #~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
 #~ msgstr ""
 #~ "Šo informāciju izmanto ldap serveris, lai raksturotu kuras nodes tiek "
-#~ "izmantotas meklēšanā. Sazinieties ar servera administrātoru, lai "
-#~ "uzzinātu ko vairāk."
+#~ "izmantotas meklēšanā. Sazinieties ar servera administrātoru, lai uzzinātu "
+#~ "ko vairāk."
 
 #~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
 #~ msgstr ""
 #~ "Šis ir pamatmezgls visiem jūsu meklējumiem uz ldap servera. "
 #~ "Kontaktējaties ar sava servera administrātoru, lai iegūtu vairāk "
@@ -27789,15 +28821,9 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "_My server requires authentication"
 #~ msgstr "_Mans serveris pieprasa autentifikāciju"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Citi Kontakti"
-
 #~ msgid "Name contains"
 #~ msgstr "Vārds satur"
 
-#~ msgid "(none)"
-#~ msgstr "(nekas)"
-
 #~ msgid "C_ontaining:"
 #~ msgstr "Satur_ošs:"
 
@@ -27810,13 +28836,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "_Message Recipients:"
 #~ msgstr "_Vēstules Saturs:"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "Vai jūs tiešām vēlaties\n"
-#~ "dzēst šo kontaktu?"
-
 #~ msgid "British Virgin Islands"
 #~ msgstr "Britu Virdžīnu Salas"
 
@@ -27826,12 +28845,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Moldovas Republika"
 
-#~ msgid "Starting:"
-#~ msgstr "Sākums:"
-
-#~ msgid "Ending:"
-#~ msgstr "Beigas:"
-
 #~ msgid "Create a new appointment"
 #~ msgstr "Ievietot jaunu ierakstu par satikšanos"
 
@@ -27852,265 +28865,21 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "_Other"
 #~ msgstr "_Cita"
 
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Klikšķiniet šeit lai pievienotu apmeklētāju"
-
 #~ msgid "The journal entry has changed. Send an updated version?"
 #~ msgstr "Žurnāla ieraksts ir izmainīts. Nosūtīt atjauninātu versiju?"
 
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "80%"
-
 #~ msgid "_Delete this Task"
 #~ msgstr "_Dzēst šo Uzdevumu"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "Satikšanās sākas: <b>"
-
-#~ msgid "Task begins: <b>"
-#~ msgstr "Uzdevums sākas: <b>"
-
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Brīvs/Aizņemts informācija sākas: <b>"
-
-#~ msgid "Begins: <b>"
-#~ msgstr "Sākas: <b>"
-
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Satikšanās beidzas: <b>"
-
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Brīvs/Aizņemts informācija beidzas: <b>"
-
-#~ msgid "Ends: <b>"
-#~ msgstr "Beidzas: <b>"
-
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Uzdevums Pabeigts: <b>"
-
-#~ msgid "Task Due: <b>"
-#~ msgstr "Uzdevums Līdz: <b>"
-
-#~ msgid "iCalendar Information"
-#~ msgstr "iCalendar informācija"
-
-#~ msgid "iCalendar Error"
-#~ msgstr "iCalendar Kļūda"
-
-#~ msgid "An unknown person"
-#~ msgstr "Nezināma persona"
-
-#~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
-#~ msgstr ""
-#~ "<br> Lūdzu apskatiet sekojošo informāciju un pēc tam izvēlieties "
-#~ "darbību no izvēlnes zemāk."
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Nekas</i>"
-
-#~ msgid "Choose an action:"
-#~ msgstr "Izvēlieties darbību:"
-
-#~ msgid "Update"
-#~ msgstr "Atjaunot"
-
-#~ msgid "Accept"
-#~ msgstr "Apstiprināt"
-
-#~ msgid "Tentatively accept"
-#~ msgstr "Paigaidām akceptēt"
-
-#~ msgid "Decline"
-#~ msgstr "Noliegt"
-
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Nosūtīt Brīvs/Aizņemts Informāciju"
-
-#~ msgid "Update respondent status"
-#~ msgstr "Atjaunināt respondenta statusu"
-
-#~ msgid "Send Latest Information"
-#~ msgstr "Sūtīt Pēdīgo Informāciju"
-
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> ir publicējis informāciju par tikšanos."
-
-#~ msgid "Meeting Information"
-#~ msgstr "Informācija par Satikšanos"
-
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> pieprasa tavu klātbūtni tikšanās."
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "Satikšanās Iemesls"
-
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> vēlas pievienot jau eksistējošai tikšanās."
-
-#~ msgid "Meeting Update"
-#~ msgstr "Atjaunināta Informācija Par Satikšanos"
-
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> vēlas saņemt pēdīgo informāciju par tikšanos."
-
-#~ msgid "Meeting Update Request"
-#~ msgstr "Informācijas Par Satikšanos Atjaunināšanas Pieprasīšana"
-
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> ir atbildējis uz tikšanās pieprasījumu."
-
-#~ msgid "Meeting Reply"
-#~ msgstr "Atbilde Par Satikšanos"
-
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> ir atsaucis tikšanos."
-
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Satikšanās Atcelšana"
-
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Slikta Satikšanās Ziņa"
-
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> ir publicējis informāciju par uzdevumu."
-
-#~ msgid "Task Information"
-#~ msgstr "Uzdevuma Informācija"
-
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> pieprasa jums izpildīt uzdevumu."
-
-#~ msgid "Task Proposal"
-#~ msgstr "Uzdevuma Priešlikums"
-
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> vēlas pievienot jau eksistējošam uzdevumam."
-
-#~ msgid "Task Update"
-#~ msgstr "Uzdevuma Atjaunināšana"
-
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> vēlas saņemt pēdīgo informāciju par uzdevumu."
-
-#~ msgid "Task Update Request"
-#~ msgstr "Uzdevuma Atjaunināšanas Pieprasījums"
-
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> ir atbildējis uz uzdevuma nozīmēšanu."
-
-#~ msgid "Task Reply"
-#~ msgstr "Uzdevuma Atbilde"
-
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> ir atcēlis uzdevumu."
-
-#~ msgid "Task Cancellation"
-#~ msgstr "Uzdevuma Atsaukums"
-
-#~ msgid "Bad Task Message"
-#~ msgstr "Slikts Uzdevuma Ziņojums"
-
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> ir publicējis brīvs/aizņemts informāciju."
-
-#~ msgid "Free/Busy Information"
-#~ msgstr "Brīvs/Aizņemts Informācija"
-
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> pieprasa tavu brīvs/aizņemts informāciju."
-
-#~ msgid "Free/Busy Request"
-#~ msgstr "Brīvs/Aizņemts Pieprasījums"
-
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> ir atbildējis uz brīvs/aizņemts informāciju."
-
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Brīvs/Aizņemts Atbilde"
-
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Slikta Brīvs/Aizņemts Ziņa"
-
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Ziņa satur tikai neatbalstītus pieprasījumus."
-
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "Pievienojums nesatur atļautu kalendāra ziņu"
-
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "Pievienojumam nav skatāmu kalendāra priekšmetu"
-
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "Nevar atrast nevienu no identitātēm apmeklētāju sarakstā!\n"
 
-#~ msgid "Event information"
-#~ msgstr "Notikuma informācija"
-
-#~ msgid "Task information"
-#~ msgstr "Uzdevuma Informācija"
-
-#~ msgid "Journal information"
-#~ msgstr "Žurnāla informācija"
-
-#~ msgid "Free/Busy information"
-#~ msgstr "Brīvs/Aizņemts informācija"
-
-#~ msgid "Calendar information"
-#~ msgstr "Kalendāra informācija"
-
 #~ msgid "Free/Busy information (%s to %s)"
 #~ msgstr "Brīvs/Aizņemts informācija (%s uz %s)"
 
 #~ msgid "iCalendar information"
 #~ msgstr "iCalendar informācija"
 
-#~ msgid "Task"
-#~ msgstr "Uzdevums"
-
-#~ msgid "Status: %s"
-#~ msgstr "Status: %s"
-
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Procenti Izpidildīti: %i"
-
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
-
-#~ msgid "Categories: %s"
-#~ msgstr "Kategorijas: %s"
-
-#~ msgid "Contacts: "
-#~ msgstr "Kontakti:"
-
 #, fuzzy
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "satur"
@@ -28186,9 +28955,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "(Unknown)"
 #~ msgstr "(Nezināms)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Negaidīta atbilde no POP servera: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Nevarēja atrast 'No' ('From') adresi vēstulē"
 
@@ -28202,8 +28968,7 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgstr "DATA atbildes kļūda: %s: pasts nav nosūtīts"
 
 #~ msgid "DATA response error: message termination: %s: mail not sent"
-#~ msgstr ""
-#~ "DATA atbildes kļūda: vēstules pātraukšana: %s: pasts nav nosūtīts"
+#~ msgstr "DATA atbildes kļūda: vēstules pātraukšana: %s: pasts nav nosūtīts"
 
 #~ msgid "QUIT response error: %s: non-fatal"
 #~ msgstr "QUIT atbildes kļūda: %s: ne fatāli"
@@ -28245,54 +29010,27 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "Mailbox Format"
 #~ msgstr "Pastkastītes formāts"
 
-#~ msgid " (default)"
-#~ msgstr "(noklusētais)"
-
-#~ msgid "Mail Settings"
-#~ msgstr "Pasta Uzstādījumi"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Subjekts ir %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Pasts no %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "%s epasta sarakste"
-
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "Šī vēstule satur nepareizus saņēmējus:"
 
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Inbox"
 
-#~ msgid "Account"
-#~ msgstr "Konts"
-
 #~ msgid "Composer"
 #~ msgstr "Komponētājs"
 
 #~ msgid "Default Forward style is: "
 #~ msgstr "Noklusētais pārsūtīšanas stils ir:"
 
-#~ msgid "Drafts"
-#~ msgstr "Melnraksti"
-
 #~ msgid "Edit..."
 #~ msgstr "Rediģēt..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML paraksta fails:"
-
 #~ msgid "News"
 #~ msgstr "Ziņas"
 
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Izvēlieties Filtra loga failu..."
 
-#~ msgid "Sent"
-#~ msgstr "Nosūtīts"
-
 #~ msgid "Sources"
 #~ msgstr "Avoti"
 
@@ -28323,24 +29061,9 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "seconds."
 #~ msgstr "sekundes."
 
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "Šī vēstule ir digitāli parakstīta. Klikšķiniet uz slēdzenes ikonu, "
-#~ "lai uzzinātu vairāk."
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Evolution neatpazīst ar šāda tipa parakstu parakstītu vēstuli."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Šī vēstule ir digitāli parakstīta un ir autentiska."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Šī vēstule ir digitāli parakstīta bet nevar tikt pārbaudīta, vai ir "
-#~ "autnetiska."
-
 #, fuzzy
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "komponents."
@@ -28355,62 +29078,21 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "Regions"
 #~ msgstr "Reģioni"
 
-#~ msgid " F"
-#~ msgstr " F"
-
-#~ msgid " C"
-#~ msgstr " C"
-
-#~ msgid "knots"
-#~ msgstr "pēdas"
-
-#~ msgid "kph"
-#~ msgstr "kph"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "jūdzes"
-
-#~ msgid "kilometers"
-#~ msgstr "kilometri"
-
 #~ msgid "Al_l stations:"
 #~ msgstr "Visas _laika stacijas:"
 
 #~ msgid "All _folders:"
 #~ msgstr "Visas _mapes:"
 
-#, fuzzy
-#~ msgid "All news _feeds:"
-#~ msgstr "Visi:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "_Parādīt mapes:"
 
 #~ msgid "_Display stations:"
 #~ msgstr "_Parādīt stacijas:"
 
-#~ msgid "Outbox"
-#~ msgstr "Outbox"
-
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Autortiesības 1999, 2000, 2001 Ximian, Inc."
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nevar pārsūtīt mapi:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(Nav nosaukuma)"
 
diff --git a/po/nl.po b/po/nl.po
index 422a9d93e7..93077203e8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 1\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-04-01 04:27+02:00\n"
 "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -43,7 +43,7 @@ msgstr "Importeert GnomeCard bestanden in Evolution."
 msgid "File As"
 msgstr "Opslaan Als:"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Naam"
@@ -54,7 +54,7 @@ msgid "Email"
 msgstr "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Eerste"
 
@@ -64,7 +64,7 @@ msgstr "1e"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistent"
@@ -72,8 +72,8 @@ msgstr "Assistent"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Zakelijk"
 
@@ -83,12 +83,12 @@ msgid "Bus"
 msgstr "Bzg"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Terugbel"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Bedrijf"
 
@@ -99,8 +99,8 @@ msgstr "Bedr"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Thuis"
 
@@ -115,18 +115,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Mobiel"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Bedrijfsfax"
@@ -136,13 +136,13 @@ msgid "Bus Fax"
 msgstr "Bedr Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax Thuis"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Bedrijf 2"
 
@@ -151,43 +151,43 @@ msgid "Bus 2"
 msgstr "Bzg 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Thuis 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN Nummer"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Overige"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Andere Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Pieper"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
@@ -199,14 +199,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "Email 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Email 3"
@@ -344,7 +344,7 @@ msgstr "Vkaart voor %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -352,7 +352,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Kon Bonobo niet initialiseren"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Bezig met zoeken..."
 
@@ -365,32 +365,32 @@ msgstr "Bezig met laden..."
 msgid "Error in search expression."
 msgstr "Fout in zoekopdracht."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Kaart wordt toegevoegd aan LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Kaart wordt verwijderd van LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Kaart van LDAP server wordt aangepast..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Zoeken wordt herstart."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "LDAP zoekresultaten komen binnen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Fout bij verwijderen kaart"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "kon URL %s niet verwerken"
@@ -438,104 +438,141 @@ msgstr "Een voorbeeld Bonobo control dat een adresboek weergeeft."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #, fuzzy
-msgid "Addressbook Settings"
-msgstr "Adresboekbronnen"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr "Fabriek voor de Evolution opsteller."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Control dat een Evolution minikaart adresboek weergeeft."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution Adresboek minikaartbekijker"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Een component voor het afhandelen van contacten."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fabriek voor het Adresboek Minikaart control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 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:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Fabriek voor de naam selectie interface van het Adresboek"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr "Fabriek voor de Evolution kalendercomponent."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabriek voor het voorbeeld Adresboekcontrol"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Adresboek"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Map met contactinformatie"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "LDAP server met contactinformatie"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Nieuwe Contactenlijst"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "Contacten _Lijst"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Nieuw Contact"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "C_ontacten...."
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Nieuwe Contactenlijst"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Kan geen verbinding krijgen met LDAP server."
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "Contact _List"
-msgstr "Contacten _Lijst"
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Fout bij het aanmelden bij de IMAP-server.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+#, fuzzy
+msgid "Could not perform query on Root DSE"
+msgstr "kon URL %s niet verwerken"
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Het antwoord van de IMAP-server bevatte geen %s informatie"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Fout bij het laden van filterinformatie:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "Het antwoord van de IMAP-server bevatte geen %s informatie"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL wordt niet ondersteund in deze versie van Evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Kon Gnome-vfs niet initialiseren"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Andere Adresboeken"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Kan het adresboek niet openen"
@@ -570,50 +607,59 @@ msgstr ""
 "Kan het adressenboek niet openen.  Controleer of het pad bestaat\n"
 "en of u het mag benaderen."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Voer uw wachtwoord in voor %s (gebruiker %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "eindigt op"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "Email 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categorie is"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Elk veld bevat"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Uitgebreid..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Elke Categorie"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "De URI die de Mapbladeraar zal laten zien"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(geen)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Primaire Email"
 
@@ -659,107 +705,59 @@ msgstr "Zet queries uit"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Queries toestaan (Gevaarlijk!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Kan geen verbinding krijgen met LDAP server."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Fout bij het aanmelden bij de IMAP-server.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-#, fuzzy
-msgid "Could not perform query on Root DSE"
-msgstr "kon URL %s niet verwerken"
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Ongeldige opaque trace-informatie:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "Het antwoord van de IMAP-server bevatte geen %s informatie"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL wordt niet ondersteund in deze versie van Evolution)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Voltooiingsdatum"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "_Controleer op ondersteunde types"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Opties"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "Verwijderen"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Verwijderen"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Opties"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -768,8 +766,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Adresboekbronnen"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Albany"
@@ -865,8 +863,8 @@ msgstr "Configuratie"
 msgid "Mappings"
 msgstr "Marges"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_elke"
@@ -1049,15 +1047,15 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 "Dit is het maximum aantal kaarten wat zal worden binnengehaald. Als u het te "
@@ -1085,8 +1083,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1119,7 +1117,7 @@ msgid "Using email address"
 msgstr "Emailadres"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1127,7 +1125,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Toevoegen"
 
@@ -1176,7 +1174,7 @@ msgid "_Download limit:"
 msgstr "_Downloadlimiet"
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1294,10 +1292,12 @@ msgstr "De adresboeknaam-selectie-interface van Evolution."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factory voor de naamselectie-interface van het Adresboek"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -1428,7 +1428,7 @@ msgstr "Samenwerking"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Contacten Bewerken"
 
@@ -1437,7 +1437,7 @@ msgid "D_epartment:"
 msgstr "Afd_eling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Details"
 
@@ -1496,11 +1496,12 @@ msgstr "Bij voorkeur _HTML-berichten"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Verwijderen"
 
@@ -1529,7 +1530,7 @@ msgid "_Web page address:"
 msgstr "Homepage:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Verenigde Staten"
 
@@ -2034,12 +2035,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Letland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libanon"
 
@@ -2048,7 +2048,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
@@ -2057,12 +2057,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litouwen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
@@ -2095,7 +2095,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2120,7 +2120,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexico"
 
@@ -2145,7 +2145,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marokko"
 
@@ -2170,7 +2170,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Nederland"
 
@@ -2183,12 +2183,12 @@ msgid "New Caledonia"
 msgstr "Nieuw Caledoni�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nieuw Zeeland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2205,7 +2205,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolk Eiland"
 
@@ -2214,17 +2214,17 @@ msgid "Northern Mariana Islands"
 msgstr "Noordelijke Mariana Eilanden"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Noorwegen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2237,7 +2237,7 @@ msgid "Palestinian Territory"
 msgstr "Palesteins Territorium"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2246,12 +2246,12 @@ msgid "Papua New Guinea"
 msgstr "Papoea Nieuw Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2264,22 +2264,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
@@ -2288,7 +2288,7 @@ msgid "Reunion"
 msgstr "Reunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Roemeni�"
 
@@ -2325,7 +2325,7 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome en Principe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saoedi-Arabi�"
 
@@ -2342,17 +2342,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapore"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slowakije"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Sloveni�"
 
@@ -2365,7 +2365,7 @@ msgid "Somalia"
 msgstr "Somali�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Zuid-Afrika"
 
@@ -2374,7 +2374,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Zuid Georgi� en de Zuidelijke Sandwich Eilanden"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Spanje"
 
@@ -2395,7 +2395,7 @@ msgid "Sudan"
 msgstr "Soedan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Suriname"
 
@@ -2408,17 +2408,17 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Zweden"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Zwitserland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
@@ -2455,7 +2455,7 @@ msgid "Tunisia"
 msgstr "Tunesi�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turkije"
 
@@ -2476,7 +2476,7 @@ msgid "Uganda"
 msgstr "Oeganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Oekra�ne"
 
@@ -2485,7 +2485,7 @@ msgid "United Arab Emirates"
 msgstr "Verenigde Arabische Emiraten"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Verenigd Koninkrijk"
 
@@ -2494,7 +2494,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "Amerikaanse Kleine Eilanden"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2507,12 +2507,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vi�tnam"
 
@@ -2533,12 +2533,12 @@ msgid "Western Sahara"
 msgstr "Westelijke Sahara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Joegoslavi�"
 
@@ -2551,26 +2551,34 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Weet u zeker dat u dit\n"
+"contact wilt verwijderen?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Contact verwijderen?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Categoriebewerker niet beschikbaar."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Dit contact behoort tot deze categori�en:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Contact opslaan als VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kon geen widget vinden voor een veld: `%s'"
@@ -2597,11 +2605,11 @@ msgstr "Email"
 msgid "card.vcf"
 msgstr "kaart.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "lijst"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2736,11 +2744,11 @@ msgid "contact-list-editor"
 msgstr "Contactlijstbewerker"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Contactenlijst bewerken"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Lijst opslaan als VCard"
 
@@ -2817,21 +2825,21 @@ msgid "Error getting book view"
 msgstr "Fout bij weergave boekvorm"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Fout bij aanpassen van kaart"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Succes"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -2840,7 +2848,7 @@ msgid "Repository offline"
 msgstr "Opslagplaats offline"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Operatie niet toegestaan"
 
@@ -2858,76 +2866,91 @@ msgstr "Protocol niet ondersteund"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Aanmelding mislukt"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Aanmelding is vereist"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Onbekende fout"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Wilt u de wijzingen opslaan?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Fout bij toevoegen lijst"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Fout bij toevoegen kaart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Fout bij aanpassen ljist"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Fout bij verwijderen lijst"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Fout bij verwijderen kaart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 msgid "Display Cards?"
 msgstr "Kaarten weergeven?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards"
 msgstr "Kaarten weergeven"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
 "be\n"
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
-"U heeft aangegeven dat %d kaarten worden weergegeven als kaarten. Er zullen "
-"%d\n"
+"U heeft aangegeven dat %d kaarten worden weergegeven als kaarten. Er zullen %"
+"d\n"
 "nieuwe vensters worden geopend. Wilt u deze werkelijk allemaal openen?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 msgid "Move card to"
 msgstr "Verplaats kaart naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Copy card to"
 msgstr "Kopieer kaart naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 msgid "Move cards to"
 msgstr "Verplaats kaarten naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 msgid "Copy cards to"
 msgstr "Kopieer kaarten naar"
 
@@ -2991,100 +3014,106 @@ msgstr "Andere Telefoon"
 msgid "Other Address"
 msgstr "Ander Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Adresboek"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Opslaan als VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Nieuw Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nieuwe Contactenlijst"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Ga naar Map..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Importeer..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Zoek naar Contacten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Adresboekbronnen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot Instellingen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Stuur Contact Door"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Stuur Bericht aan Contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Afdrukken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Envelop Afdrukken..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Copy to folder..."
 msgstr "Kopi�ren naar Map..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Move to folder..."
 msgstr "Verplaatsen naar Map..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Knippen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopi�ren"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Plakken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3094,7 +3123,7 @@ msgstr "_Huidige Weergave"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3102,7 +3131,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3250,7 +3279,7 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Aantal kolommen:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opties"
 
@@ -3260,7 +3289,7 @@ msgid "Orientation"
 msgstr "Ori�ntatie"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Pagina"
 
@@ -3334,29 +3363,33 @@ msgstr "Breedte:"
 msgid "_Font..."
 msgstr "_Lettertype..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Afspraak zonder titel"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Hoog"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normaal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Laag"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Ongedefinieerd"
 
@@ -3398,43 +3431,35 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Fabriek voor de Evolution opsteller."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution kalender-samenvatting-component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution kalender iTip/iMip bekijker"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution component voor het afhandelen van de kalender."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Fabriek voor het Kalender Samenvattings component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Fabriek voor de Evolution takencomponent"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Fabriek voor het kalender iTip bekijk control"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Fabriek voor het voorbeeld Kalender control"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 "Fabriek voor het centraliseren van kalendercomponent bewerkingsdialoogvenster"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Fabriek om een componentbewerkingsfabriek te cre�ren."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3446,10 +3471,23 @@ msgstr "Alarmnotificatie-dienst"
 msgid "Factory for the alarm notification service"
 msgstr "Fabriek voor de alarmmeldings-dienst"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "Bezig met starten:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "Einde:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "ongeldige tijd"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution "
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3489,7 +3527,7 @@ msgstr ""
 "normaal dialoogvenster weergeven als herinnering."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -3515,15 +3553,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Dit bericht niet meer weergeven voor dit programma."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Kon GNOME niet initialiseren"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "Cre�eren van de alarmnotificatie-dienst is mislukt:"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "Cre�eren van de alarmnotificatie-dienst is mislukt:"
 
@@ -3539,7 +3577,7 @@ msgstr "Omschrijving bevat"
 msgid "Comment contains"
 msgstr "Commentaar bevat"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Niet passend"
 
@@ -3578,14 +3616,16 @@ msgid ""
 msgstr "Kalenderweergave mislukt.  Controleer uw ORBit en OAF instellingen."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Priv�"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Vertrouwelijk"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Openbaar"
 
@@ -3606,27 +3646,32 @@ msgid "W"
 msgstr "W"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Vrij"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Bezig"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Niet Gestart"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "In Uitvoer"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -3641,11 +3686,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3660,12 +3706,14 @@ msgstr "Herhalend"
 msgid "Assigned"
 msgstr "Toegewezen"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Nee"
 
@@ -3685,58 +3733,60 @@ msgstr "Week Weergave"
 msgid "Month View"
 msgstr "Maand Weergave"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Folder met afspraken en gebeurtenissen"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Taken"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Map met to-do items"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "New meeting"
 msgstr "Nieuwe vergadering"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "_Meeting"
 msgstr "_Vergadering"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "New task"
 msgstr "Nieuwe Taak"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Taak"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Afspraak"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "New appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "_Appointment"
 msgstr "_Afspraak"
 
@@ -3947,7 +3997,7 @@ msgstr "Herinneringen"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samenvatting:"
 
@@ -3976,7 +4026,7 @@ msgstr "einde van afspraak"
 msgid "hour(s)"
 msgstr "u(u)r(en)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minuten"
 
@@ -4004,79 +4054,81 @@ msgstr "30 minuten"
 msgid "60 minutes"
 msgstr "60 minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Kalender- en Taakinstellingen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Kleur voor taken die te laat zijn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Kleur voor taken voor vandaag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Dagen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Uren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Maandag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "Z_on"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Toon weeknummers in datum navigator"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "_Begin van dag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "Z_on"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Zondag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Taken die vandaag verlopen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "D_on"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "_Din"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4105,81 +4157,96 @@ msgid "Tuesday"
 msgstr "Dinsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Werkweek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12-uurs (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24-uurs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "Vraag om bevestiging bij het wissen van items"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "Weekeinden comprimeren in maand weergave"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Taak begint: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Weergave"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "_Eind van dag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_Vrij"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Algemeen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "Verberg voltooide _taken na"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Maa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Verlopen taken:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_Zat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Toon afspraak-_eindtijden in week en maand weergave"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Tijd onder_verdeling:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_Din"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_Woe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "voor het begin van de afspraak"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4267,40 +4334,61 @@ msgstr " (Verloopt "
 msgid "Due "
 msgstr "Verloopdatum "
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Kon object niet vernieuwen!"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
 msgstr "Kon object niet vernieuwen!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Afspraak Bewerken"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Afspraak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Taak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagboekelement - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Geen samenvatting"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Ophalen huidige versie mislukt!"
 
@@ -4358,27 +4446,27 @@ msgstr "Overdragen Aan:"
 msgid "Enter Delegate"
 msgstr "Voer Gemachtigde in"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Herinnering"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Herhaling"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Bijeenkomst Plannen"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Vergadering"
 
@@ -4425,7 +4513,7 @@ msgid "Pu_blic"
 msgstr "Open_baar"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Toon Tijd Als"
 
@@ -4447,19 +4535,19 @@ msgstr "_Eindtijd:"
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Er moet een organisator ingesteld worden."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Er is minstens ��n aanwezige nodig."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Die persoon bezoekt de bijeenkomst reeds!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Overdragen Aan..."
 
@@ -4470,49 +4558,55 @@ msgstr "Aanwezige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Algemene naam"
+msgid "Click here to add an attendee"
+msgstr "Klik hier om een lid toe te voegen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Overgedragen Van"
+msgid "Common Name"
+msgstr "Algemene naam"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Overgedragen Aan"
+msgid "Delegated From"
+msgstr "Overgedragen Van"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Taal"
+msgid "Delegated To"
+msgstr "Overgedragen Aan"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Lid"
+msgid "Language"
+msgstr "Taal"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Lid"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rol"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
@@ -4527,14 +4621,10 @@ msgid "_Change Organizer"
 msgstr "Verander Organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "Nod_ig Anderen Uit..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "Andere Organisator"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4721,7 +4811,7 @@ msgid "Progress"
 msgstr "Voortgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4733,19 +4823,19 @@ msgstr "_Prioriteit:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Basis"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Opdracht"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Omschrijving:"
 
@@ -4757,23 +4847,78 @@ msgstr "Be_gindatum:"
 msgid "_Due Date:"
 msgstr "_Verloopdatum:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Geselecteerde objecten verwijderen"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Openen"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Opslaan als..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4781,20 +4926,20 @@ msgstr "Opslaan als..."
 msgid "_Print..."
 msgstr "_Afdrukken..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "K_nippen"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopi�ren"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4802,35 +4947,36 @@ msgstr "_Kopi�ren"
 msgid "_Paste"
 msgstr "_Plakken"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Taak Toewijzen"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Doorsturen als i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "Markeren als Voltooid"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markeer de Taken als Voltooid"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_Verwijder de Geselecteerde Taken"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Objecten worden ververst"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klik hier om een taak toe te voegen"
 
@@ -4838,47 +4984,48 @@ msgstr "Klik hier om een taak toe te voegen"
 msgid "Alarms"
 msgstr "Alarmen"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Voltooid"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Voltooiingsdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Verloop Datum"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Einddatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Geografische Positie"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Begindatum"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Taken Sorteren"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4926,11 +5073,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -4971,7 +5120,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Publiceer Beschikbaarheidsinformatie"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Configureer %s"
@@ -4982,7 +5131,7 @@ msgid "_Configure Pilot..."
 msgstr "Configureer %s"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "_Opslaan Als..."
 
@@ -5009,74 +5158,390 @@ msgid "Delete _All Occurrences"
 msgstr "Verwijder alle Gebeurtenissen"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Het gereedschap voor GNOME Pilot lijkt niet ge�nstalleerd te zijn."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Fout bij uitvoeren filter %s."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "Vergadering begint: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "Taak begint: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "Vrij/Bezet informatie begint <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Begint: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "Einde bijeenkomst: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "Vrij/Bezet informatie eindigt: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "Eindigt: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr " (Taak Voltooid: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "Taak klaar: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "iCalendar Informatie"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "iCalendar Fout"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "Een onbekende persoon"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Bekijk de volgende informatie en kies daarna een actie uit het menu "
+"hieronder."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Geen</i>"
+
+#: calendar/gui/e-itip-control.c:903
+msgid "Status:"
+msgstr "Status:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Geaccepteerd"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+msgid "Tentatively Accepted"
+msgstr "Voorlopig Geaccepteerd"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Geweigerd"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "Calenderbestand kon niet bijgewerkt worden!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "Kies een actie:"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Verversen"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "Accepteren"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "Voorlopig accepteren"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "Weigeren"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "Verstuur Vrij/Bezet Informatie"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "Ververs antwoordstatus"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "Verstuur Laatste Informatie"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> heeft bijeenkomstgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Bijeenkomst Informatie"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> verzoekt u bij de bijeenkomst aanwezig te zijn."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "Vergadering Voorstel"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> wil graag aan een bestaande bijeenkomst bijdragen."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "Vergadering Update"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> wil graag  de laatste bijeenkomstgegevens ontvangen."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "VergaderingsUpdate Verzoek"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s<b> heeft geantwoord op een bijeenkomstverzoek."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "Bijeenkomst Antwoord"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> heeft een bijeenkomst geannuleerd."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "Bijeenkomst Annulering"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> heeft een onleesbaar bericht gestuurd."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Fout Bijeenkomstbericht"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> heeft taakgegevens beschikbaar gemaakt."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Taak Informatie"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> verzoekt u een taak uit te voeren."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Taak Voorstel"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> wil graag iets toevoegen aan een bestaande taak."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Taak Update"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> wil graag de laatste taakgegevens ontvangen."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Taak Update Verzoek"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> heeft een taakopdracht beantwoord."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Taak Antwoord"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> heeft een taak geannuleerd."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Taak Annulering"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Fout Taakbericht"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s<b> heeft vrij/bezet informatie gepubliceerd."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Vrij/Bezet Informatie"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> vraagt om uw beschikbaarheidsinformatie."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Vrij/Bezet Verzoek"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> heeft een verzoek om beschikbaarheidsinformatie beantwoord."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Vrij/Bezet Antwoord"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Foutief Vrij/Bezet Bericht"
+
+#: calendar/gui/e-itip-control.c:1354
+msgid "The message does not appear to be properly formed"
+msgstr "Het bericht lijkt niet goed opgemaakt te zijn"
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "Het bericht bevat slechts niet ondersteunde aanvragen."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "De bijlage bevat geen geldig kalenderbericht"
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "De bijlage heeft geen bekijkbaar kalenderobject"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#, fuzzy
+msgid "There was an error on the CORBA system\n"
+msgstr "Er trad een fout op bij het downloaden van gegevens voor"
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Dit item kon niet verzonden worden!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Update Voltooid\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Calenderbestand kon niet bijgewerkt worden!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Bezoekerstatus kan niet ververst worden omdat het object niet meer bestaat"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Bezoekerstatus kon niet ververst worden vanwege een ongeldige status!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "Aanwezigheidstatus kon niet worden bijgewerkt!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Bezoekerstatus ververst\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "Aanwezigheidstatus kon niet worden bijgewerkt!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Verwijderen Voltooid"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Item Verzonden!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "Dit item kon niet verzonden worden!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Selecteer Map"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Selecteer Map"
@@ -5118,93 +5583,92 @@ msgstr "einddatum"
 msgid "date-start"
 msgstr "begindatum"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Voorzitters"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Vereiste Deelnemers"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Optionele Deelnemers"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Niet-Deelnemers"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Persoon"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Groep"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Hulpbron"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Kamer"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Voorzitter"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Vereiste Deelnemer"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Optionele Deelnemer"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Niet-Deelnemer"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Heeft Actie Nodig"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Geaccepteerd"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Geweigerd"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Voorlopig"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Overgedragen"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "In Uitvoer"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d-%m-%Y"
@@ -5216,63 +5680,63 @@ msgstr "%a %d-%m-%Y"
 msgid "%m/%d/%Y"
 msgstr "%d-%m-%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Afwezig"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Geen informatie"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Opties"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "T_oon alleen kantooruren"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Toon Uitge_zoomd"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Actualiseer Vrij/Bezet"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Automatisch uitzoeken"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Alle Mensen en Hulpbronnen"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Alle _mensen en ��n Hulpbron"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "_Vereiste Mensen"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Vereiste mensen en ��n Hulpbr_on"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Aanvang _bijeenkomst:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "_Einde bijeenkomst:"
 
@@ -5291,17 +5755,22 @@ msgstr "Kon de taken in `%s' niet laden"
 msgid "The method required to load `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te laden wordt niet ondersteund"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Kon de map in `%s' niet openen"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Voltooiingsdatum"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Geselecteerde objecten verwijderen"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 msgid "Expunging"
 msgstr "Bezig met Schrappen"
 
@@ -5313,17 +5782,17 @@ msgstr "Nieuwe _Afspraak..."
 msgid "_Delete this Appointment"
 msgstr "_Verwijder deze Afspraak"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, 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/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Bezig met openen kalender op %s"
@@ -5384,19 +5853,53 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Er is minstens ��n bezoeker nodig"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Er moet een organisator ingesteld worden."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr "Gebeurtenis informatie"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "Taak informatie"
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr "Journaal informatie"
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr "Vrij/Bezet informatie"
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr "Kalenderinformatie"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Verversen"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Lijst Verversen"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "U moet een bezoeker zijn van het evenement."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "Cre�eren van de component editor factory is mislukt"
 
@@ -5585,12 +6088,45 @@ msgstr "Geselecteerde maand (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Geselecteerde jaar (%Y)"
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "Taak"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Status: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioriteit:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Procent Voltooid: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Categorie�n: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Contacten: "
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Kalender afdrukken"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5626,8 +6162,8 @@ msgstr ""
 "\n"
 "De taken echt verwijderen?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Dit bericht niet meer weergeven."
 
@@ -5690,6 +6226,11 @@ msgstr "Importeert iCalendat bestanden in Evolution"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importeert vCalendar bestanden in Evolution"
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Herinnering"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5783,11 +6324,11 @@ msgstr "contains? verwacht dat argument 2 een string is"
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
-"contains? verwacht dat argument 1 een kleuze is uit "
-"\"any\",\"summary\",\"description\""
+"contains? verwacht dat argument 1 een kleuze is uit \"any\",\"summary\","
+"\"description\""
 
 #: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
@@ -6715,638 +7256,654 @@ msgid "Asia/Macao"
 msgstr "Azi�/Macao"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Azi�/Macao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Azi�/Magadan"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Azi�/Magadan"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Azi�/Manilla"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Azi�/Muscaat"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Azi�/Nicosia"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Azi�/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Azi�/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Azi�/Kabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Azi�/Phnom_Penh"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Azi�/Pontianak"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Azi�/Pyongyang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Azi�/Qatar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Azi�/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Azi�/Rangoon"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Azi�/Riyadh"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Azi�/Saigon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Azi�/Sakhalin"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Azi�/Samarkand"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Azi�/Seoul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Azi�/Shanghai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Azi�/Singapore"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Azi�/Taipei"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Azi�/Tashkent"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Azi�/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Azi�/Teheran"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Azi�/Thimphu"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Azi�/Tokyo"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Azi�/Ujung_Pandang"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Azi�/Ulaanbaatar"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Azi�/Urumqi"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Azi�/Vientiane"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Azi�/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Azi�/Yakutsk"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Azi�/Yekaterinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Azi�/Yerevan"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantisch/Azoren"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantisch/Bermuda"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlantisch/Canary"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantisch/Kaapverdische_Eilanden"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlantisch/Faroe"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantisch/Jan_Mayen"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlantisch/Madeira"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantisch/Reykjavik"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantisch/South_Georgia"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlantisch/St_Helena"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlantisch/Stanley"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australi�/Adelaide"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australi�/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australi�/Broken_Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australi�/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australi�/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australi�/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australi�/Lord_Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australi�/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australi�/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australi�/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europa/Athene"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrado"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europa/Berlijn"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europa/Brussel"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europa/Boekarest"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europa/Boedapest"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europa/Kopenhagen"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanboel"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europa/Ki�v"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europa/Lissabon"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europa/Londen"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburg"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europa/Moskou"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europa/Parijs"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europa/Praag"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europa/Rome"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europa/Stokholm"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europa/Tirane"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europa/Vaticaan"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europa/Wenen"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europa/Warschau"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europa/Z�rich"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Indisch/Antananarivo"
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Indisch/Chagos"
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Indisch/Christmas"
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Indisch/Cocos"
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indisch/Komoren"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Indisch/Kerguelen"
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indisch/Mahe"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indisch/Malediven"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indisch/Mauritius"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indisch/Mayotte"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indisch/Reunion"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Pacific/Apia"
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Pacific/Auckland"
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Pacific/Chatham"
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Pacific/Paaseiland"
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Pacific/Efate"
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Pacific/Enderbury"
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Pacific/Fakaofo"
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Pacific/Fiji"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Pacific/Funafuti"
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Pacific/Galapagos"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Pacific/Gambier"
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Pacific/Guadalkanaal"
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Pacific/Guam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Pacific/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Pacific/Johnston"
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Pacific/Kiritimati"
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Pacific/Kosrae"
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Pacific/Kwajalein"
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Pacific/Majuro"
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Pacific/Marquesas"
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Pacific/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Pacific/Nauru"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Pacific/Niue"
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Pacific/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Pacific/Noumea"
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Pacific/Pago_Pago"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Pacific/Palau"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Pacific/Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Pacific/Ponape"
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Pacific/Port_Moresby"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Pacific/Rarotonga"
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Pacific/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Pacific/Tahiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Pacific/Tarawa"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Pacific/Tongatapu"
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Pacific/Truk"
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Pacific/Wake"
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Pacific/Wallis"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Ondertekening wordt niet ondersteund door deze sleutel"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Clearsinging is niet ondersteund door deze sleutel"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Het gespecificeerde type word niet ondersteund door deze sleutel"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Het gespecificeerde type word niet ondersteund door deze steutel"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Het gespecificeerde type word niet ondersteund door deze sleutel"
 
@@ -7354,12 +7911,12 @@ msgstr "Het gespecificeerde type word niet ondersteund door deze sleutel"
 msgid "Unable to create cache path"
 msgstr "Kon cache pad niet cre�ren"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kon cache item: %s niet verwijderen: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7370,7 +7927,7 @@ msgstr ""
 "\"Verdere operaties op deze server zullen niet doorgevoerd worden als u\n"
 "\"herverbindt met het netwerk."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7381,11 +7938,16 @@ msgstr ""
 "%s\\n\n"
 "Veranderingen in deze map zullen niet worden gesynchroniseerd."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Aan het synchroniseren met de server"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Bezig met opslaan map '%s'"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "U moet online werken om deze bewerking te voltooien"
 
@@ -7393,56 +7955,67 @@ msgstr "U moet online werken om deze bewerking te voltooien"
 msgid "Syncing folders"
 msgstr "Bezig met synchroniseren map"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fout bij interpreten bestand: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fout bij uitvoeren filter: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Kan de spoolmap niet openen"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Kan de spoolmap niet verwerken"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ophalen bericht %d(%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Kan bericht niet opnemen"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Faalde bij bericht %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Bezig met synchroniseren map"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Bezig met ophalen bericht %d van %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Faalde bij bericht %d van %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 msgid "Failed to retrieve message"
 msgstr "Ophalen bericht mislukt"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Faalde bij cachen bericht %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Faalde bij cachen bericht %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fout bij uitvoeren filterzoekactie: %s: %s"
@@ -7474,25 +8047,102 @@ msgstr "(past-allen) vereist enkelvoudig booleaans resultaat"
 msgid "Performing query on unknown header: %s"
 msgstr "Bezig met uitvoeren van zoekopdracht op onbekende kop: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Opdracht wordt niet ondersteund: bericht achteraan toevoegen: voor %s"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Opdracht wordt niet ondersteund: zoeken op expressie: voor %s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Opdracht wordt niet ondersteund: zoeken op uids: voor %s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Verplaatsen van berichten"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Bezig met het kopi�ren van berichten naar %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Geannuleerd."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Onverwacht antwoord van IMAP-server: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Geen bestandsnaam opgegeven."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Kan dit bericht niet versleutelen: er zijn geen ontvangers opgegeven"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Faalde bij cachen bericht %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Faalde bij cachen bericht %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Decoderen van bericht mislukt."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Kan dit bestand niet verifi�ren: kon geen tijdelijk bestand maken: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7590,83 +8240,24 @@ msgstr "Fout bij opslaan van tijdelijk postbusbestand: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Fout bij opslaan van tijdelijk postbusbestand: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Voer uw %s passphrase voor %s in"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Voer uw %s passphrase in."
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Kan dit bericht niet ondertekenen: geen gewone tekst om te ondertekenen"
 
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "Kan dit berichten niet ondertekenen: geen wachtwoord gegeven"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Kan dit bericht niet ondertekenen: kon geen pijp naar GPG/PGP maken: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Kan dit bericht niet ondertekenen: geen gewone tekst te ondertekenen"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Kan bericht niet verifi�ren: geen gewone tekst te verifi�ren"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Kan dit bericht niet verifi�ren: kon geen pijp naar GPG/PGP maken: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "Kan dit bestand niet verifi�ren: kon geen tijdelijk bestand maken: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Kan dit bericht niet versleutelen: geen gewone tekst te versleutelen"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Kan dit berichten niet versleutelen: geen wachtwoord gegeven"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Kan dit bericht niet verleutelen: kon geen pijp naar GPG/PGP maken: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Kan dit bericht niet versleutelen: er zijn geen ontvangers opgegeven"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Kan dit bericht niet decoderen: geen ciphertekst te decoderen"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Kan bericht niet decoderen: geen wachtwoord gegeven"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Kan dit bericht niet decoderen: kon geen pijp naar GPG/PGP maken: %s"
+#: camel/camel-multipart-encrypted.c:325
+#, fuzzy
+msgid "Failed to decrypt MIME part: parse error"
+msgstr "Kan bericht niet decoderen: Onbekende fout"
 
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Dit berichtdeel is digitaal gesigneerd"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Onbekende fout"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7682,43 +8273,6 @@ msgstr "Kon %s niet laden: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kon %s niet laden: Geen initialisatie code in de module."
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s server %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s dienst voor %s op %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Verbinding geannuleerd"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, 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:258
-msgid "(unknown host)"
-msgstr "(onbekende machine)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Operatie geannuleerd"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Server verbrak onverwacht de verbinding: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anoniem"
@@ -7813,8 +8367,8 @@ msgstr "Kerberos 4"
 #: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
-"Deze optie zal bij het verbinden met de server gebruik maken van "
-"Kerberos-4-aanmelding."
+"Deze optie zal bij het verbinden met de server gebruik maken van Kerberos-4-"
+"aanmelding."
 
 #: camel/camel-sasl-kerberos4.c:161
 #, c-format
@@ -7826,7 +8380,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Fout aanmeldingsantwoord van server."
 
@@ -7854,14 +8408,12 @@ msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr ""
-"Deze optie zal bij het verbinden met de server gebruik maken van "
-"Kerberos-4-aanmelding."
+"Deze optie zal bij het verbinden met de server gebruik maken van Kerberos-4-"
+"aanmelding."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Wachtwoord"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7890,52 +8442,52 @@ msgstr "POP voor SMTP gebruikmakend van een niet-POP bron"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compileren van reguliere expressie mislukt: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' heeft een gebruikersnaamcomponent nodig"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' heeft een machinenaamcomponent nodig"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' heeft een padcomponent nodig"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolving \"%s\""
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fout bij opzoeken naam: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Machine niet gevonden: %s machine niet gevonden"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Machine opzoeken faalde: %s onbekende reden"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Resolving \"%s\""
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Machine niet gevonden: %s machine niet gevonden"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Machine opzoeken faalde: %s onbekende reden"
@@ -7999,11 +8551,11 @@ msgstr "Decoderen van bericht mislukt."
 msgid "Failed to verify certificates."
 msgstr "Verifi�ren van certificaten mislukt."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan map niet verkrijgen: Ongeldige bewerking op deze opslag"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan map niet maken: Ongeldige bewerking op deze opslag"
 
@@ -8033,7 +8585,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8046,16 +8598,16 @@ msgstr ""
 "Vingerafdruk:        %s\n"
 "Handtekening:        %s"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr "GOED"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr "SLECHT"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8075,15 +8627,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "kon URL %s niet verwerken"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Dergelijk bericht %s bestaat niet in %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Een dergelijk bericht bestaat niet: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Controleer op nieuwe berichten in alle mappen"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8105,68 +8657,77 @@ msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kon de naam van map: %s niet wijzigen naar: map bestaat niet"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "U kunt geen berichten kopieeren vanuit deze vuilnisbak"
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Operatie geannuleerd"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Server verbrak onverwacht de verbinding: %s"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Onverwacht antwoord van IMAP-server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-commando mislukt: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Het antwoord van de server eindigde te snel."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Het antwoord van de IMAP-server bevatte geen %s informatie"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "De IMAP-server gaf onverwacht een 'OK' antwoord: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kon directory %s niet maken: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kon samenvatting voor %s niet laden"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Map is vernietigd en opnieuw gemaakt op de server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Bezig met zoeken naar veranderde berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Dit bericht is nu niet beschikbaar"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Ophalen van samenvattingsinformatie van nieuwe berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Bezig met zoeken naar nieuwe berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH-antwoord."
 
@@ -8219,34 +8780,85 @@ msgstr "IMAP"
 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-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Wachtwoord"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 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:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP-server %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s dienst voor %s op %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Verbinding geannuleerd"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Kon niet verbinden met %s (poort %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Fout bij verbinden met de POP-server.\n"
+"Fout bij het versturen van het wachtwoord: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operatie niet ondersteund"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Aanmelding mislukt"
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-server %s ondersteunt het gevraagde aanmeldingstype %s niet"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Geen ondersteuning voor aanmeldingstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVoer het IMAP-wachtwoord voor %s@%s in"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "U heeft geen wachtwoord ingevoerd"
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8257,75 +8869,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "De map kan geen submappen bevatten"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Kon postbus niet openen: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "MH-formaat postbussen"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Voor het opslaan van lokale post in MH-achtige postbussen."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Lokale bezorging"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Voor het ophalen van lokale post uit standaard spools in mbox-formaat."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Pas filters toe op nieuwe berichten in de INBOX"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Maildir-formaat mail direcories"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Voor het opslaan van lokale post in maildir directories."
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Standaard Unix mbox spools"
-
-#: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
-"Voor het lezen en opslaan van lokale post in standaard mbox spool bestanden."
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr "Boom van mbox bestanden"
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Standaard Unix mbox spools"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
-"Voor toegang tot berichten opgeslagen in een externe boom van mbox "
-"bestanden.\n"
-"Dit maakt het u mogelijk direkt toegang toe hebben tot pine en elm mappen.\n"
-"MERK OP: Deze mogelijkheid is nog steeds experimenteel, dus verzeker u ervan "
-"dat\n"
-"u eerst een backup maakt van de mail-bestanden."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr ""
+"Voor het lezen en opslaan van lokale post in standaard mbox spool bestanden."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Opslaglocatie %s is geen absoluut pad"
@@ -8351,7 +8976,7 @@ msgstr "Lokale opslaglocaties hebben geen postbus-in"
 msgid "Local mail file %s"
 msgstr "Lokaal postbusbestand %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kon de naam van map %s niet wijzigen naar %s: %s"
@@ -8371,33 +8996,31 @@ msgstr "Kon samenvattingsbestand van map `%s' niet verwijderen: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kon indexbestand van map `%s' niet verwijderen: %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Kon samenvatting %s niet opslaan: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kan geen bericht toevoegen aan de korte inhoud: onbekende reden"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Maildir bericht toevoegen geannuleerd"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan bericht niet toevoegen aan maildir-map: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8406,20 +9029,19 @@ msgstr ""
 "Kan bericht niet verkrijgen: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Een dergelijk bericht bestaat niet"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Ongeldige berichtinhoud"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8430,13 +9052,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Map `%s' bestaat niet."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8452,7 +9074,7 @@ msgstr "`%s' is geen maildir-directory."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kon map `%s' niet verwijderen: %s"
@@ -8461,8 +9083,8 @@ msgstr "Kon map `%s' niet verwijderen: %s"
 msgid "not a maildir directory"
 msgstr "geen maildir-directory"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kon map `%s' niet scannen: %s"
@@ -8483,45 +9105,37 @@ msgstr "Controleren voor nieuwe email"
 msgid "Checking for new messages"
 msgstr "Bezig met zoeken naar nieuwe berichten"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Bezig met opslaan map"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan map niet verkrijgen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kon postbus niet openen: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Mail toevoegen geannuleerd"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan bericht niet aan mbox-bestand toevoegen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8530,13 +9144,11 @@ msgstr ""
 "Kan bericht %s uit folder %s niet verkrijgen\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "De map lijkt onherstelbaar beschadigd te zijn."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbouwen bericht mislukt: Beschadigde mailbox?"
 
@@ -8579,149 +9191,149 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Map `%s' is niet leeg. Niet verwijderd."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kon map: %s niet openen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatale email-interpreatiefout op positie %ld in map %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan map %s niet controleren: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kon bestand: %s niet openen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kon tijdelijke postbus niet openen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Samenvatting en map niet gelijk, zelfs na synchronisatie"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Fout bij het schrijven naar tijdelijke postbus: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Fout bij het schrijven naar tijdelijk postbus %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kon de bronmap %s niet sluiten: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kon de tijdelijke map niet sluiten: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kon de naam van de map niet wijzigen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Samenvatting en map niet gelijk, zelfs na synchronisatie"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Onbekende fout: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Kon de naam van de map niet wijzigen: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Fout bij het schrijven naar tijdelijke postbus: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Fout bij het schrijven naar tijdelijk postbus %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "MH bericht toevoegen geannuleerd"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan bericht niet toevoegen aan mh map %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' is geen directory."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kon MH-postbus map niet openen: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Kan bericht niet aan spool-bestand: %s toevoegen: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Spoolmappen kunnen niet hernoemd worden"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Spool `%s' bestaat niet of is geen normaal bestand"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "Opslag `%s' is geen normale directory"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Map `%s/%s' bestaat niet."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool mail bestand %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Spoolmappen kunnen niet hernoemd worden"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Spoolmappen kunnen niet hernoemd worden"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmappen kunnen niet gewist worden"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Kon tijdelijke map %s niet synchroniseren: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kon spoolmap: %s niet synchroniseren: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8730,25 +9342,6 @@ msgstr ""
 "Synchroniseren spoolmap '%s' is mislukt: %s\n"
 "Map is wellicht beschadigd, kopie opgeslagen in '%s'"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Kon niet opslaan: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Spool `%s' bestaat niet of is geen normaal bestand"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Post versturen naar %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET-nieuws"
@@ -8759,12 +9352,22 @@ msgstr ""
 "Dit is een provider voor het lezen van en versturen naar USENET "
 "nieuwsgroepen."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Kon directory %s niet maken: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-Nieuws via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8863,7 +9466,7 @@ msgstr "Laat de berichten op de server achter"
 msgid "Delete after %s day(s)"
 msgstr "Verwijder na %s dag(en)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8877,9 +9480,9 @@ msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"Bij het verbinden met de POP-server het wachtwoord versturen in "
-"platte-tekst-vorm. Deze optie is de enige die wordt ondersteund door de "
-"meeste POP servers."
+"Bij het verbinden met de POP-server het wachtwoord versturen in platte-tekst-"
+"vorm. Deze optie is de enige die wordt ondersteund door de meeste POP "
+"servers."
 
 #: camel/providers/pop3/camel-pop3-provider.c:81
 msgid ""
@@ -8891,32 +9494,22 @@ msgstr ""
 "wachtwoord via het APOP-protocol. Deze optie zal niet werken voor alle "
 "gebruikers, zelfs niet op servers die beweren het te ondersteunen."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Fout bij verbinden met de POP-server.\n"
 "Fout bij het versturen van het wachtwoord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Operatie niet ondersteund"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Aanmelding mislukt"
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Kon niet verbinden met POP-server op %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8924,27 +9517,27 @@ msgstr ""
 "Fout bij verbinden met de POP-server.\n"
 "Geen ondersteuning voor de ingestelde aanmeldingsmethode."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "SASL `%s' Inloggen mislukt: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr "SASL Protocol fout"
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr "I/O Fout: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sVoer het POP3-wachtwoord voor %s@%s in"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8953,13 +9546,13 @@ msgstr ""
 "Fout bij verbinden met de POP-server.\n"
 "Fout bij het versturen van het wachtwoord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9121,45 +9714,45 @@ msgstr "Tijdelijke aanmeldingsfout"
 msgid "Authentication required"
 msgstr "Aanmelding is vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "'Welkom respons'-fout: %s: waarschijnlijk niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Fout bij verbinden met de POP-server.\n"
 "Fout bij het versturen van het wachtwoord: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Het bericht lijkt niet goed opgemaakt te zijn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Fout bij DATA-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-server %s ondersteunt het gevraagde aanmeldingstype %s niet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVoer het SMTP wachtwoord in voor %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9170,88 +9763,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Postaflevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan berichten niet versturen: afzender niet geldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Bezig met versturen bericht"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan bericht niet versturen: een of meerdere ongeldige ontvangers"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "SMTP Begroeting"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, 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:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "'HELO respons'- fout: %s: niet-fataal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP Aanmelding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Fout bij aanmaken van SASL aanmeldingsobject"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Time-out tijdens AUTH-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH verzoek faalde"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Fout aanmeldingsantwoord van server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, 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:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr "Fout bij 'MAIL FROM'-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, 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:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
@@ -9259,37 +9852,37 @@ msgstr "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr "Fout bij DATA-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, 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:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr "DATA terminatie foutmelding."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr "Fout bij RSET-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, 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:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr "Fout bij QUIT-respons"
 
@@ -9362,52 +9955,52 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Probeer bijlage automatisch weer te geven"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Klik hier voor het adresboek"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Van:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Antwoordadres:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Aan:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Geef de geadresseerden"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 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:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9420,7 +10013,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Voeg een bestand toe als bijlage"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Kon geen PGP handtekening-context maken"
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9429,34 +10027,34 @@ msgstr ""
 "Fout bij lezen bestand %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Waarschuwing"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Bestand bestaat reeds, overschrijven?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fout bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fout bij benaderen bestand: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Kon bericht niet van editor halen"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9465,7 +10063,7 @@ msgstr ""
 "Niet in staat te zoeken op bestand: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9474,7 +10072,7 @@ msgstr ""
 "Niet in staat om bestand: %s af te kappen\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9483,7 +10081,7 @@ msgstr ""
 "Fout bij automatisch opslaan bericht: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9492,7 +10090,7 @@ msgstr ""
 "gevonden.\n"
 "Wilt u dat deze hersteld worden?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9502,23 +10100,43 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Waarschuwing: Veranderd Bericht"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Bestand openen"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Bestand Invoegen"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Bewaar handtekening"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (standaard)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Stel een nieuw bericht op"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9526,7 +10144,7 @@ msgstr ""
 "Kon het venster Opstellen niet aanmaken:\n"
 "Kan adresselectie niet activeren."
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9534,6 +10152,12 @@ msgstr ""
 "Kon het venster voor het opstellen van het bericht niet maken:\n"
 "Niet in staat de HTML editor component te activeren."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9595,7 +10219,7 @@ msgstr "Onderwerp bevat"
 msgid "Subject does not contain"
 msgstr "Onderwerp bevat niet"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9739,7 +10363,7 @@ msgstr "uur"
 msgid "minute"
 msgstr "minuut"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "seconden"
 
@@ -9814,7 +10438,7 @@ msgstr " geleden"
 msgid "ago"
 msgstr "geleden"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9826,6 +10450,21 @@ msgstr "<klik hier om een datum te selecteren>"
 msgid "Filter Rules"
 msgstr "Filterregels"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Geef Bestandsnaam:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Spool `%s' bestaat niet of is geen normaal bestand"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Kies een actie:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9844,7 +10483,7 @@ msgstr ""
 "Ga terug en kies een geldige map om berichten in op te slaan"
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Selecteer Map"
 
@@ -9857,7 +10496,11 @@ msgstr ""
 "Fout in reguliere expressie '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
@@ -9887,7 +10530,7 @@ msgstr "als aan alle criteria wordt voldaan"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "als aan een van de criteria wordt voldaan"
 
 #: filter/filter-rule.c:780
@@ -9966,190 +10609,200 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Bedrijf"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "bevat"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Kopieer naar Map"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Ontvangstdatum"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Verzendingsdatum"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "bevat niet"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "eindigt niet op"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "bestaat niet"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "klinkt niet als"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "begint niet met"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "bestaat niet"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Klad"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "eindigt op"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr "Shellopdracht uitvoeren"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Bestaat"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "bestaat"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Expressie"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr "Antwoord"
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Belangrijk"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "is"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is after"
 msgstr "is na"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "is before"
 msgstr "is voor"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr "is Gemarkeerd"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "is groter dan"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "is kleiner dan"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "is niet"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "is not Flagged"
 msgstr "Is niet Gemarkeerd"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Mailinglijst"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Berichtinhoud"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Berichtkop"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Verplaats naar Map"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Speel een geluid af:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Gelezen"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Geadresseerden"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Overeenkomende Regex"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Beantwoord aan"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Afzender"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Stel Status in"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Grootte (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "klinkt als"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Source-Account"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Specifieke kop"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "begint met"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Onderwerp"
 
@@ -10204,7 +10857,8 @@ msgid "Scanning %s"
 msgstr "Bezig met doorzoeken %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Post"
 
@@ -10220,10 +10874,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Adresboek"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10273,7 +10923,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importeert uw oude Netscape informatie"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Prullenbak"
 
@@ -10409,31 +11061,31 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Map die post bevat"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Virtueal Afval"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Virtuele Afvalmap"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Deze map kan geen berichten bevatten."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Eigenschappen..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Verander de eigenschappen van deze map"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10441,238 +11093,246 @@ msgstr ""
 "Sommige van uw email-instellingen lijken ongeldig, controleer alstublieft of "
 "alles goed staat."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Er is geen post-transportmethode ingesteld"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Waarschuwing: Veranderd Bericht"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Nieuw Bericht"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "Bericht"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan de Mail-component van Evolution niet initialiseren."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan de mailconfiguratie-component van Evolution niet initialiseren."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan de Map-info-component van Evolution niet initialiseren."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Verbinden met server..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenschappen voor \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kon tijdelijke directory niet maken: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr " %d nieuw"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d verborgen"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr "%d zichtbaar"
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d geselecteerd"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d niet verzonden"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d verzonden"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d totaal"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Maak VMap Van Bericht"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "VMap op _Onderwerp"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "VMap op Afze_nder"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "VMap op Mailing_Lijst"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filter op Afzen_der"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filter op _Mailinglijst"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "B_ewerk als Nieuw Bericht..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_Afdrukken"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Afzender beantwoorden"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Lijst Be_antwoorden"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Iedereen Be_antwoorden"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Antwoord..."
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Markeer als Voltooid"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Markering Wissen"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_keer als Gelezen"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markeer als O_ngelezen"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Markeer als _Belangrijk"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markeer Als _Onbelangrijk"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Herstellen"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Verplaatsen naar Map..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Kopi�ren naar Map..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "Laurel"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Afzender aan Adresboek Toevoegen"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Creeer Regel Van Bericht"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VMap op Mailinglijst"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter op Mailinglijst (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VMap op Mailinglijst (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Standaard"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Bezig met Verkrijgen Mapinformatie"
 
@@ -10728,7 +11388,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "U heeft niet alle informatie ingevuld die nodig is."
 
@@ -10738,83 +11398,111 @@ msgid "Evolution News Editor"
 msgstr "Evolution Nieuwsbeheer"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution Accountbeheer"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "Computernaam:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Gebruikersnaam:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Pad:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Radio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "U kunt niet meerdere accounts met dezelfde naam maken."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Weet u zeker dat u deze account wilt verwijderen?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Niet verwijderen"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Daadwerkelijk dit account verwijderen?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Uitzetten."
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Aanzetten"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Weet u zeker dat u dit nieuws-account wilt verwijderen?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aangezet"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Accountnaam:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, c-format
+msgid "Mail to %s"
+msgstr "Post versturen naar %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Onderwerp is %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Post ophalen van %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "%s mailinglijst"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Filterregel Toevoegen"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"De volgende vMappen:\n"
+"%sGebruikten de verwijderde map:\n"
+"    '%s'\n"
+"En zijn aangepast."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10826,7 +11514,7 @@ msgstr ""
 "of ontvangen.\n"
 "Wilt u email nu configureren?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10834,7 +11522,7 @@ msgstr ""
 "U dient een identiteit te configuren\n"
 "voordat u post kunt versturen."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10843,7 +11531,7 @@ msgstr ""
 "voordat u email kunt versturen."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10851,11 +11539,11 @@ msgstr ""
 "U verstuurt een HTML-geformateerd bericht, maar de volgende ontvangers "
 "willen geen HTML emailtjes ontvangen:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Toch versturen?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10863,7 +11551,7 @@ msgstr ""
 "Dit bericht heeft geen onderwerp.\n"
 "Weet u zeker dat u het wilt versturen?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10871,11 +11559,11 @@ msgstr ""
 "Omdat de contactenlijst waar u heen stuurt configureerd is voor verborgen "
 "adreslijsten zal dit bericht slechts Bcc dressen bevatten."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Dit bericht bevat alleen Bcc-ontvangers."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10885,16 +11573,16 @@ msgstr ""
 "toevoegen van een 'Apparently-To' kop.\n"
 "Toch versturen?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 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:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "U moet een account configureren voordat u deze email kunt versturen."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10902,28 +11590,28 @@ msgstr ""
 "Kan de drafts map voor die account niet openen.\n"
 "Wilt u gebruik maken van de standaardmap?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "een onbekende afzender"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Op %a %d-%m-%Y, om %H:%M schreef %%s:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Verplaats bericht(en) naar"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopieer bericht(en) naar"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Weet u zeker dat u alle %d berichten wilt bewerken?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10931,7 +11619,7 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10939,32 +11627,32 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Weet u zeker dat alle %d berichten wilt herversturen?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Geen bericht geselecteerd"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Bericht Opslaan Als..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Berichten Opslaan Als..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 msgid "Go to next folder with unread messages?"
 msgstr "Volgende map met ongelezen berichten tonen?"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -10972,7 +11660,7 @@ msgstr ""
 "Er zijn geen nieuwe berichten meer in deze map.\n"
 "Wil je naar de volgende map gaan?"
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10984,7 +11672,7 @@ msgstr ""
 "\n"
 "De berichten echt verwijderen?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10993,33 +11681,69 @@ msgstr ""
 "Fout bij het laden van filterinformatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d van %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Weet u zeker dat alle %d berichten in een appart scherm wilt weergeven?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "_Beveiliging"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Ander contact"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Verzonden"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Bewaar handtekening"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Bewaar handtekening"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11071,119 +11795,98 @@ msgstr ""
 "naam zal alleen worden gebruikt als roepnaam."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistent"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "na"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"Kon geen inbox vinden voor nieuwe mailopslag:\n"
-"%s\n"
-"Er zal geen snelkoppeling aangemaakt worden."
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Account"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Dienst wordt gecontroleerd"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Verbinden met server..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Ander contact"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "B_ewerken..."
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Nieuw"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Controleer op ondersteunde types"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL wordt niet ondersteund in deze versie van Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL wordt niet ondersteund in deze versie van Evolution)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Versleutel berichten altijd naar mijzelf bij het versturen van versleutelde "
 "berichten"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Account %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Accountinformatie"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Accountbeheer"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Bewerking Annuleren"
+msgid "Add Sc_ript"
+msgstr "_Beveiliging"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "Arkansas"
+msgid "Add new signature..."
+msgstr "Bewaar handtekening"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
@@ -11192,76 +11895,79 @@ msgstr ""
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Onderteken uitgaande berichten altijd bij het gebruik van dit account."
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Altijd een geheime kopie (Bcc) naar:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Altijd een kopie (Cc) naar:"
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "Arica"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Voeg een bestand bij het bericht"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bijlage"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Aanmelding"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automatisch controleren op nieuwe post"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Karakterencodering"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "Komoren"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Controleren voor Nieuwe Berichten"
 
 #: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Kleur voor taken voor vandaag"
+
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr "Berichten Opstellen"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11276,57 +11982,47 @@ msgstr ""
 "\n"
 "Klik op \"Voltooien\" om uw instellingen op te slaan."
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "Bari"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "Standaard"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Standaard Prioriteit:"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Standaard karaktercode:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Berichten aan het ontvangen"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Digitale ID's..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Kan bericht niet opnemen"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Klaar"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Klad map:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "Aanzetten"
 
-#: mail/mail-config.glade.h:48
-#, fuzzy
-msgid "E_nable advanced options"
-msgstr "Bewerking Annuleren"
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11347,39 +12043,34 @@ msgstr "_Emailadres:"
 msgid "Empty _trash folders on exit"
 msgstr "Leeg prullenbakken bij het afsluiten"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Opdracht Uitvoeren..."
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "eindigt op"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Eigenschappen"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Haal Digitaal ID op..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Accentueer citaten met"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Hurlburt"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
@@ -11433,68 +12124,64 @@ msgstr "Micronesi�"
 msgid "NNTP Server:"
 msgstr "NNTP Server"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Nieuwe Mail Notificatie"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "_Nieuwsbronnen"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Optionele Informatie"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organisatie:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG sleutel ID:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Kies een kleur"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Waarschuw wanneer berichten worden verstuurd met alleen _Bcc-ontvangers"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Druk geselecteerde contacten af"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Kan bericht niet opnemen"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Geciteerd"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Onthoud dit wachtwoord"
@@ -11528,117 +12215,120 @@ msgid "S_ecurity"
 msgstr "Beveiliging"
 
 #: mail/mail-config.glade.h:104
-#, fuzzy
-msgid "Same as text"
-msgstr "Somerset"
-
-#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Beveiligde MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Selecteer het pad naar PGP"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Handtekeningbestand:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Verwijder alles behalve de  handtekening"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Email Versturen"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Verzonden _berichtenmap:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Verzonden en Klad Berichten"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Server _vereist aanmelding"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Serverconfiguratie"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Server _Type: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Snelkoppelingen"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Bewaar handtekening"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Bewaar handtekening"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Bron"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Bron Informatie"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Geef Bestandsnaam:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Standaard Unix mailboxbestand"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "Bestand met _HTML-ondertekening:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11648,149 +12338,141 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Oost"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "Bestand met ondertekening:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "Altijd afbeeldingen ophalen va het internet"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Onderteken uitgaande berichten altijd bij het gebruik van dit account"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Aanmeldings Type:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 msgid "_Authentication type: "
 msgstr "_Aanmeldings type:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "_Automatisch controleren op nieuwe post"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_Automatisch controleren op nieuwe post"
+
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Piep bij binnenkomst van nieuwe email"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_Certificaat-ID:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Bevestigen bij het Legen van een map"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Bestand met _HTML-ondertekening:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Standaard"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Geen melding bij binnenkomst van nieuwe berichten"
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Bestandsnaam:"
+msgid "_Enable"
+msgstr "Aanzetten"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Standaardwijze van doorsturen: "
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 msgid "_Full name:"
 msgstr "_Volledige Naam:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "In HTML-berichten"
 
-#: mail/mail-config.glade.h:160
-#, fuzzy
-msgid "_HTML Signature:"
-msgstr "Bestand met _HTML-ondertekening:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteit"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Taal"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "Toon afbeeldingen als de afzender in het adresboek voorkomt"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Stel dit in als standaardaccount"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Markeer berichten als Gelezen na "
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Nooit afbeeldingen van het internet ophalen"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "_Pad naar het PGP-programma:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Geluid afspelen bij binnekomst van nieuwe berichten"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Waarschuw wanneer HTML berichten verstuurd worden naar contacten die dat "
 "niet willen"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Waarschuw wanneer een bericht verstuurd wordt zonder _onderwerp"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Radio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11832,69 +12514,52 @@ msgstr "Bestand met ondertekening:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "Bestand met _HTML-ondertekening:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Gebruik een beveiligde verbinding (SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_elke"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " kleur"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "omschrijving"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "niewswindow1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Kon geen PGP handtekening-context maken"
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Kon geen PGP verificatie context maken"
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Kon geen PGP encryptie context maken."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Kon geen PGP decryptie context maken"
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Kon geen S/MIME ondertekening context maken"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Kon geen S/MIME certsonly context maken."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Kon geen S/MIME encryptie context maken"
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Kon geen S/MIME envelope context maken"
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Kon geen S/MIME decode context maken"
 
@@ -11937,98 +12602,135 @@ msgstr "Extern Weergave Programma"
 msgid "Loading message content"
 msgstr "Bezig met laden berichtinhoud"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Verlopen taken:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Open Link in Browser"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Kopieer Link Locatie"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Sla Link op als (FIXME)"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Sla Figuur op als..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijlage"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kon MIME bericht niet verwerken. Laat zien als source"
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Ongeldig Emailadres"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Van"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Antwoordadres"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Aan"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "Post"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Bericht Opslaan Als..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Dit bericht is digitaal ondertekend. Klik op het hangslot icoontje voor meer "
+"informatie."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Kon geen PGP verificatie context maken"
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Dit bericht is digitaal ondertekend en is authentiek."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Dit bericht is digitaal ondertekend, maar er kan niet worden aangetoond dat "
+"het authentiek is."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Verwijzing naar FTP site (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Verwijzing naar lokaal bestand (%s) geldig bij site \"%s\""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Verwijzing naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Verwijzing naar externe gegevens (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Misvormd extern-berichtgedeelte"
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Lokale Mappen"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Map opnieuw configureren"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12037,27 +12739,27 @@ msgstr ""
 "Kan map-metainfo niet opslaan: deze map kan waarschijnlijk niet\n"
 "meer worden geopend: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan map-matainfo niet opslaan in %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan map-metagegevens %s niet verwijderen: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s mag niet opnieuw geconfigureerd worden omdat het geen lokale map is"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12065,11 +12767,11 @@ msgstr ""
 "Als deze map niet meer kan worden geopend, dan is\n"
 "het wellicht noodzakelijk om deze handmatig te repareren."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "U kunt het formaat van een niet-lokale map niet veranderen."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Herconfigureer /%s"
@@ -12127,81 +12829,73 @@ msgstr "faalde op bericht %d van %d"
 msgid "Complete."
 msgstr "Voltooid."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Bezig met opslaan bericht in map"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Bezig met verplaatsen van berichten naar %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Bezig met het kopi�ren van berichten naar %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Bezig met verplaatsen"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Bezig met kopi�ren"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met openen map %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "Bezig met openen van opslag %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "verwijderen map %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Bezig met opslaan map '%s'"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Map wordt ververest"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Bezig met legen map"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Bezig met ophalen bericht %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Bezig met ophalen van %d bericht(en)"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Bezig met het opslaan van %d bericht(en)"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12210,7 +12904,7 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12219,11 +12913,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12232,27 +12926,27 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Bezig met opnieuw verbinden met %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Shellopdracht wordt uitgevoerd: %s"
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Zoeken"
 
@@ -12323,10 +13017,6 @@ msgstr "Aan het Actualiseren ..."
 msgid "Waiting..."
 msgstr "Aan het Wachten ..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Geannuleerd."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Gebruiker heeft operatie afgebroken."
@@ -12340,16 +13030,16 @@ msgstr "Voer uw Wachtwoord in voor %s"
 msgid "Enter Password"
 msgstr "Voer Wachtwoord in"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Kon handtekening-bestand niet opslaan."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Bewaar handtekening"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12359,10 +13049,30 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Naam:"
+
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "Bewaar handtekening"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
 #, fuzzy
-msgid "Signature name:"
-msgstr "Handtekeningbestand:"
+msgid "Hide signature hint"
+msgstr "HTML Handtekeningbestand:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12377,17 +13087,17 @@ msgstr "Doorgestuurd bericht"
 msgid "Forwarded Message"
 msgstr "Doorgestuurd Bericht"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Bezig met aanmaken vfolder: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Actualiseren vfolders voor uri: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12400,90 +13110,95 @@ msgstr ""
 "    '%s'\n"
 "En zijn aangepast."
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "VMappen"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "vMappen"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Bewerk VMap"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 "Poging tot aanpassen van vMap '%s' gedetecteerd terwijl deze niet bestaat."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(geen onderwerp)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Bericht"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Ongelezen"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Gelezen"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Beantwoord"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Meerdere Ongelezen Berichten"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Meerdere Berichten"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Laagste"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Laag"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Hoog"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Hoogste"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Vandaag %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Gisteren %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Bezig met genereren van berichtenlijst"
 
@@ -12504,10 +13219,15 @@ msgid "Follow Up Flag"
 msgstr "Antwoord Markering"
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "rigineel Contact:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Ontvangen"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Grootte"
 
@@ -17220,5227 +17940,5224 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds and Bradford"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libya"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Luik"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lissabon"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "Londen"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "Londen/City"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "Londen/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "Londen/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "Londen/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Louisiana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "Lubeck-Blankensee"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr "Lviv"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malmo/Sturup"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall Eilanden"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marchalltown"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Maramoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Vliegveld"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Airport"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Vliegveld"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Midden Oosten"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Eiland"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milaan/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milaan/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Miyakejima Vliegveld"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Vliegveld"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regionaal Vliegveld"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Vliegveld"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "M�nchengladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Metego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Moskou Domodedovo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moskou Sheremetyevo"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountian View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "M�nchen"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "M�nster/Osnabr�ck"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Moermansk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Vliegveld"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoya Vlieveld"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Naha Vliegveld"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Vliegveld"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama Vliegveld"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "Naples"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napels"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "Nieuw Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "Nieuw Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "Nieuw Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "Nieuw Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "Nieuw Mexico"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "New Tokyo International Airport"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Vliegvld"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata Airport"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfork"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Noordoost Philadelphia"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "Noord Kingstown"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Noordwest Territori�n"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "Neurenberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro Vliegveld"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr "Odessa"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita Vliegveld"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Eiland"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okayama Vliegveld"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki Vliegveld"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Eiland"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Osaka Internationaal Vliegveld"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Oshima Vliegveld"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Parijs"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Parijs/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Parijs/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Parijs/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "Republiek China"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Apt"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praag"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Moerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Eiland"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Eiland"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr "Rivne"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Rusland"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbr�cken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "Sint Nicolaas Eiland"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa F�"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Sendai Vliegveld"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O Internationaal Vliegveld"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldo"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "Zuid Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marsh Eiland"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simon's Eiland"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr "Sympheropol"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Vliegveld"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talinn"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Tanegashima Vliegveld"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Tehran-Mehrabad"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Eiland"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo Helikopterplatform"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokyo Internationaal Vliegveld"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokyo Nieuw Internationaal Vliegveld"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori Vliegveld"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama Vliegveld"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Triest"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Tsushima Vliegveld"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twente"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "Verenigde Arabische Emiraten"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr "Uzhgorod"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valentia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venetie"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech Vliegveld"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser Airport"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Vliegveld"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow Vliegveld"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Yamagata Vliegveld"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube Vliegveld"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao Airport"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Zurich"
 
@@ -22468,17 +23185,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Geen omschrijving"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Samenvatting Post"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "VMappen"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Lokale Mappen"
 
@@ -22492,57 +23204,47 @@ msgstr "Lokale Mappen"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "EHAM:EHEH:EHGG:EHLW:EHBK:EHRD:EHSB:EBAW:EBBR:EBLG:EBOS"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Woord van de Dag"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Quotes van de Dag"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Voeg een nieuwsbron toe"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Geef the URL van de nieuwsbron die u wilt toevoegen"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Naam:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Fout bij downloaden van RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Nieuws Bron"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
+msgid "Add"
 msgstr "_Toevoegen"
 
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "Verwijderen"
-
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Sneeuwval"
@@ -22583,10 +23285,42 @@ msgstr "Samenvatting Afdrukken"
 msgid "Printing of Summary failed"
 msgstr "Afdrukken van Samenvatting mislukt"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Executieve samenvattingscomponent kon Bonobo niet initializeren.\n"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "knopen"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "km/u"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "mijl"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometer"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Onbewolkt"
@@ -23738,101 +24472,106 @@ msgid "C_elsius"
 msgstr "C_elsius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Nieuws_bron toevoegen"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Hoeveel dagen moet de kalender in een keer weergeven?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Ma_ximaal aantal weer te geven objecten:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Nieuwsbron-instellingen:"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "E�n _maand"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "E�n w_eek"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "Verversings_tijd (seconden):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "Verversings_tijd (seconden):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "_Volledig pad weergeven voor mappen"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Toon _alle taken"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Toon taken van _vandaag"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Temperaturen weergeven in:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Taken"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Weerinstellingen"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Vijf dagen"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Post"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "_Nieuwsbronnen"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_E�n dag"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Planning"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Weer"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 #, fuzzy
-msgid "Configuration control for Evolution default folders."
+msgid "Configuration control for Evolution folder settings."
 msgstr "Fabriek voor de Evolution opsteller."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Selecteer Map"
+msgid "Folder Settings"
+msgstr "Mail-instellingen"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "De Evolution shell."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -23843,6 +24582,37 @@ msgstr "Details weergeven"
 msgid "Cancel Operation"
 msgstr "Bewerking Annuleren"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Kan map niet overzetten:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Als Verzonden Map"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Klad"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Outbox"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Verzonden"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution installatie"
@@ -23957,6 +24727,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "U gebracht door"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Voltooiingsdatum"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Selecteer Map"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Selecteer Map"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Selecteer Map"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Voltooiingsdatum"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -23986,20 +24781,20 @@ msgstr "Kan een map niet verplaatsen naar zijn eigen kinderen."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "specificeer een map om map \"%s\" naar te kopieeren:"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Kopieer naar Map"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Specificeer een map om map \"%s\" naartoe te verplaatsen:"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Verplaats naar Map"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24008,18 +24803,19 @@ msgstr ""
 "Kon map niet verwijderen:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Verwijder \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Weet u zeker dat u de \"%s\" map wilt verwijderen?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"Kon map niet verwijderen:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24028,16 +24824,16 @@ msgstr ""
 "Kan map niet hernoemen:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Hernoem de \"%s\" map naar:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Hernoemen map"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24056,7 +24852,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Nieuwe map maken"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -24064,7 +24860,7 @@ msgstr ""
 "Het type van de geselecteerde map is niet geldig\n"
 "voor de opdracht."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Nieuw..."
 
@@ -24116,21 +24912,26 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Selecteer Map"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Map %s bestaat niet"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Evolution Fout"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "U mag alleen importeren naar lokale mappen"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24139,11 +24940,11 @@ msgstr ""
 "Er is geen importeerfunctie die het volgende kan afhandelen\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Bezig met importeren"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24152,17 +24953,17 @@ msgstr ""
 "Importeren %s.\n"
 "Beginnen %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Fout bij laden %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Fout bij laden %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24171,31 +24972,31 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Selecteer een bestand"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Bestandstype:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Importeer informatie en instellingen van oudere programma's"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Importeer een enkel bestand"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24203,31 +25004,78 @@ msgstr ""
 "Even geduld...\n"
 "Bestaande instellingen worden nagezocht"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Intelligent Importeren wordt gestart"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Van %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Selecteer Map"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Selecteer een doelmap voor deze belangrijke data"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importeer"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Verbindeingen ophangen...."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Fout tijdens '%s':\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Bezig met synchroniseren map"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Bezig met openen map %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Bezig met openen map %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Openen in %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Kan de gespecificeerde map niet aanmaken:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -24241,8 +25089,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kon de Evolution Mailer-assistent interface niet initialiseren\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nieuw"
@@ -24263,43 +25111,43 @@ msgstr "Mapnaam mag geen slashes bevatten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' en '..' zijn gereserveerde mapnamen."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 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:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kon niet worden gestart."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Over Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Ga naar map..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Selecteer de map die je wilt openen"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Maak een nieuwe snelkoppeling"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Selecteer de map waar de snelkoppeling naar moet wijzen:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "Werk Online"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "Werk Offline"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Werk zonder netwerk"
 
@@ -24333,7 +25181,7 @@ msgid ""
 msgstr ""
 "Ximian Evolution is nu offline. Klik op deze knop on online te gaan werken."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24345,12 +25193,12 @@ msgstr ""
 "De fout van het activeringssysteem is:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan de lokale opslag niet opzetten -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24362,23 +25210,19 @@ msgstr ""
 "gestopt. U zult Evolution opnieuw moeten starten om die informatie\n"
 "weer te kunnen benaderen."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Ongeldige argumenten"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Kan niet registreren op OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Configuratiedatabase niet gevonden"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Generieke fout"
 
@@ -24403,95 +25247,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Niet verwijderen"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Hernoem Snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Hernoem deze snelkoppelingsgroep naar:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Kleine Pictogrammen"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Toont de snelkoppelingen als kleine pictogrammen"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "_Grote Pictogrammen"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Toont de snelkoppelingen als grote pictogrammen"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Nieuwe Groep..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "Deze Groep _Verwijderen..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Verwijder deze snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "Deze Groep _Hernoemen..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Hernoem deze snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "_Verberg de Snelkoppelingsbalk"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Verberg de snelkoppelingenbalk"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Hernoem snelkoppeling"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Hernoem deze snelkoppeling naar:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Open deze map waar deze snelkoppeling naar wijst"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Open in Nieuw Venster"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Open de map waar deze snelkoppeling naar wijst in een nieuw venster"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Hernoemen"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Hernoem deze snelkoppeling"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "Verwijderen"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Verwijder deze snelkoppeling van de snelkoppelingenbalk"
 
@@ -24503,10 +25347,6 @@ msgstr "Fout bij opslaan van snelkoppelingen."
 msgid "Shortcuts"
 msgstr "Snelkoppelingen"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Inbox"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -24570,10 +25410,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% voltooid)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<klik hier om een map te selecteren>"
 
@@ -24614,67 +25455,67 @@ msgstr ""
 "De fout van het activeringssysteem is:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "CORBA fout"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Onderbroken"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Ongeldige argument"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Heeft al een eigenaar"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Geen eigenaar"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Niet gevonden"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Niet ondersteund type"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Niet ondersteund schema"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Niet ondersteunde bewerking"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Bestaat"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "Ongeldige URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Heeft submappen"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Geen ruimte over"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "Oude eigenaar is gestorven"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 msgid "Test type"
 msgstr "Test type"
 
@@ -24804,40 +25645,72 @@ msgstr "Dit bericht niet meer weergeven."
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan gegevens importeren van de volgende bestanden:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution is bezig met afsluiten ..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Dit bericht niet meer weergeven."
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan geen toegang verkrijgen tot de Evolution shell."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan de Ximian Evolution-schil niet initialiseren: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Splash screen niet tonen"
 
-#: shell/main.c:318
+#: shell/main.c:438
 msgid "Start in offline mode"
 msgstr "Beginnen in offline modus"
 
-#: shell/main.c:319
+#: shell/main.c:439
 msgid "Start in online mode"
 msgstr "Beginnen in online modus"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Zend de debug uitvoor van alle componenten naar een bestand"
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -24846,7 +25719,7 @@ msgstr ""
 "%s: --online en --oflinne kan niet tegelijk worden gebruikt.\n"
 "  Gebruik %s --help voor meer informatie.\n"
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan het Bonobo-componentensysteem niet initializeren"
 
@@ -24955,11 +25828,11 @@ msgstr "Huidige contact weergeven"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Acties"
 
@@ -25080,8 +25953,8 @@ msgstr "Sluit dit item"
 msgid "Delete this item"
 msgstr "Verwijder dit item"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Hoofdgereedschapsbalk"
 
@@ -25121,7 +25994,7 @@ msgstr "Bewaar dit item op de harde schijf"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Bestand"
 
@@ -25186,19 +26059,19 @@ msgstr "Doorsturen als i_Calendar"
 msgid "Forward this item via email"
 msgstr "Dit item vie email doorsturen"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Ophalen laatste bijeenkomstinformatie"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "Ververs _Bijeenkomst"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "_Bijeenkomst Plannen"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Plan een bijeenkomst voor dit item"
 
@@ -25206,10 +26079,6 @@ msgstr "Plan een bijeenkomst voor dit item"
 msgid "Customise My Evolution"
 msgstr "Mijn Evolution Instellen"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Annuleren"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Stop de huidige email operatie"
@@ -25366,7 +26235,7 @@ msgstr "Toon Discussiebomen"
 msgid "_Expunge"
 msgstr "_Wissen"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Map"
 
@@ -25772,7 +26641,7 @@ msgstr "Vorig Bericht"
 msgid "_Quoted"
 msgstr "Ge_citeerd"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Gereedschap"
 
@@ -25787,12 +26656,12 @@ msgstr "Dit venster sluiten"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_Sluiten"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "Weerga_ve"
 
@@ -25979,7 +26848,7 @@ msgstr "_Openen..."
 msgid "_Reply-To Field"
 msgstr "Antwoordadres-veld:"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Help"
 
@@ -26126,111 +26995,120 @@ msgid "Move this folder to another place"
 msgstr "Verplaats deze map naar een andere plaats"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "_Nieuwe map aanmaken..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Open in Nieuw Venster"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Open deze map in een nieuw venster"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Versturen en Ontvangen"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Toon informatie over Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Bug-Report Insturen"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "_Bug Report Insturen"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Report insturen met Bug Buddy."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Verander"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Toont de mappenbalk"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Toont de snelkoppelingenbalk"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Schakel offline werken aan of uit"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Toon de geselecteerde map"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_Over Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "Kopi�ren..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_Mappenbalk"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_Ga naar Map..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Importeer..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "Verplaatsen..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nieuw"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Nieuwe Map"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "_Pilot Instellingen..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "He_rnoemen..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Versturen en Ontvangen"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Snelkoppeling"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "_Snelkoppelingsbalk"
 
@@ -26314,20 +27192,20 @@ msgstr ""
 "selecteer een tijdzone.\n"
 "Gebruik de rechter muisknop om uit te zoomen."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Huidige Weergave"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 msgid "Custom View"
 msgstr "_Aangepaste Weergave"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr "Bewaar Ingestelde Weergave"
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Defineer Bekijkmogelijkheid"
 
@@ -26448,16 +27326,21 @@ msgstr "Zoekopdracht-editor"
 msgid "Save Search"
 msgstr "Bewaar Zoekopdracht"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Bewaar Zoekopdracht"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Voeg toe aan Bewaarde Zoekopdrachten"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Uitgebreid..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informatie"
@@ -26479,21 +27362,21 @@ msgstr "Bericht"
 msgid "Don't show this message again."
 msgstr "Dit bericht niet meer weergeven."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Zoek Nu"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Wissen"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Wissen"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Zoek Nu"
 
@@ -26519,373 +27402,309 @@ msgstr "init_corba(): kon Gnome niet initializeren"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kon Bonobo niet initializeren"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Bewerk Adresboek"
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Adresboekbronnen"
 
-#~ msgid "A_uthenticate with server using:"
-#~ msgstr "Aanmelding bij server middels:"
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "Ongeldige opaque trace-informatie:\n"
+#~ "%s"
 
-#~ msgid "Account Name"
-#~ msgstr "Accountnaam"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolution kalender-samenvatting-component"
 
-#~ msgid "Add Addressbook"
-#~ msgstr "Adresboek Toevoegen"
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Fabriek voor het Kalender Samenvattings component."
 
-#~ msgid "Advanced"
-#~ msgstr "Uitgebreid"
+#~ msgid "Sta_rt of day:"
+#~ msgstr "_Begin van dag:"
 
-#~ msgid "Base"
-#~ msgstr "Basis"
+#~ msgid "_End of day:"
+#~ msgstr "_Eind van dag:"
 
-#~ msgid "Check this if the server requires you to authenticate."
-#~ msgstr "Controleer dit als de server aanmelding vereist."
+#~ msgid "_Other Organizer"
+#~ msgstr "Andere Organisator"
 
-#~ msgid ""
-#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
-#~ "server"
-#~ msgstr ""
-#~ "Evolution zal deze Distinguished Name (DN) gebruiken om u te aan te melden "
-#~ "bij de server"
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Clearsinging is niet ondersteund door deze sleutel"
 
-#~ msgid "Server Name"
-#~ msgstr "Servernaam"
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Voer uw %s passphrase voor %s in"
 
-#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Voer uw %s passphrase in."
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
 #~ msgstr ""
-#~ "De informatie hieronder is nodig om een adresboek toe te kunnen voegen. "
+#~ "Kan dit bericht niet ondertekenen: geen gewone tekst om te ondertekenen"
 
-#~ msgid "This information is not required for most ldap servers. "
-#~ msgstr "Deze informatie is niet noodzakelijk voor de meeste LDAP-servers. "
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Kan dit berichten niet ondertekenen: geen wachtwoord gegeven"
 
-#~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 #~ msgstr ""
-#~ "Deze informatie wordt door uw LDAP-server gebruikt om aan te geven wat er "
-#~ "doorzocht moet worden. Neem contact op met uw systeembeheerder voor meer "
-#~ "informatie."
+#~ "Kan dit bericht niet ondertekenen: kon geen pijp naar GPG/PGP maken: %s"
 
-#~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
 #~ msgstr ""
-#~ "Dit is de basisnode voor al uw zoekopdrachten op de LDAP-server. Neem "
-#~ "contact op met uw systeembeheerder voor meer informatie."
-
-#~ msgid "This is the name of the server where your addressbook is located."
-#~ msgstr "Dit is de naam van de server waarop uw adresboek zich bevindt."
-
-#~ msgid "This is the port that your ldap server uses."
-#~ msgstr "Dit is de poort die uw LDAP-server gebruikt."
-
-#~ msgid "_Account name:"
-#~ msgstr "_Accountnaam:"
+#~ "Kan dit bericht niet ondertekenen: geen gewone tekst te ondertekenen"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Andere Adresboeken"
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Kan bericht niet verifi�ren: geen gewone tekst te verifi�ren"
 
-#~ msgid "(none)"
-#~ msgstr "(geen)"
-
-#~ msgid "C_ontaining:"
-#~ msgstr "be_vat:"
-
-#~ msgid "Show contacts matching the following criteria:"
-#~ msgstr "Toon contacten die aan de volgende criteria voldoen:"
-
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 #~ msgstr ""
-#~ "Weet u zeker dat u dit\n"
-#~ "contact wilt verwijderen?"
-
-#~ msgid "Starting:"
-#~ msgstr "Bezig met starten:"
-
-#~ msgid "Ending:"
-#~ msgstr "Einde:"
-
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Maak een nieuwe afspraken met een standaard _herinnering"
-
-#~ msgid "First day of wee_k:"
-#~ msgstr "Eerste dag van de we_ek:"
-
-#~ msgid "_Other"
-#~ msgstr "_Overige"
-
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Klik hier om een lid toe te voegen"
-
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
+#~ "Kan dit bericht niet verifi�ren: kon geen pijp naar GPG/PGP maken: %s"
 
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
-
-#~ msgid "100%"
-#~ msgstr "100%"
-
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "Vergadering begint: <b>"
-
-#~ msgid "Task begins: <b>"
-#~ msgstr "Taak begint: <b>"
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr ""
+#~ "Kan dit bericht niet versleutelen: geen gewone tekst te versleutelen"
 
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Vrij/Bezet informatie begint <b>"
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Kan dit berichten niet versleutelen: geen wachtwoord gegeven"
 
-#~ msgid "Begins: <b>"
-#~ msgstr "Begint: <b>"
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Kan dit bericht niet verleutelen: kon geen pijp naar GPG/PGP maken: %s"
 
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Einde bijeenkomst: <b>"
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "Kan dit bericht niet decoderen: geen ciphertekst te decoderen"
 
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Vrij/Bezet informatie eindigt: <b>"
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Kan bericht niet decoderen: geen wachtwoord gegeven"
 
-#~ msgid "Ends: <b>"
-#~ msgstr "Eindigt: <b>"
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Kan dit bericht niet decoderen: kon geen pijp naar GPG/PGP maken: %s"
 
-#~ msgid "Task Completed: <b>"
-#~ msgstr " (Taak Voltooid: <b>"
+#~ msgid "%s server %s"
+#~ msgstr "%s server %s"
 
-#~ msgid "Task Due: <b>"
-#~ msgstr "Taak klaar: <b>"
+#~ msgid "(unknown host)"
+#~ msgstr "(onbekende machine)"
 
-#~ msgid "iCalendar Information"
-#~ msgstr "iCalendar Informatie"
+#~ msgid "No such message: %s"
+#~ msgstr "Een dergelijk bericht bestaat niet: %s"
 
-#~ msgid "iCalendar Error"
-#~ msgstr "iCalendar Fout"
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "U kunt geen berichten kopieeren vanuit deze vuilnisbak"
 
-#~ msgid "An unknown person"
-#~ msgstr "Een onbekende persoon"
+#~ msgid "Directory tree of mbox files"
+#~ msgstr "Boom van mbox bestanden"
 
 #~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
+#~ "For accessing mail storedin an external tree of mbox files.\n"
+#~ "This will allow you to directly access pine and elm folders.\n"
+#~ "NOTE: This provider is still experimental so ensure you backup any mail "
+#~ "folders first."
 #~ msgstr ""
-#~ "<br> Bekijk de volgende informatie en kies daarna een actie uit het menu "
-#~ "hieronder."
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Geen</i>"
-
-#~ msgid "Status:"
-#~ msgstr "Status:"
+#~ "Voor toegang tot berichten opgeslagen in een externe boom van mbox "
+#~ "bestanden.\n"
+#~ "Dit maakt het u mogelijk direkt toegang toe hebben tot pine en elm "
+#~ "mappen.\n"
+#~ "MERK OP: Deze mogelijkheid is nog steeds experimenteel, dus verzeker u "
+#~ "ervan dat\n"
+#~ "u eerst een backup maakt van de mail-bestanden."
 
-#~ msgid "Tentatively Accepted"
-#~ msgstr "Voorlopig Geaccepteerd"
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Kan bericht niet aan spool-bestand: %s toevoegen: %s"
 
-#~ msgid "Choose an action:"
-#~ msgstr "Kies een actie:"
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Kon niet opslaan: %s: %s"
 
-#~ msgid "Update"
-#~ msgstr "Verversen"
-
-#~ msgid "Accept"
-#~ msgstr "Accepteren"
-
-#~ msgid "Tentatively accept"
-#~ msgstr "Voorlopig accepteren"
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Spool `%s' bestaat niet of is geen normaal bestand"
 
-#~ msgid "Decline"
-#~ msgstr "Weigeren"
+#, fuzzy
+#~ msgid "Mail tree %s"
+#~ msgstr "Post versturen naar %s"
 
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Verstuur Vrij/Bezet Informatie"
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Radio"
 
-#~ msgid "Update respondent status"
-#~ msgstr "Ververs antwoordstatus"
+#~ msgid ""
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
+#~ msgstr ""
+#~ "Kon geen inbox vinden voor nieuwe mailopslag:\n"
+#~ "%s\n"
+#~ "Er zal geen snelkoppeling aangemaakt worden."
 
-#~ msgid "Send Latest Information"
-#~ msgstr "Verstuur Laatste Informatie"
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "B_ewerken..."
 
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> heeft bijeenkomstgegevens beschikbaar gemaakt."
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Nieuw"
 
-#~ msgid "Meeting Information"
-#~ msgstr "Bijeenkomst Informatie"
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Bewerking Annuleren"
 
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> verzoekt u bij de bijeenkomst aanwezig te zijn."
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "Arkansas"
 
-#~ msgid "Meeting Proposal"
-#~ msgstr "Vergadering Voorstel"
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "Arica"
 
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> wil graag aan een bestaande bijeenkomst bijdragen."
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "Bari"
 
-#~ msgid "Meeting Update"
-#~ msgstr "Vergadering Update"
+#, fuzzy
+#~ msgid "E_nable advanced options"
+#~ msgstr "Bewerking Annuleren"
 
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> wil graag  de laatste bijeenkomstgegevens ontvangen."
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Hurlburt"
 
-#~ msgid "Meeting Update Request"
-#~ msgstr "VergaderingsUpdate Verzoek"
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "Somerset"
 
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s<b> heeft geantwoord op een bijeenkomstverzoek."
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Handtekeningbestand:"
 
-#~ msgid "Meeting Reply"
-#~ msgstr "Bijeenkomst Antwoord"
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Verwijder alles behalve de  handtekening"
 
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> heeft een bijeenkomst geannuleerd."
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "Bestand met _HTML-ondertekening:"
 
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Bijeenkomst Annulering"
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Bestandsnaam:"
 
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> heeft een onleesbaar bericht gestuurd."
+#, fuzzy
+#~ msgid "_HTML Signature:"
+#~ msgstr "Bestand met _HTML-ondertekening:"
 
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Fout Bijeenkomstbericht"
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Taal"
 
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> heeft taakgegevens beschikbaar gemaakt."
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Radio"
 
-#~ msgid "Task Information"
-#~ msgstr "Taak Informatie"
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Kon geen PGP encryptie context maken."
 
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> verzoekt u een taak uit te voeren."
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Kon geen PGP decryptie context maken"
 
-#~ msgid "Task Proposal"
-#~ msgstr "Taak Voorstel"
+#~ msgid "Moving"
+#~ msgstr "Bezig met verplaatsen"
 
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> wil graag iets toevoegen aan een bestaande taak."
+#~ msgid "Copying"
+#~ msgstr "Bezig met kopi�ren"
 
-#~ msgid "Task Update"
-#~ msgstr "Taak Update"
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Handtekeningbestand:"
 
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> wil graag de laatste taakgegevens ontvangen."
+#~ msgid "Riga"
+#~ msgstr "Riga"
 
-#~ msgid "Task Update Request"
-#~ msgstr "Taak Update Verzoek"
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_Toevoegen"
 
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> heeft een taakopdracht beantwoord."
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "Verwijderen"
 
-#~ msgid "Task Reply"
-#~ msgstr "Taak Antwoord"
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Weet u zeker dat u de \"%s\" map wilt verwijderen?"
 
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> heeft een taak geannuleerd."
+#~ msgid "Edit Addressbook"
+#~ msgstr "Bewerk Adresboek"
 
-#~ msgid "Task Cancellation"
-#~ msgstr "Taak Annulering"
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "Aanmelding bij server middels:"
 
-#~ msgid "Bad Task Message"
-#~ msgstr "Fout Taakbericht"
+#~ msgid "Account Name"
+#~ msgstr "Accountnaam"
 
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s<b> heeft vrij/bezet informatie gepubliceerd."
+#~ msgid "Add Addressbook"
+#~ msgstr "Adresboek Toevoegen"
 
-#~ msgid "Free/Busy Information"
-#~ msgstr "Vrij/Bezet Informatie"
+#~ msgid "Advanced"
+#~ msgstr "Uitgebreid"
 
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> vraagt om uw beschikbaarheidsinformatie."
+#~ msgid "Base"
+#~ msgstr "Basis"
 
-#~ msgid "Free/Busy Request"
-#~ msgstr "Vrij/Bezet Verzoek"
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Controleer dit als de server aanmelding vereist."
 
-#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with "
+#~ "the server"
 #~ msgstr ""
-#~ "<b>%s</b> heeft een verzoek om beschikbaarheidsinformatie beantwoord."
+#~ "Evolution zal deze Distinguished Name (DN) gebruiken om u te aan te "
+#~ "melden bij de server"
 
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Vrij/Bezet Antwoord"
-
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Foutief Vrij/Bezet Bericht"
-
-#~ msgid "The message does not appear to be properly formed"
-#~ msgstr "Het bericht lijkt niet goed opgemaakt te zijn"
-
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Het bericht bevat slechts niet ondersteunde aanvragen."
-
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "De bijlage bevat geen geldig kalenderbericht"
-
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "De bijlage heeft geen bekijkbaar kalenderobject"
-
-#~ msgid "Event information"
-#~ msgstr "Gebeurtenis informatie"
-
-#~ msgid "Task information"
-#~ msgstr "Taak informatie"
+#~ msgid "Server Name"
+#~ msgstr "Servernaam"
 
-#~ msgid "Journal information"
-#~ msgstr "Journaal informatie"
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr ""
+#~ "De informatie hieronder is nodig om een adresboek toe te kunnen voegen. "
 
-#~ msgid "Free/Busy information"
-#~ msgstr "Vrij/Bezet informatie"
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "Deze informatie is niet noodzakelijk voor de meeste LDAP-servers. "
 
-#~ msgid "Calendar information"
-#~ msgstr "Kalenderinformatie"
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "Deze informatie wordt door uw LDAP-server gebruikt om aan te geven wat er "
+#~ "doorzocht moet worden. Neem contact op met uw systeembeheerder voor meer "
+#~ "informatie."
 
-#, fuzzy
-#~ msgid "Updated"
-#~ msgstr "Verversen"
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
+#~ msgstr ""
+#~ "Dit is de basisnode voor al uw zoekopdrachten op de LDAP-server. Neem "
+#~ "contact op met uw systeembeheerder voor meer informatie."
 
-#, fuzzy
-#~ msgid "Refresh"
-#~ msgstr "Lijst Verversen"
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Dit is de naam van de server waarop uw adresboek zich bevindt."
 
-#~ msgid "Task"
-#~ msgstr "Taak"
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Dit is de poort die uw LDAP-server gebruikt."
 
-#~ msgid "Status: %s"
-#~ msgstr "Status: %s"
+#~ msgid "_Account name:"
+#~ msgstr "_Accountnaam:"
 
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Procent Voltooid: %i"
+#~ msgid "C_ontaining:"
+#~ msgstr "be_vat:"
 
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Toon contacten die aan de volgende criteria voldoen:"
 
-#~ msgid "Categories: %s"
-#~ msgstr "Categorie�n: %s"
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Maak een nieuwe afspraken met een standaard _herinnering"
 
-#~ msgid "Contacts: "
-#~ msgstr "Contacten: "
+#~ msgid "First day of wee_k:"
+#~ msgstr "Eerste dag van de we_ek:"
 
-#, fuzzy
-#~ msgid "Reminder!!"
-#~ msgstr "Herinnering"
+#~ msgid "_Other"
+#~ msgstr "_Overige"
 
 #~ msgid "Error hashing password."
 #~ msgstr "Fout bij fijnhakken van wachtwoord"
@@ -26912,9 +27731,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Could not encrypt: encoding failed."
 #~ msgstr "Kon niet versleutelen: versleutelen mislukt"
 
-#~ msgid "Failed to decrypt: Unknown"
-#~ msgstr "Kan bericht niet decoderen: Onbekende fout"
-
 #~ msgid "Please enter the NNTP password for %s@%s"
 #~ msgstr "Voer het NNTP-wachtwoord voor %s@%s in"
 
@@ -26957,7 +27773,8 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ "\n"
 #~ "Just leave it blank for the default"
 #~ msgstr ""
-#~ "U kunt een andere HTML-pagina kiezen als achtergrond voor de samenvatting.\n"
+#~ "U kunt een andere HTML-pagina kiezen als achtergrond voor de "
+#~ "samenvatting.\n"
 #~ "\n"
 #~ "Laat deze leeg voor de standaardachtergrond."
 
@@ -27050,30 +27867,12 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Enter folder URI"
 #~ msgstr "Voer een Map-URI in"
 
-#~ msgid "Default"
-#~ msgstr "Standaard"
-
-#~ msgid "Mail to %s"
-#~ msgstr "Post versturen naar %s"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Onderwerp is %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Post ophalen van %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "%s mailinglijst"
-
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Inkomende post"
 
 #~ msgid " color"
 #~ msgstr " kleur"
 
-#~ msgid "Account"
-#~ msgstr "Account"
-
 #~ msgid "Accounts"
 #~ msgstr "Accounts"
 
@@ -27081,18 +27880,10 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Ad_vanced &gt;&gt;"
 #~ msgstr "Uitgebreid"
 
-#, fuzzy
-#~ msgid "Add new signature"
-#~ msgstr "Bewaar handtekening"
-
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr ""
-#~ "Versleutel berichten altijd naar mijzelf bij het versturen van versleutelde "
-#~ "berichten"
-
-#, fuzzy
-#~ msgid "Command"
-#~ msgstr "Bedrijf"
+#~ "Versleutel berichten altijd naar mijzelf bij het versturen van "
+#~ "versleutelde berichten"
 
 #~ msgid "Composer"
 #~ msgstr "Editor"
@@ -27113,9 +27904,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Display"
 #~ msgstr "Weergave"
 
-#~ msgid "Drafts"
-#~ msgstr "Klad"
-
 #, fuzzy
 #~ msgid "E_mail address:"
 #~ msgstr "_Emailadres:"
@@ -27151,9 +27939,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "List of signatures"
 #~ msgstr "Bestand met _HTML-ondertekening:"
 
-#~ msgid "Mail Settings"
-#~ msgstr "Mail-instellingen"
-
 #, fuzzy
 #~ msgid "N_ew..."
 #~ msgstr "Nieuw..."
@@ -27178,9 +27963,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Select PGP binary"
 #~ msgstr "Selecteer het pad naar PGP"
 
-#~ msgid "Sent"
-#~ msgstr "Verzonden"
-
 #, fuzzy
 #~ msgid "Shortcut"
 #~ msgstr "_Snelkoppeling"
@@ -27223,10 +28005,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "_Remember this password"
 #~ msgstr "_Onthoud dit wachtwoord"
 
-#, fuzzy
-#~ msgid "_Script"
-#~ msgstr "_Beveiliging"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "Stuur berichten standaard in HTML-formaat."
 
@@ -27247,74 +28025,21 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "use _HTML for this signature"
 #~ msgstr "Bestand met _HTML-ondertekening:"
 
-#, fuzzy
-#~ msgid "View messages..."
-#~ msgstr "Bericht Opslaan Als..."
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "Dit bericht is digitaal ondertekend. Klik op het hangslot icoontje voor meer "
-#~ "informatie."
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Evolution herkent dit type ondertekening niet."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Dit bericht is digitaal ondertekend en is authentiek."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Dit bericht is digitaal ondertekend, maar er kan niet worden aangetoond dat "
-#~ "het authentiek is."
-
 #~ msgid "Incomplete message written on pipe!"
 #~ msgstr "Invcomplete berichten geschreven op de pijp!"
 
 #~ msgid "Mail Summary"
 #~ msgstr "Berichten Samenvatting"
 
-#~ msgid " F"
-#~ msgstr " F"
-
-#~ msgid " C"
-#~ msgstr " C"
-
-#~ msgid "knots"
-#~ msgstr "knopen"
-
-#~ msgid "kph"
-#~ msgstr "km/u"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "mijl"
-
-#~ msgid "kilometers"
-#~ msgstr "kilometer"
-
 #~ msgid "Factory for the Evolution notes component."
 #~ msgstr "Fabriek voor de Evolution kalendercomponent."
 
 #~ msgid "Factory for the Notes control"
 #~ msgstr "Fabriek voor Notitiebeheer."
 
-#~ msgid "Outbox"
-#~ msgstr "Outbox"
-
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan map niet overzetten:\n"
-#~ "%s"
-
 #~ msgid "Dump"
 #~ msgstr "Dump"
 
@@ -27611,10 +28336,11 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 
 #, fuzzy
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
 #~ msgstr ""
-#~ "Deze optie zal bij het verbinden met de server gebruik maken van "
-#~ "Kerberos-4-aanmelding."
+#~ "Deze optie zal bij het verbinden met de server gebruik maken van Kerberos-"
+#~ "4-aanmelding."
 
 #, fuzzy
 #~ msgid "Could not authenticate to KPOP server: %s"
@@ -27628,10 +28354,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "(Unknown)"
 #~ msgstr "Onbekend"
 
-#, fuzzy
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Onverwacht antwoord van IMAP-server: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Kon 'Van'-adres niet vinden in berichtinhoud"
 
@@ -27697,9 +28419,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "Dit bericht bevat alleen Bcc-ontvangers."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML Handtekeningbestand:"
-
 #~ msgid "Cannot initialize Evolution's Summary component."
 #~ msgstr "Kon de Evolution Samenvattingscomponent niet initialiseren."
 
@@ -27720,10 +28439,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgstr "Alle mappen"
 
 #, fuzzy
-#~ msgid "All news _feeds:"
-#~ msgstr "Nieuws_bron toevoegen"
-
-#, fuzzy
 #~ msgid "_Display folders:"
 #~ msgstr "_Klad map:"
 
@@ -27735,9 +28450,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "_Displayed feeds:"
 #~ msgstr "Kaarten weergeven"
 
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
 #, fuzzy
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
diff --git a/po/nn.po b/po/nn.po
index 8f92ccd88c..e9d020ef34 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-1.01\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-01-30 06:10+0100\n"
 "Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
 "Language-Team: \n"
@@ -34,7 +34,7 @@ msgstr "Importerar VCard-filer inn i Evolution."
 msgid "File As"
 msgstr "Arkiver som"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Namn"
@@ -45,7 +45,7 @@ msgid "Email"
 msgstr "E-post"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Prim�r"
 
@@ -55,7 +55,7 @@ msgstr "Prim"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistent"
@@ -63,8 +63,8 @@ msgstr "Assistent"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Firma"
 
@@ -74,12 +74,12 @@ msgid "Bus"
 msgstr "Frm"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Ring tilbake"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Firma"
 
@@ -90,8 +90,8 @@ msgstr "Frm"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Heim"
 
@@ -106,18 +106,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Firma-fax"
@@ -127,13 +127,13 @@ msgid "Bus Fax"
 msgstr "Frm-fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Heime-faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Firma 2"
 
@@ -142,43 +142,43 @@ msgid "Bus 2"
 msgstr "Frm 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Heim 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Anna"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Persons�kjar"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Teleks"
@@ -190,14 +190,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-post 3"
@@ -335,7 +335,7 @@ msgstr "VKort for %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Kunne ikkje initialisere Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "S�kjer ..."
 
@@ -356,32 +356,32 @@ msgstr "Lastar ..."
 msgid "Error in search expression."
 msgstr "Feil i s�keuttrykk."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Legg til kort til LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Fjernar kort fr� LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Endrar kort fr� LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Startar s�k om att."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Mottek LDAP-s�keresultat ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Feil ved fjerning av kort"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Klarter ikkje � tolke URL fr� �%s�"
@@ -429,104 +429,136 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Ein eksempel Bonobo-kotroll som viser ein addressebok."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "Addressebokkjelder"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Kontroll som viser eit Evolution addressebok minikort."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolutions addressebok minikortlesar"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Evolutionkomponent for handsaming av kontakter."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fabrikk for Minikortkontrolle i addresseboka"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Fabrikk for addressevisaren til addresseboka"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Fabrikke for sprettopp-vindauget til addresseboka"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrikk for ein eksemple adressebokkontroll"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Mappe som inneheld kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP-tenar"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "LDAP-tenar som inneheld kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "&Innhald ..."
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Ny kontaktliste"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Klarte ikkje � kople til LDAP-tenar."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "&Innhald ..."
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Ikkje i stand til � autentisere mot IMAP-tenar.\n"
+"%s\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Les filinformasjon"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr "Les filinformasjon"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "Den oppgitte fila finst ikkje"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Klarte ikkje � initialisere gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Andre kontakter"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Ikkje i stand � opne adresseboka"
@@ -552,50 +584,59 @@ msgid ""
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Oppgi passord for %s (brukar %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "sluttar med"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "E-post 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Nokon felt inneheld"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Avansert ..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Nokon kategori"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(ingen)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Prim�r e-post"
 
@@ -641,102 +682,59 @@ msgstr "Sl� av sp�rjingar"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Sl� p� sp�rjingar (Farleg!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Klarte ikkje � kople til LDAP-tenar."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Ikkje i stand til � autentisere mot IMAP-tenar.\n"
-"%s\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr "Les filinformasjon"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Den oppgitte fila finst ikkje"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Fullf�ringsdato"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "Vel modemtype ..."
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Val"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "Fje_rn"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Fje_rn"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Val"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -745,8 +743,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Addressebokkjelder"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Alarmar"
@@ -843,8 +841,8 @@ msgstr "Oppsett"
 msgid "Mappings"
 msgstr "Margar"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_kvar"
@@ -1027,14 +1025,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1057,8 +1055,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1090,7 +1088,7 @@ msgid "Using email address"
 msgstr "E-postadresse:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1098,7 +1096,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Legg til"
 
@@ -1145,7 +1143,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1264,10 +1262,12 @@ msgstr "Gpilotd adressekomponent"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1388,7 +1388,7 @@ msgstr "Samarbeid"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -1397,7 +1397,7 @@ msgid "D_epartment:"
 msgstr "Avd_eling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Detaljar"
 
@@ -1454,11 +1454,12 @@ msgstr "Vil motta _HTML-post"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -1487,7 +1488,7 @@ msgid "_Web page address:"
 msgstr "_Nettsideaddresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "USA"
 
@@ -1993,12 +1994,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Latvia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libanon"
 
@@ -2007,7 +2007,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
@@ -2016,12 +2016,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litauen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
@@ -2054,7 +2054,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2079,7 +2079,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexico"
 
@@ -2105,7 +2105,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marokko"
 
@@ -2130,7 +2130,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Nederland"
 
@@ -2143,12 +2143,12 @@ msgid "New Caledonia"
 msgstr "New Caledonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Ny Zealand"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2165,7 +2165,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolk Island"
 
@@ -2174,17 +2174,17 @@ msgid "Northern Mariana Islands"
 msgstr "Northern Mariana Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Noreg"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2197,7 +2197,7 @@ msgid "Palestinian Territory"
 msgstr "Palestina"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2206,12 +2206,12 @@ msgid "Papua New Guinea"
 msgstr "Papua New Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2224,22 +2224,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
@@ -2248,7 +2248,7 @@ msgid "Reunion"
 msgstr "Reunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Romania"
 
@@ -2285,7 +2285,7 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome And Principe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
@@ -2302,17 +2302,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapore"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovakia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slovenia"
 
@@ -2325,7 +2325,7 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "S�r-Afrika"
 
@@ -2334,7 +2334,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "South Georgia And The South Sandwich Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Spania"
 
@@ -2355,7 +2355,7 @@ msgid "Sudan"
 msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Suriname"
 
@@ -2368,17 +2368,17 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Sverige"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Sveits"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
@@ -2416,7 +2416,7 @@ msgid "Tunisia"
 msgstr "Tunisia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Tyrkia"
 
@@ -2437,7 +2437,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukrainia"
 
@@ -2446,7 +2446,7 @@ msgid "United Arab Emirates"
 msgstr "Forente Arabiske Emirater"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Storbritannia"
 
@@ -2455,7 +2455,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2468,12 +2468,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2496,12 +2496,12 @@ msgid "Western Sahara"
 msgstr "Western Sahara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslavia"
 
@@ -2514,26 +2514,34 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Er du sikker p� at du vil\n"
+" slette denne kontakta?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Slett kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Kategoriredigering ikkje tilgjengeleg."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Lagre kontakt som VKort"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr ""
@@ -2560,11 +2568,11 @@ msgstr "E-post"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2699,11 +2707,11 @@ msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Redigering av kontakter"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Lagre liste som VCard"
 
@@ -2782,21 +2790,21 @@ msgstr ""
 "%1"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Feil ved endringa av kort"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Vellukka"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -2806,7 +2814,7 @@ msgid "Repository offline"
 msgstr "depot i vcs"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
@@ -2824,55 +2832,70 @@ msgstr "Protokollen er ikkje st�tta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Avbroten"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Autentisering feila."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autentisering:"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Anna feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringar?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Feil ved tillegging av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Feil ved tilleggjing av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Feil ved fjerning av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Vis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Vis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2880,22 +2903,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Ingen kort"
@@ -2960,102 +2983,108 @@ msgstr "Alternativ telefon"
 msgid "Other Address"
 msgstr "Alternativ adresse"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Adressebok"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Lagre som VKort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Ny kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_G� til mappe"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Import�r ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "Slett kolonne"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Kjelde:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot-innstillingar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Vidaresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Kopier til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Flytt til _mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3065,7 +3094,7 @@ msgstr "_Aktiv visning"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,�,�,�"
 
@@ -3073,7 +3102,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,�,�,�"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,�,�,�"
 
@@ -3213,7 +3242,7 @@ msgstr "Margar"
 msgid "Number of columns:"
 msgstr "Tal p� kolonnar:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Val"
 
@@ -3223,7 +3252,7 @@ msgid "Orientation"
 msgstr "Retning"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Side"
 
@@ -3297,29 +3326,33 @@ msgstr "Breidd:"
 msgid "_Font..."
 msgstr "_Skrifttype ..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Avtale utan namn"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "H�g"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Vanleg"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Lav"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Udefinert"
 
@@ -3364,49 +3397,39 @@ msgstr "�ydelagd oppsettfil."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 #, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Kan ikkje initialisera lokale variablar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Tilgjengelege lenkjer:"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Evolutionkomponent for handtere kalendaren."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Calendar Summary component."
-msgstr "�ydelagd oppsettfil."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "�ydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 #, fuzzy
 msgid "Factory for the calendar iTip view control"
 msgstr "�ydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the sample Calendar control"
 msgstr "�ydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "�ydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "�ydelagd oppsettfil."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3418,10 +3441,23 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "Startar:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "Slutt:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "ugyldig tid"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3459,7 +3495,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�tvaring"
@@ -3480,12 +3516,12 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ikkje sp�r igjen"
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikkje initiere Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 #, fuzzy
 msgid "Could not create the alarm notify service"
 msgstr ""
@@ -3493,7 +3529,7 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr ""
@@ -3513,7 +3549,7 @@ msgstr "Skildring inneheld"
 msgid "Comment contains"
 msgstr "Merknad inneheld"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Ikkje truffe"
 
@@ -3553,14 +3589,16 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Offentleg"
 
@@ -3581,27 +3619,32 @@ msgid "W"
 msgstr "V"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Oppteke"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Ikkje starta"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Ferdig"
 
@@ -3613,11 +3656,12 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3632,12 +3676,14 @@ msgstr "Repeterande"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Nei"
 
@@ -3657,62 +3703,64 @@ msgstr "Vekesvisning"
 msgid "Month View"
 msgstr "M�nadsvising"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Mappe inneheld avtaler og hendingar"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Oppg�ver"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Mappe inneheld huskeliste"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "Nettverksinnstillingar"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "M�te"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "Ny oppg�ve"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Oppg�ve"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Ny _avtale"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "Avtale"
@@ -3928,7 +3976,7 @@ msgstr "P�minning"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samandrag:"
 
@@ -3957,7 +4005,7 @@ msgstr "slutt p� avtale"
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minutt"
 
@@ -3985,80 +4033,82 @@ msgstr "30 minutt"
 msgid "60 minutes"
 msgstr "60 minutt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Innstillingar for kalendar og oppg�ver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Farge for oppg�ver som har g�tt over tida"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
 msgid "Color for tasks due today"
 msgstr "Farge eller pixmap"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Dagar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Timar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minutt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "M�ndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "Su_n"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Vis veke_nummer i datonavigat�ren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "Sta_rt p� dagen:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "Su_n"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "S�ndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "_Oppg�ver som skal vere ferdig i dag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "T_or"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "T_ys"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4087,83 +4137,97 @@ msgid "Tuesday"
 msgstr "Tysdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Arbeidsveke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timers (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 timar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Oppg�va byrjar: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Vis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "S_lutt p� dag:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_Fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Generelt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "Neste melding"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_M�n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "&Syntaksmerkingsmodusar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_Lau"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Oppdeling a_v tid:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "T_ys"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_Ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 #, fuzzy
-msgid "before the start of the appointment"
+msgid "before every appointment"
 msgstr "&Slett avtale"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4254,41 +4318,61 @@ msgstr " (Ferdig"
 msgid "Due "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:342
 #, fuzzy
-msgid "Could not update object!"
+msgid "Could not update invalid object"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Kunne ikkje laga kio-jobb.\n"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Redig�r avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Oppg�ve - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppf�ring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Lagre som ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Ikkje stand til � f� tak i noverande versjon!"
 
@@ -4349,28 +4433,28 @@ msgstr "Deleg�r til:"
 msgid "Enter Delegate"
 msgstr "Tast inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "P�minning"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Repetering"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 #, fuzzy
 msgid "Scheduling"
 msgstr "K�yreplan ..."
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "M�te"
 
@@ -4417,7 +4501,7 @@ msgid "Pu_blic"
 msgstr "_Offentleg"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Vis tid som"
 
@@ -4439,19 +4523,19 @@ msgstr "_Slutt-tid:"
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Deleg�r til ..."
 
@@ -4462,49 +4546,55 @@ msgstr "Deltakar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Felles namn"
+msgid "Click here to add an attendee"
+msgstr "Klikke her for � leggje til ein deltakar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delegert fr�"
+msgid "Common Name"
+msgstr "Felles namn"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegert til"
+msgid "Delegated From"
+msgstr "Delegert fr�"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Spr�k"
+msgid "Delegated To"
+msgstr "Delegert til"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Medlem"
+msgid "Language"
+msgstr "Spr�k"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolle"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
@@ -4519,15 +4609,10 @@ msgid "_Change Organizer"
 msgstr "_Endre organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Inviter andre ..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#, fuzzy
-msgid "_Other Organizer"
-msgstr "Planleggjar"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4722,7 +4807,7 @@ msgid "Progress"
 msgstr "Framgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4734,19 +4819,19 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Enkel"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Skildring:"
 
@@ -4758,23 +4843,78 @@ msgstr "Sta_rt-dato:"
 msgid "_Due Date:"
 msgstr "Forfalls_dato:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Opne"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Lagre som ..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4782,20 +4922,20 @@ msgstr "Lagre som ..."
 msgid "_Print..."
 msgstr "S_kriv ut"
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kl_ipp ut"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4803,35 +4943,36 @@ msgstr "_Kopier"
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Tildel oppg�ve"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Fort framover"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_Merk som komplett"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk oppg�ver som ferdig"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppg�ver"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Oppdaterar objekt"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Trykk her for � leggje til ei oppg�ve"
 
@@ -4839,47 +4980,48 @@ msgstr "Trykk her for � leggje til ei oppg�ve"
 msgid "Alarms"
 msgstr "Alarmar"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Fullf�ringsdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Forfallsdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Sluttdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Geografisk plassering"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Start-dato"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Samandrag"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Sort�r oppg�ver"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4927,11 +5069,13 @@ msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -4972,7 +5116,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "Informasjon"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Set opp %1"
@@ -4983,7 +5127,7 @@ msgid "_Configure Pilot..."
 msgstr "Set opp %1"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "_Lagre som ..."
 
@@ -5013,77 +5157,411 @@ msgid "Delete _All Occurrences"
 msgstr "Slettar klassen"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "M�tet byrjar: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "Oppg�va byrjar: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Informasjon"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Byrjar: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Informasjon"
+
+#: calendar/gui/e-itip-control.c:707
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Informasjon"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "Sluttar: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "Ferdig"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "Oppg�va ferdig: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "Informasjon"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Skriv ut alle"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "Ein ukjent person"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Sj� gjennom den f�lgjande informasjon, og velj ei handling fr� menyen "
+"under."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Ingen</i>"
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "_Status:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Akseptert"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "Mellombels"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Avsl�tt"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "Vel ei handling:"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Oppdater"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "Godta"
+
+#: calendar/gui/e-itip-control.c:1001
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Mellombels"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "Avsl�"
+
+#: calendar/gui/e-itip-control.c:1026
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Informasjon"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "Opdat�r status p� svar"
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Informasjon"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: calendar/gui/e-itip-control.c:1117
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "generer avlusingsinformasjon"
+
+#: calendar/gui/e-itip-control.c:1118
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Personleg informasjon"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> sp�r etter deg for � stille opp p� eit m�te."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "M�teframlegg"
+
+#: calendar/gui/e-itip-control.c:1127
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> �nskjar � leggje til ei eksisterande oppg�ve."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "M�teoppdatering"
+
+#: calendar/gui/e-itip-control.c:1132
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "generer avlusingsinformasjon"
+
+#: calendar/gui/e-itip-control.c:1133
+#, fuzzy
+msgid "Meeting Update Request"
+msgstr "M�teoppdatering"
+
+#: calendar/gui/e-itip-control.c:1156
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "Dette er ei repeterande hending."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "M�tesvar"
+
+#: calendar/gui/e-itip-control.c:1161
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> har kansellert ei oppg�ve."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "M�tekansellering"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, fuzzy, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> har kansellert ei oppg�ve."
+
+#: calendar/gui/e-itip-control.c:1167
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "&Finn i melding ..."
+
+#: calendar/gui/e-itip-control.c:1189
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "generer avlusingsinformasjon"
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Oppg�veinformasjon"
+
+#: calendar/gui/e-itip-control.c:1194
+#, fuzzy, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "Pr�v �%s --help� for meir informasjon\n"
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Oppg�veframlegg"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> �nskjar � leggje til ei eksisterande oppg�ve."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Oppg�veoppdatering"
+
+#: calendar/gui/e-itip-control.c:1204
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "Dette er ei f�rehandsvising av det valte bakgrunnsbiletet."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Oppg�veoppdateringsforep�rjing"
+
+#: calendar/gui/e-itip-control.c:1229
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "Dette er ei repeterande hending."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Oppg�vesvar"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> har kansellert ei oppg�ve."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Oppg�vekansellering"
+
+#: calendar/gui/e-itip-control.c:1240
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Skriv ut alle"
+
+#: calendar/gui/e-itip-control.c:1259
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Skriv avlusingsinformasjon"
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Fri/ledig-informasjon"
+
+#: calendar/gui/e-itip-control.c:1264
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "Pr�v �%s --help� for meir informasjon\n"
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Fri/ledig foresp�rsel"
+
+#: calendar/gui/e-itip-control.c:1269
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "Dette er ei repeterande hending."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Fri/Oppteke svar"
+
+#: calendar/gui/e-itip-control.c:1275
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Private meldingar"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Meldinga ser ikkje ut til � vere skikkeleg forma"
+
+#: calendar/gui/e-itip-control.c:1373
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "Meldinga har ingen sendar"
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
+
+#: calendar/gui/e-itip-control.c:1432
+#, fuzzy
+msgid "The attachment has no viewable calendar items"
+msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Kunne ikkje lagra adresseboka."
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1709
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Dato"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Vel mappe"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vel mappe"
@@ -5125,100 +5603,99 @@ msgstr "sluttdato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Bil-telefon"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 #, fuzzy
 msgid "Required Participants"
 msgstr "Tenarinformasjon"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Ikkje-deltakarar"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Ressurs"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Rom"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 #, fuzzy
 msgid "Chair"
 msgstr "Teikn"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 #, fuzzy
 msgid "Required Participant"
 msgstr "Tenarinformasjon"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 #, fuzzy
 msgid "Optional Participant"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Ikkje-deltakar"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 #, fuzzy
 msgid "Needs Action"
 msgstr "Vel ikon"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Akseptert"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Avsl�tt"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Mellombels"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Delegert"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "Under prossering"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5230,67 +5707,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Ute av kontoret"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Val"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Vis kun _arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 #, fuzzy
 msgid "Show _Zoomed Out"
 msgstr "Forminsk"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 #, fuzzy
 msgid "_Update Free/Busy"
 msgstr "Oppdateringsfrekvens"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Autoplukk"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 #, fuzzy
 msgid "_All People and Resources"
 msgstr "Alle filer og katalogar"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 #, fuzzy
 msgid "Meeting _start time:"
 msgstr "&Helsingstekst:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "M�t_e slutttid:"
 
@@ -5309,17 +5786,25 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje st�tta."
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr ""
+"Kan ikkje fjerna post fr�\n"
+"postboksen '%1':\n"
+"%2"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Fullf�ringsdato"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "Forventar %1"
@@ -5332,7 +5817,7 @@ msgstr "Ny _avtale ..."
 msgid "_Delete this Appointment"
 msgstr "Slett _denne avtalen"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
@@ -5340,12 +5825,12 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden %1 er ikkje st�tta."
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Feil ved opning"
@@ -5406,19 +5891,57 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "Informasjon"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "Informasjon om oppg�ve"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "Personleg informasjon"
+
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "Informasjon"
+
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "Informasjon"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Oppdater"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Frisk opp liste"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr ""
@@ -5611,12 +6134,45 @@ msgstr "Vald m�nad (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Vald �r (%Y)"
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "Oppg�ve"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Status: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioritet:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Prosent ferdig: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Kategoriar %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Kontaktar: "
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Skriv ut kalendar"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5648,8 +6204,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Ikkje sp�r igjen"
 
@@ -5705,6 +6261,11 @@ msgstr "Importerar VCard-filer inn i Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importerar VCard-filer inn i Evolution."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "P�minning"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5798,8 +6359,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -6726,653 +7287,668 @@ msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Asia/Macao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Asia/Magadan"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Asia/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Asia/Muscat"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Asia/Nicosia"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Asia/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Asia/Kabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Asia/Pontianak"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Asia/Pyongyang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Asia/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Asia/Rangoon"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Asia/Riyadh"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Asia/Saigon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Asia/Sakhalin"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Asia/Samarkand"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Asia/Seoul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Asia/Shanghai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Asia/Singapore"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Asia/Taipei"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Asia/Tashkent"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Asia/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Asia/Tehran"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Asia/Thimphu"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Asia/Tokyo"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Asia/Ujung_Pandang"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Asia/Ulaanbaatar"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Asia/Urumqi"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Asia/Vientiane"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Asia/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Asia/Yakutsk"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Asia/Yekaterinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Asia/Yerevan"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantisk/Azores"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantisk/Bermuda"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlantisk/Canary"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantisk/Cape_Verde"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlantisk/F�r�yane"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 #, fuzzy
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantisk/Jan_Mayen"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 #, fuzzy
 msgid "Atlantic/Madeira"
 msgstr "Atlantisk/Madeira"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 #, fuzzy
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantisk/Reykjavik"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 #, fuzzy
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantisk/South_Georgia"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 #, fuzzy
 msgid "Atlantic/St_Helena"
 msgstr "Atlantisk/St_Helena"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 #, fuzzy
 msgid "Atlantic/Stanley"
 msgstr "Atlantisk/Stanley"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australia/Adelaide"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australia/Broken_Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australia/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australia/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australia/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australia/Lord_Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australia/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australia/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australia/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europa/Athen"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europa/Beograd"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europa/Br�ssel"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucaresti"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europe/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europa/K�benhavn"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinki"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxembourg"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europa/Moskva"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europa/Praha"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europe/Simferopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikan"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europa/Wien"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europa/Warsawa"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europe/Zaporozhye"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europa/Z�rich"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 #, fuzzy
 msgid "Indian/Comoro"
 msgstr "Lukk"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 #, fuzzy
 msgid "Indian/Mahe"
 msgstr "India"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr ""
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 #, fuzzy
 msgid "Indian/Mauritius"
 msgstr "Marger"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 #, fuzzy
 msgid "Indian/Mayotte"
 msgstr "M�ndag"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 #, fuzzy
 msgid "Indian/Reunion"
 msgstr "Start om att"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Stillehavet/Apia"
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Stillehavet/Auckland"
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Stillehavet/Chatham"
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Stillehavet/P�ske�ya"
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Stillehavet/Efate"
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Stillehavet/Enderbury"
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Stillehavet/Fakaofo"
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Stillehavet/Fiji"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Stillehavet/Funafuti"
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Stillehavet/Galapagos"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Stillehavet/Gambier"
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Stillehavet/Guadalcanal"
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Stillehavet/Guam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Stillehavet/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Stillehavet/Johnston"
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Stillehavet/Kiritimati"
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Stillehavet/Kosrae"
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Stillehavet/Kwajalein"
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Stillehavet/Majuro"
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Stillehavet/Marquesas"
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Stillehavet/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Stillehavet/Nauru"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Stillehavet/Niue"
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Stillehavet/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Stillehavet/Noumea"
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Stillehavet/Pago_Pago"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Stillehavet/Palau"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Stillehavet/Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Stillehavet/Ponape"
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Stillehavet/Port_Moresby"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Stillehavet/Rarotonga"
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Stillehavet/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Stillehavet/Tahiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Stillehavet/Tarawa"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Stillehavet/Tongatapu"
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Stillehavet/Truk"
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Stillehavet/Wake"
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Stillehavet/Wallis"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Stillehavet/Yap"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:209
-#, fuzzy
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Den oppgitte fila finst ikkje"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Knapp (ikkje st�tta av KControl)"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
@@ -7382,14 +7958,14 @@ msgstr "Den oppgitte fila finst ikkje"
 msgid "Unable to create cache path"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7397,7 +7973,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7408,12 +7984,17 @@ msgstr ""
 "%s\n"
 "Endringar gjort p� mappa vil ikkje bli resynkronisert."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 #, fuzzy
 msgid "Resynchronizing with server"
 msgstr "Registrerer hj� tenaren ..."
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Lagrar mappe �%s�"
+
+#: camel/camel-disco-store.c:367
 #, fuzzy
 msgid "You must be working online to complete this operation"
 msgstr "Kan ikkje gjera LIST-operasjon ferdig"
@@ -7422,63 +8003,74 @@ msgstr "Kan ikkje gjera LIST-operasjon ferdig"
 msgid "Syncing folders"
 msgstr "Synkroniserar mapper"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Kan ikkje 'chown' 'spool'-katalogen"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Mottek melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Kan ikkje opne melding"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Synkroniser mapper"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Klarte ikkje � dekode melding."
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Kunne ikkje leggja til melding:\n"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Kunne ikkje leggja til melding:\n"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -7512,29 +8104,105 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Flyttar melding"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Melding"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Avbroten."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Uventa svar fr� POP-tenaren: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "G� til side"
+
+#: camel/camel-gpg-context.c:827
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr ""
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Kunne ikkje leggja til melding:\n"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Kunne ikkje leggja til melding:\n"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Klarte ikkje � dekode melding."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Kunne ikkje laga katalog\n"
+
 #: camel/camel-lock-client.c:111
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7642,82 +8310,23 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-pgp-context.c:193
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Oppgi ditt OpenPGP-passord"
-
-#: camel/camel-pgp-context.c:196
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Oppgi ditt OpenPGP-passord"
-
-#: camel/camel-pgp-context.c:621
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Kan ikkje setja blokkstorleik for band."
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, fuzzy, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Kunne ikkje laga katalog\n"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr ""
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr ""
-
-#: camel/camel-pgp-context.c:993
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Kunne ikkje laga katalog\n"
-
-#: camel/camel-pgp-context.c:1004
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "Kunne ikkje laga katalog\n"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1194
-#, fuzzy, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Kunne ikkje laga katalog\n"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1387
-#, fuzzy, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Kunne ikkje laga katalog\n"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Anna feil"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7733,43 +8342,6 @@ msgstr "Klarte ikkje � laste %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s tenar %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Tilknytning avbroten"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(ukjend vert)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Operasjonen vart avbroten"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr ""
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonym"
@@ -7863,7 +8435,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -7891,11 +8463,9 @@ msgid ""
 "Password Authentication."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Passord"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7923,51 +8493,51 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URLen �%s� treng ein bruknamn-komponent"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Sl�r opp: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Feil i namneoppslag: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Sl�r opp: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8031,12 +8601,12 @@ msgstr "Klarte ikkje � dekode melding."
 msgid "Failed to verify certificates."
 msgstr "�tvaring ved &tilbaketrekte sertifikat"
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Klarar ikkje � opprette mappe: Ugyldig operasjon p� dette lageret"
 
@@ -8064,7 +8634,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8073,16 +8643,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8102,15 +8672,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Klarter ikkje � tolke URL fr� �%s�"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Inga slik melding %s i %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Inga slik melding: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Berre sjekk for ny e-post."
 
 #: camel/camel-vee-store.c:262
 #, fuzzy, c-format
@@ -8132,74 +8702,82 @@ msgstr "Leitar etter tilleggsmodular"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vtrash-folder.c:117
-#, fuzzy
-msgid "You cannot copy messages from this trash folder."
-msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Operasjonen vart avbroten"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, fuzzy, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Slett e-post fr� tenaren"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, fuzzy, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 #, fuzzy
 msgid "This message is not currently available"
 msgstr "%1 er ikkje tilgjengeleg."
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8258,32 +8836,81 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Passord"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP-tenar %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "SMTP-tenar %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Tilknytning avbroten"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operasjonen vart stoppa"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Autentisering feila."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-tenaren %s s�ttar ikkje den �nska autentiseringstypa %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Du tasta ikkje inn eit passord."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8293,73 +8920,93 @@ msgstr ""
 "Ikkje i stand til � autentisere mot IMAP-tenar.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Vidaresendt melding"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr ""
+"Kan ikkje fjerna post fr�\n"
+"postboksen '%1':\n"
+"%2"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "Separate katalogar"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 #, fuzzy
 msgid "Local delivery"
 msgstr "Mapper"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Sentrer dei valte elementa"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "Separate katalogar"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:100
-#, fuzzy
-msgid "Standard Unix mbox spools"
-msgstr "Standardfil"
-
-#: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Standardfil"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8387,7 +9034,7 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
@@ -8413,55 +9060,52 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 #, fuzzy
 msgid "No such message"
 msgstr "Vidaresendt melding"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, fuzzy, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8473,13 +9117,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappa �%s� eksisterar ikkje."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, fuzzy, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8493,7 +9137,7 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, fuzzy, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -8502,8 +9146,8 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -8527,26 +9171,21 @@ msgstr "Berre sjekk for ny e-post."
 msgid "Checking for new messages"
 msgstr "Melding"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Lagrar mappe"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -8554,35 +9193,30 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Feil ved opning"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -8622,8 +9256,7 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
@@ -8631,21 +9264,19 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
@@ -8653,8 +9284,8 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, fuzzy, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
@@ -8662,111 +9293,114 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, 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:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, fuzzy, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjend feil"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "�%s� er ikkje ein katalog"
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, fuzzy, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikkje opna katalogen %1"
 
-#: camel/providers/local/camel-spool-folder.c:515
+#: camel/providers/local/camel-spool-store.c:116
 #, fuzzy, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Mottek meldingar fr� %1"
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Denne mappa kan ikkje fjernast."
 
-#: camel/providers/local/camel-spool-store.c:115
+#: camel/providers/local/camel-spool-store.c:128
 #, fuzzy, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "%1 finst, men er inga vanleg fil"
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "er ei vanleg fil"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Fila finst ikkje\n"
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Denne mappa kan ikkje fjernast."
+
+#: camel/providers/local/camel-spool-store.c:182
 #, fuzzy
 msgid "Spool folders cannot be renamed"
 msgstr "Denne mappa kan ikkje fjernast."
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 #, fuzzy
 msgid "Spool folders cannot be deleted"
 msgstr "Denne mappa kan ikkje slettast."
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr ""
@@ -8774,39 +9408,20 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, fuzzy, c-format
-msgid "Could not file: %s: %s"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "%1 finst, men er inga vanleg fil"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Melding til %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET news"
@@ -8815,12 +9430,24 @@ msgstr "USENET news"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr ""
+"Kan ikkje laga heimekatalog\n"
+"Feil: %1"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8925,7 +9552,7 @@ msgstr "&La e-posten liggja p� tenaren."
 msgid "Delete after %s day(s)"
 msgstr "Slett denne adressa"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8946,69 +9573,59 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Operasjonen vart stoppa"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Autentisering feila."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "I/U-feil"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Inga slik mappe �%s�."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9173,43 +9790,43 @@ msgstr "Autentisering:"
 msgid "Authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Meldinga ser ikkje ut til � vere skikkeleg forma"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Feil svar p� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
+#: camel/providers/smtp/camel-smtp-transport.c:461
 #, fuzzy, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9217,94 +9834,94 @@ msgid ""
 "\n"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tenar %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Meldinga har ingen sendar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "M�te"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Feil svar p� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, 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:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -9312,37 +9929,37 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "Feil svar p� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "Feil svar p� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Feil svar p� RSET: %s"
@@ -9420,7 +10037,7 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -9428,46 +10045,46 @@ msgstr "Legg adresse til adresseboka"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Fr�:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn p� meldinga."
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9478,7 +10095,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Kunne ikkje laga kio-jobb.\n"
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9487,53 +10109,53 @@ msgstr ""
 "Feil ved lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "�tvaring:"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Fila eksisterar, skriv over?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil ved lasting av fil %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9542,13 +10164,13 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -9558,35 +10180,61 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "�tvaring: Melding er endra"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Set inn fil"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Lagre signatur"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (standard)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Skriv ei melding"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9645,7 +10293,7 @@ msgstr "Emne inneheld"
 msgid "Subject does not contain"
 msgstr "Emne inneheld ikkje"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9790,7 +10438,7 @@ msgstr "time"
 msgid "minute"
 msgstr "minutt"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "sekund"
 
@@ -9860,7 +10508,7 @@ msgstr " sidan"
 msgid "ago"
 msgstr "sidan"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b %k:%M"
@@ -9874,6 +10522,21 @@ msgstr "<klikk her for � velje ein dato>"
 msgid "Filter Rules"
 msgstr "Filter-reglar"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Stilnamn:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "%1 finst, men er inga vanleg fil"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Vel ei handling:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 #, fuzzy
@@ -9891,7 +10554,7 @@ msgid ""
 msgstr ""
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Vel mappe"
 
@@ -9904,7 +10567,11 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
@@ -9934,7 +10601,7 @@ msgid "if all criteria are met"
 msgstr ""
 
 #: filter/filter-rule.c:769
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr ""
 
 #: filter/filter-rule.c:780
@@ -10013,196 +10680,206 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Firma"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "inneheld"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Dato motteke"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Sletta"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "inneheld ikkje"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "sluttar ikkje med"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "finst ikkje"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "h�yres ikkje ut som"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "startar ikkje med"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Eksisterar ikkje"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Kladd"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "sluttar med"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Eksisterar"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "eksisterar"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Viktig"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "var etter"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "var f�r"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "Flagga"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "er st�rre enn"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "er ikkje"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Flagga"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 #, fuzzy
 msgid "Message Header"
 msgstr "Melding motteken"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Spel lyd:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Les"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Mottakarar"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Svart til"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Poengsum"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Avsendar"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Sett status"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Storleik (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "h�yres ut som"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "Source Account"
 msgstr "Set opp konto"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "byrjar med"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Stopp prosessering"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Emne"
 
@@ -10258,7 +10935,8 @@ msgid "Scanning %s"
 msgstr "Sender %1"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "E-post"
 
@@ -10272,10 +10950,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Adressebok"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10323,7 +10997,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Papirkorg"
 
@@ -10467,34 +11143,34 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Fil alt i liste"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Virtuell papirkorg"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Mapper"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Denne mappe kan ikkje innehalde meldingar."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Eigenskapar ..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Endra namnet p� spelarane"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10502,241 +11178,249 @@ msgstr ""
 "Nokre av e-postinstillingane dine ser ut til � vere �ydelagde, sjekk at alt "
 "er i orden."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Du har ikkje sett opp ein transportmetode for e-post"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "�tvaring: Melding er endra"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Ny e-postmelding"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Klarar ikkje initialisere Evolution sin e-postkomponent"
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr " Koplar til tenar ..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Klarar ikkje � registrer lager med skal"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenskapar for �%s�"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Eigenskapar"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Klarte ikkje � lage mellombels katalog: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d nye"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d g�ymde"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d valde"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendt"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d sendt"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Mapper"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "vMappe p� _emne"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "vMappe p� avse_dar"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "vMappe p� mottaka_r"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "vMappe p� e-post_liste"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filtr�r p� _emne"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filtr�r p� avsen_dar:"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Svar til _liste"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Ferdig"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "T�m"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marker som _ulesen"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marker som uvi_ktig"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Slett"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "Laurel"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Legg til avsendar i adresseboka"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Bruk filter"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Mapper"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr�r p� e-postliste (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Fil alt i liste"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Forvald"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Hentar informasjon om mapper"
 
@@ -10794,7 +11478,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikkje fyllt ut all den p�krevde informasjonen."
 
@@ -10805,86 +11489,110 @@ msgid "Evolution News Editor"
 msgstr "KDeelop-installering"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontohandtering"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Br_ukarnamn:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Sti:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Radio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikkje opprette to kontoar med det same namnet."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 #, 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:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Ikkje slett"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Verkeleg slette konto?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Skru av"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Skru p�"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "P�"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Konton_amn:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Melding til %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Emne er %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Melding fr� %s"
+
+#: mail/mail-autofilter.c:295
+#, fuzzy, c-format
+msgid "%s mailing list"
+msgstr "E-post&liste for spr�ket:"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 #, fuzzy
 msgid "Add Filter Rule"
 msgstr "Filter-reglar"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10896,7 +11604,7 @@ msgstr ""
 "eller skrive e-post.\n"
 "Vil du sette opp dette no?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10904,7 +11612,7 @@ msgstr ""
 "Du m� sette opp ein identitet\n"
 "f�r du skrive e-post."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10913,7 +11621,7 @@ msgstr ""
 "f�r du kan skrive e-post."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10921,18 +11629,18 @@ msgstr ""
 "Du sender ei HTML-formattert melding, men den f�lgjande mottakeren vil ikkje "
 "ha HTML-formatter e-post:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Send likevel?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 #, fuzzy
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr "Meldinga har ingen sendar"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10940,11 +11648,11 @@ msgstr ""
 "Sidan kontaktlista du sender til, er sett opp til � g�yme addressatane, vil "
 "den sette opp alle mottakarane som Bcc."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Denne meldinga inneheld kun Bcc-mottakarar."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10954,90 +11662,90 @@ msgstr ""
 "�Apparently-To�-topptekst.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Du m� spesifisere mottakarar for � sende denne meldinga."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Du m� setje opp ein konto f�r du kan sende denn e-posten."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "ein ukjend avsendar"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "P� %a, %d/%m/%Y klokka %H:%M, skreiv %%s:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker p� at du vil sletta %1?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 #, 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:2155
+#: mail/mail-callbacks.c:2203
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker p� at du vil fjerna %1?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Ingen meldingar vald!"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Skriv over fil?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Lagre melding som ..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Lagre meldingar som ..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Vis informasjonsmelding"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11045,39 +11753,75 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Utskrift av melding feila"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker p� at du vil sletta denne overf�ringa?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Ingen skildring"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Kontakt utan namn"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Sendt"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Legg til kriterium"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Lagre signatur"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11115,61 +11859,49 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "KDeelop-installering"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "etter"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Konto"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Sjekkar teneste"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 #, fuzzy
 msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Kontakt utan namn"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
@@ -11177,133 +11909,130 @@ msgstr ", "
 
 #: mail/mail-config.glade.h:2
 #, fuzzy
-msgid " Edit "
-msgstr "R_edig�r"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Ny"
-
-#: mail/mail-config.glade.h:4
-#, fuzzy
 msgid " _Check for supported types "
 msgstr "Vel modemtype ..."
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Account Information"
 msgstr "Informasjon"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Avbryt operasjon"
+msgid "Add Sc_ript"
+msgstr "Legg til kriterium"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "Arkansas"
+msgid "Add new signature..."
+msgstr "Lagre signatur"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-#, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
-
-#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "Arica"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "enkle innlegg"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Ukjent teiknsett: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_Lukk"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Ser etter ny e-post"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Farge eller pixmap"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "Skriv ei melding"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11313,56 +12042,47 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "Bari"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Standardteiknsett"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Digitale IDar ..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Kan ikkje opne melding"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Lagra i &kladdemappe"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "S_l� p�"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11383,41 +12103,36 @@ msgstr "E-postadresse:"
 msgid "Empty _trash folders on exit"
 msgstr "T�m papirkorg ved avslutting"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "K�yr autorun.sh"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "sluttar med"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Eigenskapar"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Get Digital ID..."
 msgstr "Les band-ID ..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Merkingsvilk�r"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Honolulu"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11471,70 +12186,66 @@ msgstr "Mikronesia"
 msgid "NNTP Server:"
 msgstr "NNTP-tenar:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Oppsett for post"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "Diskusjonsgruppetenarar"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Valfri informasjon"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sasjon:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP-lykje ID:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Vel ein farge"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "&Innhald ..."
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Kan ikkje opne melding"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Husk dette passordet"
@@ -11570,269 +12281,265 @@ msgstr "Tryggleik"
 
 #: mail/mail-config.glade.h:104
 #, fuzzy
-msgid "Same as text"
-msgstr "Somerset"
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Trygg MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Vel PGP-bin�r"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Signaturfil:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Slett alt utanom signatur"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Tenar-oppsett"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Tenar-_type: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Snarvegar"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Lagre signatur"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Lagre signatur"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Kjelde"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Source Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stilnamn:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Standard unix e-postkasse"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "_HTML-signatur:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Aust"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_HTML-signatur:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "enkle innlegg"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "enkle innlegg"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Forventar %1"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "_HTML-signatur:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Forvald"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Filnamn:"
+msgid "_Enable"
+msgstr "Skru p�"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Vidaresend som"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Fullt namn:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "I HTML-e-post"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "_HTML-signatur:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Spr�k"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "Last alle bileta i ein katalog"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Gjer _dette til min standardkonto"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Merk meldingar som lest etter"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "Last aldri bileter fr� _nettet"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Radio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11873,77 +12580,56 @@ msgstr "_HTML-signatur:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "_HTML-signatur:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Bruk sikker tilknytning (SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_kvar"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr "farge"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "skildring"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-crypto.c:59
-#, fuzzy
-msgid "Could not create a PGP signature context."
-msgstr "Kunne ikkje laga kio-jobb.\n"
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
 #, fuzzy
-msgid "Could not create a PGP verification context."
-msgstr "Kunne ikkje laga kio-jobb.\n"
-
-#: mail/mail-crypto.c:113
-#, fuzzy
-msgid "Could not create a PGP encryption context."
-msgstr "Kunne ikkje laga kio-jobb.\n"
-
-#: mail/mail-crypto.c:138
-#, fuzzy
-msgid "Could not create a PGP decryption context."
-msgstr "Kunne ikkje laga kio-jobb.\n"
-
-#: mail/mail-crypto.c:173
-#, fuzzy
 msgid "Could not create a S/MIME signature context."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 #, fuzzy
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 #, fuzzy
 msgid "Could not create a S/MIME encryption context."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikkje laga kio-jobb.\n"
@@ -11988,138 +12674,171 @@ msgstr "Ekstern visar"
 msgid "Loading message content"
 msgstr "Markerer meldingar"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "&Syntaksmerkingsmodusar"
+
+#: mail/mail-display.c:1833
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenkje som "
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Lagre  bilete som ..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s vedlegg"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Ugyldig addresse"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Fr�"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "E-post"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Lagre melding som ..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Kunne ikkje laga kio-jobb.\n"
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Lokale mapper"
+
+#: mail/mail-local.c:670
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Les mapper"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Klarar ikkje � lagre mappemetainfo til %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Set opp %1"
@@ -12178,90 +12897,82 @@ msgstr "Markerer meldingar"
 msgid "Complete."
 msgstr "Ferdig."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Melding"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Flyttar"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Kopierer"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappe �%s�"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Friskar opp mappe"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hentat melding %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mottek %d melding(ar)"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrar %d melding(ar)"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12270,38 +12981,38 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje � skrive data: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar fr� %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s p� nytt"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_S�k"
 
@@ -12372,10 +13083,6 @@ msgstr "Oppdaterar ..."
 msgid "Waiting..."
 msgstr "Ventar ..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Avbroten."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Brukar avbraut operasjonen."
@@ -12389,16 +13096,16 @@ msgstr "Tast inn passord for %s"
 msgid "Enter Password"
 msgstr "Tast inn passord"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Klarte ikkje � lagre signaturfil."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Lagre signatur"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -12408,10 +13115,30 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Namn:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "Signaturfil:"
+msgid "Signature hint"
+msgstr "Lagre signatur"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "HTML-signaturfil:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12426,17 +13153,17 @@ msgstr "Vidaresendt melding"
 msgid "Forwarded Message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Set opp vMappe: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12445,89 +13172,94 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "vMapper"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Rediger vMappe"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pr�var � redigere ei vmappe �%s� som ikkje finnest."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Ikkje noko emne)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - melding"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Ulesen"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Svara"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Fleire uleste meldingar"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Fleire meldingar"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Lavast"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Senk"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "H�gare"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "H�gast"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "I dag, %H:%M"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "I g�r %H:%M"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Opprettar meldingsliste"
 
@@ -12550,10 +13282,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Opprinneleg forfattar"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Mottatt"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Storleik"
 
@@ -17266,5232 +18003,5229 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds and Bradford"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libya"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisboa"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "London"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "London/City"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "London/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "London/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "London/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Lousiana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "Lubeck-Blankensee"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "Latvia"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malm�/Sturup"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Airport"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Airport"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Airport"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Middle East"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Miyakejima Airport"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Airport"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Airport"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Moskva Domodedovo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moskva Sheremetyevo"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosj�en"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "M�nchen"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Airport"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoya Airport"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Naha Airport"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Airport"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama Airport"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "New Tokyo International Airport"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata Airport"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrk�ping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "N�rnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro Airport"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Odesa"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita Airport"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okayama Airport"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki Airport"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "�rsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Osaka International Airport"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Oshima Airport"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardermoen"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "Kina"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Apt"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "R�nneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "R�ros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "R�rvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Russland"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessj�en/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O International Airport"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "S�rkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/S�rstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harn�sand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolv�r/Helle"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 #, fuzzy
 msgid "Sympheropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Airport"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talinn"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Tanegashima Airport"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokyo International Airport"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokyo New International Airport"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori Airport"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama Airport"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Troms�/Langnes"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/V�rnes"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Tsushima Airport"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Ume�"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "Sameinte Arabiske Emiratar"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 #, fuzzy
 msgid "Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vads�"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "V�xj�"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech Airport"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser Airport"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Airport"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Yamagata Airport"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube Airport"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao Airport"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Z�rich"
 
@@ -22519,17 +23253,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Ingen skildring"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Postsamandrag"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "vMapper"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
@@ -22538,57 +23267,47 @@ msgstr "Lokale mapper"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "ENOV:ENGM"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictinary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Tips for dagen"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Legg til ei nyhendekjelde"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Oppgi URLen p� den nyhendekjelda du vil leggje til"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Namn:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Feil ved nedlasting av RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Nyhendekjelde"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
-msgstr "_Legg til"
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "Fje_rn"
+msgid "Add"
+msgstr "Le_gg til"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
@@ -22629,11 +23348,43 @@ msgstr "Skriv ut samandrag"
 msgid "Printing of Summary failed"
 msgstr "Utskrift av samandrag feila"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Kunne ikkje initiere Bonobo"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "knop"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "km/t"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "engelske mil"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometer"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Klar himmel"
@@ -23890,103 +24641,109 @@ msgid "C_elsius"
 msgstr "C_elsius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "&Alle felt"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Kor mange dagar skal kalendaren vise p� ein gang?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 #, fuzzy
 msgid "Ma_x number of items shown:"
 msgstr "&H�gste tal p� hopp:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 #, fuzzy
 msgid "News Feed Settings"
 msgstr "Nettverksinnstillingar"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Ein _m�nad"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "Ei v_eke"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 #, fuzzy
 msgid "R_efresh time (seconds):"
 msgstr "&Oppfriskingsrate:"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "Refresh _time (seconds):"
 msgstr "&Oppfriskingsrate:"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "Vis sidekantar"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Vis _alle oppg�ver"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "Vedlegg"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Vis temperatur i:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Oppg�ver"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 #, fuzzy
 msgid "Weather settings"
 msgstr "Toppinnstillingar"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Fem dagar"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "_Mail"
 msgstr "Send"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "_News Feeds"
 msgstr "Diskusjonsgruppetenarar"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Ein dag"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 #, fuzzy
 msgid "_Schedule"
 msgstr "&Plan"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_V�r"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "�ydelagd oppsettfil."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Spesialmapper"
+msgid "Folder Settings"
+msgstr "Innstillingar for e-post"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 #, fuzzy
@@ -23994,7 +24751,7 @@ msgid "The Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -24005,6 +24762,35 @@ msgstr "Vis detaljar"
 msgid "Cancel Operation"
 msgstr "Avbryt operasjon"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Vel mappe"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Kladd"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Innboks"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Utboks"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Sendt"
+
 #: shell/e-setup.c:126
 #, fuzzy
 msgid "Evolution installation"
@@ -24097,6 +24883,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Fullf�ringsdato"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Spesialmapper"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Spesialmapper"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Spesialmapper"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Fullf�ringsdato"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -24127,56 +24938,55 @@ msgstr "Kan ikkje flytta ei foreldremappe inn i ei barnemappe."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Kopier mappe"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 #, fuzzy
 msgid "Move folder"
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Slett �%s�"
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
+#: shell/e-shell-folder-commands.c:407
 #, fuzzy, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Er du sikker p� at du vil sletta denne mappa?"
+msgid "Really delete folder \"%s\"?"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endra namn p� profil '%1'"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Endra namn p� profil '%1'"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, fuzzy, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24195,13 +25005,13 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Opprett ny mappe"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Ny ..."
 
@@ -24245,32 +25055,37 @@ msgstr ""
 "Importerar %s\n"
 "Importerar element %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Vel mappe"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fila %s finst ikkje"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Evolution feil"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Du kan berre importere til lokale mapper"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "Det er ikkje band i stasjonen."
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24279,82 +25094,129 @@ msgstr ""
 "Importerar %s.\n"
 "Startar %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil ved asting av %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Vel ei fil"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Import�r data og innstillinga fr� eldre program"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 #, fuzzy
 msgid "Import a single file"
 msgstr "Flyttar"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Fr� %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import�r"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 #, fuzzy
 msgid "Closing connections..."
 msgstr "Lukkar prosjekt ..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Feil ved �%s�:\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Synkroniser mapper"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Leitar etter tilleggsmodular"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Leitar etter tilleggsmodular"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Opne i %s ..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Kan ikkje laga fila\n"
+"\""
+
 #: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
@@ -24367,8 +25229,8 @@ msgstr "Kan ikkje initialisera adresseboka"
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Ny"
@@ -24396,49 +25258,49 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr "�.� og �..� er resverte mappenamn."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug Buddy vart ikkje funnen i s�kestien din ($PATH)"
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 #, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Oppl�ysing"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 #, fuzzy
 msgid "Select the folder that you want to open"
 msgstr "Vel det ikontemaet du vil bruka:"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 #, fuzzy
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vel katalogen som inneheld tenestene"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "Arbeid _fr�kopla"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Arbeid fr�kopla"
 
@@ -24469,7 +25331,7 @@ msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24477,12 +25339,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, fuzzy, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24490,24 +25352,20 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Ugyldig(e) argument"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Generell feil"
 
@@ -24531,105 +25389,105 @@ msgstr "Vil du verkeleg leggja '%1' i papirkorga?"
 msgid "Don't remove"
 msgstr "Ikkje fjern"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Sm� ikon"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 #, fuzzy
 msgid "_Large Icons"
 msgstr "Ordna ikon"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Ny gruppe ..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "&Programsn�ggtastar"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Gi snarveg nytt namn"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Gi valde snarvegar nytt namn til:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Opne i nytt _vindauge"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Opna dokumentet i eit nytt vindauge"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Gje nytt namn"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Gi denne snarvegen nytt namn"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "Fj_ern"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarvegen fr� snarvegstolpen"
 
@@ -24641,10 +25499,6 @@ msgstr "Feil ved lagring av snavegar."
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Innboks"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -24718,11 +25572,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, fuzzy
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "%1 av %2 ferdig"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<klikk her for � velje mappe>"
 
@@ -24752,70 +25606,70 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "CORBA-feil"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Avbroten"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Har allereide ein eigar"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Ingen eigar"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 #, fuzzy
 msgid "Not found"
 msgstr "Fann ikkje fil"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Vel modemtype ..."
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Ust�tta skjema"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Ust�tta operasjon"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Eksisterar"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Vidaresendt melding"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Ikkje noko plass att"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "Gammal eigar har d�ydd"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Filtype:"
@@ -24943,50 +25797,82 @@ msgstr "Ikkje sp�r meg igjen"
 msgid "Evolution can import data from the following files:"
 msgstr "Bruk p� f�lgjande delar:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avsluttar no ..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Ikkje sp�r meg igjen"
+
+#: shell/main.c:347
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Sl� av oppstartsskjerm"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Startar importering"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Startar importering"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
@@ -25110,11 +25996,11 @@ msgstr "tid no"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "H_andlingar"
 
@@ -25244,8 +26130,8 @@ msgstr "Slett denne adressa"
 msgid "Delete this item"
 msgstr "Slett dette elementet"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Hovudverktylinje"
 
@@ -25286,7 +26172,7 @@ msgstr "Lagre dette elementet til disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Fil"
 
@@ -25357,22 +26243,22 @@ msgstr "Fort framover"
 msgid "Forward this item via email"
 msgstr "Vidaresendt melding"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 #, fuzzy
 msgid "Obtain the latest meeting information"
 msgstr "generer avlusingsinformasjon"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Re_fresh Meeting"
 msgstr "Oppfriskingstid"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 #, fuzzy
 msgid "Schedule _Meeting"
 msgstr "K�yreplan ..."
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 #, fuzzy
 msgid "Schedule a meeting for this item"
 msgstr "K�yreplan ..."
@@ -25382,10 +26268,6 @@ msgstr "K�yreplan ..."
 msgid "Customise My Evolution"
 msgstr "Evalueringsfeil"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Avbryt"
-
 #: ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
@@ -25556,7 +26438,7 @@ msgstr "Tr�da meldingsliste"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Mappe"
 
@@ -26006,7 +26888,7 @@ msgstr "Forrige melding"
 msgid "_Quoted"
 msgstr "Sitert"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "Verk_ty"
 
@@ -26022,12 +26904,12 @@ msgstr "Lukk vindauge"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "L_ukk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Visning"
 
@@ -26214,7 +27096,7 @@ msgstr "_Opne ..."
 msgid "_Reply-To Field"
 msgstr "_Reply-To felt"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -26364,112 +27246,121 @@ msgid "Move this folder to another place"
 msgstr "Flytt denne mappa til ein annan plass"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Lag _ny mappe ..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Opne i eige vindauge"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Opne denne mappe i eit anna vindauge"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Send / Motta"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Send k�a meldingar og motta ny meldingar"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Vis informasjon om Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "Send inn _feilrapport"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Byt"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Avgjer om snarvegstolpen skal vise"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Vis den valde mappa"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution ..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Kopier ..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_Mappestolpe"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_G� til mappe"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Import�r ..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Flytt ..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "_Pilot-innstillingar"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Omd�yp ..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Send / Receive"
 msgstr "Mottakar"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Snarveg"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "_Snarvegstolpe"
 
@@ -26552,21 +27443,21 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "_Aktiv visning"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Definer visningar"
 
@@ -26688,16 +27579,21 @@ msgstr "Redigering av s�k"
 msgid "Save Search"
 msgstr "Lagre s�k"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Lagre s�k"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Legg til lagra s�k"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Avansert ..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informasjon"
@@ -26719,21 +27615,21 @@ msgstr "Melding"
 msgid "Don't show this message again."
 msgstr "Ikkje vis denne meldinga att"
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Finn no"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "T�m"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "T�m"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Finn no"
 
@@ -26759,6 +27655,181 @@ msgstr "init_corba(): klarte ikkje initialisere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Addressebokkjelder"
+
+#, fuzzy
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Kan ikkje initialisera lokale variablar"
+
+#, fuzzy
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "�ydelagd oppsettfil."
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Sta_rt p� dagen:"
+
+#~ msgid "_End of day:"
+#~ msgstr "S_lutt p� dag:"
+
+#, fuzzy
+#~ msgid "_Other Organizer"
+#~ msgstr "Planleggjar"
+
+#, fuzzy
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Den oppgitte fila finst ikkje"
+
+#, fuzzy
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Oppgi ditt OpenPGP-passord"
+
+#, fuzzy
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Oppgi ditt OpenPGP-passord"
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Kan ikkje setja blokkstorleik for band."
+
+#, fuzzy
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Kunne ikkje laga katalog\n"
+
+#, fuzzy
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Kunne ikkje laga katalog\n"
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Kunne ikkje laga katalog\n"
+
+#, fuzzy
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Kunne ikkje laga katalog\n"
+
+#~ msgid "%s server %s"
+#~ msgstr "%s tenar %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(ukjend vert)"
+
+#~ msgid "No such message: %s"
+#~ msgstr "Inga slik melding: %s"
+
+#, fuzzy
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
+
+#, fuzzy
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Mottek meldingar fr� %1"
+
+#, fuzzy
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "%1 finst, men er inga vanleg fil"
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Radio"
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "R_edig�r"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Ny"
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Avbryt operasjon"
+
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "Arkansas"
+
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "Arica"
+
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "Bari"
+
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Honolulu"
+
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "Somerset"
+
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Signaturfil:"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Slett alt utanom signatur"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "_HTML-signatur:"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Filnamn:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "_HTML-signatur:"
+
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Spr�k"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Radio"
+
+#, fuzzy
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Kunne ikkje laga kio-jobb.\n"
+
+#, fuzzy
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Kunne ikkje laga kio-jobb.\n"
+
+#~ msgid "Moving"
+#~ msgstr "Flyttar"
+
+#~ msgid "Copying"
+#~ msgstr "Kopierer"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Signaturfil:"
+
+#~ msgid "Riga"
+#~ msgstr "Riga"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_Legg til"
+
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "Fje_rn"
+
+#, fuzzy
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Er du sikker p� at du vil sletta denne mappa?"
+
 #~ msgid "Card: "
 #~ msgstr "Kort: "
 
@@ -27030,43 +28101,25 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgstr "Denne informasjonen er ikkje naudsynt for dei fleste ldap-tenarer."
 
 #~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
 #~ msgstr ""
-#~ "Denne informasjonen er brukt av ldap-tenaren for � spesifierse kva nodar som "
-#~ "skal brukast i s�ket. Kontakt tenaradmistratoren din for meir informasjon."
+#~ "Denne informasjonen er brukt av ldap-tenaren for � spesifierse kva nodar "
+#~ "som skal brukast i s�ket. Kontakt tenaradmistratoren din for meir "
+#~ "informasjon."
 
 #~ msgid "_My server requires authentication"
 #~ msgstr "_Min tenar treng autentisering"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Andre kontakter"
-
 #~ msgid "Name contains"
 #~ msgstr "Namn inneheld"
 
-#~ msgid "(none)"
-#~ msgstr "(ingen)"
-
 #~ msgid "C_ontaining:"
 #~ msgstr "I_nneheld:"
 
 #~ msgid "Show contacts matching the following criteria:"
 #~ msgstr "Vis kontakter som stemmer med desse kriteria:"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "Er du sikker p� at du vil\n"
-#~ " slette denne kontakta?"
-
-#~ msgid "Starting:"
-#~ msgstr "Startar:"
-
-#~ msgid "Ending:"
-#~ msgstr "Slutt:"
-
 #~ msgid "Create a new appointment"
 #~ msgstr "Lag ein ny avtale"
 
@@ -27086,246 +28139,9 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "_Other"
 #~ msgstr "_Anna"
 
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Klikke her for � leggje til ein deltakar"
-
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
-
-#~ msgid "100%"
-#~ msgstr "100%"
-
 #~ msgid "_Delete this Task"
 #~ msgstr "Slett _denne oppg�va"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "M�tet byrjar: <b>"
-
-#~ msgid "Task begins: <b>"
-#~ msgstr "Oppg�va byrjar: <b>"
-
-#, fuzzy
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Informasjon"
-
-#~ msgid "Begins: <b>"
-#~ msgstr "Byrjar: <b>"
-
-#, fuzzy
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Informasjon"
-
-#, fuzzy
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Informasjon"
-
-#~ msgid "Ends: <b>"
-#~ msgstr "Sluttar: <b>"
-
-#, fuzzy
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Ferdig"
-
-#~ msgid "Task Due: <b>"
-#~ msgstr "Oppg�va ferdig: <b>"
-
-#, fuzzy
-#~ msgid "iCalendar Information"
-#~ msgstr "Informasjon"
-
-#, fuzzy
-#~ msgid "iCalendar Error"
-#~ msgstr "Skriv ut alle"
-
-#~ msgid "An unknown person"
-#~ msgstr "Ein ukjent person"
-
-#~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
-#~ msgstr ""
-#~ "<br> Sj� gjennom den f�lgjande informasjon, og velj ei handling fr� menyen "
-#~ "under."
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Ingen</i>"
-
-#~ msgid "Choose an action:"
-#~ msgstr "Vel ei handling:"
-
-#~ msgid "Update"
-#~ msgstr "Oppdater"
-
-#~ msgid "Accept"
-#~ msgstr "Godta"
-
-#, fuzzy
-#~ msgid "Tentatively accept"
-#~ msgstr "Mellombels"
-
-#~ msgid "Decline"
-#~ msgstr "Avsl�"
-
-#, fuzzy
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Informasjon"
-
-#~ msgid "Update respondent status"
-#~ msgstr "Opdat�r status p� svar"
-
-#, fuzzy
-#~ msgid "Send Latest Information"
-#~ msgstr "Informasjon"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "generer avlusingsinformasjon"
-
-#, fuzzy
-#~ msgid "Meeting Information"
-#~ msgstr "Personleg informasjon"
-
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> sp�r etter deg for � stille opp p� eit m�te."
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "M�teframlegg"
-
-#~ msgid "Meeting Update"
-#~ msgstr "M�teoppdatering"
-
-#, fuzzy
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "generer avlusingsinformasjon"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "Dette er ei repeterande hending."
-
-#~ msgid "Meeting Reply"
-#~ msgstr "M�tesvar"
-
-#~ msgid "Meeting Cancellation"
-#~ msgstr "M�tekansellering"
-
-#, fuzzy
-#~ msgid "Bad Meeting Message"
-#~ msgstr "&Finn i melding ..."
-
-#~ msgid "Task Information"
-#~ msgstr "Oppg�veinformasjon"
-
-#~ msgid "Task Proposal"
-#~ msgstr "Oppg�veframlegg"
-
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> �nskjar � leggje til ei eksisterande oppg�ve."
-
-#~ msgid "Task Update"
-#~ msgstr "Oppg�veoppdatering"
-
-#, fuzzy
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "Dette er ei f�rehandsvising av det valte bakgrunnsbiletet."
-
-#~ msgid "Task Update Request"
-#~ msgstr "Oppg�veoppdateringsforep�rjing"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "Dette er ei repeterande hending."
-
-#~ msgid "Task Reply"
-#~ msgstr "Oppg�vesvar"
-
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> har kansellert ei oppg�ve."
-
-#~ msgid "Task Cancellation"
-#~ msgstr "Oppg�vekansellering"
-
-#, fuzzy
-#~ msgid "Bad Task Message"
-#~ msgstr "Skriv ut alle"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "Skriv avlusingsinformasjon"
-
-#~ msgid "Free/Busy Information"
-#~ msgstr "Fri/ledig-informasjon"
-
-#, fuzzy
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "Pr�v �%s --help� for meir informasjon\n"
-
-#~ msgid "Free/Busy Request"
-#~ msgstr "Fri/ledig foresp�rsel"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "Dette er ei repeterande hending."
-
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Fri/Oppteke svar"
-
-#, fuzzy
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Private meldingar"
-
-#, fuzzy
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Meldinga har ingen sendar"
-
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
-
-#, fuzzy
-#~ msgid "Event information"
-#~ msgstr "Informasjon"
-
-#~ msgid "Task information"
-#~ msgstr "Informasjon om oppg�ve"
-
-#, fuzzy
-#~ msgid "Journal information"
-#~ msgstr "Personleg informasjon"
-
-#, fuzzy
-#~ msgid "Free/Busy information"
-#~ msgstr "Informasjon"
-
-#, fuzzy
-#~ msgid "Calendar information"
-#~ msgstr "Informasjon"
-
 #, fuzzy
 #~ msgid "Free/Busy information (%s to %s)"
 #~ msgstr "Informasjon"
@@ -27334,24 +28150,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "iCalendar information"
 #~ msgstr "Informasjon"
 
-#~ msgid "Task"
-#~ msgstr "Oppg�ve"
-
-#~ msgid "Status: %s"
-#~ msgstr "Status: %s"
-
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Prosent ferdig: %i"
-
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
-
-#~ msgid "Categories: %s"
-#~ msgstr "Kategoriar %s"
-
-#~ msgid "Contacts: "
-#~ msgstr "Kontaktar: "
-
 #, fuzzy
 #~ msgid "Error hashing password."
 #~ msgstr "Feil ved tilleggjing av kort"
@@ -27413,9 +28211,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "(Unknown)"
 #~ msgstr "(Ukjend)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Uventa svar fr� POP-tenaren: %s"
-
 #, fuzzy
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Vidaresendt melding fr� %1"
@@ -27521,31 +28316,12 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "Filter on Mailing List"
 #~ msgstr "Fil alt i liste"
 
-#~ msgid "Default"
-#~ msgstr "Forvald"
-
 #~ msgid "Indexing:"
 #~ msgstr "Indekserar"
 
 #~ msgid "Mailbox Format"
 #~ msgstr "Postkasseformat"
 
-#~ msgid " (default)"
-#~ msgstr " (standard)"
-
-#~ msgid "Mail Settings"
-#~ msgstr "Innstillingar for e-post"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Emne er %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Melding fr� %s"
-
-#, fuzzy
-#~ msgid "%s mailing list"
-#~ msgstr "E-post&liste for spr�ket:"
-
 #, fuzzy
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "Meldinga har ingen sendar"
@@ -27553,9 +28329,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: innboks"
 
-#~ msgid "Account"
-#~ msgstr "Konto"
-
 #~ msgid "Composer"
 #~ msgstr "Meldingsskrivar"
 
@@ -27565,15 +28338,9 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "Display"
 #~ msgstr "Vis"
 
-#~ msgid "Drafts"
-#~ msgstr "Kladd"
-
 #~ msgid "Edit..."
 #~ msgstr "Rediger ..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML-signaturfil:"
-
 #~ msgid "News"
 #~ msgstr "Nyhende"
 
@@ -27581,9 +28348,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Signaturfil:"
 
-#~ msgid "Sent"
-#~ msgstr "Sendt"
-
 #~ msgid "Sources"
 #~ msgstr "Kjelder"
 
@@ -27629,30 +28393,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "Regions"
 #~ msgstr "Omr�der"
 
-#~ msgid " F"
-#~ msgstr " F"
-
-#~ msgid " C"
-#~ msgstr " C"
-
-#~ msgid "knots"
-#~ msgstr "knop"
-
-#~ msgid "kph"
-#~ msgstr "km/t"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "engelske mil"
-
-#~ msgid "kilometers"
-#~ msgstr "kilometer"
-
 #, fuzzy
 #~ msgid "Al_l stations:"
 #~ msgstr "&Tilgjengelege handlingar:"
@@ -27662,10 +28402,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgstr "Alle kantar"
 
 #, fuzzy
-#~ msgid "All news _feeds:"
-#~ msgstr "&Alle felt"
-
-#, fuzzy
 #~ msgid "_Display folders:"
 #~ msgstr "Skjermkontrollerarar"
 
@@ -27685,21 +28421,9 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "Factory for the Notes control"
 #~ msgstr "�ydelagd oppsettfil."
 
-#~ msgid "Outbox"
-#~ msgstr "Utboks"
-
-#~ msgid "Evolution "
-#~ msgstr "Evolution"
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Opphavsrett � 1999, 2000, 2001 Ximian, Inc."
 
-#, fuzzy
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
 #~ msgid "(No name)"
 #~ msgstr "(Ingen namn)"
 
diff --git a/po/no.po b/po/no.po
index 29eb43d61e..3c3edc81df 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2002-06-19 22:06+0200\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-06-19 22:13+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -34,7 +34,7 @@ msgstr "Importerer VCard-filer til Evolution."
 msgid "File As"
 msgstr "Lagre som"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Navn"
@@ -492,21 +492,53 @@ msgid "LDAP server containing contact information"
 msgstr "LDAP-tjener s�mme inneholder kontaktinformasjon"
 
 #: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "Kontakt_liste"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact List"
-msgstr "Ny kontaktliste"
+#: addressbook/gui/component/addressbook-config.c:197
+msgid "Failed to connect to LDAP server"
+msgstr "Kunne ikke koble til LDAP-tjener"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "Contact _List"
-msgstr "Kontakt_liste"
+#: addressbook/gui/component/addressbook-config.c:216
+msgid "Failed to authenticate with LDAP server"
+msgstr "Kunne ikke autentisere mot LDAP-tjener"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr "Kunne ikke utf�re sp�rring p� Root DSE"
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr "Tjeneren svarte ikke med noen st�ttede basis for s�k"
+
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Denne tjeneren st�tter ikke LDAPv3 schema-informasjon"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+msgid "Error retrieving schema information"
+msgstr "Feil under henting av schema-informasjon"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+msgid "Server did not respond with valid schema information"
+msgstr "Tjener svarte ikke med gyldig schema-informasjon"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP er ikke st�ttet i denne versjonen av Evolution"
 
 #: addressbook/gui/component/addressbook-factory.c:72
 #: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
@@ -647,38 +679,6 @@ msgstr "Deaktiver sp�rringer"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aktiver sp�rringer (Farlig!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-msgid "Failed to connect to LDAP server"
-msgstr "Kunne ikke koble til LDAP-tjener"
-
-#: addressbook/gui/component/addressbook-config.c:216
-msgid "Failed to authenticate with LDAP server"
-msgstr "Kunne ikke autentisere mot LDAP-tjener"
-
-#: addressbook/gui/component/addressbook-config.c:239
-msgid "Could not perform query on Root DSE"
-msgstr "Kunne ikke utf�re sp�rring p� Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:648
-msgid "The server responded with no supported search bases"
-msgstr "Tjeneren svarte ikke med noen st�ttede basis for s�k"
-
-#: addressbook/gui/component/addressbook-config.c:1152
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Denne tjeneren st�tter ikke LDAPv3 schema-informasjon"
-
-#: addressbook/gui/component/addressbook-config.c:1174
-msgid "Error retrieving schema information"
-msgstr "Feil under henting av schema-informasjon"
-
-#: addressbook/gui/component/addressbook-config.c:1182
-msgid "Server did not respond with valid schema information"
-msgstr "Tjener svarte ikke med gyldig schema-informasjon"
-
-#: addressbook/gui/component/addressbook-config.c:1627
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP er ikke st�ttet i denne versjonen av Evolution"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr "V_is st�ttede baser "
@@ -821,7 +821,7 @@ msgid "Mappings"
 msgstr "Mappinger"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Aldri"
 
@@ -1061,7 +1061,7 @@ msgid "Using email address"
 msgstr "Bruker e-post adresse"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:137
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr "N�r mulig"
 
@@ -1069,7 +1069,7 @@ msgstr "N�r mulig"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Legg til"
 
@@ -1110,7 +1110,7 @@ msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:155 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1219,7 +1219,7 @@ msgstr "Factory for adressebokens grensesnitt for navnevalg"
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:534
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
 #: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Fjern"
@@ -1358,7 +1358,7 @@ msgid "D_epartment:"
 msgstr "Avd_eling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1418,10 +1418,10 @@ msgstr "Vil motta _HTML e-post"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706
+#: calendar/gui/dialogs/meeting-page.c:673
 #: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
 #: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:153 ui/evolution-calendar.xml.h:27
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
 #: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
 #: ui/evolution.xml.h:41
 msgid "_Delete"
@@ -1452,7 +1452,7 @@ msgid "_Web page address:"
 msgstr "_Hjemmeside-adresse:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "De forente stater"
 
@@ -1957,12 +1957,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Latvia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libanon"
 
@@ -1971,7 +1970,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
@@ -1980,12 +1979,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litauen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
@@ -2018,7 +2017,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2043,7 +2042,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexico"
 
@@ -2068,7 +2067,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marokko"
 
@@ -2093,7 +2092,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Nederland"
 
@@ -2106,12 +2105,12 @@ msgid "New Caledonia"
 msgstr "Ny-kaledonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "New Zealand"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2128,7 +2127,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolk-�ya"
 
@@ -2137,17 +2136,17 @@ msgid "Northern Mariana Islands"
 msgstr "Nordre Mariana-�yer"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norge"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2160,7 +2159,7 @@ msgid "Palestinian Territory"
 msgstr "Palestinsk omr�de"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2169,12 +2168,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Ny Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2187,22 +2186,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
@@ -2211,7 +2210,7 @@ msgid "Reunion"
 msgstr "Gjenforening"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Romania"
 
@@ -2248,7 +2247,7 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome og Principe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudi arabia"
 
@@ -2265,17 +2264,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapore"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovakia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slovenia"
 
@@ -2288,7 +2287,7 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "S�r Afrika"
 
@@ -2297,7 +2296,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Syd Georgia og de sydlige sandwich-�yene"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Spania"
 
@@ -2318,7 +2317,7 @@ msgid "Sudan"
 msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -2331,17 +2330,17 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Sverige"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Sveits"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
@@ -2378,7 +2377,7 @@ msgid "Tunisia"
 msgstr "Tunisia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Tyrkia"
 
@@ -2399,7 +2398,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraina"
 
@@ -2408,7 +2407,7 @@ msgid "United Arab Emirates"
 msgstr "De forente arabiske emirater"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "England"
 
@@ -2417,7 +2416,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "USA, mindre omliggende �yer"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2430,12 +2429,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2456,12 +2455,12 @@ msgid "Western Sahara"
 msgstr "Vestre Sahara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslavia"
 
@@ -3192,7 +3191,7 @@ msgstr "Marger"
 msgid "Number of columns:"
 msgstr "Antall kolonner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Alternativer"
 
@@ -3202,7 +3201,7 @@ msgid "Orientation"
 msgstr "Orientering"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Side"
 
@@ -3276,7 +3275,7 @@ msgstr "Bredde:"
 msgid "_Font..."
 msgstr "Skri_fttype..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Avtale uten navn"
 
@@ -3563,7 +3562,7 @@ msgid "Free"
 msgstr "Ledig"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:435
+#: calendar/gui/e-meeting-time-sel.c:438
 #: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Opptatt"
@@ -3582,8 +3581,8 @@ msgstr "Under arbeid"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2296
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Fullf�rt"
 
@@ -3598,12 +3597,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1903
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
 #: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1620 mail/mail-accounts.c:445
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
 #: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3618,14 +3617,14 @@ msgstr "Gjeninntreffer"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
-#: calendar/gui/e-meeting-model.c:821
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Nei"
 
@@ -3934,7 +3933,7 @@ msgstr "slutt p� avtale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:187
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -4107,7 +4106,7 @@ msgid "_Fri"
 msgstr "_Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Generell"
 
@@ -4229,52 +4228,59 @@ msgstr " (Ferdig "
 msgid "Due "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor.c:327
+#: calendar/gui/dialogs/comp-editor.c:342
 msgid "Could not update invalid object"
 msgstr "Kunne ikke oppdatere ugyldig objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:330
+#: calendar/gui/dialogs/comp-editor.c:345
 msgid "Object not found, not updated"
 msgstr "Objekt ikke funnet, ikke oppdatert"
 
-#: calendar/gui/dialogs/comp-editor.c:333
+#: calendar/gui/dialogs/comp-editor.c:348
 msgid "You don't have permissions to update this object"
 msgstr "Du har ikke rettigheter til � oppdatere dette objektet"
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:351
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:725
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:730
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:733
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:736
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppf�ring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:750
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1129
+#: calendar/gui/dialogs/comp-editor.c:1203
 #: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1002
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1281
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versjonsdata!"
 
@@ -4332,27 +4338,27 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:190 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "P�minnelse"
 
-#: calendar/gui/dialogs/event-editor.c:200
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:265
-#: calendar/gui/dialogs/event-editor.c:370
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "M�teplanlegging"
 
-#: calendar/gui/dialogs/event-editor.c:212
-#: calendar/gui/dialogs/event-editor.c:268
-#: calendar/gui/dialogs/event-editor.c:373 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "M�te"
 
@@ -4421,19 +4427,19 @@ msgstr "S_lutt-tid:"
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Denne personen er allerede satt opp for dette m�tet!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
@@ -4507,14 +4513,10 @@ msgid "_Change Organizer"
 msgstr "En_dre organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Inviter andre..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "Annen _organisator"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4694,7 +4696,7 @@ msgid "Progress"
 msgstr "Fremdrift"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:782
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4706,19 +4708,19 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Tildeling"
 
 #: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -5108,26 +5110,26 @@ msgstr "<i>Ingen</i>"
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:318
-#: calendar/gui/e-meeting-model.c:341 calendar/gui/e-meeting-model.c:835
-#: calendar/gui/itip-utils.c:323
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:326
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
 msgid "Tentatively Accepted"
 msgstr "Akteptert tentativt"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:320
-#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:836
-#: calendar/gui/itip-utils.c:329 calendar/gui/itip-utils.c:355
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
 msgid "Declined"
 msgstr "Avsl�tt"
 
 #: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:289 calendar/gui/e-meeting-model.c:354
-#: calendar/gui/e-meeting-model.c:793 calendar/gui/e-meeting-model.c:809
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
@@ -5176,7 +5178,7 @@ msgstr "Oppdater status for respondent"
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:343
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
 #: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
@@ -5452,92 +5454,92 @@ msgstr "slutt-dato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Styremedlemmer"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Obligatoriske deltakere"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Valgfrie deltakere"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Ikke-deltakere"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533 calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Ressurs"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Rom"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Styremedlem"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535 calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:807
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:808
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543 calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Trenger handling"
 
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:838
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Delegert"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "Under arbeid"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
@@ -5549,63 +5551,63 @@ msgstr "%a %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Ute"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Vis k_un arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Vis _zoomet ut"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Alle mennesker og ressurser"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Alle _mennesker og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "_Obligatoriske mennesker"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Obligatoriske mennesker _og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Tid for m�tets _start:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Tid for m�tets slutt:"
 
@@ -5720,47 +5722,47 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "En organisator m� oppgis."
 
-#: calendar/gui/itip-utils.c:295
+#: calendar/gui/itip-utils.c:354
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:356
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/itip-utils.c:299
+#: calendar/gui/itip-utils.c:358
 msgid "Journal information"
 msgstr "Journalinformasjon"
 
-#: calendar/gui/itip-utils.c:301
+#: calendar/gui/itip-utils.c:360
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:362
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: calendar/gui/itip-utils.c:339
+#: calendar/gui/itip-utils.c:398
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: calendar/gui/itip-utils.c:347
+#: calendar/gui/itip-utils.c:406
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:351
+#: calendar/gui/itip-utils.c:410
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Du m� v�re en deltager i hendelsen."
 
@@ -7747,23 +7749,19 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
-#: camel/camel-cipher-context.c:174
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Signering er ikke st�ttet av dette cipheret"
 
-#: camel/camel-cipher-context.c:214
-msgid "Clearsigning is not supported by this cipher"
-msgstr "�Clearsigning� er ikke st�ttet av dette cipheret"
-
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifisering er ikke st�ttet av dette cipheret"
 
-#: camel/camel-cipher-context.c:297
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering er ikke st�ttet av dette cipheret"
 
-#: camel/camel-cipher-context.c:339
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke st�ttet av dette cipheret"
 
@@ -7912,24 +7910,99 @@ msgstr "Utf�rer sp�rring p� ukjent header: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Ust�ttet operasjon: legg til melding: for %s"
 
-#: camel/camel-folder.c:1155
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Ust�ttet operasjon: s�k etter uttrykk: etter %s"
 
-#: camel/camel-folder.c:1195
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Ust�ttet operasjon: s�k p� uid: etter %s"
 
-#: camel/camel-folder.c:1311
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Flytter meldinger"
 
-#: camel/camel-folder.c:1311
+#: camel/camel-folder.c:1317
 msgid "Copying messages"
 msgstr "Kopierer meldinger"
 
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+#, fuzzy
+msgid "Failed to parse gpg passphrase request."
+msgstr "Kunne ikke behandle foresp�rsel.\n"
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Avbrutt"
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Uventet svar fra POP-tjener: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Ingen filnavn spesifisert."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Kan ikke kryptere denne meldingen: ingen mottakere oppgitt"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Feil under mellomlagring av melding %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Feil under mellomlagring av melding %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Feil under dekoding av melding."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+"Kunne ikke verifisere denne meldingen: kunne ikke opprette midlertidig fil: %"
+"s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8025,89 +8098,23 @@ msgstr "Feil under skriving av midlertidig fil: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Feil under kopiering midlertidig meldingsfil: %s"
 
-#: camel/camel-pgp-context.c:207
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Vennligst skriv inn din %s passphrase for %s"
-
-#: camel/camel-pgp-context.c:210
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Vennligst skriv inn din %s passphrase"
-
-#: camel/camel-pgp-context.c:635
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Kan ikke signere denne meldingen: ingen tekst � signere"
-
-#: camel/camel-pgp-context.c:642 camel/camel-pgp-context.c:816
-msgid "Cannot sign this message: no password provided"
-msgstr "Kan ikke signere denne meldingen: ingen passord oppgitt"
-
-#: camel/camel-pgp-context.c:648 camel/camel-pgp-context.c:822
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Kunne ikke signere denne meldingen: kunne ikke opprette r�r til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:809
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Kan ikke signere denne meldingen: ingen tekst for �clearsign�"
+#: camel/camel-multipart-encrypted.c:325
+#, fuzzy
+msgid "Failed to decrypt MIME part: parse error"
+msgstr "Klarte ikke � dekryptere: Ukjent"
 
-#: camel/camel-pgp-context.c:1001
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Kan ikke verifisere denne meldingen: ingen tekst � verifisere"
-
-#: camel/camel-pgp-context.c:1007
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Kunne ikke verifisere denne meldingen: kunne ikke opprette r�r til GPG/PGP: %"
-"s"
-
-#: camel/camel-pgp-context.c:1018
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-"Kunne ikke verifisere denne meldingen: kunne ikke opprette midlertidig fil: %"
-"s"
-
-#: camel/camel-pgp-context.c:1191
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Kan ikke kryptere denne meldingen: ingen tekst � kryptere"
-
-#: camel/camel-pgp-context.c:1201
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Kan ikke kryptere denne meldingen: ingen passord oppgitt"
-
-#: camel/camel-pgp-context.c:1208
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Kunne ikke kryptere denne meldingen: kunne ikke opprette r�r til GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1217
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Kan ikke kryptere denne meldingen: ingen mottakere oppgitt"
-
-#: camel/camel-pgp-context.c:1386
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Kan ikke dekryptere denne meldingen: ingen ciphertekst � dekryptere"
-
-#: camel/camel-pgp-context.c:1394
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Kan ikke dekryptere denne meldingen: ingen passord oppgitt"
-
-#: camel/camel-pgp-context.c:1401
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Kunne ikke dekryptere denne meldingen: kunne ikke opprette r�r til GPG/PGP: %"
-"s"
-
-#: camel/camel-multipart-signed.c:624 camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt signert meldingsdel"
 
+#: camel/camel-multipart-signed.c:678
+msgid "parse error"
+msgstr "lesefeil"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -8502,12 +8509,12 @@ msgstr "Kan ikke endre navn p� mappe: %s: Ingen slik mappe"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2265
+#: camel/providers/imap/camel-imap-store.c:2276
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2268
+#: camel/providers/imap/camel-imap-store.c:2279
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
@@ -8551,25 +8558,25 @@ msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen ble �delagt og laget p� nytt p� tjeneren."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:522
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "S�ker etter endrede meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1835
-#: camel/providers/imap/camel-imap-folder.c:2316
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: camel/providers/imap/camel-imap-folder.c:1992
-#: camel/providers/imap/camel-imap-folder.c:2069
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformasjon for nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1998
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "S�ker etter nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:2353
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -8624,7 +8631,7 @@ msgstr "For lesing og lagring av e-post p� IMAP-tjenere."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Passord"
 
@@ -8713,71 +8720,81 @@ msgstr ""
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1648
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Opphavsmappen tillates ikke � ha undermapper"
 
-#: camel/providers/local/camel-local-provider.c:44
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, c-format
+msgid "~%s (%s)"
+msgstr "~%s (%s)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, c-format
+msgid "mailbox:%s (%s)"
+msgstr "postboks:%s (%s)"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: camel/providers/local/camel-local-provider.c:43
 msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "E-postkataloger i MH-format"
 
-#: camel/providers/local/camel-local-provider.c:51
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "For lagring av lokal e-post i MH-lignende meldingskataloger."
 
-#: camel/providers/local/camel-local-provider.c:66
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Lokal levering"
 
-#: camel/providers/local/camel-local-provider.c:67
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "For henting av lokal e-post fra standard �spools� i mbox format"
 
-#: camel/providers/local/camel-local-provider.c:78
-#: camel/providers/local/camel-local-provider.c:96
+#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Bruk filtre for nye meldinger i INNBOKS"
 
-#: camel/providers/local/camel-local-provider.c:84
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "E-postkataloger i maildir-format"
 
-#: camel/providers/local/camel-local-provider.c:85
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "For lagring av lokal e-post i maildir-kataloger."
 
-#: camel/providers/local/camel-local-provider.c:102
-msgid "Standard Unix mbox spools"
-msgstr "Standard Unix mbox �spools�"
-
-#: camel/providers/local/camel-local-provider.c:103
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "For lesing og lagring av lokal e-post i standard mbox �spool�-filer."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:118
-msgid "Directory tree of mbox files"
-msgstr "Katalogtree av mbox-filer"
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Standard Unix mbox �spools�"
 
-#: camel/providers/local/camel-local-provider.c:119
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
-"For � aksessere meldinger lagret i et eksternt tree av mbox-filer.\n"
-"Dette vil la deg aksessere pine- og elm-mapper direkte.\n"
-"MERK: Denne tilbyderen er fremdeles eksperimentell slik at du m� "
-"sikkerhetskopiere mappene f�r du bruker den."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "For lesing og lagring av lokal e-post i standard mbox �spool�-filer."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrot %s er ikke en absolutt sti"
@@ -8823,13 +8840,12 @@ msgstr "Kunne ikke slette sammendragsfil for mappe �%s�: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe �%s�: %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Kunne ikke lagre sammendrag: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke legge til melding i sammendraget: ukjent grunn"
 
@@ -8845,11 +8861,10 @@ msgstr "Kan ikke legge til melding i maildir mappe: %s: %s"
 #: camel/providers/local/camel-maildir-folder.c:212
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:334
+#: camel/providers/local/camel-mbox-folder.c:348
 #: camel/providers/local/camel-mh-folder.c:201
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:218
-#: camel/providers/local/camel-spool-folder.c:585
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8859,9 +8874,8 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:334
+#: camel/providers/local/camel-mbox-folder.c:348
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-spool-folder.c:585
 msgid "No such message"
 msgstr "Ingen slik melding"
 
@@ -8914,7 +8928,7 @@ msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikke s�ke i mappe �%s�: %s"
@@ -8933,45 +8947,37 @@ msgstr "Sjekker om mappen er konsistent"
 msgid "Checking for new messages"
 msgstr "Ser etter nye meldinger"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Lagrer mappe"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikke opprette mappel�s p�: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke �pne postboks: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Operasjon for � legge til e-post avbrutt"
 
-#: camel/providers/local/camel-mbox-folder.c:271
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke legge til melding i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:350
-#: camel/providers/local/camel-mbox-folder.c:382
-#: camel/providers/local/camel-mbox-folder.c:394
-#: camel/providers/local/camel-spool-folder.c:601
-#: camel/providers/local/camel-spool-folder.c:633
-#: camel/providers/local/camel-spool-folder.c:645
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8980,13 +8986,11 @@ msgstr ""
 "Kan ikke hente melding: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:383
-#: camel/providers/local/camel-spool-folder.c:634
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ut til � ha blitt korrupt og kan ikke repareres."
 
-#: camel/providers/local/camel-mbox-folder.c:395
-#: camel/providers/local/camel-spool-folder.c:646
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Oppbygging av melding feilet: Korrupt postboks?"
 
@@ -9029,84 +9033,78 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen �%s� er ikke tom. Ikke slettet."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunne ikke �pne mappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatal feil i lesing av postboksen n�r posisjon %ld i mappe %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikke sjekke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunne ikke �pne fil %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke �pne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Feil i sammendrag og mappe, selv etter synkronisering"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Feil under skriving til midlertidig postboks: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Skriving til midlertidig postboks feilet: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn p� mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Feil i sammendrag og mappe, selv etter synkronisering"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
 
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Kunne ikke endre navn p� mappe: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Feil under skriving til midlertidig postboks: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Skriving til midlertidig postboks feilet: %s: %s"
+
 #: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Operasjon for � legge til melding for MH avbrutt"
@@ -9126,52 +9124,58 @@ msgstr "�%s� er ikke en katalog."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikke �pne MH-katalogsti: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:518
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Kan ikke legge til melding i spool-filen: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Spool-mapper kan ikke v�re gis nytt navn"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Spool �%s� eksisterer ikke eller er ikke en vanlig fil"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "Lagerrot %s er ikke en vanlig katalog"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen �%s/%s� eksisterer ikke."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr "Lager st�tter ikke en INNBOKS"
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool e-post-fil %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Spool-mapper kan ikke v�re gis nytt navn"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mapper kan ikke v�re gis nytt navn"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmapper kan ikke v�re slettes"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Kunne ikke synkronisere midlertidig mappe %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kunne ikke synkronisere spool-mappe %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -9180,25 +9184,6 @@ msgstr ""
 "Kunne ikke synkronisere spool-mappe %s: %s\n"
 "Mappen kan v�re korrupt, kopi lagret i �%s�"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Kunne ikke lagre: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Lager �%s� eksisterer ikke eller er ikke en katalog"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr "Lager st�tter ikke en INNBOKS"
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, c-format
-msgid "Mail tree %s"
-msgstr "E-post-tre %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET news"
@@ -9324,7 +9309,7 @@ msgstr "Behold meldinger p� tjeneren"
 msgid "Delete after %s day(s)"
 msgstr "Slett etter %s dag(er)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -9407,7 +9392,7 @@ msgid "No such folder `%s'."
 msgstr "Ingen slik mappe �%s�."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9461,7 +9446,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering av e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9863,11 +9848,11 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer.c:505
+#: composer/e-msg-composer.c:506
 msgid "Could not create a PGP signature context"
 msgstr "Kunne ikke opprette PGP signaturkontekst"
 
-#: composer/e-msg-composer.c:752
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9876,34 +9861,34 @@ msgstr ""
 "Feil under lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1011
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: composer/e-msg-composer.c:1015
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:1037
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:1056
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:1087
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1095
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9912,7 +9897,7 @@ msgstr ""
 "Kunne ikke s�ke i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1109
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9921,7 +9906,7 @@ msgstr ""
 "Kunne ikke kutte av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1118
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9930,7 +9915,7 @@ msgstr ""
 "Feil under autolagring av av melding: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1220
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9938,7 +9923,7 @@ msgstr ""
 "Ximian Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
 "Vil du pr�ve � gjenopprette dem?"
 
-#: composer/e-msg-composer.c:1366
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9948,41 +9933,41 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:1373
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Endret melding"
 
-#: composer/e-msg-composer.c:1405
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "�pne fil"
 
-#: composer/e-msg-composer.c:1554
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Sett inn fil"
 
-#: composer/e-msg-composer.c:1826
+#: composer/e-msg-composer.c:1841
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1863
+#: composer/e-msg-composer.c:1878
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:1904 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: composer/e-msg-composer.c:1916
+#: composer/e-msg-composer.c:1931
 msgid "Set as default"
 msgstr "Sett som forvalg"
 
-#: composer/e-msg-composer.c:2114 composer/e-msg-composer.c:2727
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2744
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9990,7 +9975,7 @@ msgstr ""
 "Kunne ikke opprette vindu for ny melding:\n"
 "Klarte ikke � aktivere kontroll for adressevelger."
 
-#: composer/e-msg-composer.c:2770 composer/e-msg-composer.c:2825
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9998,7 +9983,7 @@ msgstr ""
 "Kunne ikke opprette skrivevindu:\n"
 "Klarte ikke � aktivere HTML-redigeringskomponenten."
 
-#: composer/e-msg-composer.c:3537
+#: composer/e-msg-composer.c:3665
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be editted.)"
 "<b>"
@@ -10210,7 +10195,7 @@ msgstr "time"
 msgid "minute"
 msgstr "minutt"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:189
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr " sekunder"
 
@@ -10526,8 +10511,8 @@ msgstr "Uttrykk"
 msgid "Follow Up"
 msgstr "F�lg opp"
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:74
-#: mail/mail-config.glade.h:61
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Viktig"
 
@@ -10864,11 +10849,11 @@ msgstr "Factory for e-post sammendrag komponent."
 msgid "Font Preferences"
 msgstr "Brukervalg for skrift"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:67
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
@@ -11146,7 +11131,7 @@ msgstr "Filtrer _p� e-postliste (%s)"
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VFolder _p� e-postliste (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
 msgid "Default"
 msgstr "Forvalgt"
 
@@ -11218,19 +11203,19 @@ msgstr "Evolution nyhetsredigerer"
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:162
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:132
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-account-gui.c:1816
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
@@ -11263,7 +11248,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker p� at du vil slette denne diskusjonsgruppekontoen?"
 
 #: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aktivert"
 
@@ -11535,7 +11520,7 @@ msgstr " [skript]"
 msgid "Please specify a valid script name"
 msgstr "Vennligst spesifiser et gyldig navn p� skriptet"
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2818
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
 msgid "Unnamed"
 msgstr "Uten navn"
 
@@ -11608,35 +11593,35 @@ msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:138
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 msgid "Work"
 msgstr "Arbeid"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:87
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr "Personlig"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:129
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 msgid "To Do"
 msgstr "Oppgaver"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:65
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 msgid "Later"
 msgstr "Senere"
 
-#: mail/mail-config.c:623
+#: mail/mail-config.c:625
 #, c-format
 msgid "Account %d"
 msgstr "Konto %d"
 
-#: mail/mail-config.c:2538
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: mail/mail-config.c:2616 mail/mail-config.c:2620
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
@@ -11701,58 +11686,62 @@ msgid "Always _carbon-copy (Cc) to:"
 msgstr "Alltid _karbonkopi (Cc) til:"
 
 #: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
 msgid "Attach original message"
 msgstr "Legg ved opprinnelig melding"
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:22
 msgid "Automatically _detect links"
 msgstr "Finn _lenker automatisk"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "F_arger"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr "Skriver meldinger"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11768,309 +11757,309 @@ msgstr ""
 "\n"
 "Klikk �Fullf�r� for � lagre dine innstillinger"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Forvalgt oppf�rsel"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Default character _encoding:"
 msgstr "Forvalgt t_egnkoding:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 msgid "Deleting Mail"
 msgstr "Sletter meldinger"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Digitale IDer..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 msgid "Do not quote original message"
 msgstr "Ikke siter opprinnelig melding"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "Drafts _folder:"
 msgstr "Mappe _for skisser:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "A_ktiver"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 msgid "Email Accounts"
 msgstr "E-post konti"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Email _address:"
 msgstr "E-post _adresse:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Empty _trash folders on exit"
 msgstr "_T�m s�ppelkurven ved slutt"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Kj�r kommando..."
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr "Fast _bredde:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr "Egenskaper for skrift"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Hent digital ID..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:60 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Labels and Colors"
 msgstr "Etiketter og farger"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Loading Images"
 msgstr "Laster bilder"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Message Composer"
 msgstr "Meldingsredigering"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Message Display"
 msgstr "Meldingsvisning"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP-tjener:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Melding om ny e-post"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "News Servers"
 msgstr "news-tjenere"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr "Skrifter p� skjermen"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Tilleggsinformasjon"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-n�_kkel ID:"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Sp�_r ved sending av meldinger med kun Bcc-mottakere definert"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Skrifter ved utskrift"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Siter opprinnelig melding"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "H_usk dette passordet"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: mail/mail-config.glade.h:97 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Alternativer for m_ottak"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "Husk dette _passordet"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "N�dvendig informasjon"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "Sikk_erhet"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr "Velg skrift med fast bredde for bruk ved utskrift av HTML"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "Select PGP program"
 msgstr "Velg PGP-program"
 
-#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Utg�ende e-post"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Sendte meldinger og skisser"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Shortcuts _type:"
 msgstr "Snarvei_type:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "Signature #1"
 msgstr "Signatur #1"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 msgid "Signature #2"
 msgstr "Signatur #2"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Kilde"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Kildeinformasjon"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:122
 msgid "Specify _filename:"
 msgstr "Spesifiser _filnavn:"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:123
 msgid "Spell Checking Language"
 msgstr "Spr�k for stavekontroll"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:124
 msgid "Spell _Checking"
 msgstr "Stave_kontroll"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:126
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:129
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12078,11 +12067,11 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel �Arbeid� eller �Personlig�"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:134
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12092,215 +12081,199 @@ msgstr ""
 "\n"
 "Klikk �Neste� for � begynne. "
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:140
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:142
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "_Alltid last bilder fra nettet"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Alltid signer utg�ende meldinger n�r denne kontoen brukes"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Autentiseringstype: "
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:146
 msgid "_Authentication type: "
 msgstr "_Autentiseringstype: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "Sjekk etter meldinger _automatisk"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:148
 msgid "_Automatically insert smiley images"
 msgstr "Sett inn emotikoner _automatisk"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr "_Pip n�r nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:151
 msgid "_Confirm when expunging a folder"
 msgstr "_Bekreft ved t�mming av mappe"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:152
 msgid "_Default signature:"
 msgstr "_Forvalgt signatur:"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:153
 msgid "_Defaults"
 msgstr "_Forvalg"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ikke gi beskjed n�r nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:157
 msgid "_Enable"
 msgstr "_Aktiver"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr "_Fast bredde:"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:159
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:160
 msgid "_Full name:"
 msgstr "_Fullt navn:"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:162
 msgid "_HTML Mail"
 msgstr "_HTML e-post"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:164
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_Last bilder hvis avsender er i adresseboken"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "Aldri last bilder fra _nettet"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "Sti til _PGP-bin�rfil:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr "S_pill en lydfil n�r nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "S_p�r ved sending av HTML-meldinger til kontakter som ikke �nsker dem"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S_p�r ved sending av meldinger med tomt emnefelt"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Receiving Mail"
 msgstr "_Mottak av e-post"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Restore defaults"
 msgstr "Gjenopp_rett forvalg"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:178 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Sending Mail"
 msgstr "Ut_sending av e-post"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilder"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "_Signatures"
 msgstr "_Signaturer"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:183
 msgid "_Use secure connection (SSL):"
 msgstr "Br_uk sikker forbindelse (SSL):"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:184
 msgid "_Variable-width:"
 msgstr "_Variabel bredde:"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "hv_er(t)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:186
 msgid "color"
 msgstr "farge"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "nyhetsvindu1"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:191
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Kunne ikke opprette PGP signaturkontekst."
-
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Kunne ikke opprette PGP verifiseringskontekst."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Kunne ikke opprette PGP krypteringskontekst."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Kunne ikke opprette PGP dekrypteringskontekst."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Kunne ikke opprette S/MIME signaturkontekst."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Kunne ikke opprette S/MIME �certsonly�-kontekst."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Kunne ikke opprette S/MIME krypteringskontekst."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Kunne ikke opprette S/MIME �envelope�-kontekst."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikke opprette S/MIME dekodingskontekst."
 
@@ -12408,50 +12381,50 @@ msgstr "Postprogram"
 msgid "View messages..."
 msgstr "Vis meldinger..."
 
-#: mail/mail-format.c:1831
+#: mail/mail-format.c:1832
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Denne meldingen er digitalt signert. Klikk l�sikonet for mer informasjon."
 
-#: mail/mail-format.c:1857
+#: mail/mail-format.c:1859
 msgid "Could not create a PGP verfication context"
 msgstr "Kunne ikke opprette PGP verifiseringskontekst"
 
-#: mail/mail-format.c:1866
+#: mail/mail-format.c:1868
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Denne meldingen er digitalt signert og er funnet autentisk."
 
-#: mail/mail-format.c:1874
+#: mail/mail-format.c:1876
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne meldingen er digitalt signert, men kan ikke finnes autentisk."
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:2138
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig p� nettsted �%s�"
 
-#: mail/mail-format.c:2143
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:2172
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: mail/mail-format.c:2180
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data (�%s�-type)"
 
-#: mail/mail-format.c:2185
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
@@ -12752,10 +12725,6 @@ msgstr "Oppdaterer..."
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Avbrutt"
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
@@ -12792,7 +12761,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr "Skriv navnet du vil referere til denne signaturen med."
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:774
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
 msgid "Name:"
 msgstr "Navn:"
 
@@ -12847,7 +12816,6 @@ msgstr ""
 "    �%s�\n"
 "Og har blitt oppdatert."
 
-#. Make this static, saves having to recompute it each time
 #: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
 #: my-evolution/e-summary-mail.c:733
 msgid "VFolders"
@@ -17665,5227 +17633,5224 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds og Bradford"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libya"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisboa"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Linvingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "London"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "London/City"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "London/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "London/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "London/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Louisiana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "L�beck-Blankensee"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr "Lviv"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malm�/Sturup"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto flyplass"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsuyama flyplass"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McAll"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu flyplass"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Midt�sten"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Miyakejima flyplass"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Miyazaki flyplass"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile sentrum"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile regionale flyplass"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo i rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu flyplass"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Monchencladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montaque"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Sucro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Moskva Domodedovo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moskva Sheremetyevo"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosj�en"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "Munchen"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki flyplass"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoya flyplass"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Naha flyplass"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu flyplass"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama flyplass"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "Naples"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa's romferge"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "Nye Tokyo internasjonale flyplass"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK flyplass"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-C�te d'Azur"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata flyplass"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "Las Vegas N"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "Myrtle Beach N"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "N�rrk�ping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Nordvest-territoriet"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "N�rnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro flyplass"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocalu"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr "Odesa"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita flyplass"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okayama flyplass"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki flyplass"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando internasjonale)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "�rsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Osaka internasjonale flyplass"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Oshima flyplass"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardemoen"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg:"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyreneene"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson:"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton:"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "Folkerepublikken Kina"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpugnan-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozadovsk"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung nord"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung syd"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porte Alegre Apt"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr "Rivne"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Rostan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russel"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "R�nneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "R�ros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "R�rvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "R�st"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Russland"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbr�cken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford kommunale flyplass"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessj�en/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Fransisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jos�"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jos� De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jos� del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jos�-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "St. Petersburg"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "San Jos� Dos Campo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Sendai flyplass"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O internasjonale flyplass"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheik internasjonale"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport sentrum"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport regionale"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "S�nderborg"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "S�rkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "Timbalier syd"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton:"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St. Louis-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/S�rstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolv�r/Helle"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr "Sympheropol"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu flyplass"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talinn"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Tanegashima flyplass"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Teheran-Mehrabad"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo heliport"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokyi internasjonale flyplass"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokyo nye internasjonale flyplass"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori flyplass"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama flyplass"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Troms�/Langnes"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/V�rnes"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Tsushima flyplass"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Ume�"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "De forente arabiske emirater"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguay"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/S�sterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr "Uzhgorod"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vads�"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "V�rl�se"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "V�ster�s"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia tekniske flyplass"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser flyplass"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakesfield"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai flyplass"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Warshava"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia obervatorie"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Yamagata flyplass"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube flyplass"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao flyplass"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeinpyeungdo"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama flyplass"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Zurich"
 
@@ -22917,7 +22882,7 @@ msgstr "Ingen beskrivelse"
 msgid "Mail summary"
 msgstr "E-post sammendrag"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:409
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
 #: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Lokale mapper"
@@ -22927,45 +22892,45 @@ msgstr "Lokale mapper"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Dagens sitat"
 
-#: my-evolution/e-summary-preferences.c:762
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Legg til news-tjener"
 
-#: my-evolution/e-summary-preferences.c:770
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Skriv inn URL for nyhetsstedet du vil legge til"
 
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Feil under nedlasting av RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Nyhetstjenester"
 
-#: my-evolution/e-summary-shown.c:518
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr "Alle"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:527
+#: my-evolution/e-summary-shown.c:545
 msgid "Add"
 msgstr "Legg til"
 
-#: my-evolution/e-summary-shown.c:542 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Vist"
 
@@ -23005,7 +22970,7 @@ msgstr "Skriv ut sammendrag"
 msgid "Printing of Summary failed"
 msgstr "Feil under utskrift av sammendrag"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Executive summary komponent kunne ikke initiere Bonobo.\n"
 
@@ -24192,82 +24157,87 @@ msgid "C_elsius"
 msgstr "C_elsius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Alle _nyhetstjenester"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Hvor mange dager skal kalenderen vise om gangen?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Ma_ksimalt antall oppf�ringer som vises:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Innstillinger for nyhetstjeneste"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "E_n m�ned"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "_En uke"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "Oppdat_eringstid (sekunder):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "Oppda_teringstid (sekunder):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "V_is full sti for mapper"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Vis _alle oppgaver"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Vis _oppgaver for i dag"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Vis temperaturer i:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Oppgaver "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Innstillinger for v�r"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Fem dager"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_E-post"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "_Nyhetstjenester"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_En dag"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Sett av tid"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_V�r"
 
@@ -24305,11 +24275,6 @@ msgstr ""
 "Kan ikke overf�re mappe:\n"
 "%s"
 
-#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:113
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "�%s��i �%s�"
-
 #: shell/e-folder-list.c:312
 msgid "Add a Folder"
 msgstr "Legg til en mappe"
@@ -24621,21 +24586,26 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppf�ring %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Velg mappe"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Evolution feil"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Du kan kun importere til lokale mapper"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24644,11 +24614,11 @@ msgstr ""
 "Ingen importerer som kan h�ndtere\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24657,17 +24627,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Feil under start av %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil under lasting av %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24676,31 +24646,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppf�ring 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Importer data og innstillinger fra andre programmer"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Importer en enkelt fil"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24708,24 +24678,24 @@ msgstr ""
 "Vennligst vent...\n"
 "S�ker etter eksisterende oppsett"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent import"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Velg en m�lmappe for � importere data"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importer"
 
@@ -27085,28 +27055,108 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 
-#: camel/camel-multipart-signed.c:678
-msgid "parse error"
-msgstr "lesefeil"
+#~ msgid "_Other Organizer"
+#~ msgstr "Annen _organisator"
 
-#. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:335
-#, c-format
-msgid "~%s (%s)"
-msgstr "~%s (%s)"
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "�Clearsigning� er ikke st�ttet av dette cipheret"
 
-#. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:339
-#: camel/providers/local/camel-local-folder.c:342
-#, c-format
-msgid "mailbox:%s (%s)"
-msgstr "postboks:%s (%s)"
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Vennligst skriv inn din %s passphrase for %s"
 
-#. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:346
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Vennligst skriv inn din %s passphrase"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Kan ikke signere denne meldingen: ingen tekst � signere"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Kan ikke signere denne meldingen: ingen passord oppgitt"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Kunne ikke signere denne meldingen: kunne ikke opprette r�r til GPG/PGP: %"
+#~ "s"
+
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Kan ikke signere denne meldingen: ingen tekst for �clearsign�"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Kan ikke verifisere denne meldingen: ingen tekst � verifisere"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Kunne ikke verifisere denne meldingen: kunne ikke opprette r�r til GPG/"
+#~ "PGP: %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Kan ikke kryptere denne meldingen: ingen tekst � kryptere"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Kan ikke kryptere denne meldingen: ingen passord oppgitt"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Kunne ikke kryptere denne meldingen: kunne ikke opprette r�r til GPG/PGP: "
+#~ "%s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "Kan ikke dekryptere denne meldingen: ingen ciphertekst � dekryptere"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Kan ikke dekryptere denne meldingen: ingen passord oppgitt"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Kunne ikke dekryptere denne meldingen: kunne ikke opprette r�r til GPG/"
+#~ "PGP: %s"
+
+#~ msgid "Directory tree of mbox files"
+#~ msgstr "Katalogtree av mbox-filer"
+
+#~ msgid ""
+#~ "For accessing mail storedin an external tree of mbox files.\n"
+#~ "This will allow you to directly access pine and elm folders.\n"
+#~ "NOTE: This provider is still experimental so ensure you backup any mail "
+#~ "folders first."
+#~ msgstr ""
+#~ "For � aksessere meldinger lagret i et eksternt tree av mbox-filer.\n"
+#~ "Dette vil la deg aksessere pine- og elm-mapper direkte.\n"
+#~ "MERK: Denne tilbyderen er fremdeles eksperimentell slik at du m� "
+#~ "sikkerhetskopiere mappene f�r du bruker den."
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Kan ikke legge til melding i spool-filen: %s: %s"
+
+#~ msgid "Spool `%s' does not exist or is not a regular file"
+#~ msgstr "Spool �%s� eksisterer ikke eller er ikke en vanlig fil"
+
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Kunne ikke lagre: %s: %s"
+
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Lager �%s� eksisterer ikke eller er ikke en katalog"
+
+#~ msgid "Mail tree %s"
+#~ msgstr "E-post-tre %s"
+
+#~ msgid "Could not create a PGP signature context."
+#~ msgstr "Kunne ikke opprette PGP signaturkontekst."
+
+#~ msgid "Could not create a PGP verification context."
+#~ msgstr "Kunne ikke opprette PGP verifiseringskontekst."
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Kunne ikke opprette PGP krypteringskontekst."
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Kunne ikke opprette PGP dekrypteringskontekst."
+
+#~ msgid "Riga"
+#~ msgstr "Riga"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "�%s��i �%s�"
 
 #~ msgid "Signature information"
 #~ msgstr "Signaturinformasjon"
@@ -27368,9 +27418,6 @@ msgstr "%s (%s)"
 #~ msgid "Could not encrypt: encoding failed."
 #~ msgstr "Kunne ikke kryptere: koding feilet."
 
-#~ msgid "Failed to decrypt: Unknown"
-#~ msgstr "Klarte ikke � dekryptere: Ukjent"
-
 #~ msgid "Please enter the NNTP password for %s@%s"
 #~ msgstr "Vennligst skriv inn NNTP-passord for %s@%s"
 
@@ -27876,9 +27923,6 @@ msgstr "%s (%s)"
 #~ msgid "All _folders:"
 #~ msgstr "Alle _mapper:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "Alle _nyhetstjenester"
-
 #~ msgid "_Display folders:"
 #~ msgstr "_Vis mapper:"
 
@@ -28169,9 +28213,6 @@ msgstr "%s (%s)"
 #~ msgid "(Unknown)"
 #~ msgstr "(Ukjent)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Uventet svar fra POP-tjener: %s"
-
 #~ msgid "RCPT TO response error: %s: mail not sent"
 #~ msgstr "Feil ved �RCPT TO�-svar: %s: melding ikke sendt."
 
@@ -29880,9 +29921,6 @@ msgstr "%s (%s)"
 #~ msgid "Can't parse XML. Net connection down?"
 #~ msgstr "Kan ikke lese XML. Nettforbindelsen nede?"
 
-#~ msgid "Unable to process request.\n"
-#~ msgstr "Kunne ikke behandle foresp�rsel.\n"
-
 #~ msgid "This is a reply from someone who was uninvited!"
 #~ msgstr "Dette er et svar fra noen som ikke er invitert!"
 
diff --git a/po/pl.po b/po/pl.po
index 006131157e..12060a737f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2001-11-13 07:43+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -38,7 +38,7 @@ msgstr "Importuje pliki VCard do Evolution."
 msgid "File As"
 msgstr "Nazwa karty"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nazwa"
@@ -49,7 +49,7 @@ msgid "Email"
 msgstr "E-mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "G��wny"
 
@@ -59,7 +59,7 @@ msgstr "G�wn"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asystent"
@@ -67,8 +67,8 @@ msgstr "Asystent"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Praca"
 
@@ -78,12 +78,12 @@ msgid "Bus"
 msgstr "Prc"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Telefon kontaktowy"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Firma"
 
@@ -94,8 +94,8 @@ msgstr "Frma"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Dom"
 
@@ -110,18 +110,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Przeno�ny"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Samoch�d"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Faks s�u�bowy"
@@ -131,13 +131,13 @@ msgid "Bus Fax"
 msgstr "Faks s�u�b"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Faks w domu"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Praca 2"
 
@@ -146,43 +146,43 @@ msgid "Bus 2"
 msgstr "Prc 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Dom 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Inne"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Inny faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Teleks"
@@ -194,14 +194,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-mail 3"
@@ -339,7 +339,7 @@ msgstr "Plik VCard z pozycj� %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -347,7 +347,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Nie mo�na zainicjowa� Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Wyszukiwanie..."
 
@@ -360,32 +360,32 @@ msgstr "Wczytywanie..."
 msgid "Error in search expression."
 msgstr "B��d w wyra�eniu wyszukiwania."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Dodawanie karty na serwerze LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Usuwanie karty z serwera LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Modyfikowanie karty na serwerze LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Ponowne rozpoczynanie wyszukiwania."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Pobieranie wynik�w wyszukiwania na LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "B��d przy usuwaniu karty"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Nie mo�na rozpozna� URL-a \"%s\""
@@ -433,107 +433,143 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Przyk�adowy komponent Bonobo wy�wietlaj�cy ksi��k� adresow�."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "�r�d�a ksi��ki adresowej"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 "Komponent Bonobo wy�wietlaj�cy miniaturow� kart� ksi��ki adresowej Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Przegl�darka miniaturowych kart ksi��ki adresowej Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Komponent Evolution obs�uguj�cy kontakty."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Generator komponent�w miniatorowych kart ksi��ki adresowej"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Generator komponent�w wy�wietlaj�cych adres z ksi��ki adresowej"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 "Generator komponent�w wy�wietlaj�cych wyskakuj�ce okno z adresem z ksi��ki "
 "adresowej"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Generator przyk�adowych komponent�w ksi��ki adresowej"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Folder zawieraj�cy informacje o kontaktach"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "Serwer LDAP zawieraj�cy informacje o kontaktach"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Nowa lista kontakt�w"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "Lista _kontakt�w"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Nowy kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Nowa lista kontakt�w"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Nie mo�na nawi�za� po��czenia z serwerem LDAP."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "Lista _kontakt�w"
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Nie mo�na dokona� uwierzytelnienia na serwerze IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Odpowied� serwera IMAP nie zawiera informacji %s"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"B��d przy wczytywaniu informacji o filtrze:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "Odpowied� serwera IMAP nie zawiera informacji %s"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(Ta kopia Evolution nie obs�uguje SSL-a)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Nie mo�na zainicjowa� gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Inne kontakty"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Nie mo�na otworzy� ksi��ki adresowej"
@@ -566,50 +602,59 @@ msgstr ""
 "Nie mo�na otworzy� tej ksi��ki adresowej. Upewnij si�, �e �cie�ka\n"
 "ustnieje oraz �e ma ustawione odpowiednie uprawnienia."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Wprowad� has�o dla %s (u�ytkownik %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "ko�czy si� na"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "E-mail 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori� jest"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Jakiekolwiek pole zawiera"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Dowolna kategoria"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "URI kt�re ma wy�wietli� przegl�darka katalog�w"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(brak)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "G��wny e-mail"
 
@@ -655,106 +700,59 @@ msgstr "Wy��cz zapytania"
 msgid "Enable Queries (Dangerous!)"
 msgstr "W��cz zapytania (Niebezpieczne!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Nie mo�na nawi�za� po��czenia z serwerem LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Nie mo�na dokona� uwierzytelnienia na serwerze IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Niepoprawne nieprzejrzyste informacje identyfikuj�ce:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "Odpowied� serwera IMAP nie zawiera informacji %s"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(Ta kopia Evolution nie obs�uguje SSL-a)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Data zako�czenia"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr " _Sprawd� obs�ugiwane typy "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Opcje"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr " _Usu�"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr " _Usu�"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Opcje"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -763,8 +761,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "�r�d�a ksi��ki adresowej"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Alarmy"
@@ -859,8 +857,8 @@ msgstr "Konfiguracja"
 msgid "Mappings"
 msgstr "Marginesy"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_co"
@@ -1041,14 +1039,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1071,8 +1069,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1104,7 +1102,7 @@ msgid "Using email address"
 msgstr "_To jest adres pocztowy"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1112,7 +1110,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -1159,7 +1157,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1276,10 +1274,12 @@ msgstr "Interfejs wyboru nazwy ksi��ki adresowej Evolution"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Generator interfejsu wyboru nazwy ksi��ki adresowej Evolution"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Usu�"
 
@@ -1323,9 +1323,8 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 "Nie mo�na uzyska� lokalnego miejsca przechowywania ksi��ki adresowej.\n"
-"Mo�e to by� spowodowane nieprawid�owym dzia�aniem "
-"komponentuevolution-addressbook. Aby pom�c nam w zrozumieniu i rozwi�zaniu "
-"tego\n"
+"Mo�e to by� spowodowane nieprawid�owym dzia�aniem komponentuevolution-"
+"addressbook. Aby pom�c nam w zrozumieniu i rozwi�zaniu tego\n"
 "problemu, wy�lij e-mail (w j�zyku angielskim) do Jona Trowbridge'a\n"
 "<trow@ximian.com>, szczeg�owo opisuj�c warunki, w jakich pojawi� si�\n"
 "problem. Dzi�kujemy."
@@ -1415,7 +1414,7 @@ msgstr "Wsp�praca"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Edytor kontakt�w"
 
@@ -1425,7 +1424,7 @@ msgid "D_epartment:"
 msgstr "_Oddzia�:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Szczeg�y"
 
@@ -1489,11 +1488,12 @@ msgstr "Chce otrzymywa� listy w HTML-u"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Usu�"
 
@@ -1522,7 +1522,7 @@ msgid "_Web page address:"
 msgstr "Adres strony _WWW:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Stany Zjednoczone"
 
@@ -2029,12 +2029,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Litwa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libia"
 
@@ -2043,7 +2042,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
@@ -2052,12 +2051,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "�otwa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
@@ -2090,7 +2089,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2115,7 +2114,7 @@ msgid "Mayotte"
 msgstr "Majotta"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Meksyk"
 
@@ -2140,7 +2139,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Maroko"
 
@@ -2165,7 +2164,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Holandia"
 
@@ -2178,12 +2177,12 @@ msgid "New Caledonia"
 msgstr "Nowa Kaledonia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nowa Zelandia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
@@ -2200,7 +2199,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Wyspa Norfolk"
 
@@ -2210,17 +2209,17 @@ msgid "Northern Mariana Islands"
 msgstr "P�nocne Mariany"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norwegia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2233,7 +2232,7 @@ msgid "Palestinian Territory"
 msgstr "Autonomia Palesty�ska"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2242,12 +2241,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Nowa Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paragwaj"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2260,22 +2259,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polska"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Katar"
 
@@ -2284,7 +2283,7 @@ msgid "Reunion"
 msgstr "Reunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rumunia"
 
@@ -2322,7 +2321,7 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Arabia Saudyjska"
 
@@ -2339,17 +2338,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapur"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "S�owacja"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "S�owenia"
 
@@ -2362,7 +2361,7 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Po�udniowa Afryka"
 
@@ -2371,7 +2370,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Po�udniowa Georgia i Sandwich Po�udniowy"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Hiszpania"
 
@@ -2392,7 +2391,7 @@ msgid "Sudan"
 msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -2405,17 +2404,17 @@ msgid "Swaziland"
 msgstr "Suazi"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Szwecja"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Szwajcaria"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
@@ -2453,7 +2452,7 @@ msgid "Tunisia"
 msgstr "Tunezja"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turcja"
 
@@ -2474,7 +2473,7 @@ msgid "Uganda"
 msgstr "Kanada"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraina"
 
@@ -2483,7 +2482,7 @@ msgid "United Arab Emirates"
 msgstr "Zjednoczone Emiraty Arabskie"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Zjednoczone Kr�lestwo"
 
@@ -2492,7 +2491,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "Oddalone drobne wyspy Stan�w Zjednoczonych"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Urugwaj"
 
@@ -2505,12 +2504,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Wenezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Wietnam"
 
@@ -2533,12 +2532,12 @@ msgid "Western Sahara"
 msgstr "Zachodnia Sachara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugos�awia"
 
@@ -2551,27 +2550,35 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Czy na pewno chcesz\n"
+"usun�� ten kontakt?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Usun�� kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Edytor kategorii nie jest dost�pny."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Ten kontakt przynale�y do nast�puj�cych kategorii:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "Zapisz jako VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTy/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nie mo�na odnale�� widgetu zwi�zanego z polem: \"%s\""
@@ -2598,11 +2605,11 @@ msgstr "E-mail"
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2738,11 +2745,11 @@ msgid "contact-list-editor"
 msgstr "Edytor listy kontakt�w"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Edytor listy kontakt�w"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Zapisz jako VCard"
@@ -2821,21 +2828,21 @@ msgid "Error getting book view"
 msgstr "B��d przy uruchamianiu %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "B��d przy modyfikacji karty"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Sukces"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Nieznany b��d"
 
@@ -2844,7 +2851,7 @@ msgid "Repository offline"
 msgstr "Repozytorium roz��czone"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Brak uprawnie�"
 
@@ -2862,55 +2869,70 @@ msgstr "Protok� nie jest obs�ugiwany"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Anulowane"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Uwierzytelnienie nie powiod�o si�."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Wymagane uwierzytelnienie"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Inny b��d"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Czy chcesz zapisa� zmiany?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "B��d przy dodawaniu listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "B��d przy dodawaniu karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "B��d przy modyfikacji listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "B��d przy usuwaniu listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "B��d przy usuwaniu karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Wy�wietlanie"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Wy�wietlanie"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2918,22 +2940,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Brak kart"
@@ -2998,102 +3020,108 @@ msgstr "Inny telefon"
 msgid "Other Address"
 msgstr "Inny adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Ksi��ka adresowa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Zapisz jako VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Nowy kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nowa lista kontakt�w"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Przejd� do folderu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "Za_importuj..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Szukaj kontakt�w"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "�r�d�a ksi��ki adresowej..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Ustawienia pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Prze�lij kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Wy�lij list do kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Wydrukuj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Wydrukuj kopert�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "S_kopiuj do folderu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "P_rzenie� do folderu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Wytnij"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Skopiuj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Wklej"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Usu�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3103,7 +3131,7 @@ msgstr "_Bie��cy widok"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 ",123,a,�,b,c,�,d,e,�,f,g,h,i,j,k,l,�,m,n,�,o,�,p,q,r,s,�,t,u,v,w,x,y,z,�,�"
@@ -3112,7 +3140,7 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 ",0,a,�,b,c,�,d,e,�,f,g,h,i,j,k,l,�,m,n,�,o,�,p,q,r,s,�,t,u,v,w,x,y,z,�,�"
@@ -3265,7 +3293,7 @@ msgstr "Marginesy"
 msgid "Number of columns:"
 msgstr "Liczba kolumn:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Opcje"
 
@@ -3275,7 +3303,7 @@ msgid "Orientation"
 msgstr "U�o�enie"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Strona"
 
@@ -3349,29 +3377,33 @@ msgstr "Szeroko��:"
 msgid "_Font..."
 msgstr "_Czcionka..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Termin pozbawiony nazwy"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Wysoki"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Zwyk�y"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Niski"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
@@ -3414,42 +3446,34 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Generator edytora list�w Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Komponent zestawienia wykonawczego kalendarza Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Przegl�darka kalendarza iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Komponent Bonobo obs�uguj�cy kalendarz."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Generator komponentu zestawienia kalendarza."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Generator formantu zada� Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Generator formantu wy�wietlania iTip kalendarza"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Generator przyk�adowego formantu kalendarza"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Generator centralizuj�cy okna edytora komponentu kalendarza"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Generator tworz�cy generator komponentu edytora"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3461,10 +3485,25 @@ msgstr "Us�uga przypominania za pomoc� alarmu"
 msgid "Factory for the alarm notification service"
 msgstr "Generator us�ugi przypominania za pomoc� alarmu"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Ustawienia"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Indeksowanie:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "niepoprawny czas"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3504,7 +3543,7 @@ msgstr ""
 "zostanie wy�wietlone zwyk�e okno przypomnienia."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Ostrze�enie"
@@ -3531,15 +3570,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Bez pytania o to w przysz�o�ci."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Nie mo�na zainicjowa� GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "Nie mo�na stworzy� us�ugi przypominania za pomoc� alarmu"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "Nie mo�na stworzy� generatora us�ugi przypominania za pomoc� alarmu"
 
@@ -3555,7 +3594,7 @@ msgstr "Opis zawiera"
 msgid "Comment contains"
 msgstr "Komentarz zawiera"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Niedopasowane"
 
@@ -3595,14 +3634,16 @@ msgstr ""
 "Nie mo�na stworzy� widoku kalendarza.  Zweryfikuj ustawienia ORBita i OAF-a."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Prywatny"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Tajny"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Publiczny"
 
@@ -3623,27 +3664,32 @@ msgid "W"
 msgstr "W"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Wolny"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Zaj�ty"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Przed rozpocz�ciem"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Trwaj�ce"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Zako�czone"
 
@@ -3658,11 +3704,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3677,12 +3724,14 @@ msgstr "Powtarzanie"
 msgid "Assigned"
 msgstr "Przyporz�dkowany"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Tak"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Nie"
 
@@ -3702,62 +3751,64 @@ msgstr "Widok tygodnia"
 msgid "Month View"
 msgstr "Widok miesi�ca"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Folder zawieraj�cy terminy i zdarzenia"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Zadania"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Folder zawieraj�cy pozycje do wykonania"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "Ustawienia �r�de� nowo�ci"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "Spotkanie"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Zadanie"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nowy termin"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nowy _termin"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "Nowy termin"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "Termin"
@@ -3967,7 +4018,7 @@ msgstr "Przypominanie"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zestawienie:"
 
@@ -3996,7 +4047,7 @@ msgstr "koniec terminu"
 msgid "hour(s)"
 msgstr "godzin"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minut"
 
@@ -4024,79 +4075,81 @@ msgstr "30 minut"
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alarmy"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Ustawienia kalendarza i zada�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Kolor zaleg�ych zada�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Kolor dzisiejszych zada�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Dni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Pi�tek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Godzin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Poniedzia�ek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "_Nie"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Wy�wietlanie _numer�w tygodni w przegl�darce dat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "Pocz�tek _dnia:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "_Nie"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Zadania na _dzi�:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "_Czw"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "_Wto"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4125,82 +4178,97 @@ msgid "Tuesday"
 msgstr "Wtorek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "�roda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Tydzie� roboczy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12-godzinny (AP/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24-godzinny"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Potwierdzanie przed usuni�ciem element�w"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_Kompresowanie weekend�w na widoku miesi�cznym"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Czas rozpocz�cia zadania: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "Wy�wi_etlanie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "_Koniec dnia:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_Pi�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "Og�_lne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_Ukrywanie zako�czonych zada� po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "P_on"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Z_aleg�e zadania:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_Sob"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr ""
 "Wy�wietlanie _czas�w zako�czenia termin�w w widoku tygodniowym i miesi�cznym"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Prze_dzia�y czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_Wto"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "�_ro"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "przed pocz�tkiem terminu"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4283,40 +4351,61 @@ msgstr " (Nale�ne "
 msgid "Due "
 msgstr "Nale�ne "
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
 msgstr "Nie mo�na uaktualni� obiektu!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Nie mo�na uaktualni� obiektu!"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Wpis dziennika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Brak zestawienia"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Nie mo�na uzyska� bie��cej wersji!"
 
@@ -4374,27 +4463,27 @@ msgstr "Oddelegowanie do:"
 msgid "Enter Delegate"
 msgstr "Oddelegowanie"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Przypominanie"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Powtarzalno��"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Planowanie"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Spotkanie"
 
@@ -4444,7 +4533,7 @@ msgid "Pu_blic"
 msgstr "Pu_bliczny"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Forma wy�wietlania czasu"
 
@@ -4466,19 +4555,19 @@ msgstr "_Czas zako�czenia:"
 msgid "_Start time:"
 msgstr "Cza_s rozpocz�cia:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Wymagany jest organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Wymagany jest co najmniej jeden uczestnik."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Ta osoba ju� uczestniczy w spotkaniu!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Oddeleguj do..."
 
@@ -4489,49 +4578,55 @@ msgstr "Uczestnik"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Wsp�lna nazwa"
+msgid "Click here to add an attendee"
+msgstr "Kliknij, aby doda� uczestnika"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Oddelegowane od"
+msgid "Common Name"
+msgstr "Wsp�lna nazwa"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Oddelegowane do"
+msgid "Delegated From"
+msgstr "Oddelegowane od"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "J�zyk"
+msgid "Delegated To"
+msgstr "Oddelegowane do"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Cz�onek"
+msgid "Language"
+msgstr "J�zyk"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Cz�onek"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rola"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stan"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -4546,14 +4641,10 @@ msgid "_Change Organizer"
 msgstr "_Zmie� organizatora"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Zapro� innych..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Inny organizator"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4743,7 +4834,7 @@ msgid "Progress"
 msgstr "Post�p"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4755,19 +4846,19 @@ msgstr "P_riorytet:"
 msgid "_Status:"
 msgstr "_Stan:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Proste"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Przyporz�dkowanie"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Opis:"
 
@@ -4779,23 +4870,78 @@ msgstr "Cza_s rozpocz�cia:"
 msgid "_Due Date:"
 msgstr "_Czas zako�czenia:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, fuzzy, c-format
+msgid "100%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Usuwanie zaznaczonych obiekt�w"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Otw�rz"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Zapisz jako..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4803,20 +4949,20 @@ msgstr "Zapisz jako..."
 msgid "_Print..."
 msgstr "Wy_drukuj..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Wytnij"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "S_kopiuj"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4824,35 +4970,36 @@ msgstr "S_kopiuj"
 msgid "_Paste"
 msgstr "Wk_lej"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Przypisz zadanie"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Prze�lij jako i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_Oznacz jako zako�czone"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Oznacz zadania jako zako�czone"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_Usu� zaznaczone zadania"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Aktualizowanie obiekt�w"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknij, aby doda� zadanie"
 
@@ -4860,47 +5007,48 @@ msgstr "Kliknij, aby doda� zadanie"
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Zako�czone"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Data zako�czenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Data wykonania"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Data zako�czenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Pozycja geograficzna"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Priorytet"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Data rozpocz�cia"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Zestawienie"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Porz�dek zada�"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4948,11 +5096,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -4992,7 +5142,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Opublikuj informacj� o zaj�to�ci"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Konfiguracja"
@@ -5003,7 +5153,7 @@ msgid "_Configure Pilot..."
 msgstr "Konfiguracja"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "Zapisz j_ako..."
 
@@ -5030,75 +5180,393 @@ msgid "Delete _All Occurrences"
 msgstr "Usu� w_szystkie wyst�pienia"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "W systemie nie jest zainstalowany GNOME Pilot tools."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "B��d przy wykonywaniu %s."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "Czas rozpocz�cia spotkania: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "Czas rozpocz�cia zadania: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "Czas rozpocz�cia informacji o zaj�to�ci: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Rozpocz�cie: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "Czas zako�czenia spotkania spotkania: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "Czas zako�czenia informacji o zaj�to�ci: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "Zako�czenie: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "Zadanie uko�czone: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "Zadanie na: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "Informacje iKalendarza"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "B��d iKalendarza"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "Nieznana osoba"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Przejrzyj wy�wietlone informacje, a nast�pnie wybierz czynno�� z "
+"poni�szego menu."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Brak</i>"
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "_Stan:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Zaakceptowane"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "Pr�bna akceptacja"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Odrzucone"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "Nie mo�na uaktualni� pliku kalendarza!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "Wyb�r czynno�ci:"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Aktualizacja"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "Akceptacja"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "Pr�bna akceptacja"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "Odrzucenie"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "Wys�anie informacji o zaj�to�ci"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "Pobranie stanu wezwanej osoby"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "Wys�anie naj�wie�szej informacji"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> opublikowa� informacje o spotkaniu."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Informacje o spotkaniu"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> zwraca si� o twoj� obecno�� na spotkaniu."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "Propozycja spotkania"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> chce dodania do istniej�cego spotkania."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "Aktualizacja spotkania"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> chce otrzyma� naj�wie�sze informacje o spotkaniu."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "Zwr�cenie si� o aktualizacj� spotkania"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> odpowiedzia� na zwr�cenie si� o spotkanie."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "Odpowied� na spotkanie"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> anulowa� spotkanie."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "Anulowanie spotkania"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> wys�a� niezrozumia�� wiadomo��."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Niepoprawna wiadomo�� o spotkaniu"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> opublikowa� informacje o spotkaniu."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Informacje o zadaniu"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> zwraca si� o wykonanie przez ciebie zadania."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Propozycja zadania"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> chce dodania do istniej�cego zadania."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Aktualizacja zadania"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> chce otrzyma�  naj�wie�sze informacje o zadaniu."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Zwr�cenie si� o aktualizacj� zadania"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> odpowiedzia� na przypisanie zadania."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Odpowied� na zadanie"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> anulowa� zadanie."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Anulowanie zadania"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Niepoprawna wiadomo�� o zadaniu"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> opublikowa� informacj� o zaj�to�ci."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Informacja o zaj�to�ci"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> zwraca si� o informacj� o zaj�to�ci."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Zwr�cenie si� o informacj� o zaj�to�ci"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> odpowiedzia� na zwr�cenie si� o informacj� o zaj�to�ci."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Odpowied� z informacj� o zaj�to�ci"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Niepoprawna wiadomo�� o zaj�to�ci"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Folder jest uszkodzony w spos�b uniemo�liwiaj�cy napraw�."
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "Lista zawiera tylko nieobs�ugiwane ��dania."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "Za��cznik nie zawiera poprawnego komunikatu kalendarza"
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "Za��cznik nie zawiera daj�cych si� wy�wietli� element�w kalendarza"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Nie mo�na wys�a� elementu!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Aktualizacja zako�czona\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Nie mo�na uaktualni� pliku kalendarza!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Nie mo�na uaktualni� stanu uczestnika, poniewa� element ju� nie istnieje"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Nie mo�na uaktualni� stanu uczestnika, poniewa� jest on nieprawid�owy!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-#, fuzzy
-msgid "Attendee status could not be updated!\n"
-msgstr "Nie mo�na uaktualni� stanu uczestnika!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Stan uczestnika zosta� uaktualniony\n"
 
 #: calendar/gui/e-itip-control.c:1674
+#, fuzzy
+msgid "Attendee status could not be updated!\n"
+msgstr "Nie mo�na uaktualni� stanu uczestnika!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Usuni�cie zako�czone"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Element zosta� wys�any!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "Nie mo�na wys�a� elementu!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Wyb�r folderu"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Wyb�r folderu"
@@ -5140,93 +5608,92 @@ msgstr "data-pocz�tkowa"
 msgid "date-start"
 msgstr "data-ko�cowa"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Osoby przewodnicz�ce"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Wymagani uczestnicy"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Opcjonalni uczestnicy"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Nie uczestnicy"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Osoba"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Zas�b"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Pomieszczenie"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Przewodniczenie"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Wymagany uczestnik"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Opcjonalny uczestnik"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Nie uczestnik"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Wymaga dzia�ania"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Zaakceptowane"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Odrzucone"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Pr�bnie zaakceptowane"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Oddelegowane"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "W trakcie"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5238,63 +5705,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Poza biurem"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Brak informacji"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "Opcj_e"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Wy�wietlanie _tylko godzin roboczych"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Wy�wietlanie w p_owi�kszeniu"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Uaktualnij informacj� o zaj�to�ci"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Automatyczny wyb�r"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Wszyscy ludzie i zasoby"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Wszyscy _ludzie i jeden zas�b"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Wy_magani ludzie"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Wymagani ludzie i j_eden zas�b"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Czas p_ocz�tku spotkania:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Czas _ko�ca spotkania:"
 
@@ -5313,17 +5780,22 @@ msgstr "Nie mo�na wczyta� zadania w \"%s\""
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda wymagana do odczytu \"%s\" nie jest obs�ugiwana"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Nie mo�na otworzy� folderu w \"%s\""
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data zako�czenia"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Usuwanie zaznaczonych obiekt�w"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "Oczyszczanie folderu"
@@ -5336,17 +5808,17 @@ msgstr "Nowy _termin..."
 msgid "_Delete this Appointment"
 msgstr "_Usu� termin"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nie mo�na otworzy� folderu w \"%s\""
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda wymagana do otwarcia \"%s\" nie jest obs�ugiwana"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otwieranie kalendarza z %s"
@@ -5407,20 +5879,59 @@ msgstr "Pa�dziernik"
 msgid "September"
 msgstr "Wrzesie�"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "Wymagany jest co najmniej jeden uczestnik"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Nale�y poda� organizatora."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "informacje kalendarza"
+
+#: calendar/gui/itip-utils.c:356
+#, fuzzy
+msgid "Task information"
+msgstr "Informacje o zadaniu"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "Informacje opcjonalne"
+
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "Informacja o zaj�to�ci"
+
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "informacje kalendarza"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Aktualizacja"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Od�wie� list�"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Musisz nale�e� do uczestnik�w zdarzenia."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "Nie mo�na stworzy� generatora komponentu edytora"
 
@@ -5609,12 +6120,46 @@ msgstr "Wybrany miesi�c (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Wybrany rok (%Y)"
 
+#: calendar/gui/print.c:2249
+#, fuzzy
+msgid "Task"
+msgstr "_Zadanie"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Stan: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "P_riorytet:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Procent zako�czenia: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Kategorie: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Kontakty: "
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Wydrukuj kalendarz"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5652,8 +6197,8 @@ msgstr ""
 "\n"
 "Czy rzeczywi�cie usun�� te listy?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Bez pytania o to w przysz�o�ci."
 
@@ -5719,6 +6264,11 @@ msgstr "Importuje pliki VCard do Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importuje pliki VCard do Evolution."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Przypominanie"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5821,11 +6371,11 @@ msgstr "contains? wymaga, �eby 2. argument by� napisem"
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
-"contains? wymaga, �eby 1. argument mia� jedn� z warto�ci: \"any\", "
-"\"summary\", \"description\""
+"contains? wymaga, �eby 1. argument mia� jedn� z warto�ci: \"any\", \"summary"
+"\", \"description\""
 
 #: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
@@ -6827,668 +7377,683 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Asystent"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Katar"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr ""
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 #, fuzzy
 msgid "Asia/Muscat"
 msgstr "Asystent"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr ""
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 #, fuzzy
 msgid "Asia/Omsk"
 msgstr "Przypisz zadanie"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Przypisz zadanie"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 #, fuzzy
 msgid "Asia/Qatar"
 msgstr "Katar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr ""
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr ""
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr ""
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 #, fuzzy
 msgid "Asia/Singapore"
 msgstr "Singapur"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr ""
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr ""
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr ""
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 #, fuzzy
 msgid "Atlantic/Bermuda"
 msgstr "Bermudy"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 #, fuzzy
 msgid "Atlantic/Cape_Verde"
 msgstr "Wyspy Zielonego Przyl�dka"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 #, fuzzy
 msgid "Australia/Adelaide"
 msgstr "Australia"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 #, fuzzy
 msgid "Australia/Brisbane"
 msgstr "Australia"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 #, fuzzy
 msgid "Australia/Broken_Hill"
 msgstr "Australia"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 #, fuzzy
 msgid "Australia/Darwin"
 msgstr "Australia"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 #, fuzzy
 msgid "Australia/Hobart"
 msgstr "Australia"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 #, fuzzy
 msgid "Australia/Lindeman"
 msgstr "Australia"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 #, fuzzy
 msgid "Australia/Lord_Howe"
 msgstr "Australia"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 #, fuzzy
 msgid "Australia/Melbourne"
 msgstr "Australia"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 #, fuzzy
 msgid "Australia/Perth"
 msgstr "Australia"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 #, fuzzy
 msgid "Australia/Sydney"
 msgstr "Australia"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr ""
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 #, fuzzy
 msgid "Europe/Andorra"
 msgstr "Andora"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 #, fuzzy
 msgid "Europe/Athens"
 msgstr "W�a�ciwo�ci"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr ""
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr ""
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr ""
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr ""
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr ""
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr ""
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr ""
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr ""
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 #, fuzzy
 msgid "Europe/Gibraltar"
 msgstr "Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr ""
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr ""
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr ""
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr ""
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr ""
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr ""
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 #, fuzzy
 msgid "Europe/Luxembourg"
 msgstr "Luksemburg"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr ""
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr ""
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr ""
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 #, fuzzy
 msgid "Europe/Monaco"
 msgstr "Monako"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr ""
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr ""
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 #, fuzzy
 msgid "Europe/Paris"
 msgstr "W�a�ciwo�ci"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr ""
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr ""
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr ""
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr ""
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 #, fuzzy
 msgid "Europe/San_Marino"
 msgstr "San Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr ""
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr ""
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr ""
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr ""
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr ""
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr ""
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 #, fuzzy
 msgid "Indian/Comoro"
 msgstr "Komory"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 #, fuzzy
 msgid "Indian/Mahe"
 msgstr "Indie"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 #, fuzzy
 msgid "Indian/Maldives"
 msgstr "Mo�dawia"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 #, fuzzy
 msgid "Indian/Mauritius"
 msgstr "Mauritius"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 #, fuzzy
 msgid "Indian/Mayotte"
 msgstr "Majotta"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 #, fuzzy
 msgid "Indian/Reunion"
 msgstr "Reunion"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 #, fuzzy
 msgid "Pacific/Pitcairn"
 msgstr "Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje podpisywania"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Ten rodzaj szyfrowania nie obs�uguje czytelnego podpisywania"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje weryfikacji"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje kodowania"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Ten rodzaj szyfrowania nie obs�uguje rozkodowywania"
 
@@ -7499,12 +8064,12 @@ msgstr ""
 "Nie mo�na stworzy� pliku wyj�ciowego: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nie mo�na otworzy� katalogu cache: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7515,7 +8080,7 @@ msgstr ""
 "Kolejne operacje na tym serwerze nie b�d� mog�y zosta� odtworzone\n"
 "po ponownym pod��czeniu do sieci."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7526,11 +8091,16 @@ msgstr ""
 "%s\n"
 "Zmiany w tym folderze nie zostan� zsynchronizowane z serwerem."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Ponowne synchronizowanie z serwerem"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Zapisywanie folderu \"%s\""
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Do zako�czenia tej operacji konieczne jest po��czenie z sieci�"
 
@@ -7538,57 +8108,68 @@ msgstr "Do zako�czenia tej operacji konieczne jest po��czenie z sieci�"
 msgid "Syncing folders"
 msgstr "Synchronizowanie folder�w"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "B��d przy analizie sk�adni filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "B��d przy wykonywaniu filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Nie mo�na otworzy� folderu kolejki"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Nie mo�na przetworzy� folderu kolejki"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Pobieranie %d. listu (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Nie mo�na otworzy� listu"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Niepowodzenie przy %d. li�cie"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Synchronizowanie folderu"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Pobieranie %d. listu z %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Niepowodzenie przy li�cie %d z %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Nie mo�na odkodowa� listu."
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Nie mo�na zapisa� listu %s w cache: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Nie mo�na zapisa� listu %s w cache: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "B��d przy wykonywaniu wyszukiwania przez filtr: %s: %s"
@@ -7620,25 +8201,103 @@ msgstr "(match-all) wymaga pojedynczego wyniku logicznego"
 msgid "Performing query on unknown header: %s"
 msgstr "Wykonywanie zapytania na nieznanym nag��wku: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nieobs�ugiwana operacja: do��czenie listu: typ %s"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nieobs�ugiwana operacja: wyszukiwanie wed�ug wyra�enia: typ %s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nieobs�ugiwana operacja: wyszukiwanie wed�ug uid: dla %s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Przenoszenie list�w"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Kopiowanie list�w do %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Anulowano."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Nieoczekiwana odpowied� od serwera POP: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Nie podano nazwy pliku."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Nie mo�na zaszyfrowa� listu: nie podano odbiorc�w"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Nie mo�na zapisa� listu %s w cache: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Nie mo�na zapisa� listu %s w cache: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Nie mo�na odkodowa� listu."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+"Nie mo�na zweryfikowa� listu: nie mo�na stworzy� pliku tymczasowego: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7737,84 +8396,23 @@ msgstr "B��d przy zapisie do tymczasowego pliku z listami: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "B��d przy kopiowaniu tymczasowego pliku z listami: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Wprowad� swoje d�ugie has�o %s dla %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Wprowad� swoje d�ugie has�o %s"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Nie mo�na podpisa� listu: brak tekstu, kt�ry mo�na podpisa�"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "Nie mo�na podpisa� listu: nie podano has�a"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Nie mo�na podpisa� listu: nie mo�na stworzy� potoku do GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Nie mo�na podpisa� listu: brak tekstu, kt�ry mo�na czytelnie podpisa�"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Nie mo�na zweryfikowa� listu: brak tekstu, kt�ry mo�na zweryfikowa�"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Nie mo�na zweryfikowa� listu: nie mo�na stworzy� potoku do GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Nie mo�na zweryfikowa� listu: nie mo�na stworzy� pliku tymczasowego: %s"
 
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Nie mo�na zaszyfrowa� listu: brak tekstu, kt�ry mo�na zaszyfrowa�"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Nie mo�na zaszyfrowa� listu: nie podano has�a"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Nie mo�na zaszyfrowa� listu: nie mo�na stworzy� potoku do GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Nie mo�na zaszyfrowa� listu: nie podano odbiorc�w"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
-"Nie mo�na odszyfrowa� listu: brak zaszyfrowanego tekstu, kt�ry mo�na "
-"odszyfrowa�"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Nie mo�na odszyfrowa� listu: nie podano has�a"
 
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Nie mo�na odszyfrowa� listu: nie mo�na stworzy� potoku do GPG/PGP: %s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Inny b��d"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7830,43 +8428,6 @@ msgstr "Nie mo�na wczyta� %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie mo�na wczyta� %s: Brak kodu inicjuj�cego w module."
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "serwer %s %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "us�uga %s dla %s na %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Anulowano po��czenie"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Nie mo�na nawi�za� po��czenia z %s (port %d): %s"
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(nieznany komputer)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Operacja anulowana"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Serwer nieoczekiwanie przerwa� po��czenie: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonimowy"
@@ -7942,8 +8503,8 @@ msgstr "Niepoprawne wezwanie serwera\n"
 #: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
-"Wezwanie serwera zawiera�o niepoprawny token \"Quality of Protection\" "
-"(jako�� ochrony)\n"
+"Wezwanie serwera zawiera�o niepoprawny token \"Quality of Protection"
+"\" (jako�� ochrony)\n"
 
 #: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
@@ -7977,7 +8538,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie."
 
@@ -8009,11 +8570,9 @@ msgstr ""
 "Opcja ta spowoduje ��czenie z serwerem przy wykorzystaniu uwierzytelniania "
 "Kerberos 4."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Has�o"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -8041,55 +8600,55 @@ msgstr "POP przed SMTP przy u�yciu �r�d�a nie b�d�cego typu pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nie powiod�a si� kompilacja wyra�enia regularnego: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "W URL-u \"%s\" wymagana jest nazwa u�ytkownika"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "W URL-u \"%s\" wymagana jest nazwa komputera"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "W URL-u \"%s\" wymagana jest �cie�ka"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Wyszukiwanie: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s: nazwa nie istnieje"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s: przyczyna nieznana"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Wyszukiwanie: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr ""
 "Nie mo�na ustali� adresu odpowiadaj�cego nazwie: %s: nazwa nie istnieje"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr ""
@@ -8155,12 +8714,12 @@ msgstr "Nie mo�na odkodowa� listu."
 msgid "Failed to verify certificates."
 msgstr "Nie mo�na zweryfikowa� certyfikatu."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Nie mo�na pobra� folderu: Niepoprawna operacja na tym miejscu przechowywania"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Nie mo�na stworzy� folderu: Niepoprawna operacja na tym miejscu "
@@ -8192,7 +8751,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8201,16 +8760,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8230,15 +8789,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nie mo�na rozpozna� URL-a \"%s\""
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Brak listu %s w %s."
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Brak listu: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Sprawdzanie nowych list�w we wszystkich folderach"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8260,68 +8819,77 @@ msgstr "Nie mo�na zmieni� nazwy folderu: %s: Niepoprawna operacja"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie mo�na zmieni� nazwy folderu %s: Folder nie istnieje"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Nie mo�na kopiowa� list�w z tego folderu �mietnka."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Operacja anulowana"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Serwer nieoczekiwanie przerwa� po��czenie: %s"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied� od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nie powiod�o si� polecenie IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Odpowied� serwera zako�czy�a si� zbyt wcze�nie."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odpowied� serwera IMAP nie zawiera informacji %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied� OK od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie mo�na stworzy� katalogu %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nie mo�na wczyta� zestawienia dla %s"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder na serwerze zosta� usuni�ty stworzony ponownie."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Wyszukiwanie zmodyfikowanych list�w"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Ten list jest obecnie niedost�pny"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Pobieranie informacji podsumowuj�cych nowe listy"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Wyszukiwanie nowych list�w"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Nie mo�na odnale�� tre�ci listu w odpowiedzi na FETCH."
 
@@ -8375,34 +8943,85 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Do przegl�dania i przechowywania poczty na serwerach IMAP."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Has�o"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Przy tej opcji po��czenie z serwerem IMAP nast�pi przy u�yciu has�a w "
 "postaci czystego tekstu."
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Serwer SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "us�uga %s dla %s na %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Anulowano po��czenie"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Nie mo�na nawi�za� po��czenia z %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Nie mo�na nawi�za� po��czenia z serwerem POP.\n"
+"Wyst�pi� b��d przy wysy�aniu nazwy u�ytkownika: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Nieobs�ugiwana operacja"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Uwierzytelnienie nie powiod�o si�."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Serwer IMAP-a %s nie obs�uguje wymaganego typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Brak obs�ugi typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPodaj has�o IMAP dla %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Nie wprowadzono has�a."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8413,71 +9032,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder \"%s\" nie istnieje"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder nadrz�dny nie mo�e zawiera� folder�w podrz�dnych"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Nie mo�na otworzy� skrzynki: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Katalogi z listami formacie MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Do przechowywania lokalnej poczty w katalogach podobnych do MH."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Dostarczanie lokalne"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 "Do pobierania lokalnej poczty ze standardowych kolejek w formacie mbox."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Zastosowywanie filtr�w w odniesieniu do nowych list�w w INBOX"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Katalogi z listami formacie Maildir"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Do przechowywania lokalnej poczty w katalogach Maildir."
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Standardowe uniksowe kolejki mbox"
-
-#: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
-"Do odczytu i przechowywania lokalnej poczty w standardowych plikach kolejek "
-"w formacie mbox."
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Standardowe uniksowe kolejki mbox"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
+"Do odczytu i przechowywania lokalnej poczty w standardowych plikach kolejek "
+"w formacie mbox."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8505,7 +9143,7 @@ msgstr "Lokalne miejsca przechowywania nie maj� skrzynki nadchodz�cej"
 msgid "Local mail file %s"
 msgstr "Lokalny plik z listami %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nie mo�na zmieni� nazwy folderu %s na %s: %s"
@@ -8525,33 +9163,31 @@ msgstr "Nie mo�na usun�� pliku z zestawieniem folderu \"%s\": %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nie mo�na usun�� pliku \"%s\" z indeksem folderu: %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nie mo�na zapisa� zestawienia: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nie mo�na doda� listu do zestawienia: przyczyna nieznana"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Anulowano do��czenie listu do katalogu Maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nie mo�na do��czy� listu do folderu w formacie maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8560,20 +9196,19 @@ msgstr ""
 "Nie mo�na pobra� listu: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Nie ma takiego listu"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Niepoprawna zawarto�� listu"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8584,14 +9219,14 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Folder \"%s\" nie istnieje."
 
 # y, c-format
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8607,7 +9242,7 @@ msgstr "\"%s\" nie jest katalogiem z listami w formacie maildir."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie mo�na usun�� folderu \"%s\": %s"
@@ -8616,8 +9251,8 @@ msgstr "Nie mo�na usun�� folderu \"%s\": %s"
 msgid "not a maildir directory"
 msgstr "to nie katalog z listami w formacie maildir"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nie mo�na przeszuka� folderu \"%s\": %s"
@@ -8638,45 +9273,37 @@ msgstr "Sprawdzanie nowej poczty"
 msgid "Checking for new messages"
 msgstr "Wyszukiwanie nowych list�w"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Zapisywanie folderu"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nie mo�na stworzy� blokady folderu dla %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nie mo�na otworzy� skrzynki: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Anulowano do��czenie listu"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nie mo�na do��czy� listu do pliku mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8685,13 +9312,11 @@ msgstr ""
 "Nie mo�na pobra� listu: %s z folderu %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Folder jest uszkodzony w spos�b uniemo�liwiaj�cy napraw�."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Stworzenie listu nie powiod�o si�: Uszkodzona skrzynka?"
 
@@ -8734,149 +9359,150 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder \"%s\" nie jest pusty. Nie zosta� usuni�ty."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nie mo�na otworzy� folderu %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Powa�ny b��d sk�adniowy na pozycji %ld w folderze %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nie mo�na sprawdzi� folderu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nie mo�na otworzy� pliku %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nie mo�na otworzy� tymczasowej skrzynki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Niezgodno�� folderu z zestawieniem, nawet po synchronizacji"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "B��d przy zapisie do tymczasowej skrzynki: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Nie powi�d� si� zapis do tymczasowej skrzynki: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nie mo�na zamkn�� folderu �r�d�owego %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie mo�na zamkn�� folderu tymczasowego: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie mo�na zmieni� nazwy folderu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Niezgodno�� folderu z zestawieniem, nawet po synchronizacji"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nieznany b��d: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Nie mo�na zmieni� nazwy folderu: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "B��d przy zapisie do tymczasowej skrzynki: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Nie powi�d� si� zapis do tymczasowej skrzynki: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Anulowano do��czenie listu do katalogu MH"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nie mo�na do��czy� listu do folderu mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" nie jest katalogiem."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nie mo�na otworzy� �cie�ki katalogu MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Nie mo�na do��czy� listu do pliku kolejki: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Nie mo�na zmienia� nazw folder�w kolejek"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Kolejka \"%s\" nie istnieje lub nie jest zwyk�ym plikiem"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr ""
+"Lokalizacja nadrz�dna miejsca przechowywania %s nie jest zwyk�ym katalogiem"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Folder \"%s/%s\" nie istnieje."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Plik %s z kolejk� list�w"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Nie mo�na zmienia� nazw folder�w kolejek"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Nie mo�na zmienia� nazw folder�w kolejek"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Nie mo�na usuwa� folder�w kolejek"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nie mo�na zsynchronizowa� folderu tymczasowego %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nie mo�na zsynchronizowa� folderu kolejki %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8885,25 +9511,6 @@ msgstr ""
 "Nie mo�na zsynchronizowa� folderu kolejki %s: %s\n"
 "Folder mo�e by� uszkodzony, zapisano kopi� w \"%s\""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Nie mo�na otworzy� pliku: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Kolejka \"%s\" nie istnieje lub nie jest zwyk�ym plikiem"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "List do %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Nowiny USENET"
@@ -8913,12 +9520,22 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "To jest dostawca pozwalaj�cy na odczyt i wysy�anie na grupy nowin USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Nie mo�na stworzy� katalogu %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nowiny USENET za po�rednictwem %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9023,7 +9640,7 @@ msgstr "Pozostawianie list�w na serwerze"
 msgid "Delete after %s day(s)"
 msgstr "Usuwanie po %s dniach"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -9050,32 +9667,22 @@ msgstr ""
 "u�yciu protoko�u APOP. Mo�e on nie funkcjonowa� dla wszystkich u�ytkownik�w, "
 "nawet, je�li serwer teoretycznie obs�uguje protok�."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP.\n"
 "Wyst�pi� b��d przy wysy�aniu nazwy u�ytkownika: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Nieobs�ugiwana operacja"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Uwierzytelnienie nie powiod�o si�."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Nie mo�na nawi�za� po��czenia z serwerem POP pod adresem %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -9083,27 +9690,27 @@ msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP.\n"
 "Brak obs�ugi wymaganego mechanizmu uwierzytelniania."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "Nie powiod�o si� polecenie IMAP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "B��d We/Wy"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPodaj has�o POP3 dla %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -9112,13 +9719,13 @@ msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP.\n"
 "Wyst�pi� b��d przy wysy�aniu has�a: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9286,45 +9893,45 @@ msgstr "Chwilowe niepowodzenie przy uwierzytelnianiu"
 msgid "Authentication required"
 msgstr "Wymagane uwierzytelnienie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "B��dna odpowied� na powitanie: %s: prawdopodobnie mo�na kontynuowa�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP.\n"
 "Wyst�pi� b��d przy wysy�aniu nazwy u�ytkownika: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Forma listu jest niepoprawna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Up�yn�� czas oczekiwania po AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "B��dna odpowied� na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Serwer SMTP %s nie obs�uguje wymaganego typu uwierzytelniania %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPodaj has�o SMTP dla %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9335,90 +9942,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serwer SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Wysy�anie list�w za pomoc� SMTP poprzez %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "Nie mo�na wys�a� listu: niepoprawny adres nadawcy."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Wysy�anie listu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Nie mo�na wys�a� listu: nie podano odbiorc�w"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nie mo�na wys�a� listu: nie podano odbiorc�w"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "Powitanie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Up�yn�� czas oczekiwania po HELO: %s: mo�na kontynuowa�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "B��dna odpowied� na HELO: %s: mo�na kontynuowa�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "Uwierzytelnianie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "B��d przy tworzeniu obiektu uwierzytelniaj�cego SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Up�yn�� czas oczekiwania po AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "Nie powiod�o si� wykonanie AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Up�yn�� czas oczekiwania po MAIL FROM: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "B��dna odpowied� na MAIL FROM: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Up�yn�� czas oczekiwania po RCPT TO: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Up�yn�� czas oczekiwania po DATA: %s: nie wys�ano poczty"
@@ -9426,40 +10033,40 @@ msgstr "Up�yn�� czas oczekiwania po DATA: %s: nie wys�ano poczty"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "B��dna odpowied� na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Up�yn�� czas oczekiwania na wys�anie DATA: przerwanie listu: %s: nie wys�ano "
 "poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Up�yn�� czas oczekiwania po RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "B��dna odpowied� na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Up�yn�� czas oczekiwania po QUIT: %s: mo�na kontynuowa�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "B��dna odpowied� na RSET: %s"
@@ -9533,52 +10140,52 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerowanie automatycznego wy�wietlenia za��cznika"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Kliknij tu aby otworzy� ksi��k� adresow�"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Odpowied� do:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Temat:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Dla:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Podaj adres odbiorcy listu"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Podaj adresy, pod kt�re zostanie przes�ana kopia listu"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9590,7 +10197,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Za��czenie pliku"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Nie mo�na stworzy� kontekstu podpisu PGP."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9599,34 +10211,34 @@ msgstr ""
 "B��d przy odczycie pliku %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Ostrze�enie!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Plik istnieje, nadpisa�?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "B��d przy zapisie pliku: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "B��d przy odczycie pliku : %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "B��d przy dost�pie do pliku: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Nie mo�na pobra� listu z edytora"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9635,7 +10247,7 @@ msgstr ""
 "Nie mo�na zmieni� po�o�enia w pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9644,7 +10256,7 @@ msgstr ""
 "Nie mo�na przyci�� pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9653,7 +10265,7 @@ msgstr ""
 "B��d przy automatycznym zapisie listu: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9661,7 +10273,7 @@ msgstr ""
 "Odnaleziono niezapisane pliki z poprzedniej sesji Evolution.\n"
 "Czy chcesz spr�bowa� je odzyska�?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9671,23 +10283,43 @@ msgstr ""
 "\n"
 "Czy chcesz zapisa� zmiany?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Uwaga: Zmodyfikowany list"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Otwarcie pliku"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Wstawienie pliku"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Zapisz podpis"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (domy�lne)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Tworzenie listu"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9695,7 +10327,7 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu:\n"
 "Nie mo�na uaktywni� formantu wyboru adresu."
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9703,6 +10335,12 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu:\n"
 "Nie mo�na uaktywni� komponentu edytora HTML-a."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9764,7 +10402,7 @@ msgstr "Temat zawiera"
 msgid "Subject does not contain"
 msgstr "Temat nie zawiera"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9909,7 +10547,7 @@ msgstr "godzina"
 msgid "minute"
 msgstr "minuta"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "sekund"
 
@@ -9983,7 +10621,7 @@ msgstr " temu"
 msgid "ago"
 msgstr "temu"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
@@ -9995,6 +10633,21 @@ msgstr "<kliknij, aby wybra� dat�>"
 msgid "Filter Rules"
 msgstr "Regu�y filtr�w"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Nazwa stylu:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Kolejka \"%s\" nie istnieje lub nie jest zwyk�ym plikiem"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Wyb�r czynno�ci:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -10013,7 +10666,7 @@ msgstr ""
 "Wr�� i podaj folder, do kt�rego powinna by� dostarczona poczta."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Wyb�r folderu"
 
@@ -10026,7 +10679,11 @@ msgstr ""
 "B��d w wyra�eniu regularnym \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
@@ -10056,7 +10713,7 @@ msgstr "przy spe�nieniu wszystkich kryteri�w"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "przy spe�nieniu kt�regokolwiek z kryteri�w"
 
 #: filter/filter-rule.c:780
@@ -10135,194 +10792,203 @@ msgid "Beep"
 msgstr "Belize"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Firma"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "zawiera"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Skopiuj do folderu"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Data otrzymania"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Data wys�ania"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Usuni�ty"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "nie zawiera"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "nie ko�czy si� na"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "nie istnieje"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "nie brzmi jak"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "nie rozpoczyna si� od"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Nie istnieje"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Roboczy"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "ko�czy si� na"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Istnieje"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "istnieje"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Wyra�enie"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Wa�ny"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "jest"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "jest po"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "jest przed"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "Oznaczony"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "jest wi�kszy ni�"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "jest mniejszy ni�"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "nie jest"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Oznaczony"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+msgid "Label"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Lista dyskusyjna"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Tre�� listu"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Nag��wek listu"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Przenie� do folderu"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Odtwarzany d�wi�k:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Przeczytany"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Lista odbiorc�w"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Dopasowanie wg regexp"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Z odpowiedzi� do"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Punkty"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Nadawca"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Ustaw stan"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Rozmiar (KB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "brzmi jak"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Konto �r�d�owe"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Okre�lony nag��wek"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "rozpoczyna si� od"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Zatrzymanie przetwarzania"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Temat"
 
@@ -10377,7 +11043,8 @@ msgid "Scanning %s"
 msgstr "Analizowanie %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Poczta"
 
@@ -10393,10 +11060,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Ksi��ka adresowa"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10446,7 +11109,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje stare dane Netscape'a"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "�mietnik"
 
@@ -10582,31 +11247,31 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Folder zawieraj�cy poczt�"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Wirtualny �mietnik"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Folder wirtualnego �mietnika"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Ten folder nie mo�e zawiera� list�w."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "W�a�ciwo�ci..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Zmienia w�a�ciwo�ci folderu"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10614,236 +11279,246 @@ msgstr ""
 "Wygl�da na to, �e cz�� twoich ustawie� poczty zosta�a uszkodzona. Upewnij "
 "si�, �e wszystko jest na miejscu."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Nie zosta� ustawiony spos�b przekazywania list�w"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Uwaga: Zmodyfikowany list"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Nowy list"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "L_ist"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie mo�na zainicjowa� komponentu pocztowego Evolution."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nie mo�na zainicjowa� komponentu konfiguracji poczty Evolution."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nie mo�na zainicjowa� komponentu informacji o folderach Evolution."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Nawi�zywanie po��czenia z serwerem..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Nie mo�na zarejstrowa� w pow�oce miejsca przechowywania"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "W�a�ciwo�ci \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "W�a�ciwo�ci"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie mo�na stworzy� katalogu tymczasowego: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "nowych: %d"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "ukrytych: %d"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "zaznaczonych: %d"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "niewys�anych: %d"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "niewys�anych: %d"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "og�em: %d"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Stw�rz _wirtualny folder na podstawie listu"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawc�"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorc�w"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _list� dyskusyjn�"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawc�"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorc�w"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filtr w oparciu o li_st� dyskusyjn�"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "Z_redaguj jako nowy list..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Odpowiedz na _list�"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Prze�lij"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Zako�czone"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Wyczy��"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "O_znacz jako przeczytane"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Oz_nacz jako wa�ny"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Oz_nacz jako niewa�ny"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Cofnij usuni�cie"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "P_rzenie� do folderu..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "S_kopiuj do folderu..."
 
-#: mail/folder-browser.c:1645
-msgid "Label"
-msgstr ""
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Dodaj nadawc� do ksi��ki adresowej"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Zastosuj filtry"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "_Stw�rz regu�� na podstawie listu"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VFolder w oparciu o list� dyskusyjn�"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr w oparciu o list� dyskusyjn� (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VFolder w oparciu o list� dyskusyjn� (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "D_omy�lne"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Pobieranie informacji o folderze"
 
@@ -10899,7 +11574,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Nie zosta�y podane wszystkie wymagane informacje."
 
@@ -10909,83 +11584,111 @@ msgid "Evolution News Editor"
 msgstr "Edytor nowin Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Modyfikacja konta Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Komputer:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Nazwa _u�ytkownika:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "�_cie�ka:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Radio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Nie mo�na stworzy� dw�ch kont o tej samej nazwie."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Czy na pewno chcesz usun�� to konto?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Nie usuwaj"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Rzeczywi�cie usun�� konto?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Unieaktywnij"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Uaktywnij"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Czy na pewno chcesz usun�� to konto?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aktywne"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Nazwa _konta:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "List do %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Tematem jest %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "List od %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "lista dyskusyjna %s"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Dodanie regu�y filtra"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"Poni�sze vFoldery:\n"
+"%sU�ywa�y usuni�tego folderu:\n"
+"   \"%s\"\n"
+"I zosta�y zaktualizowane."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10998,7 +11701,7 @@ msgstr ""
 "jakichkolwiek list�w.\n"
 "Czy chcesz przeprowadzi� j� teraz?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11006,7 +11709,7 @@ msgstr ""
 "Przed wys�aniem listu nale�y skonfigurowa�\n"
 "wykorzystywan� to�samo��."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11015,7 +11718,7 @@ msgstr ""
 "spos�b przekazywania list�w."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11023,11 +11726,11 @@ msgstr ""
 "Zamierzasz wys�a� list zapisany w HTML-u, lecz wymienieni poni�ej odbiorcy "
 "�e nie chc� otrzymywa� list�w w tej postaci:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Czy pomimo tego wys�a�?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11035,7 +11738,7 @@ msgstr ""
 "List nie zawiera tematu.\n"
 "Rzeczywi�cie wys�a�?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11044,11 +11747,11 @@ msgstr ""
 "ukrywa� adresy jej cz�onk�w, list zawiera� b�dzie tylko ukrytych adresat�w "
 "(bcc)."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Ten list zawiera tylko ukrytych adresat�w (bcc)"
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11058,15 +11761,15 @@ msgstr ""
 "nag��wek Apparently-To.\n"
 "Czy pomimo tego wys�a�?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Przed wys�aniem listu nale�y poda� jego odbiorc�w."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Przed wys�aniem listu nale�y skonfigurowa� konto."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11074,28 +11777,28 @@ msgstr ""
 "Nie mo�na otworzy� folderu poczty roboczej, zwi�zanego z tym kontem.\n"
 "Czy chcesz zamiast tego wykorzysta� domy�lny folder Poczta robocza?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "nieznany nadawca"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "W li�cie z %a, %d-%m-%Y, godz. %H:%M, %%s pisze: "
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Przeniesienie list�w do folderu"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopiowanie list�w do folderu"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Czy na pewno chcesz zredagowa� wszystkie %d list�w?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11103,7 +11806,7 @@ msgstr ""
 "Mo�liwe jest redagowanie wy��cznie\n"
 "list�w zapisanych w folderze Poczta robocza."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11111,39 +11814,39 @@ msgstr ""
 "Listy zapisane w folderze Wys�ane\n"
 "mo�na tylko wys�a� ponownie."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Czy na pewno chcesz ponownie wys�a� wszystkie %d list�w?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Nie zaznaczono �adnego listu"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Nadpisa� plik?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Zapis listu pod podan� nazw�"
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Zapis list�w pod podan� nazw�"
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Wy�wietla kolejny nieprzeczytany list"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11156,7 +11859,7 @@ msgstr ""
 "\n"
 "Czy rzeczywi�cie usun�� te listy?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11165,32 +11868,68 @@ msgstr ""
 "B��d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Pobieranie %d. listu z %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Wydruk listu"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Wydrukowanie listu nie powiod�o si�"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Czy na pewno chcesz otworzy� wszystkie %d list�w w osobnych oknach?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "opis"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Kontakt bez nazwy"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Wy�lij"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Dodaj kryterium"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Zapisz podpis"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11245,193 +11984,176 @@ msgstr ""
 "kont."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Druid kont Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Przetwarzanie"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "po"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"Nie mo�na uzyska� folderu poczty nadchodz�cej w nowym miejscu "
-"przechowywania:\n"
-"%s\n"
-"Skr�t nie b�dzie stworzony."
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Konto"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Sprawdzanie us�ugi"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Nawi�zywanie po��czenia z serwerem..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Kontakt bez nazwy"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "_Edycja"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Nowy"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _Sprawd� obs�ugiwane typy "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Ta kopia Evolution nie obs�uguje SSL-a)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Ta kopia Evolution nie obs�uguje SSL-a)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Przy wysy�aniu zaszyfrowanych list�w _szyfrowanie zawsze do siebie"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Informacje o koncie"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Zarz�dzanie kontami"
 
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "Dodaj kryterium"
+
 #: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Anuluj operacj�"
+msgid "Add new signature..."
+msgstr "Zapisz podpis"
 
 #: mail/mail-config.glade.h:12
-msgid "Afrikaans"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Przy wysy�aniu zaszyfrowanych list�w _szyfrowanie zawsze do siebie"
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alarmy"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "_Podpisywanie wszystkich list�w wychodz�cych przy u�yciu tego konta"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Za��cza plik do listu"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Za��cznik"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automatyczne sprawdzanie nowych list�w"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Nieznany zestaw znak�w: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "Zam_knij"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Sprawdzanie nowej poczty"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Kolor dzisiejszych zada�"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "Tworzenie listu"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11446,55 +12168,47 @@ msgstr ""
 "\n"
 "Kliknij \"Zako�cz\", aby zapisa� ustawienia."
 
-#: mail/mail-config.glade.h:37
-msgid "Dari"
-msgstr ""
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "D_omy�lne"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Domy�lny"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Domy�lny zestaw znak�w: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Pobieranie poczty"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Identyfikatory cyfrowe..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Nie mo�na otworzy� listu"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Gotowe"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Folder ze _szkicami:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "U_aktywnij"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11515,40 +12229,35 @@ msgstr "Adres e-mail:"
 msgid "Empty _trash folders on exit"
 msgstr "_Opr�nianie folder�w �mietnika przy zako�czeniu"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Wykonywanie czynno�ci"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "ko�czy si� na"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "W�a�ciwo�ci"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Przes�ane listy"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Pobierz identyfikator cyfrowy..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Oznaczanie cytat�w za pomoc� koloru"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Tuvalu"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
@@ -11602,70 +12311,66 @@ msgstr "Mikronezja"
 msgid "NNTP Server:"
 msgstr "Serwer NNTP:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "�r�d�a _nowo�ci"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Informacje opcjonalne"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Organizacja:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _klucza PGP:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Wyb�r koloru"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Potwierdzanie przy wysy�aniu listu tylko z _ukrytymi adresatami (bcc)"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Drukuje zaznaczone kontakty"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Katalog maildir Qmaila"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Nie mo�na otworzy� listu"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Jako cytat"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Zapami�tanie has�a"
@@ -11699,117 +12404,121 @@ msgid "S_ecurity"
 msgstr "Bezpiecze�stwo"
 
 #: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Bezpieczne MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Wyb�r pliku programu PGP"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Plik z podpisem:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Czy�ci wszystko za wyj�tkiem podpisu"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Wysy�anie list�w"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Folder z _wys�anymi listami:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Listy wys�ane i szkice"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Serwer wymaga _uwierzytelnienia"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Konfiguracja serwera"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Typ serwera:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Skr�ty"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Zapisz podpis"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Zapisz podpis"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "�r�d�o"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Informacje o �r�dle"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nazwa stylu:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Standardowy uniksowy plik mbox"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "Podpis w _HTML-u"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Zmienny"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11819,147 +12528,140 @@ msgstr ""
 "\n"
 "Aby rozpocz��, kliknij \"Naprz�d\"."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Wsch�d"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "Podpis w _HTML-u"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "Pobieranie obraz�w z sieci w _ka�dym przypadku"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "P_odpisywanie wszystkich list�w wychodz�cych przy u�yciu tego konta"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "Typ _uwierzytelniania: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Typ _uwierzytelniania: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "_Automatyczne sprawdzanie nowych list�w"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_Automatyczne sprawdzanie nowych list�w"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "ID _certyfikatu:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Potwierdzanie oczyszczenia folderu"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Podpis w _HTML-u"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Domy�lny"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Nazwa pliku:"
+msgid "_Enable"
+msgstr "Uaktywnij"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Prze�lij jako"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Pe�na nazwa:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Listy napisane w HTML-u"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "Podpis w _HTML-u"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "To�samo��"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "J�zyk"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_Pobieranie obraz�w, je�li nadawca jest w ksi��ce adresowej"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Ustawienie jako konto _domy�lne"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "O_znaczanie list�w jako \"przeczytanych\" po up�ywie"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Bez pobierania jakichkolwiek obraz�w z sieci"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "�cie�ka programu _PGP:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Potwierdzanie przy wysy�aniu list�w w formacie HTML do os�b, kt�re ich nie "
 "chc�"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Potwierdzanie przy wysy�aniu listu bez _tematu"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Radio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -12000,70 +12702,53 @@ msgstr "Podpis w _HTML-u"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "Podpis w _HTML-u"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Wykorzystanie bezpiecznego po��czenia (_SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Zmienny"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_co"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " "
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Nie mo�na stworzy� kontekstu podpisu PGP."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Nie mo�na stworzy� kontekstu weryfikacji PGP."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Nie mo�na stworzy� kontekstu szyfrowania PGP."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Nie mo�na stworzy� kontekstu odszyfrowania PGP."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Nie mo�na stworzy� kontekstu podpisu S/MIME."
 
 # FIXME
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Nie mo�na stworzy� kontekstu certyfikacji S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nie mo�na stworzy� kontekstu szyfrowania S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Nie mo�na stworzy� kontekstu otoczki S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Nie mo�na stworzy� kontekstu dekodowania S/MIME."
 
@@ -12106,101 +12791,137 @@ msgstr "Zewn�trzna przegl�darka"
 msgid "Loading message content"
 msgstr "Wczytywanie tre�ci listu"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Z_aleg�e zadania:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Otw�rz odno�nik w przegl�darce"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Skopiuj adres odno�nika"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Zapisz odno�nik jako (FIXME)"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Zapisz obraz jako..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "Za��cznik: %s"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Nie mo�na przetworzy� jako list MIME. Wy�wietlanie w postaci �r�d�owej."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Niepoprawny adres"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Odpowied� do"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Dla"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Dostarczyciel poczty: "
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Zapis listu pod podan� nazw�"
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"List zosta� podpisany cyfrowo. Kliknij ikon� zamka, aby uzyska� wi�cej "
+"informacji."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Nie mo�na stworzy� kontekstu weryfikacji PGP."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "List zosta� podpisany cyfrowo i potwierdzono jego autentyczno��."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"List zosta� podpisany cyfrowo lecz nie potwierdzono jego autentyczno�ci."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wska�nik do witryny FTP (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Wska�nik do lokalnego pliku (%s) poprawny na witrynie \"%s\""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wska�nik do lokalnego pliku (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Wska�nik na zdalne dane (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wska�nik na nieznane zewn�trzne dane (typu \"%s\")"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Niepoprawna forma cz�ci external-body."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Lokalne foldery"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Przekonfigurowywanie folderu"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12209,27 +12930,27 @@ msgstr ""
 "Nie mo�na zapisa� metainformacji zwi�zanych z folderem; prawdopodobnie\n"
 "otwarcie folderu nie b�dzie ju� mo�liwe: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nie mo�na zapisa� metadanych zwi�zanych z folderem w %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nie mo�na usun�� metadanych zwi�zanych z folderem: %s: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Konwertowanie folderu \"%s\" na format \"%s\""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "Nie mo�na przekonfigurowa� %s, poniewa� nie jest on lokalnym folderem"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12237,11 +12958,11 @@ msgstr ""
 "Je�li otwarcie tej skrzynki nie b�dzie ju� mo�liwe,\n"
 "w�wczas mo�e by� konieczne r�czne jej naprawienie."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nie mo�na zmieni� formatu zdalnego folderu."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Zmiana konfiguracji /%s"
@@ -12299,81 +13020,73 @@ msgstr "Niepowodzenie przy %d. li�cie z %d"
 msgid "Complete."
 msgstr "Gotowe."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Zapisywanie listu w folderze"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Przenoszenie list�w do %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiowanie list�w do %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Przenoszenie"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Kopiowanie"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizowanie folder�w w \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Przes�ane listy"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otwieranie folderu %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "Otwieranie miejsca przechowywania %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Usuwanie folderu %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Zapisywanie folderu \"%s\""
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Od�wie�anie folderu"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Oczyszczanie folderu"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Pobieranie listu %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Pobieranie %d list�w"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Zapisywanie %d list�w"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12382,7 +13095,7 @@ msgstr ""
 "Nie mo�na stworzy� pliku wyj�ciowego: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12391,11 +13104,11 @@ msgstr ""
 "B��d przy zapisie list�w do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Zapisywanie za��cznika"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12404,27 +13117,27 @@ msgstr ""
 "Nie mo�na stworzy� pliku wyj�ciowego: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie mo�na zapisa� danych: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Od��czanie od %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponowne nawi�zywanie po��czenia z %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Znajd�"
 
@@ -12495,10 +13208,6 @@ msgstr "Aktualizowanie..."
 msgid "Waiting..."
 msgstr "Oczekiwanie..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Anulowano."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Operacja anulowana przez u�ytkownika."
@@ -12512,16 +13221,16 @@ msgstr "Wprowad� has�o dla %s"
 msgid "Enter Password"
 msgstr "Wprowad� has�o"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Nie mo�na zapisa� pliku z podpisem."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Zapisz podpis"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12531,10 +13240,30 @@ msgstr ""
 "\n"
 "Czy chcesz je zapisa�?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Nazwa:"
+
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "Zapisz podpis"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
 #, fuzzy
-msgid "Signature name:"
-msgstr "Plik z podpisem:"
+msgid "Hide signature hint"
+msgstr "Plik z podpisem w HTML-u:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12549,17 +13278,17 @@ msgstr "Przes�any list"
 msgid "Forwarded Message"
 msgstr "Przes�any list"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ustawianie vfolderu: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aktualizowanie vfolder�w pod uri: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12572,90 +13301,95 @@ msgstr ""
 "   \"%s\"\n"
 "I zosta�y zaktualizowane."
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "VFoldery"
+
+#: mail/mail-vfolder.c:784
 #, fuzzy
 msgid "vFolders"
 msgstr "Foldery"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Modyfikacja VFoldera"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pr�ba zmodyfikowania vfoldera \"%s\", kt�ry nie istnieje"
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Brak tematu)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - List"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Niewidziany"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Widziany"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Z odpowiedzi�"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Wiele niewidzianych list�w"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Wiele list�w"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Najni�szy"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Ni�szy"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Wy�szy"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Najwy�szy"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Dzi� %k:%M"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Wczoraj %k:%M"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Aktualizowanie zestawienia list�w"
 
@@ -12678,10 +13412,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Oryginalny kontakt:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Odebrany"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -17877,5806 +18616,5801 @@ msgstr "Litwa"
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "_Wi�kszy"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 #, fuzzy
 msgid "La Verne"
 msgstr "Wyspy Zielonego Przyl�dka"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "Libia"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 #, fuzzy
 msgid "Learmouth"
 msgstr "Lesotho"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 #, fuzzy
 msgid "Leesburg"
 msgstr "Luksemburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "Mnd�"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "Martynika"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 #, fuzzy
 msgid "Lemmon"
 msgstr "Libia"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "Usu�"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "lat"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 #, fuzzy
 msgid "Lewisburg"
 msgstr "Luksemburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "Lesotho"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 #, fuzzy
 msgid "Lewistown"
 msgstr "Lesotho"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 #, fuzzy
 msgid "Lexington"
 msgstr "Libia"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Liberal"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Libya"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "Niger"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Lihue"
 msgstr "Niue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limoges"
 msgstr "Najni�szy"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "miesi�c"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Lincoln"
 msgstr "nadchodz�ce"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 #, fuzzy
 msgid "Lisboa"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 #, fuzzy
 msgid "Litchfield"
 msgstr "Lekki grad"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "Logowanie NT"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "Frma"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "London"
 msgstr "Libia"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "Hinduras"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 #, fuzzy
 msgid "Los Alamos"
 msgstr "Alarmy"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 #, fuzzy
 msgid "Lousiana"
 msgstr "Botswana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "Libia"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "wychodz�ce"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "Luksemburg"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "Litwa"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "Marzec"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "Makao"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macapa"
 msgstr "Makao"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "Macedonia"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "Mnd�"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "Macedonia"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "Kanada"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "Mnd�"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "Mnd�"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "Malawi"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "Menad�er"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "Malezja"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "Makao"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manchester"
 msgstr "Dopasowania:"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "Mnd�"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "Mgie�ka"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "G��wny pasek narz�dziowy"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "Poczta"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 #, fuzzy
 msgid "Maraba"
 msgstr "Mauretania"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "Marzec"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "Mauretania"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "Mauretania"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "Mauretania"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "Marginesy"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 #, fuzzy
 msgid "Marquette"
 msgstr "Martynika"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "Wyspy Marshalla"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 #, fuzzy
 msgid "Marshalltown"
 msgstr "Wyspy Marshalla"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "Martynika"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Martynika"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "Martynika"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "Irlandia"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "Malezja"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "Macedonia"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "Komory"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mattoon"
 msgstr "Mnd�"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Menad�er"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "Majotta"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Kazahstan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 #, fuzzy
 msgid "Mazu"
 msgstr "Makao"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "Marzec"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McClellan"
 msgstr "Islandia"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "Frma"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "Makao"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "przed"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 #, fuzzy
 msgid "Mehamn"
 msgstr "Mnd�"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "Macedonia"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "Pi�tek"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 #, fuzzy
 msgid "Merril Field"
 msgstr "Pole _Od"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "Meksyk"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 #, fuzzy
 msgid "Miami"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middle East"
 msgstr "_Drugie:"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middleton Island"
 msgstr "Wyspy Salomona"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "_Drugie:"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "Finlandia"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "Typ pliku:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 #, fuzzy
 msgid "Milford"
 msgstr "z"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "List do %s"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minatitlan"
 msgstr "Mauretania"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "nadchodz�ce"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 #, fuzzy
 msgid "Minnesota"
 msgstr "Mikronezja"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "nie jest"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missoula"
 msgstr "Panna"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Missouri"
 msgstr "Panna"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitchell"
 msgstr "Dopasowania:"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 #, fuzzy
 msgid "Mitilini"
 msgstr "Lista dyskusyjna"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "Po"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "Telefon przeno�ny"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "Przeno�ny"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Modesto"
 msgstr "Umiarkowana mg�a"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "Przenie�"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "Przeno�ny"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Moldova"
 msgstr "Poniedzia�ek"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 #, fuzzy
 msgid "Molokai"
 msgstr "Malawi"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "Poniedzia�ek"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "Menad�er"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montana"
 msgstr "Botswana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "Umiarkowany �nieg"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Widok miesi�ca"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 #, fuzzy
 msgid "Montego Bay"
 msgstr "Mongolia"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 #, fuzzy
 msgid "Monterrey"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 #, fuzzy
 msgid "Montgomery"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "Montserrat"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morelia"
 msgstr "Mongolia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organizacja"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "G��wny"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "Przeno�ny"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "Widok miesi�ca"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "Po�udniowy wsch�d"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Widok miesi�ca"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 #, fuzzy
 msgid "Mullan"
 msgstr "Mnd�"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 #, fuzzy
 msgid "Muncie"
 msgstr "Czerwiec"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 #, fuzzy
 msgid "Murcia"
 msgstr "Mauretania"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "Prc"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 #, fuzzy
 msgid "Muscatine"
 msgstr "Martynika"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "w�z�y"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 #, fuzzy
 msgid "Najran"
 msgstr "Bahrain"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "Nazwa"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "Ostrze�enie"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "Japonia"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "Nazwa"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Napoli"
 msgstr "Mali"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "Przyd"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "W�ochy"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natchez"
 msgstr "Dopasowania:"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 #, fuzzy
 msgid "Nebraska"
 msgstr "Nowe zadanie"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "Grenada"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Nevada"
 msgstr "Grenada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "Nowe zadanie"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bedford"
 msgstr "�r�d�o nowo�ci"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "Nowa Zelandia"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "Newcastle"
 msgstr "Nowiny"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Nowa Zelandia"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Nowa Zelandia"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "Nowa Kaledonia"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Iberia"
 msgstr "Nowa Kaledonia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "Nowy list"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Mexico"
 msgstr "Meksyk"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "Holandia"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "P�noc"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "Nowy VFolder"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "Nowy"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "New York"
 msgstr "Nowy VFolder"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "Wymiary:"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "Hiszpania"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nis"
 msgstr "jest"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "Zwyk�y"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "Nazwa"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "Wyspa Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 #, fuzzy
 msgid "Norfolk NAS"
 msgstr "Wyspa Norfolk"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norrkoping"
 msgstr "Przetwarzanie"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Adams"
 msgstr "P�nocny wsch�d"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "P�noc"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "Norwegia"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "P�nocny wsch�d"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "P�nocny wsch�d"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "Norwegia"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "Francuskie terytoria po�udniowe"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "P�noc"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "Norwegia"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "Notka"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "Przed rozpocz�ciem"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "Tajlandia"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Jamajka"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Oceanside"
 msgstr "Islandia"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "Pojedyncze"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "Otw�rz"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "Otw�rz"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "Inne"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
 # [cyba] Nie mam pewno�ci, ale jest zatoka Cooka, cie�nina, g�ry, wi�c chyba...
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 #, fuzzy
 msgid "Ojika Island"
 msgstr "Wyspy Cooka"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "Brytyjskie Wyspy Dziewicze"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "Inne"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 #, fuzzy
 msgid "Olbia"
 msgstr "Albania"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 #, fuzzy
 msgid "Omaha"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "U�o�enie"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oostende"
 msgstr "Uczestnik"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oran"
 msgstr "Oman"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "Org"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 #, fuzzy
 msgid "Oregon"
 msgstr "Org"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "Irlandia"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orlando"
 msgstr "Irlandia"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 #, fuzzy
 msgid "Oruro"
 msgstr "B��d"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr "sekunda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 #, fuzzy
 msgid "Ostrava"
 msgstr "Australia"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "tydzie�"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 #, fuzzy
 msgid "Oxford"
 msgstr "z"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "Strona"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 #, fuzzy
 msgid "Palacios"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "Pager"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 #, fuzzy
 msgid "Palmdale"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "Pager"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "Ustawienia poczty"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 #, fuzzy
 msgid "Pamplona"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama City"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Anulowane"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "Japonia"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Paphos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 #, fuzzy
 msgid "Paris"
 msgstr "G�wn"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "Cz�ciowy py� wodny"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "Has�o"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "Panama"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "Obfity piasek"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "Odtwarzany d�wi�k:"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "Pytanie"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "Od�wie�"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "Wyb�r:"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "Georgia"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "G�wn"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philip"
 msgstr "Filipiny"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Filipiny"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 #, fuzzy
 msgid "Phillips"
 msgstr "Filipiny"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "Peru"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "Podgl�d"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 #, fuzzy
 msgid "Pisa"
 msgstr "Pakistan"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 #, fuzzy
 msgid "Plymouth"
 msgstr "miesi�c"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 #, fuzzy
 msgid "Podgorica Titograd"
 msgstr "Cz�ciowe tornado"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "Wydrukuj kopert�"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "Wydrukuj"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Wydruk listu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "W�a�ciwo�ci"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponca City"
 msgstr "Lista telefon�w"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponce"
 msgstr "Brak"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "Kontakty"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "Polska"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Wydrukuj kalendarz"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "Wydrukuj kopert�"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "Podgl�d"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Wydrukuj kart�"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Polska"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Portland"
 msgstr "Polska"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto"
 msgstr "P_ort:"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "Post�p"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "Portret"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Portret"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "Portret"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "Polska"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poza Rica"
 msgstr "Kostaryka"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poznan"
 msgstr "Polska"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Praha"
 msgstr "Paragwaj"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "Cz�ciowa m�awka"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Podgl�d wydruku"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Pretoria"
 msgstr "Georgia"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "Podgl�d"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Price-Carbon"
 msgstr "Pitcairn"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "Tradycyjny"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Providence"
 msgstr "_Stan/Prowincja:"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "Podgl�d"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "Zawd"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 #, fuzzy
 msgid "Pucallpa"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Puebla"
 msgstr "Publiczny"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Pueblo"
 msgstr "Publiczny"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 #, fuzzy
 msgid "Puerto Barrios"
 msgstr "Puerto Rico"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 #, fuzzy
 msgid "Puerto Escondido"
 msgstr "Puerto Rico"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "Puerto Rico"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Puerto Rico"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 #, fuzzy
 msgid "Puerto Maldonado"
 msgstr "Cz�ciowe tornado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "Puerto Rico"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "Puerto Rico"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "Wydrukuj"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pula"
 msgstr "Palau"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "Polska"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Wydrukuj kalendarz"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "Pytanie"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quebec"
 msgstr "Temat"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 #, fuzzy
 msgid "Rapid City"
 msgstr "Z odpowiedzi� do"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Rawlins"
 msgstr "Deszcz"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Reading"
 msgstr "Nag��wki"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Rebun Island"
 msgstr "Wyspa Bouveta"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Recife"
 msgstr "Odebrany"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redding"
 msgstr "Nag��wki"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "Przeczytany"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redmond"
 msgstr "Przypominanie"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "Regiony"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Rennes"
 msgstr "Przypominanie"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Reno"
 msgstr "Reunion"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "Reunion"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "Regu�y"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "lat"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reynosa"
 msgstr "Od�wie�"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Finlandia"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 #, fuzzy
 msgid "Rhode Island"
 msgstr "Wyspa Bouveta"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 #, fuzzy
 msgid "Riberalta"
 msgstr "Gibraltar"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "Przydomek"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "Haiti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "Rola"
 
-#: my-evolution/Locations.h:1881
-#, fuzzy
-msgid "Riga"
-msgstr "Prawy:"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rijeka"
 msgstr "Przeczytany"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 #, fuzzy
 msgid "Rimini"
 msgstr "Rumunia"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rioja"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "Nikaragua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "Brytyjskie Wyspy Dziewicze"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "Liberia"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 #, fuzzy
 msgid "Riyadh"
 msgstr "Przeczytany"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Roatan"
 msgstr "Chorwacja"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 #, fuzzy
 msgid "Robore"
 msgstr "przed"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "Polska"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rodos"
 msgstr "Pomieszczenie"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Rogers"
 msgstr "Foldery"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 #, fuzzy
 msgid "Roma/Ciampino"
 msgstr "Rumunia"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "Komory"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 #, fuzzy
 msgid "Rosario"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Roseglen"
 msgstr "Rola"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "Komputer"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "Powtarzalno��"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Russia"
 msgstr "Austria"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 #, fuzzy
 msgid "Rutland"
 msgstr "Bhutan"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 #, fuzzy
 msgid "Sacramento"
 msgstr "Oddzia�"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 #, fuzzy
 msgid "Saginaw"
 msgstr "Hiszpania"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saint Paul"
 msgstr "Saint Lucia"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "Hiszpania"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Salalah"
 msgstr "Nawa�nica"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salem"
 msgstr "Zapisz"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salmon"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "_Sob"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 #, fuzzy
 msgid "Salvador"
 msgstr "Salwador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samos"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "_Nie"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 #, fuzzy
 msgid "Sana'A"
 msgstr "Piasek"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 #, fuzzy
 msgid "San Angelo"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "San Carlos"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "Piasek"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sandberg"
 msgstr "Nadawca"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sanderson"
 msgstr "Nadawca"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 #, fuzzy
 msgid "San Diego"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 #, fuzzy
 msgid "Sand Point"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sanford"
 msgstr "Piasek"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 #, fuzzy
 msgid "San Francisco"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "Cieniowanie"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Joaquin"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "Zapisz i zamknij"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Juan"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 #, fuzzy
 msgid "San Miguel"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 #, fuzzy
 msgid "San Nicholas Island"
 msgstr "Wyspa Norfolk"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 #, fuzzy
 msgid "San Salvador"
 msgstr "Salwador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 #, fuzzy
 msgid "San Sebastian"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 #, fuzzy
 msgid "Santa Ana"
 msgstr "Saint Lucia"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 #, fuzzy
 msgid "Santa Maria"
 msgstr "San Marino"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santa Monica"
 msgstr "Saint Lucia"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "Nadawca"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santarem"
 msgstr "Burza piaskowa"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 #, fuzzy
 msgid "Santiago"
 msgstr "Saint Lucia"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santorini"
 msgstr "Burza piaskowa"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "Stan"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 #, fuzzy
 msgid "Sao Luiz"
 msgstr "Saint Lucia"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 #, fuzzy
 msgid "Sarasota"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "Sri Lanka"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "_Nie"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "Stan"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "Organizacja"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "Ustawienia"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "Widziany"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "Rozpoczynanie importowania"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "Wyszukiwanie"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "Cieniowanie"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "Wyszukiwanie"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "Sobota"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "Sobota"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Shearwater"
 msgstr "Data rozpocz�cia"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "Szwecja"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "Wyb�r:"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Sheridan"
 msgstr "Sudan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "Rozmiar"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Shoreham"
 msgstr "Punkty"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "S�aby �nieg"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 #, fuzzy
 msgid "Sidney"
 msgstr "Pine"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Silver City"
 msgstr "Bezpiecze�stwo"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "Rozmiar"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skopje"
 msgstr "Zatrzymaj"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "Wys�ane"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "Albania"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "minut"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Snowshoe Lake"
 msgstr "Kr�tkotrwa�y �nieg"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Sochi"
 msgstr "Po�udnie"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socorro"
 msgstr "Punkty"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Socotra"
 msgstr "Punkty"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 #, fuzzy
 msgid "Soda Springs"
 msgstr "Ziarna �niegu"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sofia"
 msgstr "Somalia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Soldotna"
 msgstr "S�owenia"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Somerset"
 msgstr "Kr�tkotrwa�a m�awka"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Nadawca"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "Southampton"
 msgstr "Po�udniowy wsch�d"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "Po�udnie"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Carolina"
 msgstr "Po�udniowa Afryka"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "South Dakota"
 msgstr "Po�udniowy wsch�d"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "Po�udnie"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "Wyspy Marshalla"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "Nadawca"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "lista"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "Hiszpania"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "Uproszczony"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "State College"
 msgstr "Data zako�czenia:"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "Pocz�tek:"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "Pocz�tek:"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "Zatrzymaj"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "Stephenville"
 msgstr "Szeszele"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 #, fuzzy
 msgid "St. George"
 msgstr "�wi�ta Helena"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "Zatrzymaj"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 #, fuzzy
 msgid "St Louis"
 msgstr "Saint Lucia"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Sri Lanka"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "Norwegia"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "St Paul"
 msgstr "Stan"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "Wyspy Salomona"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "Sobota"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "Punkty"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Luksemburg"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "Zestawienie"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 #, fuzzy
 msgid "Sutton"
 msgstr "_Nie"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Tradycyjny"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "Zadanie"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "Ghana"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 #, fuzzy
 msgid "Taejon"
 msgstr "Podejmowane czynno�ci"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Taif"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Tainan"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Taiz"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "Taiwan"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Taiwan"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 #, fuzzy
 msgid "Tampa"
 msgstr "Japonia"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "Papier"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "Kanada"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "Laos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Taranto"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "Zadanie"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Tarija"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "Tradycyjny"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "Tokelau"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "Teleks"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "Texas"
 msgstr "Zadanie"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 #, fuzzy
 msgid "The Dalles"
 msgstr "Szeszele"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "Tytu�"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "Czwartek"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tianjin"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Tijuana"
 msgstr "�otwa"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tirana"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "Wolny"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "Tytu�"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "Prywatny"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 #, fuzzy
 msgid "Tokunoshima Island"
 msgstr "Wyspa Bo�ego Narodzenia"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 #, fuzzy
 msgid "Toledo"
 msgstr "Prze��cz"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 #, fuzzy
 msgid "Toluca"
 msgstr "Tokelau"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "Tonga"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Topeka"
 msgstr "Tokelau"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 #, fuzzy
 msgid "Toronto"
 msgstr "Tornado"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "G�rny:"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torrance"
 msgstr "Francja"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Torreon"
 msgstr "Korea�ski"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "Rozpoczynanie importowania"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Toulouse"
 msgstr "Zamknij"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trabzon"
 msgstr "Gabon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 #, fuzzy
 msgid "Trapani"
 msgstr "Japonia"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "Teleks"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "U�o�enie"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "Poprzedni"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 #, fuzzy
 msgid "Trieste"
 msgstr "Test"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 #, fuzzy
 msgid "Trinidad"
 msgstr "Tornado"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "Turcja"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "Wtorek"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "Tunezja"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "_Wto"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turaif"
 msgstr "Turecki"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "Turecki"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turku"
 msgstr "Turcja"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 #, fuzzy
 msgid "Twenthe"
 msgstr "Pr�bnie zaakceptowane"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "Typ"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "_Wto"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "Zjednoczone Emiraty Arabskie"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 #, fuzzy
 msgid "Unst"
 msgstr "Niewidziany"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruapan"
 msgstr "Japonia"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Urugwaj"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 #, fuzzy
 msgid "Utah"
 msgstr "."
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vadso"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Zmienny"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vagar"
 msgstr "Pager"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "Malta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valencia"
 msgstr "S�owenia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 #, fuzzy
 msgid "Valentine"
 msgstr "Wy�wietl na miejscu"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 #, fuzzy
 msgid "Van"
 msgstr "Mnd�"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "Anuluj"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 #, fuzzy
 msgid "Varadero"
 msgstr "Barbados"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Varna"
 msgstr "Vanuatu"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "po"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 #, fuzzy
 msgid "Venezia"
 msgstr "Wenezuela"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 #, fuzzy
 msgid "Venice"
 msgstr "Unicode"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vermont"
 msgstr "miesi�c"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "Og�lne"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 #, fuzzy
 msgid "Vicenza"
 msgstr "Wenezuela"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "Nazwa pliku:"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "Australia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "Finlandia"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volkel"
 msgstr "Tokelau"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 #, fuzzy
 msgid "Volk Field"
 msgstr "Pole _Od"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 #, fuzzy
 msgid "Voslau"
 msgstr "Tokelau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 #, fuzzy
 msgid "Waco"
 msgstr "Monako"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 #, fuzzy
 msgid "Wallops Island"
 msgstr "Falklandy"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "Ostrze�enie"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "Pogoda"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Waterloo"
 msgstr "Pogoda"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "Pogoda"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 #, fuzzy
 msgid "Waterville"
 msgstr "Kategorie"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 #, fuzzy
 msgid "Wausau"
 msgstr "Vanuatu"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Webster City"
 msgstr "Serwis WWW"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "�r"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Pogoda"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 #, fuzzy
 msgid "Wendover"
 msgstr "Nadawca"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "West Burke"
 msgstr "Zachodnioeuropejski"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "Holandia"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westfield"
 msgstr "Zach�d"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "Planowanie"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "Wyspa Bo�ego Narodzenia"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "Przyd"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 #, fuzzy
 msgid "Wien"
 msgstr "�r"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 #, fuzzy
 msgid "Williston"
 msgstr "lista"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 #, fuzzy
 msgid "Winchester"
 msgstr "Liechtenstein"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 #, fuzzy
 msgid "Windsor"
 msgstr "Burza piaskowa"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 #, fuzzy
 msgid "Winslow"
 msgstr "teraz"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 #, fuzzy
 msgid "Winter Park"
 msgstr "Wprowad� has�o"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 #, fuzzy
 msgid "Wisconsin"
 msgstr "Mikronezja"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "�r"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "Hong Kong"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "Stopka:"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "bez ko�ca"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "Polska"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "Przetwarzanie"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "Przetwarzanie"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 #, fuzzy
 msgid "Xiamen"
 msgstr "Nazwa"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 #, fuzzy
 msgid "Yao Airport"
 msgstr "Nie importuj"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 #, fuzzy
 msgid "Yenbo"
 msgstr "Jemen"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zadar"
 msgstr "Kalendarz"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 #, fuzzy
 msgid "Zagreb"
 msgstr "Strona"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zanesville"
 msgstr "Anulowane"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 #, fuzzy
 msgid "Zaragoza"
 msgstr "Paragwaj"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 #, fuzzy
 msgid "Zurich"
 msgstr "Turecki"
@@ -23707,17 +24441,12 @@ msgstr "%d %B, %l:%M"
 msgid "No description"
 msgstr "opis"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Zestawienie poczty"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "VFoldery"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Lokalne foldery"
 
@@ -23726,56 +24455,46 @@ msgstr "Lokalne foldery"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "EPGD:EPKK:EPWA"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "S�owo dnia Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Cytaty dnia"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Nowe �r�d�o nowo�ci"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Podaj URL �r�d�a nowo�ci, kt�re chcesz doda�"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Nazwa:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "B��d przy pobieraniu RDF-a"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "�r�d�o nowo�ci"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
+msgid "Add"
 msgstr "_Dodaj"
 
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr " _Usu�"
-
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Kr�tkotrwa�a m�awka"
@@ -23817,10 +24536,47 @@ msgstr "Wydrukuj"
 msgid "Printing of Summary failed"
 msgstr "Wydrukowanie zestawienia nie powiod�o si�"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponent zestawienia wykonawczego nie m�g� zainicjowa� Bonobo.\n"
 
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " F"
+msgstr ", "
+
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " C"
+msgstr ", "
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "w�z�y"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "km/h"
+
+# [cyba] mo�e raczej calHg??
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "mile"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometry"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Czyste niebo"
@@ -24973,100 +25729,106 @@ msgid "C_elsius"
 msgstr "_Celsjusza"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "W_szystkie �r�d�a nowo�ci:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Liczba dni wy�wietlanych jednocze�nie w kalendarzu"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "_Maksymalna liczba wy�wietlanych element�w:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Ustawienia �r�de� nowo�ci"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Jeden _miesi�c"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "J_eden tydzie�"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "O_kres od�wie�ania (sekundy):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "O_kres od�wie�ania (sekundy):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "_Wy�wietlanie pe�nych �cie�ek folder�w"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Wy�wietlanie _wszystkich zada�"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Wy�wietlanie _dzisiejszych zada�"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Wy�wietlanie temperatur w skali:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Zadania "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Ustawienia dotycz�ce pogody"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheita"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Pi�� dni"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "Pocz_ta"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "�r�d�a _nowo�ci"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Jeden dzie�"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "P_lanowanie"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "Pogod_a"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Generator edytora list�w Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Foldery specjalne"
+msgid "Folder Settings"
+msgstr "Ustawienia"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Pow�oka Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -25077,6 +25839,39 @@ msgstr "Wy�wietl szczeg�y"
 msgid "Cancel Operation"
 msgstr "Anuluj operacj�"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Nie mo�na przenie�� folderu:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Wyb�r folderu"
+
+#: shell/e-local-storage.c:174
+#, fuzzy
+msgid "Drafts"
+msgstr "Roboczy"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Nadchodz�ce"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Wychodz�ce"
+
+#: shell/e-local-storage.c:177
+#, fuzzy
+msgid "Sent"
+msgstr "Widziany"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instalacja Evolution"
@@ -25182,6 +25977,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Dostarczone przez"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Data zako�czenia"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Foldery specjalne"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Foldery specjalne"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Foldery specjalne"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Data zako�czenia"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -25211,20 +26031,20 @@ msgstr "Nie mo�na skopiowa� folderu do jego folderu podrz�dnego."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Wybierz folder, do kt�rego chcesz skopiowa� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Kopiowanie folderu"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Wybierz folder, do kt�rego chcesz przenie�� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Przeniesienie folderu"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25233,18 +26053,19 @@ msgstr ""
 "Nie mo�na usun�� folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Usuni�cie \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Czy na pewno chcesz usun�� folder \"%s\"?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"Nie mo�na usun�� folderu:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25253,16 +26074,16 @@ msgstr ""
 "Nie mo�na zmieni� nazwy folderu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Zmiana nazwy folderu \"%s\" na:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Zmiana nazwy folderu"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -25281,7 +26102,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - tworzenie nowego folderu"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -25289,7 +26110,7 @@ msgstr ""
 "Typ wybranego folderu nie jest poprawny w odniesieniu\n"
 "do ��danej operacji."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Nowy..."
 
@@ -25341,22 +26162,27 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie %d. elementu."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Wyb�r folderu"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Plik %s nie istnieje."
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution "
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Mo�na importowa� tylko lokalne foldery"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25365,11 +26191,11 @@ msgstr ""
 "�aden z importer�w nie potrafi obs�u�y� pliku\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importowanie"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25378,17 +26204,17 @@ msgstr ""
 "Importowanie %s.\n"
 "Rozpoczynanie %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "B��d przy uruchamianiu %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "B��d odczycie %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25397,31 +26223,31 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie 1. elementu."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Wyb�r pliku"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Typ pliku:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Import danych i ustawie� ze starszych program�w"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Import pojedynczego pliku"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25429,31 +26255,78 @@ msgstr ""
 "Poczekaj chwil�...\n"
 "Trwa analizowanie istniej�cej konfiguracji"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Uruchamianie inteligentnych importer�w"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Wyb�r folderu"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Wybierz folder, do kt�rego powinny zosta� zaimportowane te dane"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Zamykanie po��cze�..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"B��d podczas operacji \"%s\":\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Synchronizowanie folderu"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Alarm Evolution"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Otwieranie folderu %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Otwieranie folderu %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Otw�rz za pomoc� programu %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Nie mo�na stworzy� podanego folderu:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -25467,8 +26340,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Nie mo�na uruchomi� interfejsu druida pocztowego Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nowy"
@@ -25489,43 +26362,43 @@ msgstr "Nazwa folderu nie mo�e zawiera� uko�nik�w."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" oraz \"..\" s� zarezerwowanymi nazwami folder�w."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nie znajduje si� w �cie�ce."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Nie mo�na uruchomi� Bug buddy."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Informacje o Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Przej�cie do innego folderu..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Wybierz folder, kt�ry chcesz otworzy�"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Tworzy nowy skr�t"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Wybierz folder, na kt�ry ma wskazywa� skr�t:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "Praca _z pod��czeniem"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "Praca _bez pod��czenia"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Praca bez pod��czenia"
 
@@ -25560,7 +26433,7 @@ msgstr ""
 "Ximian Evolution dzia�a obecnie w trybie bez pod��czenia do sieci. Aby "
 "przej�� w tryb z pod��czeniem, kliknij ten przycisk."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25572,12 +26445,12 @@ msgstr ""
 "Opis b��du otrzymany od systemu aktywacji:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nie mo�na ustawi� lokalnego miejsca przechowywania -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25588,23 +26461,19 @@ msgstr ""
 "nieoczekiwanie zako�czy� dzia�anie. Aby ponownie uzyska� dost�p do\n"
 "danych, nale�y zako�czy� Evolution, a nast�pnie uruchomi� ponownie."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Niepoprawny argumenty"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Nie mo�na dokona� rejestracji na serwerze OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Nie odnaleziono bazy danych konfiguracji"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "B��d og�lny"
 
@@ -25629,95 +26498,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Nie usuwaj"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Zmiana nazwy grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Zmie� nazw� wybranej grupy skr�t�w na:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Ma�e ikony"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Wy�wietla skr�ty jako ma�e ikony"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "_Du�e ikony"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Wy�wietla skr�ty jako du�e ikony"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Nowa grupa..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Tworzy now� grup� skr�t�w"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "_Usu� grup�..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Usuwa t� grup� skr�t�w"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "_Zmie� nazw� grupy..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Zmienia nazw� grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ukryj pasek skr�t�w"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Ukrywa pasek skr�t�w"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Zmiana nazwy skr�tu"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Zmie� nazw� wybranego skr�tu na:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Otwiera folder powi�zany ze skr�tem"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Otw�rz w nowym _oknie"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Otwiera w nowym oknie folder powi�zany ze skr�tem"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Zmie� nazw�"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Zmienia nazw� skr�tu"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "_Usu�"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Usuwa skr�t z paska skr�t�w"
 
@@ -25729,10 +26598,6 @@ msgstr "B��d przy zapisywaniu skr�t�w."
 msgid "Shortcuts"
 msgstr "Skr�ty"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Nadchodz�ce"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -25795,10 +26660,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zako�czono %d%%)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<kliknij, aby wybra� folder> "
 
@@ -25839,67 +26705,67 @@ msgstr ""
 "Opis b��du otrzymany od systemu aktywacji:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "B��d Corby"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Przerwane"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Niepoprawny argument"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Ma ju� w�a�ciciela"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Brak w�a�ciciela"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Nie odnaleziono"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Nieobs�ugiwany typ"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Nieobs�ugiwany schemat"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Nieobs�ugiwana operacja"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "B��d wewn�trzny"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Istnieje"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "Niepoprawny URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Zawiera foldery podrz�dne"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Brak miejsca"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "Poprzedni w�a�ciciel zako�czy� dzia�anie"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Typ pliku:"
@@ -26030,50 +26896,82 @@ msgstr "Nie pytaj o to ponownie"
 msgid "Evolution can import data from the following files:"
 msgstr "Mo�na zaimportowa� do Evolution dane z nast�puj�cych plik�w:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ko�czy prac�..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "_Najcz�ciej zadawane pytania"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Nie pytaj o to ponownie"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nie mo�na uzyska� dost�pu do pow�oki Ximian Evolution."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nie mo�na zainicjowa� pow�oki Ximian Evolution: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Ukrywa okno powitalne"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Rozpoczynanie importowania"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Uruchamianie inteligentnych importer�w"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Zapisuje do pliku informacje dotycz�ce przebiegu wykonania komponent�w."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie mo�na zainicjowa� systemu komponent�w Bonobo."
 
@@ -26187,11 +27085,11 @@ msgstr "bie��cym czasem"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "C_zynno�ci"
 
@@ -26313,8 +27211,8 @@ msgstr "Zamyka bie��cy element"
 msgid "Delete this item"
 msgstr "Usuwa bie��cy element"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "G��wny pasek narz�dziowy"
 
@@ -26354,7 +27252,7 @@ msgstr "Zapisuje bie��cy element na dysku"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Plik"
 
@@ -26419,19 +27317,19 @@ msgstr "Prze�lij jako i_Calendar"
 msgid "Forward this item via email"
 msgstr "Przesy�a ten element w li�cie"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Pobiera naj�wie�sze informacje o spotkaniu"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "_Od�wie� spotkanie"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "_Zaplanuj spotkanie"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Planuje spotkanie zwi�zane z tym elementem"
 
@@ -26439,10 +27337,6 @@ msgstr "Planuje spotkanie zwi�zane z tym elementem"
 msgid "Customise My Evolution"
 msgstr "Dopasuj Moje Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Anuluj"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Anuluje bie��c� operacj� na listach"
@@ -26600,7 +27494,7 @@ msgstr "Prze��cza grupowanie list�w w w�tki"
 msgid "_Expunge"
 msgstr "Wy_czy��"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Folder"
 
@@ -27016,7 +27910,7 @@ msgstr "Poprzedni list"
 msgid "_Quoted"
 msgstr "Jako cytat"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Narz�dzia"
 
@@ -27031,12 +27925,12 @@ msgstr "Zamyka bie��ce okno"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "Zam_knij"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Widok"
 
@@ -27223,7 +28117,7 @@ msgstr "_Otw�rz..."
 msgid "_Reply-To Field"
 msgstr "Pole Odpowied� _do"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Pomo_c"
 
@@ -27372,112 +28266,121 @@ msgid "Move this folder to another place"
 msgstr "Przenosi folder w inne miejsce"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Stw�rz _nowy folder..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Otw�rz w nowym oknie"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Otwiera folder w nowym oknie"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Wy�lij / Odbierz"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Wysy�a listy w kolejce i pobiera nowe"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Wy�wietla informacje o Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Wy�lij zg�oszenie b��du"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "Wy�lij zg�oszenie _b��du"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Wysy�a zg�oszenie b��du za pomoc� Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Prze��cz"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Prze��cza wy�wietlanie paska folder�w"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prze��cza wy�wietlanie paska skr�t�w"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr ""
 "Prze��cza pomi�dzy trybami pracy z pod��czeniem i bez pod��czenia do sieci."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Wy�wietla zaznaczony folder"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "_Najcz�ciej zadawane pytania"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_Informacje o Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "Pasek f_older�w"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_Przejd� do folderu..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "Za_importuj..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Przenie�..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nowy"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Nowy folder"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "_Ustawienia pilota..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Zmie� nazw�..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "Wy�lij / _Odbierz"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Skr�t"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "Pasek _skr�t�w"
 
@@ -27562,21 +28465,21 @@ msgstr ""
 "stref� czasow�.\n"
 "Przyci�ni�cie prawego przycisku przywraca zwyk�e powi�kszenie."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Bie��cy widok"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "_Bie��cy widok"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Zdefiniuj widoki"
 
@@ -27698,16 +28601,21 @@ msgstr "Edytor wyszukiwa�"
 msgid "Save Search"
 msgstr "Zapisz wyszukiwanie"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Zapisz wyszukiwanie"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Dodaj do zapisanych wyszukiwa�"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Zaawansowane..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informacje"
@@ -27729,21 +28637,21 @@ msgstr "List"
 msgid "Don't show this message again."
 msgstr "Bez wy�wietlania tego komunikatu w przysz�o�ci."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Znajd�"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Wyczy��"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Wyczy��"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Znajd�"
 
@@ -27769,6 +28677,192 @@ msgstr "init_corba(): nie mo�na zainicjowa� GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "�r�d�a ksi��ki adresowej"
+
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "Niepoprawne nieprzejrzyste informacje identyfikuj�ce:\n"
+#~ "%s"
+
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Komponent zestawienia wykonawczego kalendarza Evolution."
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Generator komponentu zestawienia kalendarza."
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Pocz�tek _dnia:"
+
+#~ msgid "_End of day:"
+#~ msgstr "_Koniec dnia:"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "_Inny organizator"
+
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Ten rodzaj szyfrowania nie obs�uguje czytelnego podpisywania"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Wprowad� swoje d�ugie has�o %s dla %s"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Wprowad� swoje d�ugie has�o %s"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Nie mo�na podpisa� listu: brak tekstu, kt�ry mo�na podpisa�"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Nie mo�na podpisa� listu: nie podano has�a"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Nie mo�na podpisa� listu: nie mo�na stworzy� potoku do GPG/PGP: %s"
+
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr ""
+#~ "Nie mo�na podpisa� listu: brak tekstu, kt�ry mo�na czytelnie podpisa�"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Nie mo�na zweryfikowa� listu: brak tekstu, kt�ry mo�na zweryfikowa�"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nie mo�na zweryfikowa� listu: nie mo�na stworzy� potoku do GPG/PGP: %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Nie mo�na zaszyfrowa� listu: brak tekstu, kt�ry mo�na zaszyfrowa�"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Nie mo�na zaszyfrowa� listu: nie podano has�a"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nie mo�na zaszyfrowa� listu: nie mo�na stworzy� potoku do GPG/PGP: %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "Nie mo�na odszyfrowa� listu: brak zaszyfrowanego tekstu, kt�ry mo�na "
+#~ "odszyfrowa�"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Nie mo�na odszyfrowa� listu: nie podano has�a"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nie mo�na odszyfrowa� listu: nie mo�na stworzy� potoku do GPG/PGP: %s"
+
+#~ msgid "%s server %s"
+#~ msgstr "serwer %s %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(nieznany komputer)"
+
+#~ msgid "No such message: %s"
+#~ msgstr "Brak listu: %s"
+
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Nie mo�na kopiowa� list�w z tego folderu �mietnka."
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Nie mo�na do��czy� listu do pliku kolejki: %s: %s"
+
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Nie mo�na otworzy� pliku: %s: %s"
+
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Kolejka \"%s\" nie istnieje lub nie jest zwyk�ym plikiem"
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Radio"
+
+#~ msgid ""
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
+#~ msgstr ""
+#~ "Nie mo�na uzyska� folderu poczty nadchodz�cej w nowym miejscu "
+#~ "przechowywania:\n"
+#~ "%s\n"
+#~ "Skr�t nie b�dzie stworzony."
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "_Edycja"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Nowy"
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Anuluj operacj�"
+
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Tuvalu"
+
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Plik z podpisem:"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Czy�ci wszystko za wyj�tkiem podpisu"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "Podpis w _HTML-u"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Nazwa pliku:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "Podpis w _HTML-u"
+
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "J�zyk"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Radio"
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Nie mo�na stworzy� kontekstu szyfrowania PGP."
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Nie mo�na stworzy� kontekstu odszyfrowania PGP."
+
+#~ msgid "Moving"
+#~ msgstr "Przenoszenie"
+
+#~ msgid "Copying"
+#~ msgstr "Kopiowanie"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Plik z podpisem:"
+
+#, fuzzy
+#~ msgid "Riga"
+#~ msgstr "Prawy:"
+
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_Dodaj"
+
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr " _Usu�"
+
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Czy na pewno chcesz usun�� folder \"%s\"?"
+
 #~ msgid "Card: "
 #~ msgstr "Karta: "
 
@@ -28028,19 +29122,19 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ "W przypadku wi�kszo�ci serwer�w LDAP te informacje nie s� potrzebne."
 
 #~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
 #~ msgstr ""
 #~ "Ta informacja jest u�ywana przez serwer LDAP do okre�lenia w�z��w "
-#~ "wykorzystywanych w wyszukiwaniu. Aby uzysta� wi�cej informacji, skontaktuj "
-#~ "si� z administratorem systemu."
+#~ "wykorzystywanych w wyszukiwaniu. Aby uzysta� wi�cej informacji, "
+#~ "skontaktuj si� z administratorem systemu."
 
 #~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
 #~ msgstr ""
-#~ "To jest w�ze� bazowy dla wszystkich wyszukiwa� na serwerze LDAP. Aby uzysta� "
-#~ "wi�cej informacji, skontaktuj si� z administratorem systemu."
+#~ "To jest w�ze� bazowy dla wszystkich wyszukiwa� na serwerze LDAP. Aby "
+#~ "uzysta� wi�cej informacji, skontaktuj si� z administratorem systemu."
 
 #~ msgid "This is the name of the server where your addressbook is located."
 #~ msgstr ""
@@ -28052,12 +29146,6 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "_My server requires authentication"
 #~ msgstr "_Serwer wymaga uwierzytelnienia"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Inne kontakty"
-
-#~ msgid "(none)"
-#~ msgstr "(brak)"
-
 #~ msgid "Co_ntacts:"
 #~ msgstr "K_ontakty:"
 
@@ -28082,13 +29170,6 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "_Mobile"
 #~ msgstr "P_rzeno�ny"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "Czy na pewno chcesz\n"
-#~ "usun�� ten kontakt?"
-
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Republika Mo�dawii"
 
@@ -28110,245 +29191,16 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "_Other"
 #~ msgstr "_Inne"
 
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Kliknij, aby doda� uczestnika"
-
 #~ msgid "The journal entry has changed. Send an updated version?"
 #~ msgstr "Wpis dziennika zosta� zmieniony. Czy wys�a� aktualn� wersj�?"
 
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
-
 #~ msgid "_Delete this Task"
 #~ msgstr "_Usu� zadanie"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "Czas rozpocz�cia spotkania: <b>"
-
-#~ msgid "Task begins: <b>"
-#~ msgstr "Czas rozpocz�cia zadania: <b>"
-
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Czas rozpocz�cia informacji o zaj�to�ci: <b>"
-
-#~ msgid "Begins: <b>"
-#~ msgstr "Rozpocz�cie: <b>"
-
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Czas zako�czenia spotkania spotkania: <b>"
-
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Czas zako�czenia informacji o zaj�to�ci: <b>"
-
-#~ msgid "Ends: <b>"
-#~ msgstr "Zako�czenie: <b>"
-
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Zadanie uko�czone: <b>"
-
-#~ msgid "Task Due: <b>"
-#~ msgstr "Zadanie na: <b>"
-
-#~ msgid "iCalendar Information"
-#~ msgstr "Informacje iKalendarza"
-
-#~ msgid "iCalendar Error"
-#~ msgstr "B��d iKalendarza"
-
-#~ msgid "An unknown person"
-#~ msgstr "Nieznana osoba"
-
-#~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
-#~ msgstr ""
-#~ "<br> Przejrzyj wy�wietlone informacje, a nast�pnie wybierz czynno�� z "
-#~ "poni�szego menu."
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Brak</i>"
-
-#~ msgid "Choose an action:"
-#~ msgstr "Wyb�r czynno�ci:"
-
-#~ msgid "Update"
-#~ msgstr "Aktualizacja"
-
-#~ msgid "Accept"
-#~ msgstr "Akceptacja"
-
-#~ msgid "Tentatively accept"
-#~ msgstr "Pr�bna akceptacja"
-
-#~ msgid "Decline"
-#~ msgstr "Odrzucenie"
-
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Wys�anie informacji o zaj�to�ci"
-
-#~ msgid "Update respondent status"
-#~ msgstr "Pobranie stanu wezwanej osoby"
-
-#~ msgid "Send Latest Information"
-#~ msgstr "Wys�anie naj�wie�szej informacji"
-
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> opublikowa� informacje o spotkaniu."
-
-#~ msgid "Meeting Information"
-#~ msgstr "Informacje o spotkaniu"
-
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> zwraca si� o twoj� obecno�� na spotkaniu."
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "Propozycja spotkania"
-
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> chce dodania do istniej�cego spotkania."
-
-#~ msgid "Meeting Update"
-#~ msgstr "Aktualizacja spotkania"
-
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> chce otrzyma� naj�wie�sze informacje o spotkaniu."
-
-#~ msgid "Meeting Update Request"
-#~ msgstr "Zwr�cenie si� o aktualizacj� spotkania"
-
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> odpowiedzia� na zwr�cenie si� o spotkanie."
-
-#~ msgid "Meeting Reply"
-#~ msgstr "Odpowied� na spotkanie"
-
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> anulowa� spotkanie."
-
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Anulowanie spotkania"
-
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> wys�a� niezrozumia�� wiadomo��."
-
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Niepoprawna wiadomo�� o spotkaniu"
-
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> opublikowa� informacje o spotkaniu."
-
-#~ msgid "Task Information"
-#~ msgstr "Informacje o zadaniu"
-
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> zwraca si� o wykonanie przez ciebie zadania."
-
-#~ msgid "Task Proposal"
-#~ msgstr "Propozycja zadania"
-
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> chce dodania do istniej�cego zadania."
-
-#~ msgid "Task Update"
-#~ msgstr "Aktualizacja zadania"
-
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> chce otrzyma�  naj�wie�sze informacje o zadaniu."
-
-#~ msgid "Task Update Request"
-#~ msgstr "Zwr�cenie si� o aktualizacj� zadania"
-
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> odpowiedzia� na przypisanie zadania."
-
-#~ msgid "Task Reply"
-#~ msgstr "Odpowied� na zadanie"
-
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> anulowa� zadanie."
-
-#~ msgid "Task Cancellation"
-#~ msgstr "Anulowanie zadania"
-
-#~ msgid "Bad Task Message"
-#~ msgstr "Niepoprawna wiadomo�� o zadaniu"
-
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> opublikowa� informacj� o zaj�to�ci."
-
-#~ msgid "Free/Busy Information"
-#~ msgstr "Informacja o zaj�to�ci"
-
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> zwraca si� o informacj� o zaj�to�ci."
-
-#~ msgid "Free/Busy Request"
-#~ msgstr "Zwr�cenie si� o informacj� o zaj�to�ci"
-
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> odpowiedzia� na zwr�cenie si� o informacj� o zaj�to�ci."
-
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Odpowied� z informacj� o zaj�to�ci"
-
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Niepoprawna wiadomo�� o zaj�to�ci"
-
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Lista zawiera tylko nieobs�ugiwane ��dania."
-
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "Za��cznik nie zawiera poprawnego komunikatu kalendarza"
-
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "Za��cznik nie zawiera daj�cych si� wy�wietli� element�w kalendarza"
-
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr ""
 #~ "Nie mo�na odnale�� �adnej z twoich to�samo�ci na li�cie uczestnik�w!\n"
 
-#~ msgid "Status: %s"
-#~ msgstr "Stan: %s"
-
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Procent zako�czenia: %i"
-
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
-
-#~ msgid "Categories: %s"
-#~ msgstr "Kategorie: %s"
-
-#~ msgid "Contacts: "
-#~ msgstr "Kontakty: "
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Niepoprawny typ warto�ci body-contains, oczekiwano napisu"
 
@@ -28412,10 +29264,11 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgstr "Nie mo�na pobra� listu z serwera POP %s: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
 #~ msgstr ""
-#~ "Przy tej opcji uwierzytelnianie na serwerze POP b�dzie przeprowadzane przy "
-#~ "u�yciu Kerberosa 4 ."
+#~ "Przy tej opcji uwierzytelnianie na serwerze POP b�dzie przeprowadzane "
+#~ "przy u�yciu Kerberosa 4 ."
 
 #~ msgid "Could not authenticate to KPOP server: %s"
 #~ msgstr "Nie mo�na przeprowadzi� uwierzytelnienia na serwerze KPOP: %s"
@@ -28426,9 +29279,6 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "(Unknown)"
 #~ msgstr "(Nieznane)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Nieoczekiwana odpowied� od serwera POP: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Nie mo�na odnale�� adresu \"Od\" w li�cie"
 
@@ -28474,33 +29324,15 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "Filter on Mailing List"
 #~ msgstr "Filtr w oparciu o list� dyskusyjn�"
 
-#~ msgid "Indexing:"
-#~ msgstr "Indeksowanie:"
-
 #~ msgid "Mailbox Format"
 #~ msgstr "Format skrzynki"
 
-#~ msgid " (default)"
-#~ msgstr " (domy�lne)"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Tematem jest %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "List od %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "lista dyskusyjna %s"
-
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "Ten list zawiera niepoprawnych adresat�w:"
 
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Nadchodz�ce"
 
-#~ msgid "Account"
-#~ msgstr "Konto"
-
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr "Przy wysy�aniu zaszyfrowanych list�w s_zyfrowanie zawsze do siebie"
 
@@ -28513,9 +29345,6 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "Edit..."
 #~ msgstr "Zmodyfikuj..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "Plik z podpisem w HTML-u:"
-
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Wyb�r pliku dziennika komunikat�w o filtrowaniu..."
 
@@ -28543,23 +29372,9 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "seconds."
 #~ msgstr "sekund."
 
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "List zosta� podpisany cyfrowo. Kliknij ikon� zamka, aby uzyska� wi�cej "
-#~ "informacji."
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Evolution nie rozpoznaje podpisanego listu tego typu."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "List zosta� podpisany cyfrowo i potwierdzono jego autentyczno��."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "List zosta� podpisany cyfrowo lecz nie potwierdzono jego autentyczno�ci."
-
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "Komponent Evolution obs�uguj�cy zestawienie wykonawcze."
 
@@ -28575,28 +29390,12 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "�C"
 #~ msgstr "�C"
 
-#~ msgid "kph"
-#~ msgstr "km/h"
-
-# [cyba] mo�e raczej calHg??
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "kilometers"
-#~ msgstr "kilometry"
-
 #~ msgid "Al_l stations:"
 #~ msgstr "Wszy_stkie stacje:"
 
 #~ msgid "All _folders:"
 #~ msgstr "W_szystkie foldery:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "W_szystkie �r�d�a nowo�ci:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "Wy�wi_etlane foldery:"
 
@@ -28606,19 +29405,9 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "_Displayed feeds:"
 #~ msgstr "Wy�wi_etlane �r�d�a:"
 
-#~ msgid "Outbox"
-#~ msgstr "Wychodz�ce"
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nie mo�na przenie�� folderu:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(Bez nazwy)"
 
diff --git a/po/pt.po b/po/pt.po
index 852a497fb1..afa6856078 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2000-04-16 16:33+01:00\n"
 "Last-Translator: Tiago Ant�o <tiagoantao@bigfoot.com>\n"
 "Language-Team: Gnome Portuguese <gnome@poli.org>\n"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "File As"
 msgstr "_Pasta"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 #, fuzzy
 msgid "Name"
@@ -48,7 +48,7 @@ msgid "Email"
 msgstr "Correio electr�nico 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Prim�rio"
 
@@ -59,7 +59,7 @@ msgstr "Prim�rio"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr ""
@@ -67,8 +67,8 @@ msgstr ""
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr ""
 
@@ -79,12 +79,12 @@ msgid "Bus"
 msgstr "Ocupado"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Empresa"
 
@@ -96,8 +96,8 @@ msgstr "Copiar"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Casa"
 
@@ -112,18 +112,18 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Telem�vel"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Carro"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr ""
@@ -133,13 +133,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax de casa"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr ""
 
@@ -149,43 +149,43 @@ msgid "Bus 2"
 msgstr "Ocupado"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Casa 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "RDIS"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Outro"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Outro Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Bip"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
@@ -197,14 +197,14 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "Correio electr�nico 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Correio electr�nico 3"
@@ -355,7 +355,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -363,7 +363,7 @@ msgid "Could not initialize Bonobo"
 msgstr "N�o se consegui inicializar Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 #, fuzzy
 msgid "Searching..."
 msgstr "Ano"
@@ -379,32 +379,32 @@ msgstr "Imprimir calend�rio"
 msgid "Error in search expression."
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Criar um novo calend�rio"
@@ -454,118 +454,146 @@ msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #, fuzzy
-msgid "Addressbook Settings"
-msgstr "Adicionar Fonte"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#, fuzzy
-msgid "Configuration control for the Evolution Addressbook."
-msgstr "N�o consigo inicializar o componente de mail do Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 #, fuzzy
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Atalho para _barra do Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 #, fuzzy
 msgid "Evolution component for handling contacts."
 msgstr "Uma pasta contendo contactos"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the Addressbook Minicard control"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 #, fuzzy
 msgid "Factory for the sample Addressbook control"
 msgstr "Pressione aqui para o livro de endere�os"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 #, fuzzy
 msgid "Contacts"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 #, fuzzy
 msgid "Folder containing contact information"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor:"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "New Contact List"
+msgstr "_Contacto"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Contacto"
+
+#: addressbook/gui/component/addressbook-component.c:581
 #, fuzzy
 msgid "New Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 #, fuzzy
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
-msgid "New Contact List"
-msgstr "_Contacto"
+msgid "Failed to connect to LDAP server"
+msgstr "Criar um novo calend�rio"
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "_Contacto"
+msgid "Failed to authenticate with LDAP server"
+msgstr "Criar um novo calend�rio"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr "Uma pasta contendo entradas de calend�rio"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+msgid "Server did not respond with valid schema information"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1638
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "N�o se consegui inicializar Bonobo"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+#, fuzzy
+msgid "Other Contacts"
+msgstr "_Novo Contacto"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Imposs�vel abrir o livro de endere�os"
@@ -591,52 +619,62 @@ msgid ""
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "Correio electr�nico 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "�cone_s pequenos"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 #, fuzzy
 msgid "Any field contains"
 msgstr "Uma pasta contendo tarefas"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 #, fuzzy
 msgid "Advanced..."
 msgstr "Adicionar..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que o navegador de pastas mostrar�"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "Nome"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Endere�o principal de correio electr�nico"
 
@@ -686,94 +724,55 @@ msgstr ""
 msgid "Enable Queries (Dangerous!)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Criar um novo calend�rio"
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr "Criar um novo calend�rio"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-msgid "Could not query for schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1169
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1613
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Ir para a _pasta..."
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "_Op��es"
+msgid "1234"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "Remover"
+msgid "1:00"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1234"
+msgid "2:30"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:5
-msgid "1:00"
+msgid "3268"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
+msgid "380"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
-msgid "3268"
+msgid "389"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:8
-msgid "380"
+msgid "5:00"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "389"
+msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "5:00"
+msgid "666"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "636"
-msgstr ""
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Remover"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "666"
-msgstr ""
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "_Op��es"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
@@ -784,8 +783,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Adicionar Fonte"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Alarmes"
@@ -879,8 +878,8 @@ msgstr "Configura��o do correio"
 msgid "Mappings"
 msgstr "�cones _grandes"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "Remover"
@@ -1066,14 +1065,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1093,8 +1092,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1126,7 +1125,7 @@ msgid "Using email address"
 msgstr "Endere�o de correio:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1134,7 +1133,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Add"
 msgstr "Adicionar"
@@ -1182,7 +1181,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1300,10 +1299,12 @@ msgstr ""
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Remover"
 
@@ -1435,7 +1436,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 #, fuzzy
 msgid "Contact Editor"
 msgstr "_Contacto"
@@ -1446,7 +1447,7 @@ msgid "D_epartment:"
 msgstr "Data"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr ""
 
@@ -1509,11 +1510,12 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "_Delete"
 msgstr "Apagar"
@@ -1545,7 +1547,7 @@ msgid "_Web page address:"
 msgstr "Endere�o de correio:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 #, fuzzy
 msgid "United States"
 msgstr "Encontrar mensagens"
@@ -2072,12 +2074,11 @@ msgid "Laos"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
@@ -2086,7 +2087,7 @@ msgid "Lesotho"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 #, fuzzy
 msgid "Liberia"
 msgstr "_Correio"
@@ -2096,12 +2097,12 @@ msgid "Liechtenstein"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr ""
 
@@ -2137,7 +2138,7 @@ msgid "Mali"
 msgstr "_Correio"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 #, fuzzy
 msgid "Malta"
 msgstr "_Correio"
@@ -2165,7 +2166,7 @@ msgid "Mayotte"
 msgstr "Segunda-feira"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr ""
 
@@ -2191,7 +2192,7 @@ msgid "Montserrat"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr ""
 
@@ -2219,7 +2220,7 @@ msgid "Nepal"
 msgstr "Responder"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 #, fuzzy
 msgid "Netherlands"
 msgstr "Reponder para todos"
@@ -2234,12 +2235,12 @@ msgid "New Caledonia"
 msgstr "_Contacto"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr ""
 
@@ -2259,7 +2260,7 @@ msgid "Niue"
 msgstr "Minuto"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr ""
 
@@ -2268,18 +2269,18 @@ msgid "Northern Mariana Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norway"
 msgstr "Novo"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 #, fuzzy
 msgid "Pakistan"
 msgstr "Colar"
@@ -2293,7 +2294,7 @@ msgid "Palestinian Territory"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 #, fuzzy
 msgid "Panama"
 msgstr "Novo Ca_lend�rio"
@@ -2303,12 +2304,12 @@ msgid "Papua New Guinea"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 #, fuzzy
 msgid "Peru"
 msgstr "Bip"
@@ -2322,24 +2323,24 @@ msgid "Pitcairn"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 #, fuzzy
 msgid "Poland"
 msgstr "Encontrar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 #, fuzzy
 msgid "Portugal"
 msgstr "Prioridade"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 #, fuzzy
 msgid "Qatar"
 msgstr "Data"
@@ -2350,7 +2351,7 @@ msgid "Reunion"
 msgstr "Segundos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr ""
 
@@ -2389,7 +2390,7 @@ msgid "Sao Tome And Principe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr ""
 
@@ -2407,17 +2408,17 @@ msgid "Sierra Leone"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr ""
 
@@ -2431,7 +2432,7 @@ msgid "Somalia"
 msgstr "F_ormato"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr ""
 
@@ -2440,7 +2441,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 #, fuzzy
 msgid "Spain"
 msgstr "Enviar"
@@ -2463,7 +2464,7 @@ msgid "Sudan"
 msgstr "Dom"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 #, fuzzy
 msgid "Suriname"
 msgstr "Nome"
@@ -2478,18 +2479,18 @@ msgid "Swaziland"
 msgstr "Encontrar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 #, fuzzy
 msgid "Sweden"
 msgstr "Enviar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr ""
 
@@ -2530,7 +2531,7 @@ msgid "Tunisia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 #, fuzzy
 msgid "Turkey"
 msgstr "Ter"
@@ -2553,7 +2554,7 @@ msgid "Uganda"
 msgstr "Novo Ca_lend�rio"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr ""
 
@@ -2562,7 +2563,7 @@ msgid "United Arab Emirates"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr ""
 
@@ -2571,7 +2572,7 @@ msgid "United States Minor Outlying Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr ""
 
@@ -2584,12 +2585,12 @@ msgid "Vanuatu"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 #, fuzzy
 msgid "Viet Nam"
 msgstr "_Items seleccionados"
@@ -2611,13 +2612,13 @@ msgid "Western Sahara"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 #, fuzzy
 msgid "Yemen"
 msgstr "Enviar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr ""
 
@@ -2630,29 +2631,35 @@ msgid "Zimbabwe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "Apagar um contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 #, fuzzy
 msgid "Category editor not available."
 msgstr "Nenhum sum�rio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "Gravar como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Criar um novo calend�rio"
@@ -2682,12 +2689,12 @@ msgstr "Correio electr�nico 2"
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 #, fuzzy
 msgid "list"
 msgstr "Pr�_ximo"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2830,12 +2837,12 @@ msgid "contact-list-editor"
 msgstr "_Contacto"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 #, fuzzy
 msgid "Contact List Editor"
 msgstr "_Contacto"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Gravar como VCard"
@@ -2918,22 +2925,22 @@ msgid "Error getting book view"
 msgstr "Erro a gravar os atalhos."
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 #, fuzzy
 msgid "Success"
 msgstr "Fontes"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr ""
 
@@ -2942,7 +2949,7 @@ msgid "Repository offline"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr ""
 
@@ -2961,60 +2968,75 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
 #, fuzzy
+msgid "Authentication Failed"
+msgstr "Autentica��o"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autentica��o"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
 msgid "Other error"
 msgstr "Outro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 #, fuzzy
 msgid "Error adding list"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 #, fuzzy
 msgid "Error adding card"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 #, fuzzy
 msgid "Error removing list"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 #, fuzzy
 msgid "Error removing card"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Dia"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Dia"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -3022,22 +3044,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "_Come�ando"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "_Come�ando"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "_Come�ando"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "_Come�ando"
@@ -3111,105 +3133,112 @@ msgstr "_Novo Contacto"
 msgid "Other Address"
 msgstr "Endere�o"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#, fuzzy
+msgid "Addressbook"
+msgstr "Imposs�vel abrir o livro de endere�os"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Gravar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "_Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "_Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "Seg"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Adicionar Fonte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Configura��o do co_rreio..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Enviar esta mensagem"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Enviar mensagem em formato HTML"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 #, fuzzy
 msgid "Print Envelope"
 msgstr "Imprimir..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Ir para a _pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Ir para a _pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Apagar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3219,7 +3248,7 @@ msgstr "Ano corrente (%Y)"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3227,7 +3256,7 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3383,7 +3412,7 @@ msgstr "�cones _grandes"
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Options"
 msgstr "_Op��es"
@@ -3395,7 +3424,7 @@ msgid "Orientation"
 msgstr "Organiza��o"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 #, fuzzy
 msgid "Page"
 msgstr "Bip"
@@ -3484,26 +3513,29 @@ msgstr ""
 msgid "_Font..."
 msgstr "Imprimir..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "_Editar Compromisso"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 #, fuzzy
 msgid "High"
 msgstr "Cabe�alhos:"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 #, fuzzy
 msgid "Normal"
 msgstr "F_ormato"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 #, fuzzy
 msgid "Low"
 msgstr "Novo"
@@ -3511,6 +3543,7 @@ msgstr "Novo"
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr ""
 
@@ -3554,49 +3587,39 @@ msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 #, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "N�o consigo inicializar o componente de mail do Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Atalho para _barra do Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Calendar Summary component."
-msgstr "N�o consigo inicializar o componente de mail do Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 #, fuzzy
 msgid "Factory for the calendar iTip view control"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the sample Calendar control"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3608,11 +3631,26 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Segundos"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Cabe�alhos:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 #, fuzzy
 msgid "invalid time"
 msgstr "Hora de _fim de _encontro"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, fuzzy, c-format
 msgid "Alarm on %s"
@@ -3652,7 +3690,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
@@ -3674,17 +3712,17 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Enviar esta mensagem"
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 #, fuzzy
 msgid "Could not create the alarm notify service"
 msgstr "Criar um novo calend�rio"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3703,7 +3741,7 @@ msgstr "Nenhuma descri��o"
 msgid "Comment contains"
 msgstr "Assunto"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr ""
 
@@ -3742,15 +3780,17 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 #, fuzzy
 msgid "Private"
 msgstr "Imprimir"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr ""
 
@@ -3773,29 +3813,34 @@ msgid "W"
 msgstr "Qa"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
 msgstr "Semana"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Ocupado"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 #, fuzzy
 msgid "Not Started"
 msgstr "_Come�ando"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 #, fuzzy
 msgid "Completed"
 msgstr "Cores"
@@ -3808,11 +3853,12 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3827,12 +3873,14 @@ msgstr ""
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 #, fuzzy
 msgid "No"
 msgstr "Novo"
@@ -3857,67 +3905,69 @@ msgstr "Semana"
 msgid "Month View"
 msgstr "M�s"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 #, fuzzy
 msgid "Calendar"
 msgstr "Novo Ca_lend�rio"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 #, fuzzy
 msgid "Folder containing appointments and events"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "Tasks"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "Seg"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "Seg"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "Compromissos:"
@@ -4140,7 +4190,7 @@ msgstr "Enviar"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "Sum�rio:"
@@ -4175,7 +4225,7 @@ msgstr "_Editar Compromisso"
 msgid "hour(s)"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 #, fuzzy
 msgid "minute(s)"
 msgstr "Minutos"
@@ -4210,87 +4260,86 @@ msgstr "Minutos"
 msgid "60 minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alarmes"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
 msgid "Calendar and Tasks Settings"
 msgstr "Prefer�ncias"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "Days"
 msgstr "5 Dias"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 #, fuzzy
 msgid "Friday"
 msgstr "Sex"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "Dom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 #, fuzzy
 msgid "Saturday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #, fuzzy
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar 1 semana"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#, fuzzy
-msgid "Sta_rt of day:"
-msgstr "Hora de �n_icio de encontro"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, fuzzy
-msgid "Su_n"
-msgstr "Dom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_asks due today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "T_hu"
 msgstr "Qui"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#, fuzzy
-msgid "T_ue"
-msgstr "Ter"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4323,90 +4372,103 @@ msgid "Tuesday"
 msgstr "Hoje"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Work Week"
 msgstr "Semana"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #, fuzzy
 msgid "_12 hour (AM/PM)"
 msgstr "12 horas (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #, fuzzy
 msgid "_24 hour"
 msgstr "24 horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "_Display"
-msgstr "Dia"
+msgid "_Day begins:"
+msgstr "_Ac��es"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #, fuzzy
-msgid "_End of day:"
-msgstr "Hora de �n_icio de encontro"
+msgid "_Display"
+msgstr "Dia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_Fri"
 msgstr "Sex"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Mon"
 msgstr "Seg"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Overdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #, fuzzy
 msgid "_Sat"
 msgstr "S�b"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Show appointment end times in week and month views"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Nenhuma descri��o"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "Ter"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
 msgid "_Wed"
 msgstr "Qua"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 #, fuzzy
-msgid "before the start of the appointment"
+msgid "before every appointment"
 msgstr "Novo compromisso"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4490,42 +4552,62 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
 #, fuzzy
-msgid "Could not update object!"
+msgid "Could not update object"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "_Editar Compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "_Entrada di�ria?"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Nenhum sum�rio"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 #, fuzzy
 msgid "Save as..."
 msgstr "Gravar como VCard"
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4586,31 +4668,31 @@ msgstr "Apagar"
 msgid "Enter Delegate"
 msgstr "Apagar"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 #, fuzzy
 msgid "Appointment"
 msgstr "Compromissos:"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 #, fuzzy
 msgid "Reminder"
 msgstr "Enviar"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 #, fuzzy
 msgid "Recurrence"
 msgstr "Apagar todas as ocurr�ncias"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 #, fuzzy
 msgid "Scheduling"
 msgstr "Fontes"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 #, fuzzy
 msgid "Meeting"
 msgstr "Seg"
@@ -4663,7 +4745,7 @@ msgid "Pu_blic"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Show Time As"
 msgstr "Horas"
@@ -4690,19 +4772,19 @@ msgstr "Hora de _fim de _encontro"
 msgid "_Start time:"
 msgstr "Hora de �n_icio de encontro"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Apagar"
@@ -4714,54 +4796,61 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr ""
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "Pressione aqui para o livro de endere�os"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-#, fuzzy
-msgid "Delegated From"
-msgstr "Apagar"
+msgid "Common Name"
+msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
-msgid "Delegated To"
+msgid "Delegated From"
 msgstr "Apagar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
 #, fuzzy
-msgid "Language"
-msgstr "Bip"
+msgid "Delegated To"
+msgstr "Apagar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr ""
+#, fuzzy
+msgid "Language"
+msgstr "Bip"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
+msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 #, fuzzy
 msgid "Role"
 msgstr "Telem�vel"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 #, fuzzy
 msgid "Status"
 msgstr "S�b"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -4777,14 +4866,10 @@ msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr ""
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4991,7 +5076,7 @@ msgid "Progress"
 msgstr "Propriedades do alarme"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr ""
 
@@ -5005,21 +5090,21 @@ msgstr "Prioridade:"
 msgid "_Status:"
 msgstr "S�b"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 #, fuzzy
 msgid "Basic"
 msgstr "Colar"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 #, fuzzy
 msgid "Assignment"
 msgstr "Compromissos:"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Description:"
 msgstr "Nenhuma descri��o"
@@ -5033,25 +5118,80 @@ msgstr "Hora de �n_icio de encontro"
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Apagar um contacto"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Gravar como VCard"
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -5060,14 +5200,14 @@ msgstr "Gravar como VCard"
 msgid "_Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 msgstr "Cortar"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
@@ -5075,7 +5215,7 @@ msgstr "Cortar"
 msgid "_Copy"
 msgstr "Copiar"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -5084,35 +5224,36 @@ msgstr "Copiar"
 msgid "_Paste"
 msgstr "Colar"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Imprimir calend�rio"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Apagar este item"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Pressione aqui para o livro de endere�os"
@@ -5122,52 +5263,53 @@ msgstr "Pressione aqui para o livro de endere�os"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 #, fuzzy
 msgid "Complete"
 msgstr "Cores"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 #, fuzzy
 msgid "End Date"
 msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 #, fuzzy
 msgid "Start Date"
 msgstr "Hora de �n_icio de encontro"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 #, fuzzy
 msgid "Summary"
 msgstr "Sum�rio"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 #, fuzzy
 msgid "Task sort"
 msgstr "Lista de tarefas"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr ""
 
@@ -5212,11 +5354,13 @@ msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -5261,7 +5405,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "Nenhuma Informa��o"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Configura��o do correio"
@@ -5272,7 +5416,7 @@ msgid "_Configure Pilot..."
 msgstr "Configura��o do correio"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 #, fuzzy
 msgid "_Save As..."
 msgstr "Gravar na _pasta..."
@@ -5303,74 +5447,425 @@ msgid "Delete _All Occurrences"
 msgstr "Apagar todas as ocurr�ncias"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Erro a gravar os atalhos."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+#, fuzzy
+msgid "Meeting begins: <b>"
+msgstr "Hora de _fim de _encontro"
+
+#: calendar/gui/e-itip-control.c:683
+#, fuzzy
+msgid "Task begins: <b>"
+msgstr "Cores"
+
+#: calendar/gui/e-itip-control.c:688
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:692
+#, fuzzy
+msgid "Begins: <b>"
+msgstr "Hora de _fim de _encontro"
+
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Hora de _fim de _encontro"
+
+#: calendar/gui/e-itip-control.c:707
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:711
+#, fuzzy
+msgid "Ends: <b>"
+msgstr "Hora de _fim de _encontro"
+
+#: calendar/gui/e-itip-control.c:725
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "Cores"
+
+#: calendar/gui/e-itip-control.c:735
+#, fuzzy
+msgid "Task Due: <b>"
+msgstr "Cores"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "Nenhuma Informa��o"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Novo Ca_lend�rio"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "An unknown person"
+msgstr "Imposs�vel abrir o livro de endere�os"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "S�b"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#, fuzzy
+msgid "Declined"
+msgstr "Receber"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Apagar um contacto"
+
+#: calendar/gui/e-itip-control.c:972
+#, fuzzy
+msgid "Update"
+msgstr "Lista de tarefas"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1000
+#, fuzzy
+msgid "Accept"
+msgstr "�cone_s pequenos"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1002
+#, fuzzy
+msgid "Decline"
+msgstr "Receber"
+
+#: calendar/gui/e-itip-control.c:1026
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1117
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1118
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1122
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1123
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Seg"
+
+#: calendar/gui/e-itip-control.c:1127
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1128
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Hora de _fim de _encontro"
+
+#: calendar/gui/e-itip-control.c:1132
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1133
+#, fuzzy
+msgid "Meeting Update Request"
+msgstr "Pedido de _encontro"
+
+#: calendar/gui/e-itip-control.c:1156
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1157
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Seg"
+
+#: calendar/gui/e-itip-control.c:1161
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1162
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Apagar um contacto"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1167
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Mensagens enviadas"
+
+#: calendar/gui/e-itip-control.c:1189
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1190
+#, fuzzy
+msgid "Task Information"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1195
+#, fuzzy
+msgid "Task Proposal"
+msgstr "_Tarefa"
+
+#: calendar/gui/e-itip-control.c:1199
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1200
+#, fuzzy
+msgid "Task Update"
+msgstr "Lista de tarefas"
+
+#: calendar/gui/e-itip-control.c:1204
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1205
+#, fuzzy
+msgid "Task Update Request"
+msgstr "_Pedido de tarefa"
+
+#: calendar/gui/e-itip-control.c:1229
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1230
+#, fuzzy
+msgid "Task Reply"
+msgstr "Responder"
+
+#: calendar/gui/e-itip-control.c:1234
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1235
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Apagar um contacto"
+
+#: calendar/gui/e-itip-control.c:1240
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Novo Ca_lend�rio"
+
+#: calendar/gui/e-itip-control.c:1259
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1260
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1264
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1265
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "Encontrar mensagens"
+
+#: calendar/gui/e-itip-control.c:1269
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/e-itip-control.c:1270
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "Encontrar mensagens"
+
+#: calendar/gui/e-itip-control.c:1275
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Encontrar mensagens"
+
+#: calendar/gui/e-itip-control.c:1354
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "N�o consegui correr o Bub buddy"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1709
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Cores"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "_Nova pasta"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "_Nova pasta"
@@ -5417,100 +5912,98 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 #, fuzzy
 msgid "Group"
 msgstr "Grupo %i"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 #, fuzzy
 msgid "Resource"
 msgstr "Fontes"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 #, fuzzy
 msgid "Chair"
 msgstr "Carro"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 #, fuzzy
 msgid "Required Participant"
 msgstr "Pessoas _Necess�rias"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 #, fuzzy
 msgid "Needs Action"
 msgstr "Remover grupo"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#, fuzzy
-msgid "Declined"
-msgstr "Receber"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 #, fuzzy
 msgid "Delegated"
 msgstr "Apagar"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr ""
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr ""
@@ -5522,63 +6015,63 @@ msgstr ""
 msgid "%m/%d/%Y"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Fora do escrit�rio"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Op��es"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Pessoas _Necess�rias"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Hora de �n_icio de encontro"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Hora de _fim de _encontro"
 
@@ -5597,16 +6090,21 @@ msgstr "Criar um novo calend�rio"
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Criar um novo calend�rio"
+
+#: calendar/gui/e-tasks.c:558
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Apagar um contacto"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "Cabe�alhos:"
@@ -5621,17 +6119,17 @@ msgstr "Novo compromisso"
 msgid "_Delete this Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Criar um novo calend�rio"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrir calend�rio"
@@ -5698,19 +6196,58 @@ msgstr "Outro"
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/itip-utils.c:356
+#, fuzzy
+msgid "Task information"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "Nenhuma Informa��o"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Lista de tarefas"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Ano"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Criar um novo calend�rio"
@@ -5902,12 +6439,47 @@ msgstr "M�s corrente (%a %Y)"
 msgid "Selected year (%Y)"
 msgstr "Ano corrente (%Y)"
 
+#: calendar/gui/print.c:2249
+#, fuzzy
+msgid "Task"
+msgstr "_Tarefa"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "S�b"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "Prioridade:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr ""
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: calendar/gui/print.c:2364
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr "�cone_s pequenos"
+
+#: calendar/gui/print.c:2375
+#, fuzzy
+msgid "Contacts: "
+msgstr "_Contacto"
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Imprimir calend�rio"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5941,8 +6513,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Enviar esta mensagem"
@@ -5997,6 +6569,11 @@ msgstr ""
 msgid "Imports vCalendar files into Evolution"
 msgstr ""
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Enviar"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -6087,8 +6664,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -7018,646 +7595,661 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Data"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Data"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr ""
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr ""
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr ""
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr ""
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Data"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 #, fuzzy
 msgid "Asia/Qatar"
 msgstr "Data"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr ""
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr ""
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr ""
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr ""
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr ""
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr ""
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr ""
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr ""
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr ""
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr ""
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr ""
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr ""
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr ""
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr ""
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr ""
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr ""
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr ""
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr ""
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr ""
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr ""
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr ""
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 #, fuzzy
 msgid "Europe/Athens"
 msgstr "Propriedades do alarme"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr ""
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr ""
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr ""
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr ""
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr ""
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr ""
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr ""
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr ""
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr ""
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr ""
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr ""
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr ""
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr ""
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr ""
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr ""
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr ""
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr ""
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr ""
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr ""
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 #, fuzzy
 msgid "Europe/Monaco"
 msgstr "Segunda-feira"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr ""
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr ""
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 #, fuzzy
 msgid "Europe/Paris"
 msgstr "Propriedades do alarme"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr ""
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr ""
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr ""
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr ""
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr ""
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr ""
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr ""
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr ""
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr ""
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr ""
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr ""
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 #, fuzzy
 msgid "Indian/Comoro"
 msgstr "Cores"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr ""
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 #, fuzzy
 msgid "Indian/Mauritius"
 msgstr "�cones _grandes"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 #, fuzzy
 msgid "Indian/Mayotte"
 msgstr "Segunda-feira"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 #, fuzzy
 msgid "Indian/Reunion"
 msgstr "Segundos"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr ""
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
@@ -7665,12 +8257,12 @@ msgstr ""
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7678,7 +8270,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7686,11 +8278,16 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Abrir ficheiro"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -7699,62 +8296,72 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "Sincronizar"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: camel/camel-filter-driver.c:911
-#, fuzzy
+#: camel/camel-filter-driver.c:908
+#, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 #, fuzzy
 msgid "Cannot open message"
 msgstr "Encontrar mensagens"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Sincronizar"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Anexar um ficheiro � mensagem"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Anexar um ficheiro � mensagem"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro a gravar os atalhos."
@@ -7782,26 +8389,102 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 #, fuzzy
 msgid "Moving messages"
 msgstr "Erro a gravar os atalhos."
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Encontrar mensagens"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr ""
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "(Nenhuma pasta mostrada)"
+
+#: camel/camel-gpg-context.c:827
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr ""
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Anexar um ficheiro � mensagem"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Anexar um ficheiro � mensagem"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Anexar um ficheiro � mensagem"
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Criar um novo calend�rio"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7897,81 +8580,23 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr ""
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr ""
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr ""
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1004
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "Criar um novo calend�rio"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Outro"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7987,44 +8612,6 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr ""
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-#, fuzzy
-msgid "Operation cancelled"
-msgstr "Abrir calend�rio"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr ""
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr ""
@@ -8119,7 +8706,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8146,12 +8733,9 @@ msgid ""
 "Password Authentication."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-#, fuzzy
-msgid "Password"
-msgstr "Esquecer _Senhas"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -8179,51 +8763,51 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Abrir ficheiro"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8285,12 +8869,12 @@ msgstr "Anexar um ficheiro � mensagem"
 msgid "Failed to verify certificates."
 msgstr ""
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "N�o consigo abrir a localiza��o: %s"
@@ -8314,7 +8898,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8323,16 +8907,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8347,15 +8931,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Criar um novo calend�rio"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Enviar a mensagem"
 
-#: camel/camel-vee-folder.c:753
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "Enviar a mensagem"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Verificar novo correio"
 
 #: camel/camel-vee-store.c:262
 #, fuzzy, c-format
@@ -8377,70 +8961,80 @@ msgstr "N�o consigo abrir a localiza��o: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "Abrir calend�rio"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Enviar uma nova mensagem"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Encontrar mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8496,32 +9090,81 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#, fuzzy
+msgid "Password"
+msgstr "Esquecer _Senhas"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Servidor:"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Criar um novo calend�rio"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+msgid "SSL/TLS extension not supported."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Autentica��o"
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentica��o"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8529,70 +9172,87 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Enviar a mensagem"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
-msgid "MH-format mail directories"
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s%s"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "N�o consigo abrir a localiza��o: %s"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s%s"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:49
+msgid "MH-format mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 #, fuzzy
 msgid "Local delivery"
 msgstr "_Pastas"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+msgid "Standard Unix mbox spool or directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8618,7 +9278,7 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
@@ -8638,55 +9298,52 @@ msgstr ""
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Enviar esta mensagem"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 #, fuzzy
 msgid "No such message"
 msgstr "Enviar a mensagem"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8695,13 +9352,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8715,7 +9372,7 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
@@ -8724,8 +9381,8 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Criar um novo calend�rio"
@@ -8746,60 +9403,50 @@ msgstr "Verificar novo correio"
 msgid "Checking for new messages"
 msgstr "Encontrar mensagens"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
 msgstr "Sincronizar"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Abrir calend�rio"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -8836,175 +9483,156 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, fuzzy, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
+#, c-format
+msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
-msgid "Error writing to temp mailbox: %s"
+msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
+msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
-#, c-format
-msgid "Could not close source folder %s: %s"
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
-msgid "Could not close temp folder: %s"
+msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Criar um novo calend�rio"
+
+#: camel/providers/local/camel-mbox-summary.c:973
 #, c-format
-msgid "Could not rename folder: %s"
+msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:990
 #, c-format
-msgid "Unknown error: %s"
+msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "Enviar mensagem em formato HTML"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr ""
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, fuzzy, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, fuzzy, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "N�o consigo abrir a localiza��o: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:115
+#: camel/providers/local/camel-spool-store.c:128
 #, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
+msgid "Spool `%s' is not a regular file or directory"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, fuzzy, c-format
-msgid "Could not file: %s: %s"
-msgstr "Criar um novo calend�rio"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Fontes de correio"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr ""
@@ -9013,12 +9641,22 @@ msgstr ""
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Criar um novo calend�rio"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9122,7 +9760,7 @@ msgstr "Gravar a mensagem na pasta especificada"
 msgid "Delete after %s day(s)"
 msgstr "Apagar este item"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr ""
 
@@ -9143,68 +9781,59 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-msgid "SSL/TLS extension not supported."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Autentica��o"
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sendmail"
 msgstr "Enviar"
@@ -9370,41 +9999,41 @@ msgstr "Autentica��o"
 msgid "Authentication required"
 msgstr "Autentica��o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "Autentica��o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9412,90 +10041,90 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 #, fuzzy
 msgid "Sending message"
 msgstr "Mensagens enviadas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentica��o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9503,35 +10132,35 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr ""
 
@@ -9607,14 +10236,14 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Pressione aqui para o livro de endere�os"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 #, fuzzy
 msgid "From:"
 msgstr "De"
@@ -9622,7 +10251,7 @@ msgstr "De"
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Responder"
@@ -9630,31 +10259,31 @@ msgstr "Responder"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Introduza os receptores da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entre os endere�os que ir�o receber uma c�pia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9667,105 +10296,136 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Anexar um ficheiro"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: composer/e-msg-composer.c:774
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 #, fuzzy
 msgid "Warning!"
 msgstr "Seg"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Enviar esta mensagem"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 #, fuzzy
 msgid "Insert File"
 msgstr "_Inserir"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Ficheiro com assinatura:"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr "Apagar"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Criar uma nova mensagem"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9837,7 +10497,7 @@ msgstr "Assunto"
 msgid "Subject does not contain"
 msgstr "Assunto"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9988,7 +10648,7 @@ msgstr "Hora"
 msgid "minute"
 msgstr "Minuto"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 #, fuzzy
 msgid "seconds"
 msgstr " segundos"
@@ -10057,7 +10717,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr ""
 
@@ -10069,6 +10729,21 @@ msgstr ""
 msgid "Filter Rules"
 msgstr ""
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Nome completo:"
+
+#: filter/filter-file.c:186
+#, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr ""
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Apagar um contacto"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 #, fuzzy
@@ -10087,7 +10762,7 @@ msgid ""
 msgstr ""
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 #, fuzzy
 msgid "Select Folder"
 msgstr "_Nova pasta"
@@ -10099,7 +10774,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr ""
 
@@ -10130,7 +10809,7 @@ msgid "if all criteria are met"
 msgstr ""
 
 #: filter/filter-rule.c:769
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr ""
 
 #: filter/filter-rule.c:780
@@ -10214,209 +10893,218 @@ msgstr "Tamanho"
 
 #: filter/libfilter-i18n.h:7
 #, fuzzy
+msgid "Command"
+msgstr "Empresa"
+
+#: filter/libfilter-i18n.h:8
+#, fuzzy
 msgid "contains"
 msgstr "_Ac��es"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "Ir para a _pasta..."
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Date received"
 msgstr "Receber"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 #, fuzzy
 msgid "Date sent"
 msgstr "Data"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 #, fuzzy
 msgid "Deleted"
 msgstr "Apagar"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 #, fuzzy
 msgid "does not sound like"
 msgstr "Ficheiro n�o encontrado"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Draft"
 msgstr "Data"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 #, fuzzy
 msgid "Execute Shell Command"
 msgstr "Sum�rio executivo"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Exist"
 msgstr "Pr�_ximo"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "Data"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "is before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+msgid "Label"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 #, fuzzy
 msgid "Message Body"
 msgstr "Situa��o das mensagens"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 #, fuzzy
 msgid "Message Header"
 msgstr "Situa��o das mensagens"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Move to Folder"
 msgstr "Ir para a _pasta..."
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Esquecer _Senhas"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Read"
 msgstr "Remover"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "Replied to"
 msgstr "Reponder para todos"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 #, fuzzy
 msgid "Score"
 msgstr "Fontes"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 #, fuzzy
 msgid "Sender"
 msgstr "Enviar"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 #, fuzzy
 msgid "Set Status"
 msgstr "Situa��o online"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Tamanho"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "Source Account"
 msgstr "�cone_s pequenos"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Assunto"
 
@@ -10477,7 +11165,8 @@ msgid "Scanning %s"
 msgstr "Sincronizar"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 #, fuzzy
 msgid "Mail"
 msgstr "_Correio"
@@ -10492,11 +11181,6 @@ msgstr ""
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-#, fuzzy
-msgid "Addressbook"
-msgstr "Imposs�vel abrir o livro de endere�os"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10544,7 +11228,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Trash"
 msgstr "_Tarefa"
@@ -10688,287 +11374,297 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "_Pastas"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "_Pastas"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 #, fuzzy
 msgid "This folder cannot contain messages."
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 #, fuzzy
 msgid "Properties..."
 msgstr "Propriedades do alarme"
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Propriedades"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Enviar esta mensagem"
+
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mensagem de _correio"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 #, fuzzy
 msgid "_Mail Message"
 msgstr "Mensagem de _correio"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ano"
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriedades do alarme"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 #, fuzzy
 msgid "Properties"
 msgstr "Propriedades do alarme"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Apagar"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr " segundos"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Assunto"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Situa��o das mensagens"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Encontrar mensagens"
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 #, fuzzy
 msgid "_Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Cores"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Carro"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Apagar"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:1645
-msgid "Label"
-msgstr ""
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Dru�da dos _filtros"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "Apagar"
+
+#: mail/folder-info.c:71
 #, fuzzy
 msgid "Getting Folder Information"
 msgstr "Nenhuma Informa��o"
@@ -11026,7 +11722,7 @@ msgstr "Correio novo"
 msgid "mh"
 msgstr "h"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
@@ -11037,87 +11733,111 @@ msgid "Evolution News Editor"
 msgstr "Atalho para _barra do Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Atalho para _barra do Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Host:"
 msgstr "Horas"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Utilizador:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Path:"
 msgstr "Caminho"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Novo Ca_lend�rio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 #, fuzzy
 msgid "Don't delete"
 msgstr "Apagar"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 #, fuzzy
 msgid "Disable"
 msgstr "Como _Tabela"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "�cone_s pequenos"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Fontes de correio"
+
+#: mail/mail-autofilter.c:223
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "Assunto"
+
+#: mail/mail-autofilter.c:239
+#, fuzzy, c-format
+msgid "Mail from %s"
+msgstr "Fontes de correio"
+
+#: mail/mail-autofilter.c:295
+#, fuzzy, c-format
+msgid "%s mailing list"
+msgstr "Erro a gravar os atalhos."
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11125,135 +11845,135 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Enviar"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Criar uma nova mensagem"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Situa��o das mensagens"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11261,41 +11981,76 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 #, fuzzy
 msgid "Filters"
 msgstr "_Pasta"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 #, fuzzy
 msgid "Print Message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Nenhuma descri��o"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "_Novo Contacto"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Seg"
+
+#: mail/mail-composer-prefs.c:861
+msgid "Add script signature"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Ficheiro com assinatura:"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11333,190 +12088,176 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Atalho para _barra do Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Seg"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Para:"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "Data"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "�cone_s pequenos"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "_Novo Contacto"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 msgid " "
 msgstr ""
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "Editar..."
+msgid " _Check for supported types "
+msgstr ""
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Novo"
+msgid "(SSL is not supported in this build of Evolution)"
+msgstr ""
 
 #: mail/mail-config.glade.h:4
-msgid " _Check for supported types "
+msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of Evolution)"
+msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:6
-msgid "(SSL is not supported in this build of evolution)"
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
 msgstr ""
 
 #: mail/mail-config.glade.h:7
-msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Account Editor"
 msgstr "�cone_s pequenos"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Account Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "Nenhuma descri��o"
+
 #: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Encontrar avan�ado"
+msgid "Add new signature..."
+msgstr "Ficheiro com assinatura:"
 
 #: mail/mail-config.glade.h:12
-msgid "Afrikaans"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-#, fuzzy
-msgid "Alerts"
-msgstr "Alarmes"
-
-#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Authentication"
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Verificar novo correio"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "Cores"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "Verificar novo correio"
 
 #: mail/mail-config.glade.h:29
+msgid "Color for _misspelled words:"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Criar uma nova mensagem"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Configuration"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11526,57 +12267,48 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
-msgid "Dari"
-msgstr ""
-
 #: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "De_fault"
 msgstr "Apagar"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Apagar"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Default character _encoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Done"
 msgstr "Nenhuma"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Criar um novo calend�rio"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
-#, fuzzy
-msgid "E_nable advanced options"
-msgstr "Encontrar avan�ado"
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11596,35 +12328,31 @@ msgstr "Endere�o de correio:"
 msgid "Empty _trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Sum�rio executivo"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Fi_xed -width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propriedades do alarme"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-config.glade.h:57
-msgid "Get Digital ID..."
-msgstr ""
-
 #: mail/mail-config.glade.h:58
-msgid "Highlight _quotations with"
+msgid "Get Digital ID..."
 msgstr ""
 
 #: mail/mail-config.glade.h:59
-msgid "Hulu"
+msgid "Highlight _quotations with"
 msgstr ""
 
 #: mail/mail-config.glade.h:60
@@ -11682,69 +12410,65 @@ msgstr ""
 msgid "NNTP Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Optional Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organiza��o:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimir contactos"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Quoted"
 msgstr "Nenhuma"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
@@ -11779,267 +12503,263 @@ msgid "S_ecurity"
 msgstr ""
 
 #: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "_Items seleccionados"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Ficheiro com assinatura:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Ficheiro com assinatura:"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Mudar nome de atalho"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Source"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Source Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome completo:"
 
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
+msgstr ""
+
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
 #: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+msgid "Standard Unix mbox"
 msgstr ""
 
 #: mail/mail-config.glade.h:126
-msgid "Standard Unix mbox"
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "Ficheiro com assinatura:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Colar"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Verificar novo correio"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "Verificar novo correio"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Apagar"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Nome completo:"
+msgid "_Enable"
+msgstr "Bip"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nome completo:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:160
-#, fuzzy
-msgid "_HTML Signature:"
-msgstr "Ficheiro com assinatura:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Bip"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Situa��o das mensagens"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Name:"
 msgstr "Nome"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Anular"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -12079,78 +12799,57 @@ msgid "_Signatures"
 msgstr "Ficheiro com assinatura:"
 
 #: mail/mail-config.glade.h:183
-#, fuzzy
-msgid "_Text Signature:"
-msgstr "Ficheiro com assinatura:"
-
-#: mail/mail-config.glade.h:184
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 #, fuzzy
 msgid "_every"
 msgstr "Remover"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr "Cores"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 #, fuzzy
 msgid "description"
 msgstr "Nenhuma descri��o"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-crypto.c:59
-#, fuzzy
-msgid "Could not create a PGP signature context."
-msgstr "N�o se consegui inicializar Bonobo"
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
 #, fuzzy
-msgid "Could not create a PGP verification context."
-msgstr "N�o se consegui inicializar Bonobo"
-
-#: mail/mail-crypto.c:113
-#, fuzzy
-msgid "Could not create a PGP encryption context."
-msgstr "N�o se consegui inicializar Bonobo"
-
-#: mail/mail-crypto.c:138
-#, fuzzy
-msgid "Could not create a PGP decryption context."
-msgstr "N�o se consegui inicializar Bonobo"
-
-#: mail/mail-crypto.c:173
-#, fuzzy
 msgid "Could not create a S/MIME signature context."
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 #, fuzzy
 msgid "Could not create a S/MIME certsonly context."
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 #, fuzzy
 msgid "Could not create a S/MIME encryption context."
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
 msgstr "N�o se consegui inicializar Bonobo"
@@ -12196,146 +12895,178 @@ msgstr ""
 msgid "Loading message content"
 msgstr "Mensagens enviadas"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+msgid "Overdue:"
+msgstr ""
+
+#: mail/mail-display.c:1833
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "�brir em nova janela"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Gravar na _pasta..."
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Gravar como VCard"
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Adicionar anexo"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 #, fuzzy
 msgid "Bad Address"
 msgstr "Endere�o"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 #, fuzzy
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 #, fuzzy
 msgid "Reply-To"
 msgstr "Responder"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 #, fuzzy
 msgid "To"
 msgstr "Para:"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "_Correio"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Encontrar mensagens"
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "_Pastas"
+
+#: mail/mail-local.c:670
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Nova pasta"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "_Nova pasta"
@@ -12393,132 +13124,122 @@ msgstr "Enviar esta mensagem"
 msgid "Complete."
 msgstr "Cores"
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Erro a gravar os atalhos."
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:944
-#, fuzzy
-msgid "Moving"
-msgstr "Seg"
-
-#: mail/mail-ops.c:947
-#, fuzzy
-msgid "Copying"
-msgstr "Copiar"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Nova pasta"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Erro a gravar os atalhos."
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Anexo"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Criar um novo calend�rio"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 #, fuzzy
 msgid "_Search"
 msgstr "Ano"
@@ -12599,10 +13320,6 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr ""
-
 #: mail/mail-session.c:222
 #, fuzzy
 msgid "User canceled operation."
@@ -12618,26 +13335,47 @@ msgstr ""
 msgid "Enter Password"
 msgstr "Esquecer _Senhas"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 #, fuzzy
 msgid "Save signature"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#, fuzzy
+msgid "Name:"
+msgstr "Nome"
+
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
 #, fuzzy
-msgid "Signature name:"
+msgid "Hide signature hint"
 msgstr "Ficheiro com assinatura:"
 
 #: mail/mail-tools.c:257
@@ -12655,17 +13393,17 @@ msgstr "Enviar esta mensagem"
 msgid "Forwarded Message"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12674,98 +13412,104 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+#, fuzzy
+msgid "VFolders"
+msgstr "_Pastas"
+
+#: mail/mail-vfolder.c:784
 #, fuzzy
 msgid "vFolders"
 msgstr "_Pastas"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "_Pastas"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 #, fuzzy
 msgid "New VFolder"
 msgstr "_Nova pasta"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 #, fuzzy
 msgid "(No subject)"
 msgstr "Assunto"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "Mensagem de _correio"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 #, fuzzy
 msgid "Seen"
 msgstr "Enviar"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Criar uma nova mensagem"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Encontrar mensagens"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 #, fuzzy
 msgid "Higher"
 msgstr "Cabe�alhos:"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 #, fuzzy
 msgid "Highest"
 msgstr "Cabe�alhos:"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 #, fuzzy
 msgid "Generating message list"
 msgstr "Encontrar mensagens"
@@ -12789,10 +13533,15 @@ msgstr ""
 
 #: mail/message-list.etspec.h:8
 #, fuzzy
+msgid "Original Location"
+msgstr "_Novo Contacto"
+
+#: mail/message-list.etspec.h:9
+#, fuzzy
 msgid "Received"
 msgstr "Receber"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 #, fuzzy
 msgid "Size"
 msgstr "Tamanho"
@@ -17836,5658 +18585,5653 @@ msgstr ""
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "Bip"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr ""
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "�cones _grandes"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "Remover"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "Novo"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr ""
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr ""
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Liberal"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Libya"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "Cabe�alhos:"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Lihue"
 msgstr "Minuto"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr ""
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr ""
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "M�s"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr ""
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 #, fuzzy
 msgid "Lisboa"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "Pr�_ximo"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "Hoje"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "Copiar"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "London"
 msgstr "Anular"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "Horas"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 #, fuzzy
 msgid "Los Alamos"
 msgstr "Alarmes"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr ""
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr ""
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "Nenhuma descri��o"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr ""
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr ""
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macapa"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "Novo Ca_lend�rio"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "Bip"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "Mensagem de _correio"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manchester"
 msgstr "Caminho"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "Colar"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "�cones _grandes"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "�cones _grandes"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "�cones _grandes"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 #, fuzzy
 msgid "Marquette"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr ""
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "�cones _grandes"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "�cones _grandes"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "Cores"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mattoon"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Bip"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 #, fuzzy
 msgid "Mazu"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "Copiar"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "Hora"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 #, fuzzy
 msgid "Mehamn"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "Sex"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 #, fuzzy
 msgid "Miami"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middle East"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "Nome completo:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 #, fuzzy
 msgid "Milford"
 msgstr "Hora"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "atalhos principais"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 #, fuzzy
 msgid "Minnesota"
 msgstr "Minutos"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "Minutos"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr ""
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitchell"
 msgstr "Caminho"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 #, fuzzy
 msgid "Miyazaki Airport"
 msgstr "Transporte de correio"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "Sg"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "Telem�vel"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "Telem�vel"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "Sg"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "Telem�vel"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Moldova"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 #, fuzzy
 msgid "Molokai"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "Bip"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montana"
 msgstr "_Ac��es"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "M�s"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "M�s"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "M�s"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "M�s"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr ""
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organiza��o"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "Prim�rio"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "Telem�vel"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "M�s"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "M�s"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 #, fuzzy
 msgid "Mullan"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "Ocupado"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "M�s"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "Seg"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "Responder"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Napoli"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "Hoje"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natchez"
 msgstr "Caminho"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 #, fuzzy
 msgid "Nebraska"
 msgstr "_Tarefa"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "Novo Ca_lend�rio"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Nevada"
 msgstr "Novo Ca_lend�rio"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "_Tarefa"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bedford"
 msgstr "Servidor:"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "_Nova pasta"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "Newcastle"
 msgstr "Novo"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr ""
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr ""
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "_Contacto"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Iberia"
 msgstr "_Contacto"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "Mensagem de _correio"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr ""
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "Reponder para todos"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "Hora"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "_Nova pasta"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "Novo"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "New York"
 msgstr "_Nova pasta"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "Nenhuma descri��o"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "F_ormato"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "F_ormato"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norrkoping"
 msgstr "Seg"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Adams"
 msgstr "_Nota"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "Hora"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "Novo"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "_Nota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "_Nota"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "Novo"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "_Nota"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "Hora"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "Novo"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "Nenhuma"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "_Come�ando"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "_Abrir"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "_Abrir"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "_Abrir"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "Outro"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "Outro"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "Ok"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 #, fuzzy
 msgid "Omsk"
 msgstr "Ok"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "Organiza��o"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr ""
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "Organiza��o:"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 #, fuzzy
 msgid "Oregon"
 msgstr "Segundos"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orlando"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr " segundos"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "Semana"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 #, fuzzy
 msgid "Oxford"
 msgstr "Hora"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "Bip"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "Bip"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "Bip"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "Configura��o do co_rreio..."
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 #, fuzzy
 msgid "Pamplona"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama City"
 msgstr "Novo Ca_lend�rio"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr ""
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "Bip"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 #, fuzzy
 msgid "Paris"
 msgstr "Prim�rio"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "Prioridade"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "Esquecer _Senhas"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "Novo Ca_lend�rio"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "Esquecer _Senhas"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "Esquecer _Senhas"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "Nenhuma descri��o"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "Remover"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "Segundos"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "Prim�rio"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "Prim�rio"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "Bip"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "Bip"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "Bip"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "Prever impress�o"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 #, fuzzy
 msgid "Pine Bluff"
 msgstr "Endere�o principal de correio electr�nico"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 #, fuzzy
 msgid "Pisa"
 msgstr "Colar"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 #, fuzzy
 msgid "Plymouth"
 msgstr "M�s"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 #, fuzzy
 msgid "Pocos De Caldas"
 msgstr "_Fechar Calend�rio"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "Imprimir..."
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "Sum�rio"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Encontrar mensagens"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "Propriedades do alarme"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponce"
 msgstr "Nenhuma"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "_Contacto"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Imprimir calend�rio"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "Imprimir..."
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "Prever impress�o"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Imprimir calend�rio"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Portland"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto"
 msgstr "Prioridade:"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "Propriedades do alarme"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "Prioridade"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Prioridade"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "Prioridade"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poznan"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Praha"
 msgstr "_Tarefa"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Prever impress�o"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Pretoria"
 msgstr "Prioridade"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "Prever impress�o"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "_Op��es"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Providence"
 msgstr "Prever impress�o"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "Prever impress�o"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "An_terior"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr ""
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "Nenhuma descri��o"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "Sum�rio"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pula"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Imprimir calend�rio"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "Nenhuma descri��o"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quebec"
 msgstr "Assunto"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 #, fuzzy
 msgid "Rapid City"
 msgstr "Reponder para todos"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Reading"
 msgstr "Cabe�alhos:"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Recife"
 msgstr "Receber"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redding"
 msgstr "Cabe�alhos:"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "Remover"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redmond"
 msgstr "Remover"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "Segundos"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Rennes"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Reno"
 msgstr "Remover"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "Segundos"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "Adicionar Fonte"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reynosa"
 msgstr "Remover"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 #, fuzzy
 msgid "Riberalta"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "Telem�vel"
 
-#: my-evolution/Locations.h:1881
-#, fuzzy
-msgid "Riga"
-msgstr "Cabe�alhos:"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rijeka"
 msgstr "Remover"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Imprimir"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 #, fuzzy
 msgid "Riyadh"
 msgstr "Remover"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 #, fuzzy
 msgid "Robore"
 msgstr "Telem�vel"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rodos"
 msgstr "Remover"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Rogers"
 msgstr "_Pastas"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "Cores"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Roseglen"
 msgstr "Telem�vel"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "Horas"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "Apagar todas as ocurr�ncias"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr ""
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 #, fuzzy
 msgid "Rutland"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 #, fuzzy
 msgid "Sacramento"
 msgstr "Data"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 #, fuzzy
 msgid "Saginaw"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "Imprimir calend�rio"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salem"
 msgstr "S�"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "F_ormato"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "F_ormato"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "F_ormato"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salmon"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salta"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "S�b"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samos"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "Dom"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 #, fuzzy
 msgid "Sana'A"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "San Carlos"
 msgstr "Guardar Calend�rio como"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sandberg"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sanderson"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sanford"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "Cabe�alhos:"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "Guardar Calend�rio como"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Juan"
 msgstr "Dom"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "F_ormato"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santarem"
 msgstr "Data"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "S�b"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 #, fuzzy
 msgid "Sarasota"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "Dom"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "S�b"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "Organiza��o"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "Segundos"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "F_ormato"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "Cabe�alhos:"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "Domingo"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "Domingo"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Shearwater"
 msgstr "Hora de �n_icio de encontro"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "Segundos"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Sheridan"
 msgstr "Dom"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "Tamanho"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Shoreham"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "Mostrar 1 semana"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 #, fuzzy
 msgid "Sidney"
 msgstr "Imprimir"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr ""
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "Tamanho"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skopje"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "Minutos"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Sochi"
 msgstr "Hora"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socorro"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Socotra"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sofia"
 msgstr "F_ormato"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Somerset"
 msgstr "Horas"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "Southampton"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "Hora"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 #, fuzzy
 msgid "South Carolina"
 msgstr "Sobre o calend�rio"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "South Dakota"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "Hora"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "Pr�_ximo"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "Sincronizar"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "Segundos"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "Segundos"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 #, fuzzy
 msgid "St. George"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 #, fuzzy
 msgid "St Louis"
 msgstr "Cabe�alhos:"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "Novo"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "St Paul"
 msgstr "S�b"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 #, fuzzy
 msgid "Strevell"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "Domingo"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "Sum�rio"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 #, fuzzy
 msgid "Sutton"
 msgstr "Dom"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "_Op��es"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "_Tarefa"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 #, fuzzy
 msgid "Taejon"
 msgstr "Qi"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr ""
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Tainan"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr "Lista de tarefas"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "_Correio"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "_Correio"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 #, fuzzy
 msgid "Tampa"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "Bip"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "Novo Ca_lend�rio"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "_Tarefa"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "_Tarefa"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "_Op��es"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "Texas"
 msgstr "_Tarefa"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "_Pasta"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "Hoje"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "Semana"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "_Pasta"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "Imprimir"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 #, fuzzy
 msgid "Toledo"
 msgstr "Para:"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "Hoje"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Topeka"
 msgstr "Para:"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "Para:"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torrance"
 msgstr "Apagar todas as ocurr�ncias"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr ""
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Toulouse"
 msgstr "Cores"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 #, fuzzy
 msgid "Trapani"
 msgstr "Transportes"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "Organiza��o"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "An_terior"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 #, fuzzy
 msgid "Trieste"
 msgstr "_Pasta"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "Ter"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "Hoje"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "Hoje"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "Ter"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr ""
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turku"
 msgstr "Ter"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 #, fuzzy
 msgid "Twenthe"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "Ano"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "Ter"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "Encontrar mensagens"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Novo Ca_lend�rio"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 #, fuzzy
 msgid "Utah"
 msgstr "h"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr ""
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Cores"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vagar"
 msgstr "Bip"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "_Correio"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valencia"
 msgstr "Novo Ca_lend�rio"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 #, fuzzy
 msgid "Van"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr ""
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "Data"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vermont"
 msgstr "M�s"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "Nome completo:"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 #, fuzzy
 msgid "Villahermosa"
 msgstr "Alarmes"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "Alarmes"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volkel"
 msgstr "Telem�vel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 #, fuzzy
 msgid "Waco"
 msgstr "Segunda-feira"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "Seg"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "Outro"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Waterloo"
 msgstr "Outro"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "Outro"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "Qa"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Outro"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 #, fuzzy
 msgid "Wendover"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "Reponder para todos"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westfield"
 msgstr "Qa"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 #, fuzzy
 msgid "Wien"
 msgstr "Qa"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 #, fuzzy
 msgid "Williamsport"
 msgstr "Transporte de correio"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 #, fuzzy
 msgid "Williston"
 msgstr "Pr�_ximo"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 #, fuzzy
 msgid "Winter Park"
 msgstr "Esquecer _Senhas"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 #, fuzzy
 msgid "Wisconsin"
 msgstr " segundos"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "Qa"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "_Pastas"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "Fontes"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "Encontrar"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "Seg"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "Seg"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 #, fuzzy
 msgid "Xiamen"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 #, fuzzy
 msgid "Yenbo"
 msgstr "Enviar"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zadar"
 msgstr "Novo Ca_lend�rio"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 #, fuzzy
 msgid "Zagreb"
 msgstr "Bip"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr ""
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr ""
 
@@ -23518,19 +24262,13 @@ msgstr ""
 msgid "No description"
 msgstr "Nenhuma descri��o"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 #, fuzzy
 msgid "Mail summary"
 msgstr "Nenhum sum�rio"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-#, fuzzy
-msgid "VFolders"
-msgstr "_Pastas"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 #, fuzzy
 msgid "Local Folders"
 msgstr "_Pastas"
@@ -23540,60 +24278,49 @@ msgstr "_Pastas"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Adicionar novo grupo"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:732
-#, fuzzy
-msgid "Name:"
-msgstr "Nome"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "Erro a gravar os atalhos."
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 #, fuzzy
 msgid "News Feed"
 msgstr "Servidor:"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
+msgid "Add"
 msgstr "Adicionar"
 
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "Remover"
-
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Horas"
@@ -23638,11 +24365,47 @@ msgstr "Sum�rio"
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Component de correio: N�o consegui inicializar Bonobo"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr ""
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "M�s"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Seg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "_Pasta"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "_Pasta"
+
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -24817,104 +25580,110 @@ msgid "C_elsius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Adicionar novo grupo"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "One mont_h"
 msgstr "M�s"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "One w_eek"
 msgstr "Semana"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "Novas mensagens de correio"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "Show _all tasks"
 msgstr "Ver _anexos"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "Ver _anexos"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 #, fuzzy
 msgid "Tasks "
 msgstr "_Tarefa"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "_Five days"
 msgstr "Sex"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Correio"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "_News Feeds"
 msgstr "Servidor:"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 #, fuzzy
 msgid "_One day"
 msgstr "Segunda-feira"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 #, fuzzy
 msgid "_Schedule"
 msgstr "Fontes"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 #, fuzzy
 msgid "_Weather"
 msgstr "Outro"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "_Pastas"
+msgid "Folder Settings"
+msgstr "Segundos"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 #, fuzzy
@@ -24922,7 +25691,7 @@ msgid "The Evolution shell."
 msgstr "Evolution - %s"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -24934,6 +25703,39 @@ msgstr "Ver _anexos"
 msgid "Cancel Operation"
 msgstr ""
 
+#: shell/e-folder-dnd-bridge.c:52
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "_Nova pasta"
+
+#: shell/e-local-storage.c:174
+#, fuzzy
+msgid "Drafts"
+msgstr "Data"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+#, fuzzy
+msgid "Inbox"
+msgstr "Correio novo"
+
+#: shell/e-local-storage.c:176
+#, fuzzy
+msgid "Outbox"
+msgstr "Correio novo"
+
+#: shell/e-local-storage.c:177
+#, fuzzy
+msgid "Sent"
+msgstr "Enviar"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instala��o do Evolution"
@@ -25023,6 +25825,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Ir para a _pasta..."
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "_Pastas"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "_Pastas"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "_Pastas"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Ir para a _pasta..."
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -25050,57 +25877,56 @@ msgstr ""
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 #, fuzzy
 msgid "Copy folder"
 msgstr "Ir para a _pasta..."
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 #, fuzzy
 msgid "Move folder"
 msgstr "Ir para a _pasta..."
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "Apagar"
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr ""
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr "_Nova pasta"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Abrir ficheiro"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Abrir ficheiro"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -25118,13 +25944,13 @@ msgstr "Gravar a mensagem na pasta especificada"
 msgid "Evolution - Create new folder"
 msgstr "O Evolution n�o consegue criar as suas pastas locais"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 #, fuzzy
 msgid "New..."
 msgstr "Novo"
@@ -25167,117 +25993,165 @@ msgid ""
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "_Nova pasta"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 #, fuzzy
 msgid "Importing"
 msgstr "Seg"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 #, fuzzy
 msgid "Filename:"
 msgstr "Nome completo:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 #, fuzzy
 msgid "Select a file"
 msgstr "Ficheiro com assinatura:"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 #, fuzzy
 msgid "File type:"
 msgstr "Nome completo:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 #, fuzzy
 msgid "Import a single file"
 msgstr "Seg"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 #, fuzzy
 msgid "Select folder"
 msgstr "_Nova pasta"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr ""
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr "Erro a gravar os atalhos."
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Sincronizar"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "Sincronizar"
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Instala��o do Evolution"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Abrir ficheiro"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Abrir ficheiro"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Segundos"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr "Gravar a mensagem na pasta especificada"
+
 #: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
@@ -25290,8 +26164,8 @@ msgstr "N�o consigo inicializar o componente de mail do Evolution."
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Novo"
@@ -25314,47 +26188,47 @@ msgstr "Uma pasta contendo items de correio"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "O Bug buddy n�o foi encontrado no seu $PATH."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "N�o consegui correr o Bub buddy"
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Ir para a _pasta..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 #, fuzzy
 msgid "_Work Online"
 msgstr "Seg"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Seg"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 #, fuzzy
 msgid "Work Offline"
 msgstr "Seg"
@@ -25387,7 +26261,7 @@ msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25395,12 +26269,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25408,24 +26282,20 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr ""
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configura��o do correio"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr ""
 
@@ -25450,113 +26320,113 @@ msgstr ""
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 #, fuzzy
 msgid "_Small Icons"
 msgstr "�cone_s pequenos"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 #, fuzzy
 msgid "_Large Icons"
 msgstr "�cones _grandes"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar atalhos co �cones grandes"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 #, fuzzy
 msgid "_New Group..."
 msgstr "Novo grupo"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Remover grupo"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Remover grupo"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostrar barra de atalho_s"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "�brir em nova janela"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 #, fuzzy
 msgid "_Rename"
 msgstr "Nome completo:"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 #, fuzzy
 msgid "Re_move"
 msgstr "Remover"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remover este atalho da barra de atalhos"
 
@@ -25569,11 +26439,6 @@ msgstr "Erro a gravar os atalhos."
 msgid "Shortcuts"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts.c:1033
-#, fuzzy
-msgid "Inbox"
-msgstr "Correio novo"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -25637,10 +26502,11 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr ""
 
@@ -25670,77 +26536,77 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 #, fuzzy
 msgid "CORBA error"
 msgstr "Outro"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 #, fuzzy
 msgid "No owner"
 msgstr "Nenhuma"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 #, fuzzy
 msgid "Not found"
 msgstr "Ficheiro n�o encontrado"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Transporte de correio"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Nenhuma Informa��o"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 #, fuzzy
 msgid "Internal error"
 msgstr "Outro"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 #, fuzzy
 msgid "Exists"
 msgstr "Pr�_ximo"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Novo Ca_lend�rio"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Enviar a mensagem"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 #, fuzzy
 msgid "No space left"
 msgstr "Situa��o das mensagens"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Nome completo:"
@@ -25870,51 +26736,83 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolution"
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Evolution - %s"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Enviar esta mensagem"
+
+#: shell/main.c:347
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Enviar uma nova mensagem"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Enviar uma nova mensagem"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Falhou a inicializa��o do sistema de componentes Bonobo."
 
@@ -26046,11 +26944,11 @@ msgstr "Ficheiro com assinatura:"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Ac��es"
 
@@ -26193,8 +27091,8 @@ msgstr "Apagar este item"
 msgid "Delete this item"
 msgstr "Apagar este item"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr ""
 
@@ -26237,7 +27135,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 #, fuzzy
 msgid "_File"
 msgstr "_Pasta"
@@ -26312,19 +27210,19 @@ msgstr "Imprimir calend�rio"
 msgid "Forward this item via email"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr ""
 
@@ -26333,10 +27231,6 @@ msgstr ""
 msgid "Customise My Evolution"
 msgstr "Evolution - %s"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr ""
-
 #: ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
@@ -26511,7 +27405,7 @@ msgstr "Enviar esta mensagem"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Pasta"
 
@@ -26966,7 +27860,7 @@ msgstr "Encontrar mensagens"
 msgid "_Quoted"
 msgstr "Nenhuma"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Ferramentas"
 
@@ -26983,13 +27877,13 @@ msgstr "Novo compromisso"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Close"
 msgstr "Cores"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 #, fuzzy
 msgid "_View"
 msgstr "_Novo"
@@ -27205,7 +28099,7 @@ msgstr "_Abrir"
 msgid "_Reply-To Field"
 msgstr "Responder"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 #, fuzzy
 msgid "_Help"
 msgstr "Casa"
@@ -27373,126 +28267,135 @@ msgstr "Ir para a _pasta..."
 
 #: ui/evolution.xml.h:18
 #, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Criar um novo calend�rio"
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
+#, fuzzy
 msgid "Open in New Window"
 msgstr "�brir em nova janela"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 #, fuzzy
 msgid "Send / Receive"
 msgstr "Receber"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostrar a barra de pastas"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "View the selected folder"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Copy..."
 msgstr "Copiar"
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Pasta"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Import..."
 msgstr "Seg"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 #, fuzzy
 msgid "_Move..."
 msgstr "Sg"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_New Folder"
 msgstr "_Nova pasta"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "Configura��o do co_rreio..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Abrir"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Send / Receive"
 msgstr "Receber"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Shortcut"
 msgstr "Mudar nome de atalho"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Mostrar a barra de atalhos"
@@ -27586,22 +28489,22 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 #, fuzzy
 msgid "_Current View"
 msgstr "Ano corrente (%Y)"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "Ano corrente (%Y)"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr ""
 
@@ -27729,16 +28632,21 @@ msgstr "_Contacto"
 msgid "Save Search"
 msgstr "Ano"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Ano"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Ano"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Adicionar..."
+
 #: widgets/misc/e-messagebox.c:152
 #, fuzzy
 msgid "Information"
@@ -27764,22 +28672,22 @@ msgstr "Mensagem de _correio"
 msgid "Don't show this message again."
 msgstr "Enviar esta mensagem"
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Encontrar"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Carro"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 #, fuzzy
 msgid "Clear"
 msgstr "Carro"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 #, fuzzy
 msgid "Find Now"
 msgstr "Encontrar"
@@ -27811,236 +28719,216 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "N�o se consegui inicializar Bonobo"
 
 #, fuzzy
-#~ msgid "Card: "
-#~ msgstr "Carro"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Name: "
-#~ msgstr "Nome"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Address:"
-#~ msgstr "Endere�o"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "E-mail:\n"
-#~ msgstr "Correio electr�nico 2"
+#~ msgid "Addressbook Settings"
+#~ msgstr "Adicionar Fonte"
 
 #, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "E-mail:"
-#~ msgstr "Correio electr�nico 2"
-
-#, fuzzy
-#~ msgid "New _Contact"
-#~ msgstr "_Contacto"
-
-#, fuzzy
-#~ msgid "New Contact _List"
-#~ msgstr "_Contacto"
+#~ msgid "Configuration control for the Evolution Addressbook."
+#~ msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
 #, fuzzy
-#~ msgid "Edit Addressbook"
-#~ msgstr "Imposs�vel abrir o livro de endere�os"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
 #, fuzzy
-#~ msgid "Account Name"
-#~ msgstr "�cone_s pequenos"
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
 #, fuzzy
-#~ msgid "Add Addressbook"
-#~ msgstr "Imposs�vel abrir o livro de endere�os"
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Hora de �n_icio de encontro"
 
 #, fuzzy
-#~ msgid "Server Name"
-#~ msgstr "_Items seleccionados"
+#~ msgid "_End of day:"
+#~ msgstr "Hora de �n_icio de encontro"
 
 #, fuzzy
-#~ msgid "Other Contacts"
-#~ msgstr "_Novo Contacto"
+#~ msgid "before the start of the appointment"
+#~ msgstr "Novo compromisso"
 
 #, fuzzy
-#~ msgid "(none)"
-#~ msgstr "Nome"
+#~ msgid "No such message: %s"
+#~ msgstr "Enviar a mensagem"
 
 #, fuzzy
-#~ msgid "Co_ntacts:"
-#~ msgstr "_Contacto"
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "N�o consigo abrir a localiza��o: %s"
 
 #, fuzzy
-#~ msgid "_Message Recipients:"
-#~ msgstr "Situa��o das mensagens"
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Criar um novo calend�rio"
 
 #, fuzzy
-#~ msgid "_Home"
-#~ msgstr "Casa"
+#~ msgid "Random"
+#~ msgstr "Novo Ca_lend�rio"
 
 #, fuzzy
-#~ msgid "_Mobile"
-#~ msgstr "Telem�vel"
+#~ msgid " Edit "
+#~ msgstr "Editar..."
 
 #, fuzzy
-#~ msgid "Create a new appointment"
-#~ msgstr "Criar um novo compromisso para hoje"
+#~ msgid " New "
+#~ msgstr "Novo"
 
 #, fuzzy
-#~ msgid "Create a new task"
-#~ msgstr "Criar um novo contacto"
+#~ msgid "Advanced Options"
+#~ msgstr "Encontrar avan�ado"
 
 #, fuzzy
-#~ msgid "New _Task"
-#~ msgstr "_Tarefa"
+#~ msgid "E_nable advanced options"
+#~ msgstr "Encontrar avan�ado"
 
 #, fuzzy
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Criar um novo compromisso para hoje"
+#~ msgid "Select a signature file"
+#~ msgstr "Ficheiro com assinatura:"
 
 #, fuzzy
-#~ msgid "_Other"
-#~ msgstr "Outro"
+#~ msgid "Select a signature script"
+#~ msgstr "Ficheiro com assinatura:"
 
 #, fuzzy
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Pressione aqui para o livro de endere�os"
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "Ficheiro com assinatura:"
 
 #, fuzzy
-#~ msgid "_Delete this Task"
-#~ msgstr "Apagar este item"
+#~ msgid "_Filename:"
+#~ msgstr "Nome completo:"
 
 #, fuzzy
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Nenhuma Informa��o"
+#~ msgid "_HTML Signature:"
+#~ msgstr "Ficheiro com assinatura:"
 
 #, fuzzy
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Hora de _fim de _encontro"
+#~ msgid "_Language:"
+#~ msgstr "Bip"
 
 #, fuzzy
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Nenhuma Informa��o"
+#~ msgid "_Random"
+#~ msgstr "Anular"
 
 #, fuzzy
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Cores"
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "N�o se consegui inicializar Bonobo"
 
 #, fuzzy
-#~ msgid "iCalendar Information"
-#~ msgstr "Nenhuma Informa��o"
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "N�o se consegui inicializar Bonobo"
 
 #, fuzzy
-#~ msgid "iCalendar Error"
-#~ msgstr "Novo Ca_lend�rio"
+#~ msgid "Moving"
+#~ msgstr "Seg"
 
 #, fuzzy
-#~ msgid "Choose an action:"
-#~ msgstr "Apagar um contacto"
+#~ msgid "Copying"
+#~ msgstr "Copiar"
 
 #, fuzzy
-#~ msgid "Update"
-#~ msgstr "Lista de tarefas"
+#~ msgid "Signature name:"
+#~ msgstr "Ficheiro com assinatura:"
 
 #, fuzzy
-#~ msgid "Accept"
-#~ msgstr "�cone_s pequenos"
+#~ msgid "Riga"
+#~ msgstr "Cabe�alhos:"
 
 #, fuzzy
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Nenhuma Informa��o"
+#~ msgid "Add ->"
+#~ msgstr "Adicionar"
 
 #, fuzzy
-#~ msgid "Send Latest Information"
-#~ msgstr "Nenhuma Informa��o"
+#~ msgid "<- Remove"
+#~ msgstr "Remover"
 
 #, fuzzy
-#~ msgid "Meeting Information"
-#~ msgstr "Nenhuma Informa��o"
+#~ msgid "Card: "
+#~ msgstr "Carro"
 
 #, fuzzy
-#~ msgid "Meeting Proposal"
-#~ msgstr "Seg"
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr "Nome"
 
 #, fuzzy
-#~ msgid "Meeting Update"
-#~ msgstr "Hora de _fim de _encontro"
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr "Endere�o"
 
 #, fuzzy
-#~ msgid "Meeting Update Request"
-#~ msgstr "Pedido de _encontro"
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr "Correio electr�nico 2"
 
 #, fuzzy
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "Nenhuma Informa��o"
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr "Correio electr�nico 2"
 
 #, fuzzy
-#~ msgid "Meeting Reply"
-#~ msgstr "Seg"
+#~ msgid "New _Contact"
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Apagar um contacto"
+#~ msgid "New Contact _List"
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Mensagens enviadas"
+#~ msgid "Edit Addressbook"
+#~ msgstr "Imposs�vel abrir o livro de endere�os"
 
 #, fuzzy
-#~ msgid "Task Information"
-#~ msgstr "Nenhuma Informa��o"
+#~ msgid "Account Name"
+#~ msgstr "�cone_s pequenos"
 
 #, fuzzy
-#~ msgid "Task Proposal"
-#~ msgstr "_Tarefa"
+#~ msgid "Add Addressbook"
+#~ msgstr "Imposs�vel abrir o livro de endere�os"
 
 #, fuzzy
-#~ msgid "Task Update"
-#~ msgstr "Lista de tarefas"
+#~ msgid "Server Name"
+#~ msgstr "_Items seleccionados"
 
 #, fuzzy
-#~ msgid "Task Update Request"
-#~ msgstr "_Pedido de tarefa"
+#~ msgid "Co_ntacts:"
+#~ msgstr "_Contacto"
 
 #, fuzzy
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "Nenhuma Informa��o"
+#~ msgid "_Message Recipients:"
+#~ msgstr "Situa��o das mensagens"
 
 #, fuzzy
-#~ msgid "Task Reply"
-#~ msgstr "Responder"
+#~ msgid "_Home"
+#~ msgstr "Casa"
 
 #, fuzzy
-#~ msgid "Bad Task Message"
-#~ msgstr "Novo Ca_lend�rio"
+#~ msgid "_Mobile"
+#~ msgstr "Telem�vel"
 
 #, fuzzy
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "Nenhuma Informa��o"
+#~ msgid "Create a new appointment"
+#~ msgstr "Criar um novo compromisso para hoje"
 
 #, fuzzy
-#~ msgid "Free/Busy Information"
-#~ msgstr "Nenhuma Informa��o"
+#~ msgid "Create a new task"
+#~ msgstr "Criar um novo contacto"
 
 #, fuzzy
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "Nenhuma Informa��o"
+#~ msgid "New _Task"
+#~ msgstr "_Tarefa"
 
 #, fuzzy
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Encontrar mensagens"
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Criar um novo compromisso para hoje"
 
 #, fuzzy
-#~ msgid "Status: %s"
-#~ msgstr "S�b"
+#~ msgid "_Other"
+#~ msgstr "Outro"
 
 #, fuzzy
-#~ msgid "Contacts: "
-#~ msgstr "_Contacto"
+#~ msgid "_Delete this Task"
+#~ msgstr "Apagar este item"
 
 #, fuzzy
 #~ msgid "Message %s not found."
@@ -28075,14 +28963,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "F_ormato"
 
 #, fuzzy
-#~ msgid " (default)"
-#~ msgstr "Apagar"
-
-#, fuzzy
-#~ msgid "Subject is %s"
-#~ msgstr "Assunto"
-
-#, fuzzy
 #~ msgid "%s: Inbox"
 #~ msgstr "Correio novo"
 
@@ -28095,10 +28975,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Imprimir..."
 
 #, fuzzy
-#~ msgid "HTML signature file:"
-#~ msgstr "Ficheiro com assinatura:"
-
-#, fuzzy
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Ficheiro com assinatura:"
 
@@ -28143,48 +29019,22 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Segundos"
 
 #, fuzzy
-#~ msgid "inHg"
-#~ msgstr "Seg"
-
-#, fuzzy
-#~ msgid "kilometers"
-#~ msgstr "_Pasta"
-
-#, fuzzy
 #~ msgid "All _folders:"
 #~ msgstr "_Pastas"
 
 #, fuzzy
-#~ msgid "All news _feeds:"
-#~ msgstr "Adicionar novo grupo"
-
-#, fuzzy
 #~ msgid "_Display folders:"
 #~ msgstr "Mostrar uma pasta diferente"
 
 #, fuzzy
-#~ msgid "_Display stations:"
-#~ msgstr "_Ac��es"
-
-#, fuzzy
 #~ msgid "_Displayed feeds:"
 #~ msgstr "Dia"
 
 #, fuzzy
-#~ msgid "Outbox"
-#~ msgstr "Correio novo"
-
-#, fuzzy
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
 #, fuzzy
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr "Gravar a mensagem na pasta especificada"
-
-#, fuzzy
 #~ msgid "(No name)"
 #~ msgstr "Nome"
 
@@ -28273,10 +29123,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Criar um novo calend�rio"
 
 #, fuzzy
-#~ msgid "%s - Ximian Evolution %s"
-#~ msgstr "Evolution - %s"
-
-#, fuzzy
 #~ msgid "%s - Ximian Evolution %s [%s]"
 #~ msgstr "Evolution - %s"
 
@@ -28296,22 +29142,10 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Novo compromisso"
 
 #, fuzzy
-#~ msgid "before end of appointment"
-#~ msgstr "Novo compromisso"
-
-#, fuzzy
-#~ msgid "Evolution Shortcuts"
-#~ msgstr "Instala��o do Evolution"
-
-#, fuzzy
 #~ msgid "Each account must have a different name."
 #~ msgstr "Ficheiro com assinatura:"
 
 #, fuzzy
-#~ msgid "Delete folder '%s'"
-#~ msgstr "_Nova pasta"
-
-#, fuzzy
 #~ msgid "Rename"
 #~ msgstr "Nome completo:"
 
@@ -28347,10 +29181,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "am"
 
 #, fuzzy
-#~ msgid "n"
-#~ msgstr "Seg"
-
-#, fuzzy
 #~ msgid "o"
 #~ msgstr "Para"
 
@@ -28375,10 +29205,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Tamanho"
 
 #, fuzzy
-#~ msgid "Synchronizing folder"
-#~ msgstr "Sincronizar"
-
-#, fuzzy
 #~ msgid "Elm mail"
 #~ msgstr "Correio electr�nico 2"
 
@@ -28400,8 +29226,8 @@ msgstr "N�o se consegui inicializar Bonobo"
 
 #~ msgid "Please click \"OK\" to install the Evolution user files under"
 #~ msgstr ""
-#~ "Carregue em \\\"OK\\\" para instalar os ficheiros de utilizador do Evolution "
-#~ "em"
+#~ "Carregue em \\\"OK\\\" para instalar os ficheiros de utilizador do "
+#~ "Evolution em"
 
 #, fuzzy
 #~ msgid "RDF Summary"
@@ -28786,10 +29612,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Ano:"
 
 #, fuzzy
-#~ msgid "Send \"%s\""
-#~ msgstr "Segundos"
-
-#, fuzzy
 #~ msgid "Forward message \"%s\""
 #~ msgstr "Enviar esta mensagem"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8c430b34f7..0ed542d24a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0.4\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-04-04 08:35-0300\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -34,7 +34,7 @@ msgstr "Importa arquivos VCard no Evolution."
 msgid "File As"
 msgstr "Arquivar como"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nome"
@@ -45,7 +45,7 @@ msgid "Email"
 msgstr "E-mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Principal"
 
@@ -55,7 +55,7 @@ msgstr "Princ"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistente"
@@ -63,8 +63,8 @@ msgstr "Assistente"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Comercial"
 
@@ -74,12 +74,12 @@ msgid "Bus"
 msgstr "Com"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Callback"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Empresa"
 
@@ -90,8 +90,8 @@ msgstr "Empr"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Residencial"
 
@@ -106,18 +106,18 @@ msgstr "Empr"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Celular"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Carro"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax comercial"
@@ -127,13 +127,13 @@ msgid "Bus Fax"
 msgstr "Fax com"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax residencial"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Comercial 2"
 
@@ -142,43 +142,43 @@ msgid "Bus 2"
 msgstr "Com 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Residencial 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Outro"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Outro fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "R�dio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
@@ -190,14 +190,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-mail 3"
@@ -335,7 +335,7 @@ msgstr "VCard para %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "N�o foi poss�vel iniciar Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Buscando..."
 
@@ -356,32 +356,32 @@ msgstr "Carregando..."
 msgid "Error in search expression."
 msgstr "Erro na express�o de busca."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Adicionando cart�o ao servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Removendo cart�o do servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Modificando cart�o do servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Reiniciando busca."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Recebendo resultados da busca LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Erro ao remover cart�o"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "N�o foi poss�vel analisar URL `%s'"
@@ -430,106 +430,143 @@ msgstr "Um controle Bonobo exemplo que exibe um cat�logo de endere�os."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #, fuzzy
-msgid "Addressbook Settings"
-msgstr "Fontes de cat�logos de endere�os"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr "F�brica para o redator do Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 "Controle que exibe um mini-cart�o do cat�logo de endere�os do Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Visualizador de mini-cart�o do cat�logo de endere�os do Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Componente do Evolution para manipular contatos."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "F�brica para o controle Mini-cart�o do Cat�logo de Endere�os"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "F�brica para o exibidor de endere�os do Cat�logo de Endere�os"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "F�brica para o popup de endere�os do Cat�logo de Endere�os"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr "F�brica para o redator do Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "F�brica para o controle do Cat�logo de Endere�os exemplo"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Contatos"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Pasta contendo informa��o sobre contatos"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "Servidor LDAP contendo informa��o sobre contatos"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Nova lista de contatos"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "Lista de _contatos"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Novo contato"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Contato"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Nova lista de contatos"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "N�o � poss�vel conectar ao servidor LDAP."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "Lista de _contatos"
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"N�o � poss�vel autenticar com o servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+#, fuzzy
+msgid "Could not perform query on Root DSE"
+msgstr "N�o foi poss�vel analisar URL `%s'"
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Resposta do servidor IMAP n�o cont�m informa��o de %s"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Erro ao carregar infora��o do filtro:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "Resposta do servidor IMAP n�o cont�m informa��o de %s"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL n�o � suportado nesta c�pia do Evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "N�o foi poss�vel iniciar gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Outros contatos"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "N�o � poss�vel abrir o cat�logo de endere�os"
@@ -565,48 +602,57 @@ msgstr ""
 "Por favor, verifique se o arquivo existe e que voc�\n"
 "possui as permiss�es para acess�-lo."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Entre senha para %s (usu�rio %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 msgid "Name begins with"
 msgstr "Nome come�a com"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 msgid "Email is"
 msgstr "E-mail �"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categoria �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualquer campo cont�m"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Avan�ado..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Qualquer categoria"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "A URI que o navegador de pastas vai exibir"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(nenhum)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "E-mail principal"
 
@@ -652,107 +698,59 @@ msgstr "Desativar consultas"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Ativar consultas (Perigoso!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "N�o � poss�vel conectar ao servidor LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"N�o � poss�vel autenticar com o servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-#, fuzzy
-msgid "Could not perform query on Root DSE"
-msgstr "N�o foi poss�vel analisar URL `%s'"
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Informa��o de rastreio opaca inv�lida:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "Resposta do servidor IMAP n�o cont�m informa��o de %s"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL n�o � suportado nesta c�pia do Evolution)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Data de conclus�o"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr " _Verificar tipos suportados "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Op��es"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "Remover"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Remover"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Op��es"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -761,8 +759,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Fontes de cat�logos de endere�os"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Albany"
@@ -858,8 +856,8 @@ msgstr "Configura��o"
 msgid "Mappings"
 msgstr "Margens"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "a _cada"
@@ -1042,14 +1040,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1074,8 +1072,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1108,7 +1106,7 @@ msgid "Using email address"
 msgstr "Endere�o de e-mail"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1116,7 +1114,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Adicionar"
 
@@ -1164,7 +1162,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1282,10 +1280,12 @@ msgstr "Interface para sele��o de nomes do cat�logo de endere�os do Evolution"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "F�brica para interface para sele��o de nomes do cat�logo de endere�os"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Remover"
 
@@ -1329,8 +1329,8 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 "O Evolution n�o p�de obter o reposit�rio local de cat�logo de endere�os.\n"
-"Isto pode ter sido causado por uma falha no componente "
-"evolution-addressbook.\n"
+"Isto pode ter sido causado por uma falha no componente evolution-"
+"addressbook.\n"
 "Para nos ajudar a entender melhor este problema e finalmente resolv�-lo,\n"
 "por favor envie um e-mail para Jon Trowbridge <trow@ximian.com> com uma\n"
 "descri��o detalhada das circunst�ncias sob as quais este erro ocorreu.\n"
@@ -1417,7 +1417,7 @@ msgstr "Colabora��o"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Editor de contatos"
 
@@ -1426,7 +1426,7 @@ msgid "D_epartment:"
 msgstr "_Departamento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Detalhes"
 
@@ -1486,11 +1486,12 @@ msgstr "Deseja receber correio _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Excluir"
 
@@ -1519,7 +1520,7 @@ msgid "_Web page address:"
 msgstr "Endere�o de p�gina _web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Estados Unidos"
 
@@ -2025,12 +2026,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "L�tvia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "L�bano"
 
@@ -2039,7 +2039,7 @@ msgid "Lesotho"
 msgstr "Lesoto"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Lib�ria"
 
@@ -2048,12 +2048,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litu�nia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
@@ -2086,7 +2086,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2111,7 +2111,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "M�xico"
 
@@ -2137,7 +2137,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marrocos"
 
@@ -2162,7 +2162,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Holanda"
 
@@ -2175,12 +2175,12 @@ msgid "New Caledonia"
 msgstr "Nova Caled�nia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nova Zel�ndia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicar�gua"
 
@@ -2197,7 +2197,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Ilhas Norfolk"
 
@@ -2206,17 +2206,17 @@ msgid "Northern Mariana Islands"
 msgstr "Ilhas Marianas do Norte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Noruega"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Om�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Paquist�o"
 
@@ -2229,7 +2229,7 @@ msgid "Palestinian Territory"
 msgstr "Territ�rio palestino"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panam�"
 
@@ -2238,12 +2238,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Nova Guin�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguai"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2256,22 +2256,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Pol�nia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
@@ -2280,7 +2280,7 @@ msgid "Reunion"
 msgstr "Reuni�o"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rom�nia"
 
@@ -2317,7 +2317,7 @@ msgid "Sao Tome And Principe"
 msgstr "S�o Tome e Pr�ncipe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Ar�bia Saudita"
 
@@ -2334,17 +2334,17 @@ msgid "Sierra Leone"
 msgstr "Serra Leoa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapura"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Eslov�quia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Eslov�nia"
 
@@ -2357,7 +2357,7 @@ msgid "Somalia"
 msgstr "Som�lia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "�frica do Sul"
 
@@ -2366,7 +2366,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Ilhas Georgia do Sul e Sandwich do Sul"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Espanha"
 
@@ -2387,7 +2387,7 @@ msgid "Sudan"
 msgstr "Sud�o"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Suriname"
 
@@ -2400,17 +2400,17 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Su�cia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Su��a"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Formosa"
 
@@ -2448,7 +2448,7 @@ msgid "Tunisia"
 msgstr "Tun�sia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turquia"
 
@@ -2469,7 +2469,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ucr�nia"
 
@@ -2478,7 +2478,7 @@ msgid "United Arab Emirates"
 msgstr "Emirados �rabes Unidos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
@@ -2487,7 +2487,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "Ilhas ao Largo dos Estados Unidos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguai"
 
@@ -2500,12 +2500,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietn�"
 
@@ -2528,12 +2528,12 @@ msgid "Western Sahara"
 msgstr "Sahara Ocidental"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Yugosl�via"
 
@@ -2546,26 +2546,34 @@ msgid "Zimbabwe"
 msgstr "Zimb�bue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Voc� tem certeza que deseja\n"
+"excluir este contato?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Excluir contato?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Editor de categorias n�o dispon�vel."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Este contato pertence a estas categorias:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Salvar contato como VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "N�o foi poss�vel encontrar widget para um campo: `%s'"
@@ -2592,11 +2600,11 @@ msgstr "E-mail"
 msgid "card.vcf"
 msgstr "cartao.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2731,11 +2739,11 @@ msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Editor de lista de contatos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Salvar lista como VCard"
 
@@ -2812,21 +2820,21 @@ msgid "Error getting book view"
 msgstr "Erro ao obter vis�o de livro"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Erro ao modificar cart�o"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Sucesso"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -2835,7 +2843,7 @@ msgid "Repository offline"
 msgstr "Reposit�rio off-line"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Permiss�o negada"
 
@@ -2853,55 +2861,70 @@ msgstr "Protocolo n�o suportado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Cancelada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Falhou a autentica��o."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autentica��o exigida"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Voc� deseja salvar as modifica��es?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Erro ao adicionar lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Erro ao adicionar cart�o"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Erro ao modificar lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Erro ao remover lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Erro ao remover cart�o"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Exibi��o"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Exibi��o"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2909,22 +2932,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "Copiar tarefa selecionada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "Sem cart�es"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Sem cart�es"
@@ -2989,102 +3012,108 @@ msgstr "Outro telefone"
 msgid "Other Address"
 msgstr "Outro endere�o"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Cat�logo de endere�os"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Salvar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Novo contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nova lista de contatos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Ir para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Buscar contatos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Fontes de cat�logos de endere�os..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Configura��es do _pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Encaminhar contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Enviar mensagem ao contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Imprimir envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Copiar para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Mover para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Recortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Excluir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3094,7 +3123,7 @@ msgstr "_Vis�o atual"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3102,7 +3131,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3254,7 +3283,7 @@ msgstr "Margens"
 msgid "Number of columns:"
 msgstr "N�mero de colunas:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Op��es"
 
@@ -3264,7 +3293,7 @@ msgid "Orientation"
 msgstr "Orienta��o"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "P�gina"
 
@@ -3338,29 +3367,33 @@ msgstr "Largura:"
 msgid "_Font..."
 msgstr "_Fonte..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Compromisso sem nome"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Baixa"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Indefinido"
 
@@ -3403,42 +3436,34 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "F�brica para o redator do Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Componente resumo executivo de agenda do Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Visualizador iTip/iMip da agenda do Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Componente do Evolution para manipular a agenda."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "F�brica para o componente resumo da agenda."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "F�brica para o controle de tarefas do Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "F�brica para o controle de visualiza��o iTip da agenda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "F�brica para o controle de agenda exemplo."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "F�brica para centralizar os di�logos do editor do componente de agenda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "F�brica para criar uma f�brica de editores de componentes"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3450,10 +3475,23 @@ msgstr "Servi�o de notifica��o de alarme"
 msgid "Factory for the alarm notification service"
 msgstr "F�brica para o servi�o de notifica��o de alarme"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "Iniciando:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "Terminando:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "hora inv�lida"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution "
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3493,7 +3531,7 @@ msgstr ""
 "no lugar uma caixa de di�logo de lembrete normal."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Alerta"
@@ -3520,15 +3558,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "N�o me pergunte novamente."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "N�o foi poss�vel iniciar Gnome"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "N�o foi poss�vel criar o servi�o de notifica��o de alarme"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "N�o foi poss�vel criar a f�brica de servi�o de notifica��o de alarme"
 
@@ -3544,7 +3582,7 @@ msgstr "Descri��o cont�m"
 msgid "Comment contains"
 msgstr "Coment�rio cont�m"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "N�o casadas"
 
@@ -3585,14 +3623,16 @@ msgstr ""
 "do seu ORBit e OAF."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Particular"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "P�blico"
 
@@ -3613,27 +3653,32 @@ msgid "W"
 msgstr "O"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Livre"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Ocupado"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "N�o iniciada"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Em progresso"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Conclu�da"
 
@@ -3648,11 +3693,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3667,12 +3713,14 @@ msgstr "Repetindo"
 msgid "Assigned"
 msgstr "Atribuido"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Sim"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "N�o"
 
@@ -3692,62 +3740,64 @@ msgstr "Vis�o de semana"
 msgid "Month View"
 msgstr "Vis�o de m�s"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Pasta contendo compromissos e eventos"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Pasta contendo itens de tarefa"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "Configura��es de fontes de not�cias"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "Reuni�o"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Novo _compromisso"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "Compromisso"
@@ -3958,7 +4008,7 @@ msgstr "Lembretes"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -3987,7 +4037,7 @@ msgstr "fim do compromisso"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4015,79 +4065,81 @@ msgstr "30 minutos"
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Configura��es de agenda e tarefas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Cor para tarefas atrasadas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Cor das tarefas com prazo para hoje"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Dias"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "_Dom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "S�bado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Exibir _n�meros de semana no navegador de datas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "I_n�cio do dia:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "_Dom"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Domigo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Tarefas com prazo para _hoje:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "Qu_i"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "_Ter"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4116,81 +4168,96 @@ msgid "Tuesday"
 msgstr "Ter�a-feira"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Semana �til"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pedir confirma��o ao apagar itens"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir fins de semana na vis�o de m�s"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Tarefa come�a: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Exibi��o"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "T�r_mino do dia:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "Se_x"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Geral"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "E_sconder tarefas conclu�das ap�s"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Seg"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Tarefas _atrasadas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "S�_b"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Exibir _hora de t�rmino de compromissos nas vis�es de semana e m�s"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "_Unidades de tempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_Ter"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "Qu_a"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "antes do in�cio do compromisso"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4274,40 +4341,61 @@ msgstr " (Prazo "
 msgid "Due "
 msgstr "Prazo "
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "N�o foi poss�vel atualizar objeto!"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
 msgstr "N�o foi poss�vel atualizar objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Editar compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Item de di�rio - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Sem resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "N�o foi poss�vel obter a vers�o atual!"
 
@@ -4365,27 +4453,27 @@ msgstr "Delegar para:"
 msgid "Enter Delegate"
 msgstr "Entrar delegado"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Lembrete"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Repeti��o"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Agendamento"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Reuni�o"
 
@@ -4432,7 +4520,7 @@ msgid "Pu_blic"
 msgstr "_P�blico"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Exibir como tempo"
 
@@ -4454,19 +4542,19 @@ msgstr "Hora de t�r_mino:"
 msgid "_Start time:"
 msgstr "Hora de _in�cio:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Um organizador � exigido."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Pelo menos um participante � necess�rio."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Esta pessoa j� participa da reuni�o!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Delegar para..."
 
@@ -4477,49 +4565,55 @@ msgstr "Participante"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Nome comum"
+msgid "Click here to add an attendee"
+msgstr "Clique aqui para adicionar um participante"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delegado por"
+msgid "Common Name"
+msgstr "Nome comum"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegado para"
+msgid "Delegated From"
+msgstr "Delegado por"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "L�ngua"
+msgid "Delegated To"
+msgstr "Delegado para"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Membro"
+msgid "Language"
+msgstr "L�ngua"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
@@ -4534,14 +4628,10 @@ msgid "_Change Organizer"
 msgstr "_Alterar organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Convidar outros..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Outro organizador"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4730,7 +4820,7 @@ msgid "Progress"
 msgstr "Progresso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4742,19 +4832,19 @@ msgstr "_Prioridade:"
 msgid "_Status:"
 msgstr "_Estado:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "B�sico"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Atribui��o"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Descri��o:"
 
@@ -4766,23 +4856,78 @@ msgstr "_Data de in�cio:"
 msgid "_Due Date:"
 msgstr "Pra_zo de conclus�o:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Salvar como..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4790,20 +4935,20 @@ msgstr "Salvar como..."
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Recor_tar"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4811,35 +4956,36 @@ msgstr "_Copiar"
 msgid "_Paste"
 msgstr "C_olar"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Atribuir tarefa"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Encaminar como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_Marcar como conclu�da"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tarefas como conclu�das"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir tarefas selecionadas"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Clique para adicionar uma tarefa"
 
@@ -4847,47 +4993,48 @@ msgstr "Clique para adicionar uma tarefa"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Conclu�da"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Data de conclus�o"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Prazo de conclus�o"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Data de t�rmino"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Posi��o geogr�fica"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Data de in�cio"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Resumo"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Ordena��o de tarefas"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4935,11 +5082,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -4979,7 +5128,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Publicar informa��o de livre/ocupado"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Configura��o"
@@ -4990,7 +5139,7 @@ msgid "_Configure Pilot..."
 msgstr "Configura��o"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "Salvar _como..."
 
@@ -5017,77 +5166,392 @@ msgid "Delete _All Occurrences"
 msgstr "Excluir _todas as ocorr�ncias"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "As ferramentas do GNOME Pilot n�o aparentam estar instaladas no seu sistema."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar %s."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "Reuni�o come�a: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "Tarefa come�a: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "Informa��o de livre/ocupado come�a: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Come�a: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "Reuni�o termina: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "Informa��o de livre/ocupado termina: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "Termina: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "Tarefa conclu�da: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "Tarefa para: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "Informa��o de iCalendar"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "Erro de iCalendar"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "Uma raz�o desconhecida"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Por favor veja a seguinte informa��o e ent�o selecione uma a��o do menu "
+"abaixo."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Nenhum</i>"
+
+#: calendar/gui/e-itip-control.c:903
+msgid "Status:"
+msgstr "Estado:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Aceito"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+msgid "Tentatively Accepted"
+msgstr "Aceito preliminarmente"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Recusado"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "O arquivo de agenda n�o p�de ser atualizado!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "Escolher uma a��o:"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Atualizar"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "Aceitar"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "Aceitar preliminarmente"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "Recusar"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "Enviar informa��o de livre/ocupado"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "Atualizar estado do respondente"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "Enviar informa��o mais recente"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> publicou informa��o de reuni�o."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Informa��o de reuni�o"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> requisita a sua presen�a em uma reuni�o."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "Proposta de reuni�o"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> deseja adicion�-lo a uma reuni�o existente."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "Atualiza��o de reuni�o"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> deseja receber a informa��o de reuni�o mais recente."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "_Pedido de atualiza��o de reuni�o"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> respondeu a um pedido de reuni�o."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "Resposta a reuni�o"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> cancelou a reuni�o."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "Cancelamento de reuni�o"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> enviou uma mensagem incompreens�vel."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Mensagem de reuni�o inv�lida"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> publicou informa��o de tarefa."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Informa��o de tarefa"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> requisita que voc� execute uma tarefa."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Proposta de tarefa"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> deseja acrescent�-lo a uma tarefa existente."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Atualiza��o de tarefa"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> deseja receber a informa��o de tarefa mais recente."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Pedido de atualiza��o de tarefa"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> respondeu a uma atribui��o de tarefa."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Resposta a tarefa"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> cancelou uma tarefa."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Cancelamento de tarefa"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Mensagem de tarefa inv�lida"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> publicou informa��o de livre/ocupado."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Informa��o de livre/ocupado"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> requisita sua informa��o de livre/ocupado."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Pedido de livre/ocupado"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> respondeu a um pedido de livre/ocupado."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Resposta de livre/ocupado"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Mensagem de livre/ocupado inv�lida"
+
+#: calendar/gui/e-itip-control.c:1354
+msgid "The message does not appear to be properly formed"
+msgstr "A mensagem n�o aparenta estar formada corretamente."
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "A mensagem cont�m apenas pedidos n�o suportados."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "O anexo n�o cont�m uma mensagem de agenda v�lida"
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "O anexo n�o cont�m itens visualiz�veis de agenda"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "O item n�o p�de ser enviado!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Atualiza��o conclu�da\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "O arquivo de agenda n�o p�de ser atualizado!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Estado do participante n�o p�de ser atualizado pois o item n�o existe mais"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 #, fuzzy
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta n�o � de um participante atual. Adicion�-lo como participante?"
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Estado do participante n�o p�de ser atualizado devido a um estado inv�lido!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "Estado do participante n�o p�de ser atualizado!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Estado do participante atualizado\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "Estado do participante n�o p�de ser atualizado!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Remo��o conclu�da"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "O item n�o p�de ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Selecionar pasta"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Selecionar pasta"
@@ -5129,93 +5593,92 @@ msgstr "data-fim"
 msgid "date-start"
 msgstr "data-inicio"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Moderadores"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Participantes obrigat�rios"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Participantes opcionais"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "N�o participantes"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Indiv�duo"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Sala"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Moderador"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Participante obrigat�rio"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "N�o participante"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Necessita a��o"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Aceito"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Recusado"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Preliminar"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Delegado"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "Em andamento"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5227,63 +5690,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Fora do escrit�rio"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Sem informa��o"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Op��es"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Exibir apenas _horas do expediente"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Exibir com _menos amplia��o"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Atualizar livre/ocupado"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Autoescolher"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Todas as pessoas e recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Todas as _pessoas e um recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Pessoas _necess�rias"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Pessoas necess�rias e _um recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Hora de _in�cio da reuni�o:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Hora de _t�rmino da reuni�o:"
 
@@ -5302,17 +5765,22 @@ msgstr "N�o foi poss�vel carregar as tarefas em `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "O m�todo necess�rio para carregar `%s' n�o � suportado"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "N�o foi poss�vel abrir pasta em `%s'"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data de conclus�o"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Excluindo objetos selecionados"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "Excluindo permanentemente pasta"
@@ -5325,17 +5793,17 @@ msgstr "Novo _compromisso..."
 msgid "_Delete this Appointment"
 msgstr "_Excluir este compromisso"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "N�o foi poss�vel abrir pasta em `%s'"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O m�todo necess�rio para abrir `%s' n�o � suportado"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrindo agenda em %s"
@@ -5396,19 +5864,51 @@ msgstr "Outubro"
 msgid "September"
 msgstr "Setembro"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Pelo menos um participante � necess�rio"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Um organizador deve ser configurado."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr "Informa��o de evento"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "Informa��o de tarefa"
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr "Informa��o de di�rio"
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr "Informa��o de livre/ocupado"
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr "Informa��o de agenda"
+
+#: calendar/gui/itip-utils.c:398
+msgid "Updated"
+msgstr "Atualizado"
+
+#: calendar/gui/itip-utils.c:406
+msgid "Refresh"
+msgstr "Atualizar"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr "Contra proposta"
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Voc� deve ser um participante do evento."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "N�o foi poss�vel criar a f�brica de editor de componentes"
 
@@ -5597,12 +6097,45 @@ msgstr "M�s selecionado (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Ano selecionado (%Y)"
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "Tarefa"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Estado: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioridade:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Percentagem conclu�da: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Categorias: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Contatos: "
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Imprimir agenda"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5641,8 +6174,8 @@ msgstr ""
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "N�o me pergunte novamente."
 
@@ -5708,6 +6241,11 @@ msgstr "Importa arquivos VCard no Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importa arquivos VCard no Evolution."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Lembrete"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5801,8 +6339,8 @@ msgstr "contains? espera que o argument 2 seja uma string"
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 "contains? espera que o argument 1 seja um de \"any\", \"summary\", "
 "\"description\""
@@ -6733,638 +7271,654 @@ msgid "Asia/Macao"
 msgstr "�sia/Macau"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "�sia/Macau"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "�sia/Magadan"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "�sia/Magadan"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "�sia/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "�sia/Mascate"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "�sia/Nic�sia"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "�sia/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "�sia/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "�sia/Cabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "�sia/Phnom Penh"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "�sia/Pontianak"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "�sia/Pyongyang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "�sia/Catar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "�sia/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "�sia/Yangun"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "�sia/Riad"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "�sia/Saigon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "�sia/Sakhalin"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "�sia/Samarkand"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "�sia/Seul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "�sia/Xangai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "�sia/Cingapura"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "�sia/Taip�"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "�sia/Tashkent"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "�sia/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "�sia/Teer�"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "�sia/Thimphu"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "�sia/T�quio"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "�sia/Ujung Pandang"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "�sia/Ulaanbaatar"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "�sia/Urumqi"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "�sia/Vientiane"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "�sia/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "�sia/Yakutsk"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "�sia/Yekaterinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "�sia/Yerevan"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atl�ntico/A�ores"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atl�ntico/Bermuda"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atl�ntico/Can�rias"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atl�ntico/Cabo Verde"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atl�ntico/Faroe"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atl�ntico/Jan Mayen"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atl�ntico/Madeira"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atl�ntico/Reykjavik"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atl�ntico/Ge�rgia do Sul"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atl�ntico/Santa Helena"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atl�ntico/Stanley"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Austr�lia/Adelaide"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Austr�lia/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Austr�lia/Broken Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Austr�lia/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Austr�lia/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Austr�lia/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Austr�lia/Lord Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Austr�lia/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Austr�lia/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Austr�lia/Sidnei"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterd�"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europa/Atenas"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrado"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europa/Berlim"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europa/Bruxelas"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europa/Bucareste"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europa/Budapeste"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europa/Copenhague"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsinque"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europa/Instanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europa/Lisboa"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europa/Liubliana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europa/Londres"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxenburgo"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europa/Madri"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europa/M�naco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europa/Moscou"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europa/Praga"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europa/Roma"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europa/S�o Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europa/S�fia"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europa/Estocolmo"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europa/Vaticano"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europa/Viena"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europa/Vars�via"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europa/Zurique"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "�ndico/Antananarivo"
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "�ndico/Chagos"
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "�ndico/Christmas"
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "�ndico/Cocos"
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "�ndico/Comores"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "�ndico/Kerguelen"
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "�ndico/Mahe"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "�ndico/Maldivas"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "�ndico/Maur�cio"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "�ndico/Mayote"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "�ndico/Reuni�o"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Pac�fico/�pia"
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Pac�fico/Auckland"
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Pac�fico/Chatham"
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Pac�fico/Ilha de P�scoa"
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Pac�fico/Efate"
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Pac�fico/Enderbury"
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Pac�fico/Fakaofo"
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Pac�fico/Fiji"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Pac�fico/Funafati"
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Pac�fico/Gal�pagos"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Pac�fico/Gambier"
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Pac�fico/Guadalcanal"
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Pac�fico/Guam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Pac�fico/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Pac�fico/Johnston"
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Pac�fico/Kiritimati"
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Pac�fico/Kosrae"
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Pac�fico/Kwajalein"
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Pac�fico/Majuro"
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Pac�fico/Marquesas"
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Pac�fico/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Pac�fico/Nauru"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Pac�fico/Niue"
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Pac�fico/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Pac�fico/Noumea"
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Pac�fico/Pago Pago"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Pac�fico/Palau"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Pac�fico/Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Pac�fico/Ponape"
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Pac�fico/Port Moresby"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Pac�fico/Rarotonga"
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Pac�fico/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Pac�fico/Taiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Pac�fico/Tarawa"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Pac�fico/Tongatapu"
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Pac�fico/Truk"
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Pac�fico/Wake"
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Pac�fico/Wallis"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Pac�fico/Yap"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Assinaturas n�o s�o suportadas por esta cifra"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Assinaturas em claro n�o s�o suportadas por esta cifra"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifica��o n�o � suportada por esta cifra"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Cifragem n�o � suportada por esta cifra"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Decifragem n�o � suportada por esta cifra"
 
@@ -7375,12 +7929,12 @@ msgstr ""
 "N�o � poss�vel criar arquivo de sa�da: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "N�o foi poss�vel abrir o diret�rio cache: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7391,7 +7945,7 @@ msgstr ""
 "Opera��es subsequentes neste servidor n�o ser�o reexecutas quando\n"
 "voc� reconectar a rede."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7402,11 +7956,16 @@ msgstr ""
 "%s\n"
 "Altera��es feitas a esta pasta n�o ser�o re-sincronizadas."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Re-sincronizando com servidor"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Armazenando pasta '%s'"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Voc� deve estar trabalhando conectado para completar esta opera��o"
 
@@ -7414,57 +7973,68 @@ msgstr "Voc� deve estar trabalhando conectado para completar esta opera��o"
 msgid "Syncing folders"
 msgstr "Sincronizando pastas"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analisar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "N�o � poss�vel abrir a pasta de fila"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "N�o � poss�vel processar a pasta de fila"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obtendo mensagem %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "N�o � poss�vel abrir mensagem"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Falhou na mensagem %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Sincronizando pasta"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obtendo mensagem %d de %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Falhou na mensagem %d de %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Falhou a decodifica��o da mensagem."
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Falhou a cria��o de cache para mensagem %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Falhou a cria��o de cache para mensagem %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar busca por filtro: %s: %s"
@@ -7496,25 +8066,104 @@ msgstr "(match-all) requer um simples resultado booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "Executando consulta por cabe�alho desconhecido: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Opera��o n�o suportada: anexar mensagem: para %s"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Opera��o n�o suportada: busca por express�o: para %s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Opera��o n�o suportada: busca por uids: para %s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Movendo mensagens"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Copiando mensagens para %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Cancelada."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Resposta inesperada do servidor POP: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "N�o foi fornecido um nome de arquivo."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "N�o � poss�vel cifrar esta mensagem: n�o foram definidos destinat�rios"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Falhou a cria��o de cache para mensagem %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Falhou a cria��o de cache para mensagem %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Falhou a decodifica��o da mensagem."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+"N�o � poss�vel verificar esta mensagem: n�o foi poss�vel criar arquivo "
+"tempor�rio: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7612,97 +8261,23 @@ msgstr "Erro ao escrever arquivo de correio tempor�rio: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Erro ao copiar arquivo de correio tempor�rio: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Por favor, entre a sua frase-senha de %s para %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Por favor, entre a sua frase-senha de %s"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"N�o � poss�vel assinar esta mensagem: n�o existe texto claro para assinar"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "N�o � poss�vel assinar esta mensagem: n�o foi fornecida uma senha"
 
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
-"N�o � poss�vel assinar esta mensagem: n�o foi poss�vel criar pipe para "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr ""
-"N�o � poss�vel assinar esta mensagem: n�o existe texto claro para assinar em "
-"claro"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr ""
-"N�o � poss�vel verificar esta mensagem: n�o existe texto claro para verificar"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"N�o � poss�vel verificar esta mensagem: n�o foi poss�vel criar pipe para "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-"N�o � poss�vel verificar esta mensagem: n�o foi poss�vel criar arquivo "
-"tempor�rio: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr ""
-"N�o � poss�vel cifrar esta mensagem: n�o existe texto claro para cifrar"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "N�o � poss�vel cifrar esta mensagem: n�o foi fornecida uma senha"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"N�o � poss�vel cifrar esta mensagem: n�o foi poss�vel criar pipe para "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "N�o � poss�vel cifrar esta mensagem: n�o foram definidos destinat�rios"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-"N�o � poss�vel decifrar esta mensagem: n�o existe texto cifrado para decifrar"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "N�o � poss�vel decifrar esta mensagem: n�o foi fornecida uma senha"
 
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"N�o � poss�vel decifrar esta mensagem: n�o foi poss�vel criar pipe para "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Esta � uma parte de mensagem assinada digitalmente"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Outro erro"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7720,43 +8295,6 @@ msgstr "N�o foi poss�vel carregar %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "N�o foi poss�vel carregar %s: Sem c�digo de inicializa��o no m�dulo."
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s servidor %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s servi�o para %s em %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Conex�o cancelada"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "N�o foi poss�vel conectar � %s (porta %d): %s."
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(m�quina desconhecida)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Opera��o cancelada"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "O servidor desconectou inesperadamente: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "An�nimo"
@@ -7863,7 +8401,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Resposta de autentica��o inv�lida do servidor."
 
@@ -7891,11 +8429,9 @@ msgid ""
 "Password Authentication."
 msgstr "Esta op��o conectar� ao servidor usando autentica��o Kerberos 4."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Senha"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7922,52 +8458,52 @@ msgstr "Autentica��o POP antes de SMTP usando uma fonte n�o POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Falha ao compilar express�o regular: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "A URL '%s' precisa de um componente nome do usu�rio"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "A URL '%s' precisa de um componente m�quina"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "A URL '%s' precisa de um componente caminho"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Falha na consulta de nome: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Falhou a consulta de m�quina: %s: m�quina n�o encontrada"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Falhou a consulta de m�quina: %s: raz�o desconhecida"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Falhou a consulta de m�quina: %s: m�quina n�o encontrada"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Falhou a consulta de m�quina: %s: raz�o desconhecida"
@@ -8031,11 +8567,11 @@ msgstr "Falhou a decodifica��o da mensagem."
 msgid "Failed to verify certificates."
 msgstr "Falhou a verifica��o dos certificados."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "N�o � poss�vel obter pasta: Opera��o inv�lida neste reposit�rio"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "N�o � poss�vel criar pasta: Opera��o inv�lida neste reposit�rio"
 
@@ -8063,7 +8599,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8072,16 +8608,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8101,15 +8637,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "N�o foi poss�vel analisar URL `%s'"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "N�o existe tal mensagem %s em %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "N�o existe tal mensagem: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Verificar novas mensagem em todas as pastas"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8131,68 +8667,77 @@ msgstr "N�o � poss�vel renomear pasta: %s: Opera��o inv�lida"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "N�o � poss�vel renomear pasta: %s: N�o existe tal pasta"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Voc� n�o pode copiar mensagens desta pasta de lixeira."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Opera��o cancelada"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "O servidor desconectou inesperadamente: %s"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Falhou o comando IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Resposta do servidor terminou cedo demais."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Resposta do servidor IMAP n�o cont�m informa��o de %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta OK inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "N�o foi poss�vel criar o diret�rio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "N�o foi poss�vel carregar resumo para %s"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "A pasta foi destru�da e recriada no servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Procurando mensagens alteradas"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Esta mensagem n�o est� dispon�vel no momento"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Pegando informa��o de resumo para novas mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Procurando novas mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "N�o foi poss�vel localizar corpo da mensagem na resposta FETCH."
 
@@ -8245,32 +8790,83 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e armazenar correio em servidores IMAP."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Senha"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Esta op��o conectar� ao servidor IMAP usando uma senha em texto claro."
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Servidor SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s servi�o para %s em %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Conex�o cancelada"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "N�o foi poss�vel conectar � %s (porta %d): %s."
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"N�o � poss�vel conectar ao servidor POP.\n"
+"Erro ao enviar nome do usu�rio: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Opera��o n�o suportada"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Falhou a autentica��o."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "O servidor IMAP %s n�o suporta o tipo de autentica��o pedido %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Sem suporte para o tipo de autentica��o %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPor favor entre a senha IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Voc� n�o entrou uma senha."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8281,68 +8877,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "N�o existe a pasta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A pasta pai n�o pode conter sub-pastas"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "N�o � poss�vel abrir mbox: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Diret�rios de correio no formato MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Para armazenar correio local em diret�rios de correio do tipo MH."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Entrega local"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Para recuperar correio local de filas no formato padr�o mbox."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Aplicar filtros �s novas mensagens em INBOX"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Diret�rios de correio no formato maildir"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Para armazenar correio local em diret�rios maildir."
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Filas mbox padr�o do Unix"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "Para ler e armazenar correio local em arquivos de fila mbox padr�o."
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Filas mbox padr�o do Unix"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "Para ler e armazenar correio local em arquivos de fila mbox padr�o."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Raiz de armazenagem %s n�o � um caminho absoluto"
@@ -8368,7 +8983,7 @@ msgstr "Reposit�rios locais n�o possuem uma caixa de entrada"
 msgid "Local mail file %s"
 msgstr "Arquivo de correio local %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "N�o foi poss�vel renomear pasta %s para %s: %s"
@@ -8388,33 +9003,31 @@ msgstr "N�o foi poss�vel excluir arquivo de resumo de pasta `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "N�o foi poss�vel excluir arquivo de �ndice de pasta `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "N�o foi poss�vel salvar resumo: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "N�o � poss�vel adicionar mensagem ao resumo: raz�o desconhecida"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Cancelado o acr�scimo de mensagem maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "N�o � poss�vel acrescentar mensagem � pasta maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8423,20 +9036,19 @@ msgstr ""
 "N�o � poss�vel obter mensagem: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "N�o existe tal mensagem"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Conte�do de mensagem inv�lido"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8447,13 +9059,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Pasta `%s' n�o existe."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8469,7 +9081,7 @@ msgstr "`%s' n�o � um diret�rio maildir."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "N�o foi poss�vel excluir a pasta `%s': %s"
@@ -8478,8 +9090,8 @@ msgstr "N�o foi poss�vel excluir a pasta `%s': %s"
 msgid "not a maildir directory"
 msgstr "n�o � um diret�rio maildir"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "N�o foi poss�vel varrer pasta `%s': %s"
@@ -8500,45 +9112,37 @@ msgstr "Verificando novas mensagens"
 msgid "Checking for new messages"
 msgstr "Procurando novas mensagens"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Armazenando pasta"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "N�o � poss�vel criar bloqueio de pasta em %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "N�o � poss�vel abrir mbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Acr�scimo de correio cancelado"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "N�o � poss�vel acrescentar mensagem ao arquivo mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8547,13 +9151,11 @@ msgstr ""
 "N�o � poss�vel obter mensagem: %s da pasta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "A pasta aparenta estar corrompida de modo irrecuper�vel."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Falha ao construir a mensagem: mbox corrompida?"
 
@@ -8596,149 +9198,149 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Pasta `%s' n�o est� vazia. Ela n�o foi exclu�da."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "N�o foi poss�vel abrir pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Erro fatal do analisador de correio pr�ximo � posi��o %ld na pasta %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "N�o � poss�vel checar pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "N�o foi poss�vel abrir arquivo: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "N�o � poss�vel abrir mbox tempor�rio: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "O resumo e a pasta n�o casam, mesmo ap�s uma sincroniza��o"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Erro ao escrever para o mbox tempor�rio: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Falha ao escrever para o mbox tempor�rio: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "N�o foi poss�vel fechar pasta fonte %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "N�o foi poss�vel fechar pasta tempor�ria: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "N�o foi poss�vel renomear pasta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "O resumo e a pasta n�o casam, mesmo ap�s uma sincroniza��o"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desconhecido: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "N�o foi poss�vel renomear pasta: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Erro ao escrever para o mbox tempor�rio: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Falha ao escrever para o mbox tempor�rio: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Cancelado o acr�scimo de mensagem MH"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "N�o � poss�vel acrescentar mensagem a pasta MH: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' n�o � um diret�rio."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "N�o � poss�vel abrir diret�rio MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "N�o � poss�vel acrescentar mensagem ao arquivo de fila: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Pastas de fila n�o podem ser renomeadas"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Fila `%s' n�o existe ou n�o � um arquivo comum"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "Raiz de armazenagem %s n�o � um diret�rio comum"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Pasta `%s/%s' n�o existe."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Arquivo de fila de correio %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Pastas de fila n�o podem ser renomeadas"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Pastas de fila n�o podem ser renomeadas"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Pastas de fila n�o podem ser exclu�das"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "N�o foi poss�vel sincronizar pasta tempor�ria %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "N�o foi poss�vel sincronizar pasta de fila %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8747,25 +9349,6 @@ msgstr ""
 "N�o foi poss�vel sincronizar pasta de fila %s: %s\n"
 "A pasta pode estar corrompida, c�pia salva em `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "N�o foi poss�vel arquivar: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Fila `%s' n�o existe ou n�o � um arquivo comum"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Correio para %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Not�cias USENET"
@@ -8775,12 +9358,22 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Este � um provedor para ler e publicar em grupos de not�cias da USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "N�o foi poss�vel criar o diret�rio %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Not�cias USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8884,7 +9477,7 @@ msgstr "Deixar mensagens no servidor"
 msgid "Delete after %s day(s)"
 msgstr "Excluir ap�s %s dia(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8910,32 +9503,22 @@ msgstr ""
 "protocolo APOP. Isto pode n�o funcionar para todos os usu�rios mesmo em "
 "servidores que alegam suportar o protocolo."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "N�o � poss�vel conectar ao servidor POP.\n"
 "Erro ao enviar nome do usu�rio: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Opera��o n�o suportada"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Falhou a autentica��o."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "N�o foi poss�vel conectar ao servidor POP em %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8943,27 +9526,27 @@ msgstr ""
 "N�o � poss�vel conectar ao servidor POP.\n"
 "N�o existe suporte para o mecanismo de autentica��o pedido."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "Falhou o comando IMAP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "Erro de E/S"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPor favor entre a senha POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8972,13 +9555,13 @@ msgstr ""
 "N�o � poss�vel conectar ao servidor POP.\n"
 "Erro ao enviar senha: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "N�o existe a pasta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9144,45 +9727,45 @@ msgstr "Falha de autentica��o tempor�ria"
 msgid "Authentication required"
 msgstr "Autentica��o exigida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Erro na resposta de boas-vindas: %s: possivelmente n�o-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "N�o � poss�vel conectar ao servidor POP.\n"
 "Erro ao enviar nome do usu�rio: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "A mensagem n�o aparenta estar formada corretamente."
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "O servidor SMTP %s n�o suporta o mecanismo de autentica��o pedido %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPor favor entre a senha SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9193,90 +9776,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correio SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "N�o � poss�vel enviar mensagem: endere�o do remetente n�o � v�lido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "N�o � poss�vel enviar mensagem: n�o foram definidos destinat�rios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "N�o � poss�vel enviar mensagem: n�o foram definidos destinat�rios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "Sauda��o SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Tempo excedido no pedido HELO: %s: n�o-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Erro na resposta de HELO: %s: n�o-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "Autentica��o SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao criar objeto de autentica��o SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tempo excedido no pedido AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "Falhou o pedido AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta de autentica��o inv�lida do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido MAIL FROM: %s: a mensagem n�o foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Erro na resposta de MAIL FROM: %s: a mensagem n�o foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido RCPT TO: %s: a mensagem n�o foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido DATA: %s: a mensagem n�o foi enviada"
@@ -9284,40 +9867,40 @@ msgstr "Tempo excedido no pedido DATA: %s: a mensagem n�o foi enviada"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Tempo excedido no envio de DATA: termina��o de mensagem: %s: a mensagem n�o "
 "foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Resposta de autentica��o inv�lida do servidor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Tempo excedido no pedido QUIT: %s: n�o-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Erro na resposta de RSET: %s"
@@ -9391,52 +9974,52 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir exibi��o autom�tica de anexo"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Clique aqui para o cat�logo de endere�os"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Responder-a:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Entre os destinat�rios da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entre os endere�os que receber�o uma c�pia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9449,7 +10032,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Anexar um arquivo"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "N�o foi poss�vel criar um contexto de assinatura PGP."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9458,34 +10046,34 @@ msgstr ""
 "Erro ao ler arquivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Alerta!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Arquivo existe, sobrescrever?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acessar arquivo: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "N�o foi poss�vel recuperar mensagem do editor"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9494,7 +10082,7 @@ msgstr ""
 "N�o � poss�vel buscar no arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9503,7 +10091,7 @@ msgstr ""
 "N�o � poss�vel truncar arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9512,7 +10100,7 @@ msgstr ""
 "Erro ao salvar automaticamente mensagem: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9520,7 +10108,7 @@ msgstr ""
 "O Ximian Evolution encontrou arquivos n�o salvos de uma sess�o anterior.\n"
 "Voc� gostaria de tentar recuper�-los?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9530,23 +10118,43 @@ msgstr ""
 "\n"
 "Voc� deseja salvar as suas modifica��es?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Alerta: Mensagem modificada"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Inserir arquivo"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Salvar assinatura"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (padr�o)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Redigir uma mensagem"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9554,7 +10162,7 @@ msgstr ""
 "N�o foi poss�vel criar janela de redator:\n"
 "N�o � poss�vel ativar o controle seletor de endere�os."
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9562,6 +10170,14 @@ msgstr ""
 "N�o foi poss�vel criar janela de redator:\n"
 "N�o � poss�vel ativar o componente editor de HTML."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+"<b>(O redator cont�m um corpo de mensagem n�o texto, o qual n�o pode ser "
+"editado.)<b>"
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9622,7 +10238,7 @@ msgstr "Assunto cont�m"
 msgid "Subject does not contain"
 msgstr "Assunto n�o cont�m"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9767,7 +10383,7 @@ msgstr "hora"
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "segundos"
 
@@ -9842,7 +10458,7 @@ msgstr " atr�s"
 msgid "ago"
 msgstr "atr�s"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
@@ -9854,6 +10470,21 @@ msgstr "<clique aqui para selecionar uma data>"
 msgid "Filter Rules"
 msgstr "Regras de filtro"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Nome do estilo:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Fila `%s' n�o existe ou n�o � um arquivo comum"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Escolher uma a��o:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9872,7 +10503,7 @@ msgstr ""
 "Por favor volte e especifique uma pasta v�lida para onde entregar correio."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Selecionar pasta"
 
@@ -9885,7 +10516,11 @@ msgstr ""
 "Erro na express�o regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Teste"
 
@@ -9915,7 +10550,7 @@ msgstr "se todos os crit�rios forem atendidos"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "se algum crit�rio for atendido"
 
 #: filter/filter-rule.c:780
@@ -9994,194 +10629,204 @@ msgid "Beep"
 msgstr "Bel�m"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Empresa"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "cont�m"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Copiar para pasta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Data de recebimento"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Data de envio"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Exclu�da"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "n�o cont�m"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "n�o termina com"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "n�o existe"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "n�o soa como"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "n�o come�a com"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "N�o existe"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Rascunho"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "termina com"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Express�o"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "�"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "foi ap�s"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "foi antes"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "� maior que"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "� menor que"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "n�o �"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Lista de discuss�o"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Corpo da mensagem"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Cabe�alho da mensagem"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Mover para pasta"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Tocar um som:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Lida"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinat�rios"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Casamento com express�o regular"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Em resposta a"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Pontua��o"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Remetente"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Atribuir estado"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Tamanho (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "soa como"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Conta fonte"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Cabe�alho espec�fico"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "come�a com"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Parar o processamento"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Assunto"
 
@@ -10236,7 +10881,8 @@ msgid "Scanning %s"
 msgstr "Varrendo %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Correio"
 
@@ -10252,10 +10898,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Cat�logo de endere�os"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10305,7 +10947,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "O Evolution est� importando seus dados antigos do Netscape"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Lixeira"
 
@@ -10441,31 +11085,31 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Pasta contendo correio"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Lixeira virtual"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Pasta lixeira virtual"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Esta pasta n�o pode conter mensagens."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Propriedades..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Modificar as propriedades desta pasta"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10473,239 +11117,247 @@ msgstr ""
 "Algumas de suas configura��es de correio aparentam estar corrompidas, por "
 "favor verifique se tudo est� em ordem."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Voc� n�o estabeleceu um m�todo de transporte de correio"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Alerta: Mensagem modificada"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Nova mensagem de correio"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Mensagem de correio"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "N�o � poss�vel iniciar o componente de correio do Evolution."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "N�o � poss�vel iniciar o componente de configura��o de correio do Evolution."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "N�o � poss�vel iniciar o componente de informa��o de pasta do Evolution."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando ao servidor..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "N�o � poss�vel registrar reposit�rio com a shell."
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriedades para \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Propriedades"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "N�o foi poss�vel criar diret�rio tempor�rio: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d novas"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d escondidas"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d selecionadas"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d n�o enviadas"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d enviadas"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Criar pasta _virtual a partir da mensagem"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "Pasta virtual por _busca"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "Pasta virtual por _remetente"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "Pasta virtual por _destinat�rios"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "Pasta virtual por _lista de discuss�o"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filtro por _assunto"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filtro por _remetente"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filtro por _destinat�rios"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filtro por _lista de discuss�o"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Res_ponder ao remetente"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Responder a _lista"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Encaminhar"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Conclu�da"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _n�o lida"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar como _sem import�ncia"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Des_fazer exclus�o"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover para pasta..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Copiar para pasta..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "Laurel"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adicionar remetente ao cat�logo de endere�os"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar filtros"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Criar _regra a partir da mensagem"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Pasta virtual por lista de discuss�o"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtro por lista de discuss�o (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Pasta virtual por lista de discuss�o (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Padr�o"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Obtendo informa��o de pasta"
 
@@ -10760,7 +11412,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Voc� n�o preencheu toda a informa��o exigida."
 
@@ -10770,83 +11422,111 @@ msgid "Evolution News Editor"
 msgstr "Editor de not�cias do Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Editor de contas do Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_M�quina:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome do _usu�rio:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Caminho:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "R�dio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Voc� n�o pode criar duas contas com o mesmo nome."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Voc� tem certeza que deseja excluir esta conta?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "N�o excluir"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Excluir conta mesmo?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Desativar"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Ativar"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Voc� tem certeza que deseja excluir esta conta de not�cias?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Ativado"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Nome da _conta:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Rico"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, c-format
+msgid "Mail to %s"
+msgstr "Correio para %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Assunto � %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Correio de %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "Lista de discuss�o %s"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Adicionar regra de filtro"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"A(s) seguinte(s) pasta(s) virtual(is):\n"
+"%sUsava(m) a pasta removida:\n"
+"    '%s'\n"
+"e foi(foram) atualizada(s)."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10858,7 +11538,7 @@ msgstr ""
 "receber ou redigir mensagens.\n"
 "Voc� desejaria configur�-lo agora?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10866,7 +11546,7 @@ msgstr ""
 "Voc� deve configurar uma identidade\n"
 "antes de poder redigir uma mensagem."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10875,7 +11555,7 @@ msgstr ""
 "antes de poder redigir uma mensagem."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10883,11 +11563,11 @@ msgstr ""
 "Voc� est� enviando uma mensagem em formato HTML, mas os seguintes "
 "destinat�rios n�o desejam correio em formato HTML:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Enviar mesmo assim?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10895,7 +11575,7 @@ msgstr ""
 "Esta mensagem n�o possui um assunto.\n"
 "Enviar mesmo assim?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10904,11 +11584,11 @@ msgstr ""
 "est� configurada para esconder os endere�os da lista, esta mensagem conter� "
 "apenas destinat�rios Bcc."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensagem cont�m apenas destinat�rios Bcc."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10918,15 +11598,15 @@ msgstr ""
 "cabe�alho Apparently-To.\n"
 "Enviar mesmo assim?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Voc� deve especificar destinat�rios para poder enviar esta mensagem."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Voc� deve configurar uma conta antes de poder enviar esta mensagem."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10934,28 +11614,28 @@ msgstr ""
 "N�o � poss�vel abrir a pasta de rascunhos para esta conta.\n"
 "Voc� gostaria de usar a pasta de rascunhos padr�o?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Em %a, %Y-%m-%d �s %H:%M, %%s escreveu:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copiar mensagem(ns) para"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Voc� tem certeza que deseja editar todas as %d mensagens?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10963,7 +11643,7 @@ msgstr ""
 "Voc� pode apenas editar mensagens salvas\n"
 "na pasta Rascunho."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10971,39 +11651,39 @@ msgstr ""
 "Voc� pode apenas reenviar mensagens\n"
 "na pasta Enviada."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Voc� tem certeza que deseja reenviar todas as %d mensagens?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "N�o existe mensagem selecionada"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Sobrescrever arquivo?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Salvar mensagem como..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Salvar mensagens como..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Exibir a pr�xima mensagem n�o lida"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11016,7 +11696,7 @@ msgstr ""
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11025,33 +11705,69 @@ msgstr ""
 "Erro ao carregar infora��o do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Obtendo mensagem %d de %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "Carta-US"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Falhou a impress�o da mensagem"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Voc� tem certeza que deseja abrir todas as %d mensagens em janela separadas?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "_Seguran�a"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Contato sem nome"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Enviada"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Salvar assinatura"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Salvar assinatura"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11105,195 +11821,177 @@ msgstr ""
 "Este nome ser� usado apenas para prop�sitos de exibi��o."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Assistente de contas do Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "ap�s"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"N�o foi poss�vel obter caixa de entrada para novo reposit�rio de correio:\n"
-"%s\n"
-"N�o ser� criado nenhum atalho."
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Conta"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Verificando servi�o"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Contato sem nome"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "_Editar"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Novo"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _Verificar tipos suportados "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL n�o � suportado nesta c�pia do Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL n�o � suportado nesta c�pia do Evolution)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Sempre ci_frar para mim mesmo ao enviar correio cifrado"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Conta %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Informa��o de conta"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Ger�ncia de conta"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Cancelar opera��o"
+msgid "Add Sc_ript"
+msgstr "_Seguran�a"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "Arkansas"
+msgid "Add new signature..."
+msgstr "Salvar assinatura"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Sempre ci_frar para mim mesmo ao enviar correio cifrado"
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Sempre _assinar mensagens enviadas usando esta conta"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "Arica"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexar um arquivo � mensagem"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Verificar automaticamente novas mensagens"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Codifica��o de caracteres"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "Comoros"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Verificando novas mensagens"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Cor das tarefas com prazo para hoje"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "Redigir uma mensagem"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Configura��o"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11309,57 +12007,47 @@ msgstr ""
 "\n"
 "Pressione \"Concluir\" para salvar suas configura��es."
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "Bari"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Padr�o"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Codifica��o de caracteres padr�o: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Pegando correio"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "IDs digitais..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "N�o � poss�vel abrir mensagem"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Terminado"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Pasta de _rascunhos:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "A_tivar"
 
-#: mail/mail-config.glade.h:48
-#, fuzzy
-msgid "E_nable advanced options"
-msgstr "Cancelar opera��o"
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11380,40 +12068,35 @@ msgstr "_Endere�o de e-mail:"
 msgid "Empty _trash folders on exit"
 msgstr "_Esvaziar lixeiras ao sair"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executar a��es"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "termina com"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propriedades"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Obter ID digital..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Real�ar cita��es com"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Hurlburt"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11467,70 +12150,66 @@ msgstr "Micron�sia"
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configura��o de correio"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "_Fontes de not�cias"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Informa��o opcional"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Empresa:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da chave _PGP:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Escolha uma cor"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Perguntar ao enviar mensagens com apenas destinat�rios _Bcc"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimir contatos selecionados"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "N�o � poss�vel abrir mensagem"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Lembrar esta senha"
@@ -11565,117 +12244,120 @@ msgstr "Seguran�a"
 
 #: mail/mail-config.glade.h:104
 #, fuzzy
-msgid "Same as text"
-msgstr "Somerset"
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Selecionar execut�vel PGP"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Arquivo de assinatura:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Excluir tudo exceto a assinatura"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando mensagem"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Pasta de mensagens _enviadas:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Mensagens enviadas e rascunhos"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Servidor requer _autentica��o"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Configura��o do servidor"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Tipo do _servidor: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Atalhos"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Salvar assinatura"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Salvar assinatura"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Fonte"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Informa��o da fonte"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Mbox padr�o do Unix"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "Assinatura _HTML:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Vari�vel"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11685,145 +12367,138 @@ msgstr ""
 "\n"
 "Pressione \"Pr�ximo\" para come�ar. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Leste"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_Arquivo de assinatura:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "_Sempre carregar imagens da rede"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Sempre a_ssinar mensagens enviadas usando esta conta"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Tipo de autentica��o: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Tipo de autentica��o: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "_Verificar automaticamente novas mensagens"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_Verificar automaticamente novas mensagens"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_ID do certificado:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Confirmar ao excluir permanentemente uma pasta"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Assinatura _HTML:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Padr�o"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Nome do arquivo:"
+msgid "_Enable"
+msgstr "Ativar"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Estilo de encaminhamento padr�o �: "
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nome _completo:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Em correio HTML"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "Assinatura _HTML:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "L�ngua"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_Carregar imagens se o remetente est� no cat�logo de endere�os"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Torne esta a minha conta _padr�o"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensagens como lidas ap�s"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Nunca carregar imagens da rede"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "Arquivo execut�vel _PGP:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Perguntar ao enviar mensagens HTML para contatos que n�o as querem"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Perguntar ao enviar mensagens com um assunto _vazio"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "R�dio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11865,69 +12540,52 @@ msgstr "_Arquivo de assinatura:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "Assinatura _HTML:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Usar conex�o se_gura (SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Vari�vel"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "a _cada"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " cor"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "descri��o"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "N�o foi poss�vel criar um contexto de assinatura PGP."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "N�o foi poss�vel criar um contexto de verifica��o PGP."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "N�o foi poss�vel criar um contexto de cifragem PGP."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "N�o foi poss�vel criar um contexto de decifragem PGP."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "N�o foi poss�vel criar um contexto de assinatura S/MIME."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "N�o foi poss�vel criar um contexto certsonly S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "N�o foi poss�vel criar um contexto de cifragem S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "N�o foi poss�vel criar um contexto de envelope S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "N�o foi poss�vel criar um contexto de decodifica��o S/MIME."
 
@@ -11970,98 +12628,135 @@ msgstr "Visualizador externo"
 msgid "Loading message content"
 msgstr "Carregando conte�do da mensagem"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Tarefas _atrasadas:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Abrir v�nculo no navegador"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Copiar local do v�nculo"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Salvar v�nculo como (FIXME)"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Salvar imagem como..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "N�o foi poss�vel analisar mensagem MIME. Exibindo como fonte."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Endere�o inv�lido"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Responder-a"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "Correio"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Salvar mensagem como..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Esta mensagem est� assinada digitalmente. Clique no cadeado para mais "
+"informa��es."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "N�o foi poss�vel criar um contexto de verifica��o PGP."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Esta mensagem est� assinada digitalmente e � aut�ntica."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Esta mensagem est� assinada digitalmente mas n�o � poss�vel estabelecer sua "
+"autenticidade."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Apontador para site FTP (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Apontador para arquivo local (%s) v�lido no site \"%s\""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Apontador para arquivo local (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Apontador para dados remotos (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Pastas locais"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando pasta"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12070,27 +12765,27 @@ msgstr ""
 "N�o � poss�vel salvar metainfo; voc� provavelmente descobrir� que\n"
 "n�o pode mais abrir esta pasta: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "N�o � poss�vel salvar metainfo de pasta para %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "N�o � poss�vel excluir metainfo de pasta %s: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Alterando pasta \"%s\" para o formato \"%s\""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s n�o pode ser reconfigurada pois n�o � uma pasta local"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12098,11 +12793,11 @@ msgstr ""
 "Se voc� n�o pode mais abrir esta caixa postal\n"
 "ent�o voc� precisar repar�-la manualmente."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Voc� n�o pode alterar o formato de pastas remotas."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar /%s"
@@ -12160,81 +12855,73 @@ msgstr "Falha na mensagem %d de %d"
 msgid "Complete."
 msgstr "Conclu�da."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Salvando mensagem na pasta"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensagens para %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensagens para %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Movendo"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Copiando"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Varrendo pastas em \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo reposit�rio %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removendo pasta %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Armazenando pasta '%s'"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Atualizando pasta"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Excluindo permanentemente pasta"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recuperando mensagem %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recuperando %d mensagem(ns)"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvando %d mensagem(ns)"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12243,7 +12930,7 @@ msgstr ""
 "N�o � poss�vel criar arquivo de sa�da: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12252,11 +12939,11 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Salvando anexo"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12265,27 +12952,27 @@ msgstr ""
 "N�o � poss�vel criar arquivo de sa�da: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "N�o foi poss�vel escrever dados: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectando a %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -12356,10 +13043,6 @@ msgstr "Atualizando..."
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Cancelada."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "O usu�rio cancelou a opera��o."
@@ -12373,16 +13056,16 @@ msgstr "Entre senha para %s"
 msgid "Enter Password"
 msgstr "Entre senha"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "N�o foi poss�vel salvar arquivo de assinatura."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Salvar assinatura"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12392,10 +13075,30 @@ msgstr ""
 "\n"
 "Voc� deseja salvar as suas modifica��es?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Nome:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "Arquivo de assinatura:"
+msgid "Signature hint"
+msgstr "Salvar assinatura"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "Arquivo de assinatura HTML:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12410,17 +13113,17 @@ msgstr "Mensagem encaminhada"
 msgid "Forwarded Message"
 msgstr "Mensagem encaminhada"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Preparando pasta virtual: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Atualizando pastas virtuais para URI: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12433,89 +13136,94 @@ msgstr ""
 "    '%s'\n"
 "e foi(foram) atualizada(s)."
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "Pastas virtuais"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Editar pasta virtual"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Tentando editar uma pasta virtual '%s' que n�o existe."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Nova pasta virtual"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Sem assunto)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensagem"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "N�o vista"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "V�rias mensagens n�o vistas"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "V�rias mensagens"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "M�nima"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Mais baixa"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Mais alta"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "M�xima"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
@@ -12538,10 +13246,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Contato original:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Recebida"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Tamanho"
 
@@ -17253,5232 +17966,5229 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds and Bradford"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "L�bia"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisboa"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "Londres"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "Londres/Cidade"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "Londres/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "Londres/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "Londres/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Lousiana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "Lubeck-Blankensee"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "L�tvia"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macap�"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Macei�"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malmo/Sturup"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Londres"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Marab�"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto Airport"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Aeroporto de Matsuyama"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Airport"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Oriente M�dio"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Aeroporto de Miyakejima"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Aeroporto de Miyazaki"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Aeroporto de Mombetsu"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Moscou Domodedovo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moscou Sheremetyevo"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "Munchen"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Aeroporto de Nagasaki"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Aeroporto de Nagoya"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Aeroporto de Naha"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Aeroporto de Nakashibetsu"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Aeroporto de Nankishirahama"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "N�poles"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "Novo Aeroporto Internacional de Tokyo"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Aeroporto de Niigata"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Aeroporto de Obihiro"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Odesa"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Aeroporto de Oita"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Aeroporto de Okayama"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Aeroporto de Oki"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Aeroporto Internacional de Osaka"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Aeroporto de Oshima"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "People's Republic of China"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Po�os de Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Arpt Porto Alegre"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio de Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagu�"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Russia"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "S�o Jos� dos Campos"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "S�o Lu�s"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "S�o Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Aeroporto de Sendai"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O International Airport"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 #, fuzzy
 msgid "Sympheropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Aeroporto de Takamatsu"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talinn"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Aeroporto de Tanegashima"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Tehran-Mehrabad"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Heliporto de Tokyo"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Aeroporto Internacional de Tokyo"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Novo Aeroporto Internacional de Tokyo"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori Airport"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama Airport"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Aeroporto de Tsushima"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucuru�"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "Emirados �rabes Unidos"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 #, fuzzy
 msgid "Uzhgorod"
 msgstr "Europa/Uzhgorod"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech Airport"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser Airport"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Airport"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Aeroporto de Yamagata"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Aeroporto de Yamaguchi Ube"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Aeroporto de Yao"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Zurich"
 
@@ -22506,17 +23216,12 @@ msgstr "%l:%M %d de %B"
 msgid "No description"
 msgstr "Sem descri��o"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Resumo das mensagens"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "Pastas virtuais"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Pastas locais"
 
@@ -22525,57 +23230,47 @@ msgstr "Pastas locais"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "SBFN"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "\"Word of the Day\" do Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Cita��es do dia"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Adicionar uma fonte de not�cias"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Entre a URL da fonte not�cias que voc� deseja adicionar"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Nome:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Erro ao baixar RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Fonte de not�cias"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
+msgid "Add"
 msgstr "_Adicionar"
 
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "Remover"
-
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shelton"
@@ -22616,11 +23311,43 @@ msgstr "Imprimir resumo"
 msgid "Printing of Summary failed"
 msgstr "Falhou a impress�o do resumo"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 "O componente Resumo executivo do Evolution n�o p�de iniciar o Bonobo.\n"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr "� F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr "� C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "n�s"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "milhas"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "quil�metros"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "C�u claro"
@@ -23772,101 +24499,106 @@ msgid "C_elsius"
 msgstr "Ce_lcius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Todas as fontes de _not�cias:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Quantos dias a agenda deve exibir de uma vez?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "N�mero _m�ximo de itens exibidos:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Configura��es de fontes de not�cias"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Um _m�s"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "Uma _semana"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "Tem_po de atualiza��o (segundos):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "Tem_po de atualiza��o (segundos):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "E_xibir caminho completo para pastas"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "_Exibir todas as tarefas"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Exibir as tarefas de _hoje"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Exibir temperaturas em:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Tarefas "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Configura��es de tempo"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "Fa_hrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "Ci_nco dias"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Correio"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "_Fontes de not�cias"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Um dia"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "A_genda"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Tempo"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 #, fuzzy
-msgid "Configuration control for Evolution default folders."
+msgid "Configuration control for Evolution folder settings."
 msgstr "F�brica para o redator do Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Pastas especiais"
+msgid "Folder Settings"
+msgstr "Configura��es de correio"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "A shell do Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -23877,6 +24609,37 @@ msgstr "Exibir detalhes"
 msgid "Cancel Operation"
 msgstr "Cancelar opera��o"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"N�o � poss�vel transferir pasta:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Selecionar pasta"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Rascunho"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Caixa de entrada"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Caixa de sa�da"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Enviada"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instala��o do Evolution"
@@ -23991,6 +24754,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Feito para voc� por"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Data de conclus�o"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Pastas especiais"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Pastas especiais"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Pastas especiais"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Data de conclus�o"
+
 #: shell/e-shell-folder-commands.c:140
 #, c-format
 msgid "Cannot copy folder: %s"
@@ -24018,20 +24806,20 @@ msgstr "N�o � poss�vel mover uma pasta em um dos seus descendentes."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Especifique uma pasta para onde copiar a pasta \"%s\":"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Copiar pasta"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Especifique uma pasta para onde mover a pasta \"%s\":"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Mover pasta"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24040,18 +24828,19 @@ msgstr ""
 "N�o � poss�vel excluir pasta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Excluir \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Voc� tem certeza que deseja remover a pasta \"%s\"?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"N�o � poss�vel excluir pasta:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24060,16 +24849,16 @@ msgstr ""
 "N�o � poss�vel renomear pasta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24088,7 +24877,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Criar nova pasta"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -24096,7 +24885,7 @@ msgstr ""
 "O tipo da pasta selecionada n�o � v�lido para\n"
 "a opera��o desejada."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Novo..."
 
@@ -24148,21 +24937,26 @@ msgstr ""
 "Importando %s\n"
 "Importando item %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Selecionar pasta"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Arquivo %s n�o existe"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Erro do Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Voc� s� pode importar pastas locais"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24171,11 +24965,11 @@ msgstr ""
 "N�o existe importador capaz de tratar\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24184,17 +24978,17 @@ msgstr ""
 "Importando %s.\n"
 "Iniciando %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao carregar %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24203,31 +24997,31 @@ msgstr ""
 "Importando %s\n"
 "Importando item 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Autom�tico"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Nome do arquivo:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Selecionar um arquivo"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Tipo do arquivo:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Importar dados e configura��es de programas antigos"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Importar um �nico arquivo"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24235,31 +25029,78 @@ msgstr ""
 "Por favor aguarde...\n"
 "Procurando configura��es existentes"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando importadores inteligentes"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Selecionar pasta"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Selecionar uma pasta destino para onde importar estes dados"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Fechando conex�es..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Erro enquanto '%s':\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Sincronizando pasta"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Abrindo pasta %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Abrindo pasta %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Abrir em %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"N�o � poss�vel criar a pasta especificada:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -24274,8 +25115,8 @@ msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "N�o foi poss�vel iniciar a interface do Assistente de correio do Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Novo"
@@ -24296,43 +25137,43 @@ msgstr "O nome da pasta n�o pode conter barras."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' s�o nomes de pastas reservados."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy n�o foi encontrado em seu $PATH."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy n�o p�de ser executado."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Sobre o Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Ir para a pasta..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Selecione a pasta que voc� quer abrir"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Criar um novo atalho"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Selecione a pasta para a qual voc� quer que o atalho aponte:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "_Trabalhar conectado"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "_Trabalhar desconectado"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Trabalhar desconectado"
 
@@ -24367,7 +25208,7 @@ msgstr ""
 "O Ximian Evolution est� atualmente desconectado. Clique neste bot�o para "
 "trabalhar conectado."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24379,12 +25220,12 @@ msgstr ""
 "O erro do sistema de ativa��o �:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "N�o � poss�vel preparar reposit�rio local -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24395,23 +25236,19 @@ msgstr ""
 "terminou inesperadamente. Voc� ter� que sair do Evolution e reinici�-lo\n"
 "para poder acessar os seus dados novamente."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Argumentos inv�lidos"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "N�o � poss�vel registrar no OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "N�o foi localizado o banco de dados de configura��o"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Erro gen�rico"
 
@@ -24436,95 +25273,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "N�o remover"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Renomear grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Renomear grupo de atalhos selecionado para:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "�cones _pequenos"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Exibe os atalhos como �cones pequenos"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "�cones _grandes"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Exibe os atalhos como �cones grandes"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Novo group..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Criar um novo grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "_Remover este grupo..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Exclui este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "Re_nomear este grupo..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Renomear este grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "Es_conder a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Esconder a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Renomear atalho"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Renomear atalho selecionado para:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir a pasta vinculada a este atalho"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Abrir em nova _janela"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Abrir a pasta vinculada a este atalho em uma nova janela"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Renomear este atalho"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "Re_mover"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remove este atalho da barra de atalhos"
 
@@ -24536,10 +25373,6 @@ msgstr "Erro ao salvar atalhos."
 msgid "Shortcuts"
 msgstr "Atalhos"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Caixa de entrada"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -24604,10 +25437,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% cumprida)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<clique aqui para selecionar uma pasta>"
 
@@ -24648,67 +25482,67 @@ msgstr ""
 "O erro do sistema de ativa��o �:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "Erro CORBA"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Interrompido"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Argumento inv�lido"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "J� possui um dono"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Sem dono"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "N�o encontrado"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Tipo n�o suportado"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Schema n�o suportado"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Opera��o n�o suportada"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "URI inv�lida"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Possui sub-pastas"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Sem espa�o remanescente"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "O dono anterior morreu"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Tipo do arquivo:"
@@ -24838,49 +25672,81 @@ msgstr "N�o pergunte-me novamente"
 msgid "Evolution can import data from the following files:"
 msgstr "O Evolution pode importar dados dos seguintes arquivos:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "O Evolution est� saindo agora ..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "N�o pergunte-me novamente"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "N�o � poss�vel acessar a shell do Ximian Evolution."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "N�o � poss�vel iniciar a shell do Ximian Evolution: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Desativar tela de abertura"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Iniciando a importa��o"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Iniciando importadores inteligentes"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a sa�da de depura��o de todos os componentes para um arquivo."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "N�o � poss�vel iniciar o sistema de componentes Bonobo."
 
@@ -24994,11 +25860,11 @@ msgstr "o instante atual"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_A��es"
 
@@ -25120,8 +25986,8 @@ msgstr "Fechar este item"
 msgid "Delete this item"
 msgstr "Excluir este item"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Barra de tarefas principal"
 
@@ -25161,7 +26027,7 @@ msgstr "Salvar este item para disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Arquivo"
 
@@ -25226,19 +26092,19 @@ msgstr "Encaminar como i_Calendar"
 msgid "Forward this item via email"
 msgstr "Encaminhar este item por e-mail"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Obter a informa��o de reuni�o mais recente"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "A_tualizar reuni�o"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "Agendar _reuni�o"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Agendar uma reuni�o para este item"
 
@@ -25246,10 +26112,6 @@ msgstr "Agendar uma reuni�o para este item"
 msgid "Customise My Evolution"
 msgstr "Personalizar Meu Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Cancelar a opera��o de correio atual"
@@ -25409,7 +26271,7 @@ msgstr "Lista de mensagens encadeadas"
 msgid "_Expunge"
 msgstr "E_xcluir permanentemente"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Pasta"
 
@@ -25825,7 +26687,7 @@ msgstr "Mensagem anterior"
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Ferramentas"
 
@@ -25840,12 +26702,12 @@ msgstr "Fechar esta janela"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_Fechar"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Ver"
 
@@ -26032,7 +26894,7 @@ msgstr "_Abrir..."
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-a"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Aj_uda"
 
@@ -26181,111 +27043,120 @@ msgid "Move this folder to another place"
 msgstr "Mover esta pasta para outro lugar"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Criar _nova pasta..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Abrir em nova janela"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Abrir esta pasta em uma outra janela"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Enviar / receber"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar mensagens na fila de sa�da e recuperar novas mensagens"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Exibir informa��o sobre o Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Enviar relat�rio de erro"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "Enviar relat�rio de _erro"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar relat�rio de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Alternar"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Alternar a exibi��o da barra de pastas"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Alternar a exibi��o da barra de atalhos"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Alternar se estamos trabalhando desconectados."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Ver a pasta selecionada"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ do Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_Sobre o Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_Barra de pastas"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_Ir para pasta..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Nova pasta"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "Configura��es do _pilot..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Enviar / receber"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Atalho"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "_Barra de atalhos"
 
@@ -26370,21 +27241,21 @@ msgstr ""
 "um fuso hor�rio.\n"
 "Use o bot�o direito do mouse para distanciar o mapa."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Vis�o atual"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "_Vis�o atual"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Definir vis�es"
 
@@ -26506,16 +27377,21 @@ msgstr "Editor de buscas"
 msgid "Save Search"
 msgstr "Salvar busca"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Salvar busca"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Adicionar �s busca salvas"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Avan�ado..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informa��o"
@@ -26537,21 +27413,21 @@ msgstr "Mensagem"
 msgid "Don't show this message again."
 msgstr "N�o exibir esta mensagem novamente."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Localizar agora"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Localizar agora"
 
@@ -26577,376 +27453,305 @@ msgstr "init_corba(): n�o foi poss�vel iniciar GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Editar cat�logo de endere�os"
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Fontes de cat�logos de endere�os"
 
-#~ msgid "A_uthenticate with server using:"
-#~ msgstr "A_utenticar com servidor usando:"
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "Informa��o de rastreio opaca inv�lida:\n"
+#~ "%s"
 
-#~ msgid "Account Name"
-#~ msgstr "Nome da conta"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Componente resumo executivo de agenda do Evolution."
 
-#~ msgid "Add Addressbook"
-#~ msgstr "Adicionar cat�logo de endere�os"
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "F�brica para o componente resumo da agenda."
 
-#~ msgid "Advanced"
-#~ msgstr "Avan�ado"
+#~ msgid "Sta_rt of day:"
+#~ msgstr "I_n�cio do dia:"
 
-#~ msgid "Base"
-#~ msgstr "Base"
+#~ msgid "_End of day:"
+#~ msgstr "T�r_mino do dia:"
 
-#~ msgid "Check this if the server requires you to authenticate."
-#~ msgstr "Marque aqui se o servidor exige que voc� se autentique."
+#~ msgid "_Other Organizer"
+#~ msgstr "_Outro organizador"
 
-#~ msgid ""
-#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
-#~ "server"
-#~ msgstr ""
-#~ "O Evolution usar� este Distinquished Name (DN) para autentic�-lo com o "
-#~ "servidor"
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Assinaturas em claro n�o s�o suportadas por esta cifra"
 
-#~ msgid "Server Name"
-#~ msgstr "Nome do servidor"
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Por favor, entre a sua frase-senha de %s para %s"
 
-#~ msgid "The information below is required in order to add an addressbook.  "
-#~ msgstr ""
-#~ "A informa��o abaixo � necess�ria para poder adicionar um cat�logo de "
-#~ "endere�os.  "
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Por favor, entre a sua frase-senha de %s"
 
-#~ msgid "This information is not required for most ldap servers. "
+#~ msgid "Cannot sign this message: no plaintext to sign"
 #~ msgstr ""
-#~ "Esta informa��o n�o � necess�ria para a maioria dos servidores ldap. "
+#~ "N�o � poss�vel assinar esta mensagem: n�o existe texto claro para assinar"
 
-#~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
-#~ msgstr ""
-#~ "Esta informa��o � usada pelo seu servidor ldap para especificar quais n�s "
-#~ "s�o usados em uma busca. Procure o administrador de seu servidor para mais "
-#~ "informa��es."
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "N�o � poss�vel assinar esta mensagem: n�o foi fornecida uma senha"
 
-#~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 #~ msgstr ""
-#~ "Este � o n� base para todas as suas buscas no servidor ldap. Procure o "
-#~ "administrador de seu servidor para mais informa��es."
+#~ "N�o � poss�vel assinar esta mensagem: n�o foi poss�vel criar pipe para "
+#~ "GPG/PGP: %s"
 
-#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
 #~ msgstr ""
-#~ "Este � o nome do servidor onde o seu cat�logo de endere�os est� localizado."
-
-#~ msgid "This is the port that your ldap server uses."
-#~ msgstr "Esta � a porta que o seu servidor ldap usa."
-
-#~ msgid "_Account name:"
-#~ msgstr "Nome da _conta:"
-
-#~ msgid "Other Contacts"
-#~ msgstr "Outros contatos"
+#~ "N�o � poss�vel assinar esta mensagem: n�o existe texto claro para assinar "
+#~ "em claro"
 
-#~ msgid "(none)"
-#~ msgstr "(nenhum)"
-
-#~ msgid "C_ontaining:"
-#~ msgstr "C_ontendo:"
-
-#~ msgid "Show contacts matching the following criteria:"
-#~ msgstr "Exibir contatos casando com os seguintes crit�rios:"
-
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#~ msgid "Cannot verify this message: no plaintext to verify"
 #~ msgstr ""
-#~ "Voc� tem certeza que deseja\n"
-#~ "excluir este contato?"
-
-#~ msgid "Starting:"
-#~ msgstr "Iniciando:"
+#~ "N�o � poss�vel verificar esta mensagem: n�o existe texto claro para "
+#~ "verificar"
 
-#~ msgid "Ending:"
-#~ msgstr "Terminando:"
-
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "_Criar novos compromissos com um lembrete padr�o"
-
-#~ msgid "First day of wee_k:"
-#~ msgstr "P_rimeiro dia da semana:"
-
-#~ msgid "_Other"
-#~ msgstr "_Outros"
-
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Clique aqui para adicionar um participante"
-
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "N�o � poss�vel verificar esta mensagem: n�o foi poss�vel criar pipe para "
+#~ "GPG/PGP: %s"
 
-#~ msgid "80%"
-#~ msgstr "80%"
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr ""
+#~ "N�o � poss�vel cifrar esta mensagem: n�o existe texto claro para cifrar"
 
-#~ msgid "90%"
-#~ msgstr "90%"
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "N�o � poss�vel cifrar esta mensagem: n�o foi fornecida uma senha"
 
-#~ msgid "100%"
-#~ msgstr "100%"
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "N�o � poss�vel cifrar esta mensagem: n�o foi poss�vel criar pipe para GPG/"
+#~ "PGP: %s"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "Reuni�o come�a: <b>"
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "N�o � poss�vel decifrar esta mensagem: n�o existe texto cifrado para "
+#~ "decifrar"
 
-#~ msgid "Task begins: <b>"
-#~ msgstr "Tarefa come�a: <b>"
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "N�o � poss�vel decifrar esta mensagem: n�o foi fornecida uma senha"
 
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Informa��o de livre/ocupado come�a: <b>"
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "N�o � poss�vel decifrar esta mensagem: n�o foi poss�vel criar pipe para "
+#~ "GPG/PGP: %s"
 
-#~ msgid "Begins: <b>"
-#~ msgstr "Come�a: <b>"
+#~ msgid "%s server %s"
+#~ msgstr "%s servidor %s"
 
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Reuni�o termina: <b>"
+#~ msgid "(unknown host)"
+#~ msgstr "(m�quina desconhecida)"
 
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Informa��o de livre/ocupado termina: <b>"
+#~ msgid "No such message: %s"
+#~ msgstr "N�o existe tal mensagem: %s"
 
-#~ msgid "Ends: <b>"
-#~ msgstr "Termina: <b>"
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Voc� n�o pode copiar mensagens desta pasta de lixeira."
 
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Tarefa conclu�da: <b>"
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "N�o � poss�vel acrescentar mensagem ao arquivo de fila: %s: %s"
 
-#~ msgid "Task Due: <b>"
-#~ msgstr "Tarefa para: <b>"
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "N�o foi poss�vel arquivar: %s: %s"
 
-#~ msgid "iCalendar Information"
-#~ msgstr "Informa��o de iCalendar"
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Fila `%s' n�o existe ou n�o � um arquivo comum"
 
-#~ msgid "iCalendar Error"
-#~ msgstr "Erro de iCalendar"
+#, fuzzy
+#~ msgid "Mail tree %s"
+#~ msgstr "Correio para %s"
 
-#~ msgid "An unknown person"
-#~ msgstr "Uma raz�o desconhecida"
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "R�dio"
 
 #~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
 #~ msgstr ""
-#~ "<br> Por favor veja a seguinte informa��o e ent�o selecione uma a��o do menu "
-#~ "abaixo."
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Nenhum</i>"
-
-#~ msgid "Status:"
-#~ msgstr "Estado:"
-
-#~ msgid "Tentatively Accepted"
-#~ msgstr "Aceito preliminarmente"
-
-#~ msgid "Choose an action:"
-#~ msgstr "Escolher uma a��o:"
-
-#~ msgid "Update"
-#~ msgstr "Atualizar"
-
-#~ msgid "Accept"
-#~ msgstr "Aceitar"
-
-#~ msgid "Tentatively accept"
-#~ msgstr "Aceitar preliminarmente"
-
-#~ msgid "Decline"
-#~ msgstr "Recusar"
-
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Enviar informa��o de livre/ocupado"
-
-#~ msgid "Update respondent status"
-#~ msgstr "Atualizar estado do respondente"
-
-#~ msgid "Send Latest Information"
-#~ msgstr "Enviar informa��o mais recente"
+#~ "N�o foi poss�vel obter caixa de entrada para novo reposit�rio de "
+#~ "correio:\n"
+#~ "%s\n"
+#~ "N�o ser� criado nenhum atalho."
 
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> publicou informa��o de reuni�o."
-
-#~ msgid "Meeting Information"
-#~ msgstr "Informa��o de reuni�o"
-
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> requisita a sua presen�a em uma reuni�o."
-
-#~ msgid "Meeting Proposal"
-#~ msgstr "Proposta de reuni�o"
-
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> deseja adicion�-lo a uma reuni�o existente."
-
-#~ msgid "Meeting Update"
-#~ msgstr "Atualiza��o de reuni�o"
-
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> deseja receber a informa��o de reuni�o mais recente."
-
-#~ msgid "Meeting Update Request"
-#~ msgstr "_Pedido de atualiza��o de reuni�o"
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "_Editar"
 
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> respondeu a um pedido de reuni�o."
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Novo"
 
-#~ msgid "Meeting Reply"
-#~ msgstr "Resposta a reuni�o"
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Cancelar opera��o"
 
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> cancelou a reuni�o."
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "Arkansas"
 
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Cancelamento de reuni�o"
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "Arica"
 
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> enviou uma mensagem incompreens�vel."
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "Bari"
 
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Mensagem de reuni�o inv�lida"
+#, fuzzy
+#~ msgid "E_nable advanced options"
+#~ msgstr "Cancelar opera��o"
 
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> publicou informa��o de tarefa."
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Hurlburt"
 
-#~ msgid "Task Information"
-#~ msgstr "Informa��o de tarefa"
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "Somerset"
 
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> requisita que voc� execute uma tarefa."
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Arquivo de assinatura:"
 
-#~ msgid "Task Proposal"
-#~ msgstr "Proposta de tarefa"
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Excluir tudo exceto a assinatura"
 
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> deseja acrescent�-lo a uma tarefa existente."
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "Assinatura _HTML:"
 
-#~ msgid "Task Update"
-#~ msgstr "Atualiza��o de tarefa"
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Nome do arquivo:"
 
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> deseja receber a informa��o de tarefa mais recente."
+#~ msgid "_HTML Signature:"
+#~ msgstr "Assinatura _HTML:"
 
-#~ msgid "Task Update Request"
-#~ msgstr "Pedido de atualiza��o de tarefa"
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "L�ngua"
 
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> respondeu a uma atribui��o de tarefa."
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "R�dio"
 
-#~ msgid "Task Reply"
-#~ msgstr "Resposta a tarefa"
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "N�o foi poss�vel criar um contexto de cifragem PGP."
 
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> cancelou uma tarefa."
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "N�o foi poss�vel criar um contexto de decifragem PGP."
 
-#~ msgid "Task Cancellation"
-#~ msgstr "Cancelamento de tarefa"
+#~ msgid "Moving"
+#~ msgstr "Movendo"
 
-#~ msgid "Bad Task Message"
-#~ msgstr "Mensagem de tarefa inv�lida"
+#~ msgid "Copying"
+#~ msgstr "Copiando"
 
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> publicou informa��o de livre/ocupado."
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Arquivo de assinatura:"
 
-#~ msgid "Free/Busy Information"
-#~ msgstr "Informa��o de livre/ocupado"
+#~ msgid "Riga"
+#~ msgstr "Riga"
 
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> requisita sua informa��o de livre/ocupado."
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_Adicionar"
 
-#~ msgid "Free/Busy Request"
-#~ msgstr "Pedido de livre/ocupado"
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "Remover"
 
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> respondeu a um pedido de livre/ocupado."
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Voc� tem certeza que deseja remover a pasta \"%s\"?"
 
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Resposta de livre/ocupado"
+#~ msgid "Edit Addressbook"
+#~ msgstr "Editar cat�logo de endere�os"
 
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Mensagem de livre/ocupado inv�lida"
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "A_utenticar com servidor usando:"
 
-#~ msgid "The message does not appear to be properly formed"
-#~ msgstr "A mensagem n�o aparenta estar formada corretamente."
+#~ msgid "Account Name"
+#~ msgstr "Nome da conta"
 
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "A mensagem cont�m apenas pedidos n�o suportados."
+#~ msgid "Add Addressbook"
+#~ msgstr "Adicionar cat�logo de endere�os"
 
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "O anexo n�o cont�m uma mensagem de agenda v�lida"
+#~ msgid "Advanced"
+#~ msgstr "Avan�ado"
 
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "O anexo n�o cont�m itens visualiz�veis de agenda"
+#~ msgid "Base"
+#~ msgstr "Base"
 
-#~ msgid "Event information"
-#~ msgstr "Informa��o de evento"
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Marque aqui se o servidor exige que voc� se autentique."
 
-#~ msgid "Task information"
-#~ msgstr "Informa��o de tarefa"
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with "
+#~ "the server"
+#~ msgstr ""
+#~ "O Evolution usar� este Distinquished Name (DN) para autentic�-lo com o "
+#~ "servidor"
 
-#~ msgid "Journal information"
-#~ msgstr "Informa��o de di�rio"
+#~ msgid "Server Name"
+#~ msgstr "Nome do servidor"
 
-#~ msgid "Free/Busy information"
-#~ msgstr "Informa��o de livre/ocupado"
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr ""
+#~ "A informa��o abaixo � necess�ria para poder adicionar um cat�logo de "
+#~ "endere�os.  "
 
-#~ msgid "Calendar information"
-#~ msgstr "Informa��o de agenda"
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr ""
+#~ "Esta informa��o n�o � necess�ria para a maioria dos servidores ldap. "
 
-#~ msgid "Updated"
-#~ msgstr "Atualizado"
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "Esta informa��o � usada pelo seu servidor ldap para especificar quais n�s "
+#~ "s�o usados em uma busca. Procure o administrador de seu servidor para "
+#~ "mais informa��es."
 
-#~ msgid "Refresh"
-#~ msgstr "Atualizar"
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
+#~ msgstr ""
+#~ "Este � o n� base para todas as suas buscas no servidor ldap. Procure o "
+#~ "administrador de seu servidor para mais informa��es."
 
-#~ msgid "Counter-proposal"
-#~ msgstr "Contra proposta"
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr ""
+#~ "Este � o nome do servidor onde o seu cat�logo de endere�os est� "
+#~ "localizado."
 
-#~ msgid "Task"
-#~ msgstr "Tarefa"
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Esta � a porta que o seu servidor ldap usa."
 
-#~ msgid "Status: %s"
-#~ msgstr "Estado: %s"
+#~ msgid "_Account name:"
+#~ msgstr "Nome da _conta:"
 
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Percentagem conclu�da: %i"
+#~ msgid "C_ontaining:"
+#~ msgstr "C_ontendo:"
 
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Exibir contatos casando com os seguintes crit�rios:"
 
-#~ msgid "Categories: %s"
-#~ msgstr "Categorias: %s"
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "_Criar novos compromissos com um lembrete padr�o"
 
-#~ msgid "Contacts: "
-#~ msgstr "Contatos: "
+#~ msgid "First day of wee_k:"
+#~ msgstr "P_rimeiro dia da semana:"
 
-#, fuzzy
-#~ msgid "Reminder!!"
-#~ msgstr "Lembrete"
+#~ msgid "_Other"
+#~ msgstr "_Outros"
 
 #, fuzzy
 #~ msgid "Error hashing password."
@@ -26997,13 +27802,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "Unable to save grouplist file for %s: %s"
 #~ msgstr "N�o � poss�vel salvar o arquivo de lista de grupos para %s: %s"
 
-#~ msgid ""
-#~ "<b>(The composer contains a non-text message body, which cannot be "
-#~ "editted.)<b>"
-#~ msgstr ""
-#~ "<b>(O redator cont�m um corpo de mensagem n�o texto, o qual n�o pode ser "
-#~ "editado.)<b>"
-
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "O componente do Evolution para o resumo executivo."
 
@@ -27088,30 +27886,12 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "Enter folder URI"
 #~ msgstr "Entre URI da pasta"
 
-#~ msgid "Default"
-#~ msgstr "Padr�o"
-
-#~ msgid "Mail to %s"
-#~ msgstr "Correio para %s"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Assunto � %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Correio de %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "Lista de discuss�o %s"
-
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Inbox"
 
 #~ msgid " color"
 #~ msgstr " cor"
 
-#~ msgid "Account"
-#~ msgstr "Conta"
-
 #~ msgid "Accounts"
 #~ msgstr "Contas"
 
@@ -27119,17 +27899,9 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "Ad_vanced &gt;&gt;"
 #~ msgstr "Avan�ado"
 
-#, fuzzy
-#~ msgid "Add new signature"
-#~ msgstr "Salvar assinatura"
-
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr "Sempre _cifrar para mim mesmo ao enviar correio cifrado"
 
-#, fuzzy
-#~ msgid "Command"
-#~ msgstr "Empresa"
-
 #~ msgid "Composer"
 #~ msgstr "Redator"
 
@@ -27149,9 +27921,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "Display"
 #~ msgstr "Exibi��o"
 
-#~ msgid "Drafts"
-#~ msgstr "Rascunho"
-
 #, fuzzy
 #~ msgid "E_mail address:"
 #~ msgstr "_Endere�o de e-mail:"
@@ -27187,9 +27956,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "List of signatures"
 #~ msgstr "Salvar assinatura"
 
-#~ msgid "Mail Settings"
-#~ msgstr "Configura��es de correio"
-
 #, fuzzy
 #~ msgid "N_ew..."
 #~ msgstr "Novo..."
@@ -27214,9 +27980,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "Select PGP binary"
 #~ msgstr "Selecionar execut�vel PGP"
 
-#~ msgid "Sent"
-#~ msgstr "Enviada"
-
 #, fuzzy
 #~ msgid "Shortcut"
 #~ msgstr "_Atalho"
@@ -27259,10 +28022,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "_Remember this password"
 #~ msgstr "_Lembrar esta senha"
 
-#, fuzzy
-#~ msgid "_Script"
-#~ msgstr "_Seguran�a"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "_Enviar mensagens em formato HTML por padr�o."
 
@@ -27284,56 +28043,13 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "use _HTML for this signature"
 #~ msgstr "Assinatura _HTML:"
 
-#, fuzzy
-#~ msgid "View messages..."
-#~ msgstr "Salvar mensagem como..."
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "Esta mensagem est� assinada digitalmente. Clique no cadeado para mais "
-#~ "informa��es."
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "O Evolution n�o reconhece este tipo de mensagem assinada."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Esta mensagem est� assinada digitalmente e � aut�ntica."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Esta mensagem est� assinada digitalmente mas n�o � poss�vel estabelecer sua "
-#~ "autenticidade."
-
 #, fuzzy
 #~ msgid "Mail Summary"
 #~ msgstr "Resumo das mensagens"
 
-#~ msgid " F"
-#~ msgstr "� F"
-
-#~ msgid " C"
-#~ msgstr "� C"
-
-#~ msgid "knots"
-#~ msgstr "n�s"
-
-#~ msgid "kph"
-#~ msgstr "kph"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "milhas"
-
-#~ msgid "kilometers"
-#~ msgstr "quil�metros"
-
 #, fuzzy
 #~ msgid "Factory for the Evolution notes component."
 #~ msgstr "F�brica para o redator do Evolution."
@@ -27342,16 +28058,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "Factory for the Notes control"
 #~ msgstr "F�brica para o controle de tarefas do Evolution."
 
-#~ msgid "Outbox"
-#~ msgstr "Caixa de sa�da"
-
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "N�o � poss�vel transferir pasta:\n"
-#~ "%s"
-
 #, fuzzy
 #~ msgid "_Advanced Search..."
 #~ msgstr "Busca avan�ada"
@@ -27688,7 +28394,8 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgstr "N�o foi poss�vel recuperar mensagem do servidor POP %s: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
 #~ msgstr ""
 #~ "Esta op��o conectar� ao servidor POP usando Kerberos 4 para autentica��o."
 
@@ -27698,9 +28405,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "(Unknown)"
 #~ msgstr "(Desconhecido)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Resposta inesperada do servidor POP: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "N�o foi poss�vel localizar endere�o 'De' na mensagem"
 
@@ -27761,9 +28465,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "Esta mensagem cont�m destinat�rios inv�lidos:"
 
-#~ msgid "HTML signature file:"
-#~ msgstr "Arquivo de assinatura HTML:"
-
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>O servidor de tempo n�o p�de ser contactado</b></dd>"
 
@@ -27779,9 +28480,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "All _folders:"
 #~ msgstr "Todas as _pastas:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "Todas as fontes de _not�cias:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "Pastas a _exibir:"
 
@@ -27791,9 +28489,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "_Displayed feeds:"
 #~ msgstr "Fontes de not�cias a _exibir:"
 
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
diff --git a/po/ro.po b/po/ro.po
index 4e891c4d1d..1f1bc0a8b1 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.15\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2001-09-12 16:59+0800\n"
 "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
 "Language-Team: Rom�n� <ro@li.org>\n"
@@ -38,7 +38,7 @@ msgstr "Import fi�ierele card V �n Evolution."
 msgid "File As"
 msgstr "Pune la fi�ier ca"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nume"
@@ -49,7 +49,7 @@ msgid "Email"
 msgstr "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Principal"
 
@@ -59,7 +59,7 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asistent"
@@ -67,8 +67,8 @@ msgstr "Asistent"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Serviciu"
 
@@ -78,12 +78,12 @@ msgid "Bus"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Rechemare"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Companie"
 
@@ -94,8 +94,8 @@ msgstr ""
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Adresa de acas�"
 
@@ -110,18 +110,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Ma�in�"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax serviciu"
@@ -131,13 +131,13 @@ msgid "Bus Fax"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax acas�"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Serviciu 2"
 
@@ -146,43 +146,43 @@ msgid "Bus 2"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Adresa de acas� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Alte"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Alt Fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
@@ -194,14 +194,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "Email 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Email 3"
@@ -339,7 +339,7 @@ msgstr "Card V pentru %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -347,7 +347,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Nu pot ini�ializa Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Caut..."
 
@@ -360,32 +360,32 @@ msgstr "�ncarc..."
 msgid "Error in search expression."
 msgstr "Eroare la c�utarea expresiei."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Adaug� card la serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "�terge card de la serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Modificare card pentru serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Repornire c�utare."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Primesc rezultatele c�ut�rii LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Eroare �tergere card"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Nu pot parsa URL `%s'"
@@ -434,106 +434,141 @@ msgstr "Control Bonobo de prob� care afi�eaz� o agend�."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #, fuzzy
-msgid "Addressbook Settings"
-msgstr "Surse agend�"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr "Procesator pentru componentele agendei Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#, fuzzy
-msgid "Configuration control for the Evolution Addressbook."
-msgstr "Procesator pentru componentele agendei Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Control care afi�eaz� o agend� minicard pentru Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Vizualizor agend� minicard Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Component� Evolution pentru manipulare contacte"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Procesator pentru controlul agendei minicard"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Procesator pentru afi�orul agendei de adrese"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Procesator pentru apari�ia adreselor din agend�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr "Procesator pentru componentele agendei Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Procesator pentru controlul mostr� agend�"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Contacte"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Dosar con�in�nd informa�ie de contact"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "Server LDAP con�in�nd informa�ie de contact"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "List� contacte nou�"
+
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Contact"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Contact nou"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Contact"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "List� contacte nou�"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Nu m� pot conecta la serverul LDAP."
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-config.c:216
 #, fuzzy
-msgid "Contact _List"
-msgstr "_Contact"
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Autentificare la serverul IMAP e�uat�.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "R�spunsul serverului IMAP nu con�ine informa�ia %s"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Eroare la �ncarcarea informa�iei de filtrare:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "R�spunsul serverului IMAP nu con�ine informa�ia %s"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "Semnarea e nesuportat� de acest cifru"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Nu pot ini�ializa gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Alte contacte"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Nu pot deschide agenda"
@@ -568,52 +603,62 @@ msgstr ""
 "Nu pot deschide aceast� agend�. V� rog verifica�i dac� exist� calea\n"
 "�i daca ave�i drepturi de acces."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduce�i parola pentru %s"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "se termin� cu"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "Email 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "Categorii"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Orice c�mp con�ine"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Avansat..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 #, fuzzy
 msgid "Any Category"
 msgstr "Categorie:"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "URI pe care navigatorul dosarelor �l va afi�a"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(F�r� nume)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Email principal"
 
@@ -659,51 +704,6 @@ msgstr "Dezactivare interog�ri"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Activare interog�ri (Periculos!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Nu m� pot conecta la serverul LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Autentificare la serverul IMAP e�uat�.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr "Nu pot bifurca sendmail: %s: mailul nu este trimis"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "R�spunsul serverului IMAP nu con�ine informa�ia %s"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "Semnarea e nesuportat� de acest cifru"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Data terminare"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
@@ -711,53 +711,53 @@ msgstr "Verific tipurile suportate"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
 #, fuzzy
-msgid "<< Fewer Options"
-msgstr "Op�iuni"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "�te_rge"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
-#, fuzzy
 msgid "1234"
 msgstr "123"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100%"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "�te_rge"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Op�iuni"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -766,8 +766,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Surse agend�"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Alarme"
@@ -860,8 +860,8 @@ msgstr "Configurare mail"
 msgid "Mappings"
 msgstr "Margini"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "Fiecare"
@@ -1046,14 +1046,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1073,8 +1073,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1106,7 +1106,7 @@ msgid "Using email address"
 msgstr "_Aceasta este adresa de expediere"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1114,7 +1114,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Adaug�"
 
@@ -1161,7 +1161,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1280,10 +1280,12 @@ msgstr "Interfa�a de selectare nume a agendei Evolution."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Procesator interfa�a de selectare nume a agendei"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "�terge"
 
@@ -1411,7 +1413,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Editor de contacte"
 
@@ -1421,7 +1423,7 @@ msgid "D_epartment:"
 msgstr "_Departament:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Detalii"
 
@@ -1484,11 +1486,12 @@ msgstr "Dori�i sa primi�i mail-uri _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_�terge"
 
@@ -1519,7 +1522,7 @@ msgid "_Web page address:"
 msgstr "Adresa paginii de web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 #, fuzzy
 msgid "United States"
 msgstr "(Mesaj f�r� titlu)"
@@ -2051,12 +2054,11 @@ msgid "Laos"
 msgstr "Cea mai sc�zut�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
@@ -2066,7 +2068,7 @@ msgid "Lesotho"
 msgstr "Cea mai sc�zut�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr ""
 
@@ -2075,13 +2077,13 @@ msgid "Liechtenstein"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 #, fuzzy
 msgid "Lithuania"
 msgstr "Grindin� u�oar�"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr ""
 
@@ -2117,7 +2119,7 @@ msgid "Mali"
 msgstr "Mail"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 #, fuzzy
 msgid "Malta"
 msgstr "Mail"
@@ -2145,7 +2147,7 @@ msgid "Mayotte"
 msgstr "Mai"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr ""
 
@@ -2171,7 +2173,7 @@ msgid "Montserrat"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr ""
 
@@ -2199,7 +2201,7 @@ msgid "Nepal"
 msgstr "Mail nou"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 #, fuzzy
 msgid "Netherlands"
 msgstr "Selec_teaz� �nl�n�uirea"
@@ -2214,13 +2216,13 @@ msgid "New Caledonia"
 msgstr "Contact nou"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 #, fuzzy
 msgid "New Zealand"
 msgstr "Mail nou"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr ""
 
@@ -2240,7 +2242,7 @@ msgid "Niue"
 msgstr "minut"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr ""
 
@@ -2249,18 +2251,18 @@ msgid "Northern Mariana Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 #, fuzzy
 msgid "Norway"
 msgstr "Acum"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 #, fuzzy
 msgid "Pakistan"
 msgstr "Lipe�te"
@@ -2274,7 +2276,7 @@ msgid "Palestinian Territory"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 #, fuzzy
 msgid "Panama"
 msgstr "Canada"
@@ -2284,12 +2286,12 @@ msgid "Papua New Guinea"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 #, fuzzy
 msgid "Peru"
 msgstr "H�rtie"
@@ -2303,24 +2305,24 @@ msgid "Pitcairn"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 #, fuzzy
 msgid "Poland"
 msgstr "Finlanda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 #, fuzzy
 msgid "Portugal"
 msgstr "Portret"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 #, fuzzy
 msgid "Qatar"
 msgstr "dup�"
@@ -2331,7 +2333,7 @@ msgid "Reunion"
 msgstr "Regiuni"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr ""
 
@@ -2370,7 +2372,7 @@ msgid "Sao Tome And Principe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr ""
 
@@ -2389,17 +2391,17 @@ msgid "Sierra Leone"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr ""
 
@@ -2413,7 +2415,7 @@ msgid "Somalia"
 msgstr "Normal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr ""
 
@@ -2422,7 +2424,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 #, fuzzy
 msgid "Spain"
 msgstr "Ploaie"
@@ -2445,7 +2447,7 @@ msgid "Sudan"
 msgstr "Dum"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 #, fuzzy
 msgid "Suriname"
 msgstr "Porecl�"
@@ -2460,18 +2462,18 @@ msgid "Swaziland"
 msgstr "Finlanda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 #, fuzzy
 msgid "Sweden"
 msgstr "V�zut"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 #, fuzzy
 msgid "Taiwan"
 msgstr "Ploaie"
@@ -2513,7 +2515,7 @@ msgid "Tunisia"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 #, fuzzy
 msgid "Turkey"
 msgstr "Mar"
@@ -2537,7 +2539,7 @@ msgid "Uganda"
 msgstr "Canada"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 #, fuzzy
 msgid "Ukraine"
 msgstr "Ucrainean"
@@ -2547,7 +2549,7 @@ msgid "United Arab Emirates"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr ""
 
@@ -2556,7 +2558,7 @@ msgid "United States Minor Outlying Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr ""
 
@@ -2569,12 +2571,12 @@ msgid "Vanuatu"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 #, fuzzy
 msgid "Viet Nam"
 msgstr "Selec�ie nume"
@@ -2597,13 +2599,13 @@ msgid "Western Sahara"
 msgstr "Europa de vest"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 #, fuzzy
 msgid "Yemen"
 msgstr "V�zut"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr ""
 
@@ -2616,28 +2618,35 @@ msgid "Zimbabwe"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "�terg persoana de contact?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 #, fuzzy
 msgid "Category editor not available."
 msgstr "Nu e disponibil� o descriere."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Aceast� persoan� de contact apar�ine categoriilor:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "Salveaz� ca �i card V"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nu pot �terge dosarul sumar al fi�ierelor `%s': %s"
@@ -2664,12 +2673,12 @@ msgstr "E-mail"
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 #, fuzzy
 msgid "list"
 msgstr "Cea��"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2803,11 +2812,11 @@ msgid "contact-list-editor"
 msgstr "editor-lista-contact"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Editor lista de contacte"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Salveaz� ca �i card V"
@@ -2889,21 +2898,21 @@ msgid "Error getting book view"
 msgstr "Eroare la start %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Eroare la modificare card"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Succes"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Eroare necunoscut�"
 
@@ -2912,7 +2921,7 @@ msgid "Repository offline"
 msgstr "Depozitare offline"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Acces interzis"
 
@@ -2930,55 +2939,70 @@ msgstr "Protocol nesuportat"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Revocat"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "E�ec la autentificare."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Necesit� autentificare"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Alt� eroare"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Dori�i s� salva�i modific�rile?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Eroare ad�ugare list�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Eroare ad�ugare card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Eroare la modificarea listei"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Eroare la �tergerea listei"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Eroare �tergere card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Afi�eaz�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards"
 msgstr "Afi�eaz�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2986,22 +3010,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Nepornit"
@@ -3066,104 +3090,110 @@ msgstr "Alt telefon"
 msgid "Other Address"
 msgstr "Alt� adres�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Agend�"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Salveaz� ca �i card V"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Contact nou"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "List� contacte nou�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Mer_gi la dosarul..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Import�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Caut� contacte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Surse _agend�..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Set�ri _pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Forward Contact"
 msgstr "�nainteaz� _anexat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Trimite mesaj la contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tip�re�te"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Tip�re�te plic"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "Copiez �n folderul..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "Mut �n folderul..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Decupeaz�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiaz�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Lipe�te"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "�terg"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3173,7 +3203,7 @@ msgstr "Vizualizarea _curent�"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3181,7 +3211,7 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3337,7 +3367,7 @@ msgstr "Margini"
 msgid "Number of columns:"
 msgstr "Num�r de coloane"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Op�iuni"
 
@@ -3347,7 +3377,7 @@ msgid "Orientation"
 msgstr "Orientare"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Pagin�"
 
@@ -3422,30 +3452,34 @@ msgstr "L��ime:"
 msgid "_Font..."
 msgstr "Font..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "_Editeaz� �nt�lnire"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Ridicat"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Sc�zut"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Nedefinit"
 
@@ -3489,45 +3523,37 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Procesator pentru componenta calendarului Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution calendar iTip/iMip vizualizator"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Component� Evolution pentru manipularea calendarului."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Procesator pentru componenta Centralizator a calendarului"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "Procesator pentru componenta de mail Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Procesator pentru controlul calendar iTip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Procesator pentru mostra controlului calendar"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Procesator pentru componenta calendarului Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Procesator pentru componenta calendarului Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3539,11 +3565,26 @@ msgstr "Serviciu notificare alarme"
 msgid "Factory for the alarm notification service"
 msgstr "Procesator pentru serviciul notificare alarme"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Set�ri"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Umbrire"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 #, fuzzy
 msgid "invalid time"
 msgstr "Ora d_e sf�r�it"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, fuzzy, c-format
 msgid "Alarm on %s"
@@ -3579,7 +3620,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avertisment"
@@ -3600,16 +3641,16 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Nu m� �ntreba din nou"
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Nu pot ini�ializa GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 #, fuzzy
 msgid "Could not create the alarm notify service"
 msgstr "Nu pot crea procesatorul servicului de notificare alarm�"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "Nu pot crea procesatorul servicului de notificare alarm�"
 
@@ -3625,7 +3666,7 @@ msgstr "Descrierea con�ine"
 msgid "Comment contains"
 msgstr "Comentariul con�ine"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr ""
 
@@ -3667,14 +3708,16 @@ msgid ""
 msgstr "Nu pot crea vederea calendar. Verifica�i set�rile pentru ORBit si OAF"
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confiden�ial"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Public"
 
@@ -3695,28 +3738,33 @@ msgid "W"
 msgstr "W"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
 msgstr "Grec"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Ocupat"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Nepornit"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "�n derulare"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Terminat"
 
@@ -3731,11 +3779,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3750,12 +3799,14 @@ msgstr ""
 msgid "Assigned"
 msgstr "Alocat"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Nu"
 
@@ -3775,63 +3826,65 @@ msgstr "Afi�are s�ptam�n�"
 msgid "Month View"
 msgstr "Afi�are lun�"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Sarcini"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "Dosar V �n lista de mail"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "New meeting"
 msgstr "�nt�lnire"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 #, fuzzy
 msgid "_Meeting"
 msgstr "�nt�lnire"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 #, fuzzy
 msgid "New task"
 msgstr "Sarcin� nou�"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "Sarcin�"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "_Appointment"
 msgstr "�nt�lnire"
@@ -4040,7 +4093,7 @@ msgstr "Memorator"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Cuprins:"
 
@@ -4069,7 +4122,7 @@ msgstr "sf�r�it �nt�lnire"
 msgid "hour(s)"
 msgstr "ora"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minut(e)"
 
@@ -4097,88 +4150,87 @@ msgstr "30 minute"
 msgid "60 minutes"
 msgstr "60 minute"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alarme"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
 msgid "Calendar and Tasks Settings"
 msgstr "Set�ri _mail..."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Culoare pentru sarcinile �nt�rziate"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Culoare pentru sarcinile de ast�zi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "Days"
 msgstr "Zi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Vineri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #, fuzzy
 msgid "Hours"
 msgstr "ore"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
 msgid "Minutes"
 msgstr "minute"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Luni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "Dum"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "S�mb�t�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #, fuzzy
 msgid "Show week _numbers in date navigator"
 msgstr "Arat� num�rul de s�pt�m�ni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#, fuzzy
-msgid "Sta_rt of day:"
-msgstr "�nceput zi:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, fuzzy
-msgid "Su_n"
-msgstr "Dum"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Duminic�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Sarcini pentru azi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "T_hu"
 msgstr "Joi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#, fuzzy
-msgid "T_ue"
-msgstr "Mar"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4208,95 +4260,108 @@ msgid "Tuesday"
 msgstr "Mar�i"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "S�pt�m�na de lucru"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #, fuzzy
 msgid "_12 hour (AM/PM)"
 msgstr "12 ore (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #, fuzzy
 msgid "_24 hour"
 msgstr "24 ore"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "_Compress weekends in month view"
 msgstr "Comprim� weekend-urile la afi�area lunii"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "_Display"
-msgstr "Afi�eaz�"
+msgid "_Day begins:"
+msgstr "Afi�eaz� sta�iile:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #, fuzzy
-msgid "_End of day:"
-msgstr "Sfir�it zi:"
+msgid "_Display"
+msgstr "Afi�eaz�"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_Fri"
 msgstr "Vin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_General"
 msgstr "General"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "Ascunde mesajele �terse"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Sarcini �nt�rziate"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #, fuzzy
 msgid "_Sat"
 msgstr "S�m"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr ""
 "Arat� termenul de final al �nt�lnirilor la afi�area s�pt�m�nii �i lunii"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Diviziuni de timp:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "Mar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
 msgid "_Wed"
 msgstr "Mie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 #, fuzzy
-msgid "before the start of the appointment"
-msgstr "�nainte de �nceperea �nt�lnirii"
+msgid "before every appointment"
+msgstr "�nainte de sf�r�itul �nt�lnirii"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
@@ -4380,41 +4445,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:342
 #, fuzzy
-msgid "Could not update object!"
+msgid "Could not update invalid object"
 msgstr "Nu pot actualiza fi�ierele corect"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Nu pot actualiza fi�ierele corect"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Editeaz� �nt�lnire"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "�nt�lnire - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Sarcina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Intrare jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Nu exist� rezumat"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Salveaz� ca..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Nu pot ob�ine versiunea curent�!"
 
@@ -4475,28 +4560,28 @@ msgstr "Delegat la:"
 msgid "Enter Delegate"
 msgstr "�terse"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "�nt�lnire"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Reaminte�te"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Revenire"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 #, fuzzy
 msgid "Scheduling"
 msgstr "Progra_mare �nt�lniri"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "�nt�lnire"
 
@@ -4547,7 +4632,7 @@ msgid "Pu_blic"
 msgstr "Pu_blic"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Show Time As"
 msgstr "Ploaie toren�ial�"
@@ -4570,20 +4655,20 @@ msgstr "Ora d_e sf�r�it"
 msgid "_Start time:"
 msgstr "Ora de �nceput"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Un organizator trebuie setat."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Delegat la..."
 
@@ -4594,49 +4679,56 @@ msgstr "Participare"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Nume comun"
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Click aici s� ad�uga�i un contact *"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delegat de la"
+msgid "Common Name"
+msgstr "Nume comun"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegat la"
+msgid "Delegated From"
+msgstr "Delegat de la"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Limbaj"
+msgid "Delegated To"
+msgstr "Delegat la"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Membru"
+msgid "Language"
+msgstr "Limbaj"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Membru"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rol"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stare"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tip"
@@ -4651,14 +4743,10 @@ msgid "_Change Organizer"
 msgstr "Schimb� organizator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Invit� pe al�ii..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "Alt _organizator"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4858,7 +4946,7 @@ msgid "Progress"
 msgstr "�n desf�urare"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4870,20 +4958,20 @@ msgstr "_Prioritate:"
 msgid "_Status:"
 msgstr "_Stare"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "De baz�"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 #, fuzzy
 msgid "Assignment"
 msgstr "Alocat"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Descriere:"
 
@@ -4895,24 +4983,79 @@ msgstr "Data de �nceput:"
 msgid "_Due Date:"
 msgstr "_Data scadent�:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, fuzzy, c-format
+msgid "100%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "�terge contactele selectate"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "Deschide"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Salveaz� ca..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4920,20 +5063,20 @@ msgstr "Salveaz� ca..."
 msgid "_Print..."
 msgstr "_Tip�re�te..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Dec_upeaz�"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copiaz�"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4941,37 +5084,38 @@ msgstr "_Copiaz�"
 msgid "_Paste"
 msgstr "_Lipe�te"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Atribuie task (FIXME)"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "�nainteaz� ca �i _calendar i"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marcheaz� ca terminat"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Marcheaz� sarcinile ca terminate"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "�terge sarcinile selectate"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Clic aici s� ad�uga�i o sarcin�"
@@ -4980,47 +5124,48 @@ msgstr "Clic aici s� ad�uga�i o sarcin�"
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Terminat"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Data terminare"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Data scadent�"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Data sf�r�it"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Pozi�ie geografic�"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioritate"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Data �nceput"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Rezumat"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Sortare sarcini"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -5068,11 +5213,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -5116,7 +5263,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "Aceasta e informa�ie liber-ocupat."
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Configurare mail"
@@ -5127,7 +5274,7 @@ msgid "_Configure Pilot..."
 msgstr "Configurare mail"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "_Salveaz� ca..."
 
@@ -5157,78 +5304,434 @@ msgid "Delete _All Occurrences"
 msgstr "�terge toate apari�iile"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Eroare execu�ie filtru: %s: %s"
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+#, fuzzy
+msgid "Meeting begins: <b>"
+msgstr "Ora de sf�r�it a �nt�lnirii:"
+
+#: calendar/gui/e-itip-control.c:683
+#, fuzzy
+msgid "Task begins: <b>"
+msgstr " (Terminat "
+
+#: calendar/gui/e-itip-control.c:688
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Informa�ie surs�"
+
+#: calendar/gui/e-itip-control.c:692
+#, fuzzy
+msgid "Begins: <b>"
+msgstr "Ora de sf�r�it a �nt�lnirii:"
+
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Ora de sf�r�it a �nt�lnirii:"
+
+#: calendar/gui/e-itip-control.c:707
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Informa�ie surs�"
+
+#: calendar/gui/e-itip-control.c:711
+#, fuzzy
+msgid "Ends: <b>"
+msgstr "Ora de sf�r�it a �nt�lnirii:"
+
+#: calendar/gui/e-itip-control.c:725
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (Terminat "
+
+#: calendar/gui/e-itip-control.c:735
+#, fuzzy
+msgid "Task Due: <b>"
+msgstr " (Terminat "
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "informa�ie calendar"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Calendar"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "An unknown person"
+msgstr "Eroare necunoscut�"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "_Stare"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+#, fuzzy
+msgid "Accepted"
+msgstr " Accept� "
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr " Inten�ie "
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#, fuzzy
+msgid "Declined"
+msgstr " Refuz� "
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: calendar/gui/e-itip-control.c:1564
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
 #, fuzzy
-msgid "Calendar file could not be updated!\n"
-msgstr "Nu pot �nc�rca cursorul\n"
+msgid "Choose an action:"
+msgstr "Selectez o ac�iune"
+
+#: calendar/gui/e-itip-control.c:972
+#, fuzzy
+msgid "Update"
+msgstr "a fost dup�"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:1000
+#, fuzzy
+msgid "Accept"
+msgstr " Accept� "
+
+#: calendar/gui/e-itip-control.c:1001
+#, fuzzy
+msgid "Tentatively accept"
+msgstr " Inten�ie "
+
+#: calendar/gui/e-itip-control.c:1002
+#, fuzzy
+msgid "Decline"
+msgstr " Refuz� "
+
+#: calendar/gui/e-itip-control.c:1026
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Informa�ie surs�"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Informa�ie"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Renun��"
+
+#: calendar/gui/e-itip-control.c:1117
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
+
+#: calendar/gui/e-itip-control.c:1118
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Informa�ie op�ional�"
+
+#: calendar/gui/e-itip-control.c:1122
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "Aceasta e o cerere pentru o informa�ie liber-ocupat."
+
+#: calendar/gui/e-itip-control.c:1123
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "�nt�lnire"
+
+#: calendar/gui/e-itip-control.c:1127
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
+
+#: calendar/gui/e-itip-control.c:1128
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Ora de sf�r�it a �nt�lnirii:"
+
+#: calendar/gui/e-itip-control.c:1132
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
+
+#: calendar/gui/e-itip-control.c:1133
+#, fuzzy
+msgid "Meeting Update Request"
+msgstr "Cerere de �nt�lnire (FIXME)"
+
+#: calendar/gui/e-itip-control.c:1156
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "Acesta e un r�spuns la o cerere de �nt�lnire."
+
+#: calendar/gui/e-itip-control.c:1157
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "�nt�lnire"
+
+#: calendar/gui/e-itip-control.c:1161
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "Acesta e un r�spuns la o cerere de �nt�lnire."
+
+#: calendar/gui/e-itip-control.c:1162
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Selectez o ac�iune"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1167
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "G�se�te �n mesaj"
+
+#: calendar/gui/e-itip-control.c:1189
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
+
+#: calendar/gui/e-itip-control.c:1190
+#, fuzzy
+msgid "Task Information"
+msgstr "Informa�ie"
+
+#: calendar/gui/e-itip-control.c:1194
+#, fuzzy, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "Aceasta e o cerere pentru o informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1195
+#, fuzzy
+msgid "Task Proposal"
+msgstr "Panou sarcini"
+
+#: calendar/gui/e-itip-control.c:1199
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "Aceasta e o cerere pentru ultima informa�ie despre sarcin�."
+
+#: calendar/gui/e-itip-control.c:1200
+#, fuzzy
+msgid "Task Update"
+msgstr "a fost dup�"
+
+#: calendar/gui/e-itip-control.c:1204
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "Aceasta e o cerere pentru ultima informa�ie despre sarcin�."
+
+#: calendar/gui/e-itip-control.c:1205
+#, fuzzy
+msgid "Task Update Request"
+msgstr "Ce_rere task (FIXME)"
+
+#: calendar/gui/e-itip-control.c:1229
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "Acesta e un r�spuns la o cerere de �nt�lnire."
+
+#: calendar/gui/e-itip-control.c:1230
+#, fuzzy
+msgid "Task Reply"
+msgstr "R�spunde"
+
+#: calendar/gui/e-itip-control.c:1234
+#, fuzzy, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "Acesta e un r�spuns la o cerere de �nt�lnire."
+
+#: calendar/gui/e-itip-control.c:1235
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Aceasta e o anulare a unei sarcini"
+
+#: calendar/gui/e-itip-control.c:1240
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Mesaj calendar"
+
+#: calendar/gui/e-itip-control.c:1259
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Aceasta e informa�ie liber-ocupat."
+
+#: calendar/gui/e-itip-control.c:1260
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Informa�ie surs�"
+
+#: calendar/gui/e-itip-control.c:1264
+#, fuzzy, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "Aceasta e o cerere pentru o informa�ie liber-ocupat."
+
+#: calendar/gui/e-itip-control.c:1265
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "URL liber-ocupat"
+
+#: calendar/gui/e-itip-control.c:1269
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "Acesta e un r�spuns la o cerere liber-ocupat."
+
+#: calendar/gui/e-itip-control.c:1270
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "URL liber-ocupat"
+
+#: calendar/gui/e-itip-control.c:1275
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Tip�re�te mesaj"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Dosarul pare a fi deteriorat irecuperabil."
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "Mesajul con�ine numai cererile nesuportate."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#, fuzzy
+msgid "There was an error on the CORBA system\n"
+msgstr "S-a produs o eroare la desc�rcarea sursei de �tiri</dt>"
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Bug buddy nu poate fi rulat."
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 #, fuzzy
 msgid "Update complete\n"
 msgstr "�nt�lnire �ncheiat�:"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+#, fuzzy
+msgid "Calendar file could not be updated!\n"
+msgstr "Nu pot �nc�rca cursorul\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
+#: calendar/gui/e-itip-control.c:1671
 #, fuzzy
-msgid "Attendee status could not be updated!\n"
+msgid "Attendee status updated\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
-msgid "Attendee status updated\n"
+msgid "Attendee status could not be updated!\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1709
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Terminat"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Date trimise"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Alege dosar"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Alege dosar"
@@ -5270,89 +5773,86 @@ msgstr "dat� sf�r�it"
 msgid "date-start"
 msgstr "dat� �nceput"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Telefon ma�in�"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 #, fuzzy
 msgid "Required Participants"
 msgstr "Participant necesar"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Participant op�ional"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Neparticipant"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 #, fuzzy
 msgid "Group"
 msgstr "Nume grup:"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 #, fuzzy
 msgid "Resource"
 msgstr "Surs�"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Scaun"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Participant necesar"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Participant op�ional"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Neparticipant"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 #, fuzzy
 msgid "Needs Action"
 msgstr "Selectez o ac�iune"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-#, fuzzy
-msgid "Accepted"
-msgstr " Accept� "
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#, fuzzy
-msgid "Declined"
-msgstr " Refuz� "
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Tentativ�"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 #, fuzzy
 msgid "Delegated"
 msgstr "�terse"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 #, fuzzy
 msgid "In Process"
 msgstr "�n derulare"
@@ -5360,14 +5860,14 @@ msgstr "�n derulare"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
@@ -5379,63 +5879,63 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Afar� din oficiu"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Nici o informa�ie"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Op�iuni"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Arat� numai _orele de lucru"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Arat� m�rit"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "Act_ualizeaz� liber/ocupat"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Alege automat"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "To_ate persoanele �i resursele"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Toate _persoanele �i o resurs�"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Necesa_r o persoan�"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Necesar o persoan� �i _o resurs�"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Ora de �nceput a �nt�lnirii:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Ora de sf�r�it a �nt�lnirii:"
 
@@ -5454,17 +5954,22 @@ msgstr "Nu pot inc�rca sarcinile �n `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda necesar� pentru a �nc�rca `%s' nesuportat�"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Nu pot deschide dosarul �n `%s'"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data terminare"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "�terge contactele selectate"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "Distrug dosarul"
@@ -5479,17 +5984,17 @@ msgstr "�nt�lnire nou�..."
 msgid "_Delete this Appointment"
 msgstr "�terge aceast� �nt�lnire"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nu pot deschide dosarul �n `%s'"
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda cerut� pentru deshiderea `%s' nu e suportat�"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Deschide calendar"
@@ -5551,19 +6056,58 @@ msgstr "Octombrie"
 msgid "September"
 msgstr "Septembrie"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Un organizator trebuie setat."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "informa�ie calendar"
+
+#: calendar/gui/itip-utils.c:356
+#, fuzzy
+msgid "Task information"
+msgstr "Informa�ie"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "Informa�ie op�ional�"
+
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "Informa�ie surs�"
+
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "informa�ie calendar"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "a fost dup�"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Re�mprosp�teaz� lista"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Nu pot crea procesatorul servicului de notificare alarm�"
@@ -5756,12 +6300,49 @@ msgstr "Luna curent� (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Anul curent (%Y)"
 
+#: calendar/gui/print.c:2249
+#, fuzzy
+msgid "Task"
+msgstr "Sarcin�"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "_Stare"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioritate:"
+
+#: calendar/gui/print.c:2338
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "�nt�lnire �ncheiat�:"
+
+#: calendar/gui/print.c:2350
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2364
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"Categorii:  "
+
+#: calendar/gui/print.c:2375
+#, fuzzy
+msgid "Contacts: "
+msgstr "Contacte"
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Tip�re�te calendar"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5793,8 +6374,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Nu m� �ntreba din nou"
@@ -5860,6 +6441,11 @@ msgstr "Import fi�ierele card V �n Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Import fi�ierele card V �n Evolution."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Reaminte�te"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5954,8 +6540,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -6895,652 +7481,667 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Asistent"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "dup�"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr ""
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 #, fuzzy
 msgid "Asia/Muscat"
 msgstr "Asistent"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr ""
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 #, fuzzy
 msgid "Asia/Omsk"
 msgstr "Atribuie task (FIXME)"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Atribuie task (FIXME)"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 #, fuzzy
 msgid "Asia/Qatar"
 msgstr "dup�"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr ""
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr ""
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr ""
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr ""
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr ""
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr ""
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr ""
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr ""
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr ""
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr ""
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr ""
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr ""
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 #, fuzzy
 msgid "Australia/Darwin"
 msgstr "August"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 #, fuzzy
 msgid "Australia/Hobart"
 msgstr "August"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr ""
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr ""
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr ""
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 #, fuzzy
 msgid "Australia/Perth"
 msgstr "August"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 #, fuzzy
 msgid "Australia/Sydney"
 msgstr "August"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr ""
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr ""
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 #, fuzzy
 msgid "Europe/Athens"
 msgstr "Propriet��i"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr ""
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr ""
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr ""
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr ""
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr ""
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr ""
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr ""
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr ""
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr ""
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr ""
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr ""
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr ""
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr ""
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr ""
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr ""
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr ""
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr ""
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr ""
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr ""
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 #, fuzzy
 msgid "Europe/Monaco"
 msgstr "Luni"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr ""
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr ""
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 #, fuzzy
 msgid "Europe/Paris"
 msgstr "Propriet��i"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr ""
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr ""
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr ""
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr ""
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr ""
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr ""
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr ""
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr ""
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr ""
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr ""
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr ""
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 #, fuzzy
 msgid "Indian/Comoro"
 msgstr "Culori"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr ""
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 #, fuzzy
 msgid "Indian/Mauritius"
 msgstr "Margini"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 #, fuzzy
 msgid "Indian/Mayotte"
 msgstr "Mai"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 #, fuzzy
 msgid "Indian/Reunion"
 msgstr "Regiuni"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Semnarea e nesuportat� de acest cifru"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Semnarea �n clar nu e suportat� de acest cifru"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Verificarea nu e suportat� de acest cifru"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Criptarea nu e suportat� de acest cifru"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Decriptarea nu e suportat� de acest cifru"
 
@@ -7551,12 +8152,12 @@ msgstr ""
 "Nu pot crea fi�ierul de ie�ire: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nu pot deschide directorul cache: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7567,7 +8168,7 @@ msgstr ""
 "C�teva opera�ii nu vor fi ref�cute pe acest server la reconectarea\n"
 "�n re�ea."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7578,11 +8179,16 @@ msgstr ""
 "%s\n"
 "Schimb�rile f�cute �n acest dosar nu vor fi resincronizate."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Resincronizare cu serverul"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Creez dosar nou"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Pentru aceast� opera�ie trebuie s� lucra�i online"
 
@@ -7590,57 +8196,68 @@ msgstr "Pentru aceast� opera�ie trebuie s� lucra�i online"
 msgid "Syncing folders"
 msgstr "Sincronizare foldere"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Eroare parsare filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Eroare execu�ie filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Nu pot deschide dosarul spool"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Nu pot procesa dosarul spool"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primesc mesaj %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Nu pot deschide mesajul"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "E�uare la mesajul %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Sincronizare dosar"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "E�uare la mesajul %d din %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "E�ec la decodarea mesajului."
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "E�ec la decodarea mesajului."
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Eroare execu�ie filtru c�utare: %s: %s"
@@ -7672,30 +8289,107 @@ msgstr "(potrivire total�) se cere un singur rezultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Execut� interogare �n header necunoscut: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Eroare executare expresia c�utare: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Eroare executare expresia c�utare: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 #, fuzzy
 msgid "Moving messages"
 msgstr "Copiez mesaje"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Copiez mesajele �n %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Anulat."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "R�spuns nea�teptat de la serverul IMAP: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Nici un destinatar specificat"
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Nu pot trimite mesajul: destinatar neprecizat."
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "E�ec la decodarea mesajului."
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "E�ec la decodarea mesajului."
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "E�ec la decodarea mesajului."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Nu pot crea fi�ier temp: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7792,89 +8486,23 @@ msgstr "Eroare la scrierea fi�ierului cu mesaje temporar: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Eroare la copierea fi�ierului cu mesaje temporar: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "V� rog introduce�i %s fraza de trecere pentru %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "V� rog introduce�i fraza de trecere %s"
-
-#: camel/camel-pgp-context.c:621
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Nu pot trimite mesajul: destinatar neprecizat."
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-#, fuzzy
-msgid "Cannot sign this message: no password provided"
-msgstr "Nu pot trimite mesajul: adresa expeditorului invalid�."
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, fuzzy, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Nu pot crea conexiunea la GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Nu pot trimite mesajul: destinatar neprecizat."
-
-#: camel/camel-pgp-context.c:987
-#, fuzzy
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Nu pot trimite mesajul: destinatar neprecizat."
-
-#: camel/camel-pgp-context.c:993
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Nu pot crea conexiunea la GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "Nu pot crea fi�ier temp: %s"
-
-#: camel/camel-pgp-context.c:1177
-#, fuzzy
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Nu pot trimite mesajul: destinatar neprecizat."
-
-#: camel/camel-pgp-context.c:1187
-#, fuzzy
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Nu pot trimite mesajul: adresa expeditorului invalid�."
-
-#: camel/camel-pgp-context.c:1194
-#, fuzzy, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Nu pot crea conexiunea la GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-#, fuzzy
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Nu pot trimite mesajul: destinatar neprecizat."
-
-#: camel/camel-pgp-context.c:1372
-#, fuzzy
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Nu pot trimite mesajul: destinatar neprecizat."
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1387
-#, fuzzy, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Nu pot crea conexiunea la GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
+msgstr ""
 
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Alt� eroare"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7891,43 +8519,6 @@ msgstr "Nu pot �nc�rca %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nu pot �nc�rca %s: Nu exist� cod de ini�ializare �n modul"
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s server %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s serviciu pentru %s �n %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Conexiune anulat�"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Nu m� pot conecta la %s (port %d): %s"
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(gazd� necunoscut�)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Opera�ia anulat�"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, fuzzy, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Server deconectat nea�teptat"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonim"
@@ -8034,7 +8625,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "R�spuns de la server de autentificare e�uat�."
 
@@ -8063,11 +8654,9 @@ msgid ""
 msgstr ""
 "Acest� op�iune v� va conecta la server folosind autentificare Kerberos 4"
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Parola"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -8095,52 +8684,52 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compilarea expresiei regulate e�uat�: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necesit� o component� nume utilizator"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necesit� o component� gazd�"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necesit� o component� de cale"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Rezolv: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "E�ec la c�utarea numelui: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "E�ec la c�utarea gazdei: %s: gazd� neg�sit�"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "E�ec la c�utarea gazdei: %s: motiv necunoscut"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Rezolv: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "E�ec la c�utarea gazdei: %s: gazd� neg�sit�"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "E�ec la c�utarea gazdei: %s: motiv necunoscut"
@@ -8204,12 +8793,12 @@ msgstr "E�ec la decodarea mesajului."
 msgid "Failed to verify certificates."
 msgstr "E�ec la verificarea certificatului."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
@@ -8240,7 +8829,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8249,16 +8838,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8278,15 +8867,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nu pot parsa URL `%s'"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nu exist� mesajul %s �n %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Nu exist� mesajul: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Verific mesajele noi �n toate dosarele"
 
 #: camel/camel-vee-store.c:262
 #, fuzzy, c-format
@@ -8308,70 +8897,79 @@ msgstr "Nu pot crea dosarul blocat la %s: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Nu pute�i copia mesaje din acest dosar"
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Opera�ia anulat�"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, fuzzy, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Server deconectat nea�teptat"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "R�spuns nea�teptat de la serverul IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Comanda IMAP e�uat�: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "R�spunsul serverului terminat prea repede."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "R�spunsul serverului IMAP nu con�ine informa�ia %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "R�spunsul serverului IMAP nea�teptat OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nu pot crea directorul %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nu pot �nc�rca sumarul pentru %s"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Dosarul a fost distrus �i recreat pe server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Salvez mesajele"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Mesajul nu este disponibil �n mod curent"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Salvez mesajele"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Nu pot g�si corpul mesajului �n r�spunsul FETCH."
 
@@ -8425,33 +9023,84 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pentru citirea �i stocarea mesajelor pe servere IMAP."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Parola"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Aceast� op�iune v� va conecta la serverul IMAP folosind o parol� �n clar "
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Server SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s serviciu pentru %s �n %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Conexiune anulat�"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Nu m� pot conecta la %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Nu m� pot conecta la serverul POP.\n"
+"Eroare la trimiterea numelui utilizator: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Opera�ie nesuportat�"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "E�ec la autentificare."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Serverul IMAP %s nu suport� tipul cerut de autentificare %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Tip de autentificare nesuportat %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sV� rog intoduce�i parola IMAP pentru %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Nu a�i introdus o parol�."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8462,76 +9111,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Nu exist� dosarul %s"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (...)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Nu pot deschide c�su�a po�tal�: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (...)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Director cu mail-uri �n format MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 #, fuzzy
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Pentru stocarea mail-urilor �ntr-un director de tip MH"
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 #, fuzzy
 msgid "Local delivery"
 msgstr "Dosare speciale"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 #, fuzzy
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Pentru stocarea mail-urilor locale �n format standard mbox"
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "Aplic� filtrele pe mesajele noi din INBOX pe acest server"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "Director cu mail-uri �n format MH"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 #, fuzzy
 msgid "For storing local mail in maildir directories."
 msgstr "Pentru stocarea mail-urilor locale �n directoare qmail maildir"
 
-#: camel/providers/local/camel-local-provider.c:100
-#, fuzzy
-msgid "Standard Unix mbox spools"
-msgstr "Mbox Unix standard"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
 #, fuzzy
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "Pentru stocarea mail-urilor locale �n directoare spool Unix"
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+msgid "Standard Unix mbox spool or directory"
+msgstr "Mbox Unix standard"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "Pentru stocarea mail-urilor locale �n directoare spool Unix"
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Stocarea root %s nu e o cale absolut�"
@@ -8557,7 +9223,7 @@ msgstr "Stoc�rile locale nu au un inbox"
 msgid "Local mail file %s"
 msgstr "Fi�ier mail-uri locale %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nu pot redenumi dosarul %s �n %s: %s"
@@ -8577,34 +9243,32 @@ msgstr "Nu pot �terge dosarul sumar al fi�ierelor `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nu pot �terge dosarul index al fi�ierelor `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nu pot �nc�rca sumarul pentru %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nu pot ad�uga mesajul la sumar: motiv necunoscut"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "E�uare la mesajul %d"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nu pot ad�uga mesajul la dosarul maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8613,20 +9277,19 @@ msgstr ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Nu exist� mesaj"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Con�inut invalid al mesajului"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8637,13 +9300,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Dosarul `%s' nu exist�."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8659,7 +9322,7 @@ msgstr "`%s' nu e un director de tip maildir."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nu pot �terge dosarul `%s': %s"
@@ -8668,8 +9331,8 @@ msgstr "Nu pot �terge dosarul `%s': %s"
 msgid "not a maildir directory"
 msgstr "nu e director maildir"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nu pot scana dosarul `%s': %s"
@@ -8690,47 +9353,39 @@ msgstr "Verific mailurile noi"
 msgid "Checking for new messages"
 msgstr "Salvez mesajele"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
 msgstr "Sincronizare dosar"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nu pot deschide c�su�a po�tal�: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Opera�ia anulat�"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nu pot ad�uga mesajul la fi�ierul mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8739,13 +9394,11 @@ msgstr ""
 "Nu pot lua mesajul: %s din dosarul %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dosarul pare a fi deteriorat irecuperabil."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Construc�ia mesajului e�uat�: c�su�a po�tal� corupt�?"
 
@@ -8788,154 +9441,154 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Dosarul `%s' nu e gol. Nu s-a �ters."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
 "Nu pot deschide dosarul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Eroare fatal� la parserul de mail la pozi�ia %ld �n dosarul %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 "Nu pot deschide fi�ierul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nu pot deschide c�su�a po�tal� temporar�: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Sumarul �i dosarul nu se potrivesc, chiar dup� o sincronizare"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Eroare la scrierea �n c�su�a po�tal� temporar�: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "E�ec la scrierea �n c�su�a po�tal�: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nu pot �nchide dosarul surs� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nu pot �nchide dosarul temporar: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nu pot redenumi dosarul: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Sumarul �i dosarul nu se potrivesc, chiar dup� o sincronizare"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Eroare necunoscut�: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Nu pot redenumi dosarul: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Eroare la scrierea �n c�su�a po�tal� temporar�: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "E�ec la scrierea �n c�su�a po�tal�: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "Trimite mesaj la contact"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nu pot ad�uga mesajul la dosarul mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' nu e un director"
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nu pot deschide calea c�tre directorul MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Nu pot ad�uga mesajul la fi�ierul spool: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Dosarele spool nu pot fi redenumite"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Fi�ierul spool `%s' nu exist� sau nu e un fi�ier obi�nuit."
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "Stocarea root %s nu e director obi�nuit"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Dosarul `%s'/%s nu exist�."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Fi�ier spool mail %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Dosarele spool nu pot fi redenumite"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Dosarele spool nu pot fi redenumite"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Dosarele spool nu pot fi �terse"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nu pot sincroniza dosarul temporar: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nu pot sincroniza dosarul spool %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8944,25 +9597,6 @@ msgstr ""
 "Nu pot sincroniza dosarul spool %s: %s\n"
 "Dosarul poate fi corupt, copia salvat� �n `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, fuzzy, c-format
-msgid "Could not file: %s: %s"
-msgstr "Nu pot �nc�rca %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Fi�ierul spool `%s' nu exist� sau nu e un fi�ier obi�nuit."
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Mail la %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "�tiri USENET"
@@ -8973,12 +9607,22 @@ msgstr ""
 "Acesta e un provider pentru citirea din �i postarea �n grupuri de �tiri "
 "USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Nu pot crea directorul %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "�tiri USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -9083,7 +9727,7 @@ msgstr "Las� mesajele pe server"
 msgid "Delete after %s day(s)"
 msgstr "�tergere dup� %s zi(le)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -9110,32 +9754,22 @@ msgstr ""
 "prin intermediul protocolului APOP. Aceasta poate s� nu func�ioneze pentru "
 "to�iutilizatorii chiar pe servere care pretind c� suport� acest mod."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea numelui utilizator: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Opera�ie nesuportat�"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "E�ec la autentificare."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Nu m� pot conecta la serverul POP �n %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -9143,27 +9777,27 @@ msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Mecanismul de autentificare solicitat este nesuportat."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "Comanda IMAP e�uat�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, fuzzy, c-format
 msgid "I/O Error: %s"
 msgstr "Eroare I/O"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sV� rog introduce�i parola POP3 pentru %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -9172,13 +9806,13 @@ msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea parolei: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nu exist� dosarul `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9344,45 +9978,45 @@ msgstr "E�uare temporar� a autentific�rii"
 msgid "Authentication required"
 msgstr "Necesit� autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "R�spuns de eroare: %s: probabil nu e fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea numelui utilizator: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Mesajul nu pare a fi formatat corespunz�tor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "R�spuns de eroare RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Serverul SMTP %s nu suport� tipul cerut de autentificare %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIntroduce�i v� rog parola SMTP pentru %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9393,92 +10027,92 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "Server SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail livrat prin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "Nu pot trimite mesajul: adresa expeditorului invalid�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Trimit mesaj"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "�nt�lnire"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Comanda HELO a expirat: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "R�spuns de eroare la comanda HELO: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Eroare la crearea obiectului de autentificare SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "E�ec la cererea AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "R�spuns de la server: autentificare e�uat�.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Comanda MAIL FROM a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "R�spuns de eroare la comanda MAIL FROM: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Comanda RCPT TO a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Comanda DATA a expirat: %s: mailul nu a fost trimis"
@@ -9486,38 +10120,38 @@ msgstr "Comanda DATA a expirat: %s: mailul nu a fost trimis"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "R�spuns de eroare RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA - timp expirat: terminarea mesajului: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "R�spuns de la server de autentificare e�uat�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Timp expirat pentru cererea RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "R�spuns de eroare RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Comanda QUIT a expirat: %s: nefatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "R�spuns de eroare RSET: %s"
@@ -9591,52 +10225,52 @@ msgstr "Tip MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerez afi�area automat� a anexei"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Clic aici pentru agend�"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "De la:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "R�spunde la:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Subiect:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "La:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Introduce�i destinatarul mesajului"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduce�i adresele care vor primi o copie a mesajului"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9649,7 +10283,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Anexeaz� un fisier"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Nu pot crea un context pentru o semn�tur� PGP."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9658,34 +10297,34 @@ msgstr ""
 "Eroare la citirea fi�ierului: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Avertisment!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Fi�ierul exist�, suprascriu?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Eroare la salvarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Eroare la �nc�rcarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Eroare la accesarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Nu pot primi mesajul de la editor"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9694,7 +10333,7 @@ msgstr ""
 "Nu pot c�uta �n fi�ierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9703,7 +10342,7 @@ msgstr ""
 "Nu pot trunchia fi�ierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9712,7 +10351,7 @@ msgstr ""
 "Eroare la salvarea automat� a mesajului: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -9721,7 +10360,7 @@ msgstr ""
 "Evolution a g�sit fi�iere nesalvate �ntr-o sesiune anterioar�.\n"
 "Dori�i s� �ncerc o restaurare?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9730,30 +10369,50 @@ msgstr ""
 "Acest mesaj nu a fost trimis.\n"
 "Dori�i s� salva�i modific�rile?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mesaje �naintate"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Deschide fi�ier"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Insereaz� fi�ier"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Salveaz� semn�tura"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (implicit)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Compune un mesaj"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -9762,6 +10421,12 @@ msgstr ""
 "Nu pot crea fereastra de compunere pentru c� n-a�i configurat �nc�\n"
 "nici o identitate �n componen�a mailului."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9831,7 +10496,7 @@ msgstr "Numele con�ine"
 msgid "Subject does not contain"
 msgstr "nu con�ine"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9985,7 +10650,7 @@ msgstr "or�"
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "secunde"
 
@@ -10062,7 +10727,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -10074,6 +10739,21 @@ msgstr "<clic aici pentru a selecta o dat�>"
 msgid "Filter Rules"
 msgstr "Reguli filtre"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Nume stil:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Fi�ierul spool `%s' nu exist� sau nu e un fi�ier obi�nuit."
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Selectez o ac�iune"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -10093,7 +10773,7 @@ msgstr ""
 "V� rog merge�i �napoi �i preciza�i un dosar pentru livrarea mailului."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Alege dosar"
 
@@ -10106,7 +10786,11 @@ msgstr ""
 "Eroare �n expresia regulat� '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
@@ -10137,7 +10821,7 @@ msgstr "dac� toate criteriile sunt �ndeplinite"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "dac� oricare criteriu e �ndeplinit"
 
 #: filter/filter-rule.c:780
@@ -10216,194 +10900,204 @@ msgid "Beep"
 msgstr "M�rime"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Companie"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "con�ine"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Copiaz� �n dosar"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Date recep�ionate"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Date trimise"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "�terse"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "nu con�ine"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "nu se termin� cu"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "nu exist�"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "nu sun� ca"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "nu �ncepe cu"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Nu exist�"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Ciorn�"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "se termin� cu"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Exist�"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "exist�"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Expresie"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Important"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "este"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "a fost dup�"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "a fost �nainte"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "Marcat"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "e mai mare dec�t"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "e mai mic dec�t"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "nu este"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Marcat"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "eticheta26"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Lista de mail"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Corp mesaj"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Antet mesaj"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Mut� in dosar"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Red� sunetul:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Cite�te"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Potrivire regex"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "R�spuns la"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Punctaj"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Expeditor"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Seteaz� starea"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "M�rime (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "sun� ca"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Cont surs�"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Antet specific"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "�ncepe cu"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Opresc procesarea"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Subiect"
 
@@ -10464,7 +11158,8 @@ msgid "Scanning %s"
 msgstr "Trimit \"%s\""
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Mail"
 
@@ -10480,10 +11175,6 @@ msgstr ""
 msgid "Elm"
 msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Agend�"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10533,7 +11224,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Gunoi"
 
@@ -10674,275 +11367,284 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 #, fuzzy
 msgid "Folder containing mail"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "Dosare virtuale"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Dosare virtuale"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 #, fuzzy
 msgid "Properties..."
 msgstr "_Propriet��i..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Modific� propriet��ile fi�ierului"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Nu a�i setat o metod� de transport a mailului"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Mesaje �naintate"
+
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectare la server..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriet��i pentru \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Propriet��i"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nu pot crea directorul temporar: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d noi"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d ascunse"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "�terse"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d netrimise"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d netrimise"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Creaz� dosar virtual din mesaj"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "Doasr V pe _subiect"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "Dosar V pe expeditor"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "Dosar V pe destinatari"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filtru pe subiect"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filtru pe expeditor"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filtru pe destinatari"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filtru pe lista de mail"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Editeaz� ca mesaj nou..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "Ti_p�re�te"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_R�spunde la expeditor"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "R�spunde la _list�"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "R�spunde la to�i"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_�nainteaz�"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Terminat"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "�terge"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marcheaz� ca citit"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marchez ca necitit"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Marcheaz� ca important"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcheaz� ca important"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Rec_upereaz�"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mut �n folderul..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Copiaz� �n dosarul..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "eticheta26"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adaug� expeditorul �n agend�"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplic� filtre"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Creaz� regul� din mesaj"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtru pe lista de mail (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Dosar V pe lista de mail (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "Implicit"
+
+#: mail/folder-info.c:71
 #, fuzzy
 msgid "Getting Folder Information"
 msgstr "Informa�ie op�ional�"
@@ -10998,7 +11700,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Nu a�i completat toat� informa�ia cerut�."
 
@@ -11008,85 +11710,109 @@ msgid "Evolution News Editor"
 msgstr "Editor de �tiri Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Editor de conturi Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Host:"
 msgstr "Gazd�:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Nume utilizator:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Path:"
 msgstr "Cale:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Radio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Nu �terge"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Chiar �terge�i acest cont?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Invalideaz�"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Valideaz�"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont nou?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Enabled"
 msgstr "Valideaz�"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Management cont"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Mail la %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Subiectul este %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Mail de la %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "%s lista de mail"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Adaug� regul� de filtrare"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11098,7 +11824,7 @@ msgstr ""
 "trimite, primi sau compune mailuri.\n"
 "Dori�i s� face�i configurarea acum?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11106,7 +11832,7 @@ msgstr ""
 "Trebuie s� configura�i o identitate\n"
 "�nainte de a putea compune mailuri."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11115,18 +11841,18 @@ msgstr ""
 "�nainte pentru a putea compune mailuri. "
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Trimite un email"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11134,18 +11860,18 @@ msgstr ""
 "Acest mesaj nu are subiect.\n"
 "Chiar trimite�i?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "Mesajul con�ine numai cererile nesuportate."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -11157,16 +11883,16 @@ msgstr ""
 "ad�ugarea unui antet Aparent-la.\n"
 "Trimite�i oricum?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Trebuie s� specifica�i un destinatar pentru a trimite acest mesaj."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "Trebuie s� configura�i un cont �nainte pentru a putea s� trimite�i acest mail"
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11174,29 +11900,29 @@ msgstr ""
 "Nu pot deschide dosarul cu ciorne pentru acest cont.\n"
 "Dori�i s� folosi�i dosarul cu ciorne implicit?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Eroare necunoscut�"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Mut� mesaj(e) �n"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Copiaz� mesaje(le) �n"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Sunte�i sigur c� dori�i s� edita�i toate cele %d mesaje?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11204,7 +11930,7 @@ msgstr ""
 "Pute�i numai s� edita�i mesajele\n"
 "salvate �n dosarul Ciorne"
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11212,39 +11938,39 @@ msgstr ""
 "Pute�i numai s� retrimite�i mesajele\n"
 "din dosarul Trimise"
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Sunte�i sigur c� dori�i s� retrimite�i toate cele %d mesaje?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Nici un mesaj selectat"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Suprascrie�i fi�ierul?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Salveaz� mesajul ca..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Salveaz� mesajele ca..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Afi�eaz� urm�torul mesaj necitit"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11252,7 +11978,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11261,34 +11987,70 @@ msgstr ""
 "Eroare la �ncarcarea informa�iei de filtrare:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "_Filtre..."
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Tip�re�te mesaj"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Tip�rirea mesajului nereu�it�"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Sunte�i sigur c� dori�i s� deschide�itoate cele %d mesaje �n ferestre "
 "separate?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Descriere:"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Contact schimbat:"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "n"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Adaug� criteriu"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Salveaz� semn�tura"
+
 #: mail/mail-config-druid.c:146
 #, fuzzy
 msgid ""
@@ -11296,9 +12058,9 @@ msgid ""
 "below do not need to be filled in,\n"
 "unless you wish to include this information in email you send."
 msgstr ""
-"V� rog introduce�i numele �i adresa de email mai jos. C�mpurile "
-"\"op�ional\"de mai jos nu e necesar s� le completa�i dec�t dac� dori�i s� "
-"include�i aceast� informa�ie �n emailul pe care-l trimite�i"
+"V� rog introduce�i numele �i adresa de email mai jos. C�mpurile \"op�ional"
+"\"de mai jos nu e necesar s� le completa�i dec�t dac� dori�i s� include�i "
+"aceast� informa�ie �n emailul pe care-l trimite�i"
 
 #: mail/mail-config-druid.c:148
 #, fuzzy
@@ -11337,66 +12099,54 @@ msgid ""
 "space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"Aproape a�i terminat procesul de configurare a mailului. "
-"Identitatea,serverul de mail de intrare �i metoda de transport a a mailului "
-"ce le-a�i indicat vor fi grupate �mpreun� pentru a face un cont de mail "
-"Evolution. V� rog introduce�i mai jos un nume pentru acest cont. Acest nume "
-"va fi folosit doar pentru afi�are."
+"Aproape a�i terminat procesul de configurare a mailului. Identitatea,"
+"serverul de mail de intrare �i metoda de transport a a mailului ce le-a�i "
+"indicat vor fi grupate �mpreun� pentru a face un cont de mail Evolution. V� "
+"rog introduce�i mai jos un nume pentru acest cont. Acest nume va fi folosit "
+"doar pentru afi�are."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Asistentul de conturi Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Lucrez"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "La"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "dup�"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Cont"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Conectare la server..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Contact schimbat:"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
@@ -11404,116 +12154,110 @@ msgstr ", "
 
 #: mail/mail-config.glade.h:2
 #, fuzzy
-msgid " Edit "
-msgstr "Editez"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Nou"
-
-#: mail/mail-config.glade.h:4
-#, fuzzy
 msgid " _Check for supported types "
 msgstr "Verific tipurile suportate"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "Semnarea e nesuportat� de acest cifru"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Semnarea e nesuportat� de acest cifru"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Cont"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Informa�ie cont"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Management cont"
 
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "Adaug� criteriu"
+
 #: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Op�iuni avansate LDAP "
+msgid "Add new signature..."
+msgstr "Salveaz� semn�tura"
 
 #: mail/mail-config.glade.h:12
-msgid "Afrikaans"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-#, fuzzy
-msgid "Alerts"
-msgstr "Alarme"
-
-#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexeaz� un fi�ier la mesaj"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anex�"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Verific� automat dac� sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Set de caractere necunoscut: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "�nchide"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
@@ -11521,15 +12265,20 @@ msgstr "Verific mailurile noi"
 
 #: mail/mail-config.glade.h:29
 #, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Culoare pentru sarcinile de ast�zi"
+
+#: mail/mail-config.glade.h:30
+#, fuzzy
 msgid "Composing Messages"
 msgstr "Compune un mesaj"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11546,57 +12295,48 @@ msgstr ""
 "\n"
 "Clic \"Terminare\" pentru a salva set�rile"
 
-#: mail/mail-config.glade.h:37
-msgid "Dari"
-msgstr ""
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Setul de caractere implicit: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "ID-uri digitale..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Nu pot deschide mesajul"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Gata"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Dosar ciorne:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "E_nable"
 msgstr "Valideaz�"
 
-#: mail/mail-config.glade.h:48
-#, fuzzy
-msgid "E_nable advanced options"
-msgstr "Op�iuni avansate LDAP "
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11617,39 +12357,35 @@ msgstr "Adresa email:"
 msgid "Empty _trash folders on exit"
 msgstr "Gole�te dosarul cu reziduuri la ie�ire"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Execut� ac�iunile"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "se termin� cu"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propriet��i"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Ia ID digital..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Ilumineaz� citatele cu "
 
-#: mail/mail-config.glade.h:59
-msgid "Hulu"
-msgstr ""
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
@@ -11703,69 +12439,65 @@ msgstr "Cea��"
 msgid "NNTP Server:"
 msgstr "Server NNTP"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "Dosar _nou"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Informa�ie op�ional�"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_za�ie:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID cheie PGP:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Alege o culoare"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Tip�re�te contactele selectate"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Maildir Qmail "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Nu pot deschide mesajul"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Cotat"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
@@ -11800,120 +12532,124 @@ msgid "S_ecurity"
 msgstr "Securitate"
 
 #: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME securizat"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Selecteaz� binarul PGP"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Fi�ier semn�tur�:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "�terge tot �n afar� de semn�tur�"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Trimit email"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Dosar mesaje trimise:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Trimite �i mesajele ciorn�"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Serverul necesit� _autentificare"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Configurare server"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tip server:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Scurt�turi"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Salveaz� semn�tura"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Salveaz� semn�tura"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Surs�"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Informa�ie surs�"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nume stil:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Mbox Unix standard"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "Semn�tur� HTML:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabil"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -11924,154 +12660,146 @@ msgstr ""
 "\n"
 "Clic \"Urm�torul\" pentru a �ncepe"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Est"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "Semn�tur� HTML:"
+
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Always load images off the net"
 msgstr "�ntotdeauna �ncarc� imaginile neconectat"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Tip de autentificare: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tip de autentificare: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Verific� automat dac� sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "Verific� automat dac� sunt mailuri noi la fiecare"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "ID certificat:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Semn�tur� HTML:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Nume fi�ier:"
+msgid "_Enable"
+msgstr "Valideaz�"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "�nainteaz� ca"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nume complet:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "�n mailuri HTML"
 
-#: mail/mail-config.glade.h:160
-#, fuzzy
-msgid "_HTML Signature:"
-msgstr "Semn�tur� HTML:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitate"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Limbaj"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "�ncarc� imaginile dac� expeditorul e �n agend�"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "F� contul acesta contul meu implicit"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marcheaz� mesajele ca \"Citit\" dup�"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Name:"
 msgstr "Nume:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Never load images off the net"
 msgstr "Nu �nc�rca niciodat� imaginile neconectat"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "Cale binar� PGP:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Radio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -12112,71 +12840,54 @@ msgstr "Semn�tur� HTML:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "Semn�tur� HTML:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Folose�te conectare securizat� (SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabil"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 #, fuzzy
 msgid "_every"
 msgstr "Fiecare"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " culoare"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 #, fuzzy
 msgid "description"
 msgstr "Descriere:"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "fereastra-�tiri1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Nu pot crea un context pentru o semn�tur� PGP."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Nu pot crea un context pentru o verificare PGP."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Nu pot crea un context pentru o criptare PGP."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Nu pot crea un context pentru o decriptare PGP."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Nu pot crea un context pentru semn�tura S/MIME."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Nu pot crea un context pentru certificare S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nu pot crea un context pentru o criptare S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Nu pot crea un context pentru anvelopa S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Nu pot crea contextul pentru decodarea S/MIME."
 
@@ -12219,103 +12930,137 @@ msgstr "Vizualizator extern"
 msgid "Loading message content"
 msgstr "�ncarc con�inut mesaj"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Termen dep�it"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Deschide leg�tura �n navigator"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Copiaz� leg�tura c�tre loca�ia"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Salveaz� leg�tura ca (FIXME)"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salveaz� imaginea ca..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s anex�"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nu pot parsa mesajul MIME. Afi�ez ca surs�."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adresa email:"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De la"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "R�spuns-la:"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "La"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Program de mail:"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Salveaz� mesajul ca..."
+
+#: mail/mail-format.c:1832
+#, fuzzy
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr "Acest mesaj este semnat digital �i este autentic."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Nu pot crea un context pentru o verificare PGP."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Acest mesaj este semnat digital �i este autentic."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "Acest mesaj este semnat digital dar nu se poate dovedi c� e autentic."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Indicator c�tre site-ul FTP (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Indicator c�tre fi�ierul local (%s) valid pe site-ul \"%s\""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Indicator c�tre fi�ierul local (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Indicator c�tre site-ul FTP (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Indicator c�tre o dat� extern� necunoscut� (tip \"%s\")"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Corpul extern al mesajului par�ial deformat."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Dosare speciale"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Reconfigurez dosarul"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12324,29 +13069,29 @@ msgstr ""
 "Nu pot salva informa�ia meta a dosarului; probabil c� nu ve�i mai putea\n"
 "deschide acest dosar: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Schimb dosarul \"%s\" �n formatul \"%s\""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12354,12 +13099,12 @@ msgstr ""
 "Dac� nu o s� pute�i deschide aceast� c�su�� po�tal�, atunci\n"
 "probabil va trebui s� o repara�i manual."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nu pute�i copia mesaje din acest dosar"
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigureaz� %s"
@@ -12419,81 +13164,73 @@ msgstr "E�ec la mesajul %d din %d"
 msgid "Complete."
 msgstr "Terminat"
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Salvez mesaj �n dosar"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mut mesajele �n %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiez mesajele �n %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Mut"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Copiez"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanez dosarele �n \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Deschid dosarul %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "Deschid rezerva %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "�terg dosarul %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creez dosar nou"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Primesc mesajul %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Primesc mesaje"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvez mesajele"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12502,7 +13239,7 @@ msgstr ""
 "Nu pot crea fi�ierul de ie�ire: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12511,11 +13248,11 @@ msgstr ""
 "Eroare la salvarea mesajului: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Salvez anexa"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12524,27 +13261,27 @@ msgstr ""
 "Nu pot crea fi�ierul de ie�ire: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Caut�"
 
@@ -12619,10 +13356,6 @@ msgstr "Actualizez..."
 msgid "Waiting..."
 msgstr "A�tept..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Anulat."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Opera�ie anulat� de utilizator."
@@ -12637,18 +13370,18 @@ msgstr "Introduce�i parola pentru %s"
 msgid "Enter Password"
 msgstr "Introduce�i parola pentru %s"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr ""
 "Nu pot deschde fi�ierul semn�tur� %s:\n"
 "%s"
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Salveaz� semn�tura"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12657,10 +13390,30 @@ msgstr ""
 "Aceast� semn�tur� a fost modificat�, dar n-a fost salvat�.\n"
 "Dori�i s� salva�i modific�rile?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Nume:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "Fi�ier semn�tur�:"
+msgid "Signature hint"
+msgstr "Salveaz� semn�tura"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "Semn�tur� HTML:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12677,17 +13430,17 @@ msgstr "Mesaje �naintate"
 msgid "Forwarded Message"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Creez dosar nou"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Scanez dosarele �n \"%s\""
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12696,92 +13449,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "Dosare V"
+
+#: mail/mail-vfolder.c:784
 #, fuzzy
 msgid "vFolders"
 msgstr "Dosare"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editeaz� dosare V"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Dosar V Nou"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 #, fuzzy
 msgid "(No subject)"
 msgstr "�naintat: (f�r� subiect)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "Mesaj"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Nev�zut"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "V�zut"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "R�spuns"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Mesaje nev�zute multiple"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Mesaje multiple"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Cea mai sc�zut�"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Mai sc�zut�"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Mai mare"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Cea mai mare"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Ast�zi %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 #, fuzzy
 msgid "Generating message list"
 msgstr "Salvez mesajele"
@@ -12804,10 +13562,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Contact original:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Primit"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "M�rime"
 
@@ -17921,5713 +18684,5708 @@ msgstr "Ploaie"
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "Pager"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "Cea mai sc�zut�"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 #, fuzzy
 msgid "Learmouth"
 msgstr "Cea mai sc�zut�"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr ""
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "Margini"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "�terge"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "ani"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "Cea mai sc�zut�"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 #, fuzzy
 msgid "Lewistown"
 msgstr "Cea mai sc�zut�"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr ""
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr ""
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr ""
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "Mai mare"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Lihue"
 msgstr "minut"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "Cea mai sc�zut�"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limoges"
 msgstr "Cea mai sc�zut�"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "lun�"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Lincoln"
 msgstr "intr�"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr ""
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "Cea��"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 #, fuzzy
 msgid "Litchfield"
 msgstr "Grindin� u�oar�"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "Logare NT"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "Compune"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "London"
 msgstr "Refacere"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "ore"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 #, fuzzy
 msgid "Los Alamos"
 msgstr "Alarme"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr ""
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "Cea mai sc�zut�"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "iese"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "Mai sc�zut�"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr ""
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "Martie"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "Martie"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macapa"
 msgstr "Martie"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "Luni"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "Luni"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr ""
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "Canada"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "Manager"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "Manager"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "Manager"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "Mesaje"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "Martie"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manchester"
 msgstr "Potriviri:"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "Manager"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "Cea��"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "Bara de unelte principal�"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "Luni"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "Martie"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "Margini"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "Margini"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "Margini"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 #, fuzzy
 msgid "Marquette"
 msgstr "Mai"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "Martie"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "Mai"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Marchez ca necitit"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Margini"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "Margini"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "Corean"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "Martie"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr ""
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "Culori"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr ""
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Manager"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "Mai"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 #, fuzzy
 msgid "Mazu"
 msgstr "Martie"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 #, fuzzy
 msgid "McAllen"
 msgstr "Tot"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "Martie"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "Martie"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "�nainte"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "Luni"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "Vineri"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 #, fuzzy
 msgid "Merril Field"
 msgstr "C�mpul De la"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 #, fuzzy
 msgid "Miami"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middle East"
 msgstr "Ini�iala tat�lui:"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "Ini�iala tat�lui:"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "Tip fi�ier:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 #, fuzzy
 msgid "Milford"
 msgstr "pentru"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "Mail la %s"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "intr�"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 #, fuzzy
 msgid "Minnesota"
 msgstr "minute"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "nu este"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr ""
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missoula"
 msgstr "D-ra."
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 #, fuzzy
 msgid "Missouri"
 msgstr "D-ra."
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitchell"
 msgstr "Potriviri:"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 #, fuzzy
 msgid "Mitilini"
 msgstr "Lista de mail"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "Lu"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "Telefon mobil"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "Mobil"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Modesto"
 msgstr "Negur� moderat�"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "Mut�"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "Mobil"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 #, fuzzy
 msgid "Moldova"
 msgstr "Luni"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 #, fuzzy
 msgid "Molokai"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "Luni"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "Luni"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "Luni"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "Luni"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "Manager"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 #, fuzzy
 msgid "Montana"
 msgstr "con�ine"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "Ninsoare moderat�"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Afi�are lun�"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "Luna"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "Luni"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "Afi�are lun�"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "Fonturi"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morelia"
 msgstr "Corean"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "Organiza�ie"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "Principal"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "Mobil"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "Afi�are lun�"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "Sud Est"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Afi�are lun�"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 #, fuzzy
 msgid "Muncie"
 msgstr "Iunie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 #, fuzzy
 msgid "Murcia"
 msgstr "August"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "minute"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "Fonturi"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "Nume"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "Avertisment"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "Japonez"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "Nume"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Napoli"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "Porecl�"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natchez"
 msgstr "Potriviri:"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 #, fuzzy
 msgid "Nebraska"
 msgstr "Sarcin� nou�"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "Canada"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 #, fuzzy
 msgid "Nevada"
 msgstr "Canada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "Sarcin� nou�"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bedford"
 msgstr "Dosar _nou"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "_Eveniment nou"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "Newcastle"
 msgstr "�tiri"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Mail nou"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Mail nou"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "_Eveniment nou"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Iberia"
 msgstr "Contact nou"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "Mesaj nou"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr ""
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "Selec_teaz� �nl�n�uirea"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "Nord"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "_Eveniment nou"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "Nou"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "New York"
 msgstr "Dosar V Nou"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "Dimensiuni:"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nis"
 msgstr "este"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "Nume"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norrkoping"
 msgstr "Lucrez"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Adams"
 msgstr "Nord Est"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "Nord"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "Acum"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "Nord Est"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "Nord Est"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "Acum"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "Nord Vest"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "Nord"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "Acum"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "Not�"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "Nepornit"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 #, fuzzy
 msgid "Oahu"
 msgstr "Opac"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "Unu"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "Deschide"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "Deschide"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "Alte"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "Alte"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "Ok"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 #, fuzzy
 msgid "Omsk"
 msgstr "Ok"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "Orientare"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oostende"
 msgstr "Participare"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oran"
 msgstr "Renun��"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "Org"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 #, fuzzy
 msgid "Oregon"
 msgstr "Org"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "Corean"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 #, fuzzy
 msgid "Orlando"
 msgstr "Corean"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 #, fuzzy
 msgid "Oruro"
 msgstr "Eroare"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr "secund�"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "s�pt�m�n�"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 #, fuzzy
 msgid "Oxford"
 msgstr "pentru"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "Pagin�"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "Pager"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "Pager"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "Set�ri _mail..."
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 #, fuzzy
 msgid "Pamplona"
 msgstr "Fum"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 #, fuzzy
 msgid "Panama City"
 msgstr "Canada"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Revocat"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "Japonez"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Paphos"
 msgstr "Cea mai sc�zut�"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 #, fuzzy
 msgid "Paris"
 msgstr "Margini"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 #, fuzzy
 msgid "Paris/Orly"
 msgstr "Cea�� par�ial�"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "Parola"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "Canada"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "Red� sunetul:"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "Red� sunetul:"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "�ntrebare"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "Re�ncarc�"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "Selec�ie"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "Principal"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "H�rtie"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "H�rtie"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "H�rtie"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "H�rtie"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "Previzualizare"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 #, fuzzy
 msgid "Pine Bluff"
 msgstr "Mail Pine"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 #, fuzzy
 msgid "Pisa"
 msgstr "Lipe�te"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 #, fuzzy
 msgid "Plymouth"
 msgstr "lun�"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "Tip�re�te plic"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "Rezumat"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "Tip�re�te mesaj"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "Propriet��i"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 #, fuzzy
 msgid "Ponca City"
 msgstr "Lista de telefoane"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 #, fuzzy
 msgid "Ponce"
 msgstr "Inexistent"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "Contacte"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 #, fuzzy
 msgid "Port Alexander"
 msgstr "Tip�re�te calendar"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "Tip�re�te plic"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "Previzualizare"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 #, fuzzy
 msgid "Port Hardy"
 msgstr "Tip�re�te calendar"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 #, fuzzy
 msgid "Portland"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 #, fuzzy
 msgid "Porto"
 msgstr "Port:"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "�n desf�urare"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "Portret"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "Portret"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "Portret"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 #, fuzzy
 msgid "Poznan"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Praha"
 msgstr "Gunoi"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "Burni�� par�ial"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 #, fuzzy
 msgid "Presidente Prudente"
 msgstr "Previzualizeaz� tip�rirea"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 #, fuzzy
 msgid "Pretoria"
 msgstr "Portret"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "Prev"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "Tradi�ional"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 #, fuzzy
 msgid "Providence"
 msgstr "_Stat/Provincie"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "Previzualizare"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "Prev"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Puebla"
 msgstr "Public"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 #, fuzzy
 msgid "Pueblo"
 msgstr "Public"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "�ntrebare"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "Rezumat"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 #, fuzzy
 msgid "Pula"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 #, fuzzy
 msgid "Punta Cana"
 msgstr "Tip�re�te calendar"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "�ntrebare"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 #, fuzzy
 msgid "Quebec"
 msgstr "Subiect"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 #, fuzzy
 msgid "Rapid City"
 msgstr "R�spuns la"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Rawlins"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 #, fuzzy
 msgid "Reading"
 msgstr "Titluri"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 #, fuzzy
 msgid "Recife"
 msgstr "Primit"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redding"
 msgstr "Titluri"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "Cite�te"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 #, fuzzy
 msgid "Redmond"
 msgstr "Repetare"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "Regiuni"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 #, fuzzy
 msgid "Rennes"
 msgstr "Memorator"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 #, fuzzy
 msgid "Reno"
 msgstr "Repetare"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "Regiuni"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "Reguli"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "ani"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 #, fuzzy
 msgid "Reynosa"
 msgstr "Re�ncarc�"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "Porecl�"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "Grindin�"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "Rol"
 
-#: my-evolution/Locations.h:1881
-#, fuzzy
-msgid "Riga"
-msgstr "Dreapta:"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 #, fuzzy
 msgid "Rijeka"
 msgstr "Cite�te"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 #, fuzzy
 msgid "Rimini"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 #, fuzzy
 msgid "Rioja"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "Mai mare"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "Tip�re�te"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 #, fuzzy
 msgid "Riyadh"
 msgstr "Cite�te"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Roatan"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 #, fuzzy
 msgid "Robore"
 msgstr "�nainte"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rodos"
 msgstr "Repetare"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 #, fuzzy
 msgid "Rogers"
 msgstr "Dosare"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "Culori"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 #, fuzzy
 msgid "Rosario"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Roseglen"
 msgstr "Rol"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "Gazd�"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "Revenire"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 #, fuzzy
 msgid "Russia"
 msgstr "August"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 #, fuzzy
 msgid "Rutland"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 #, fuzzy
 msgid "Sacramento"
 msgstr "Departament"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 #, fuzzy
 msgid "Saginaw"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "Tip�re�te calendar"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 #, fuzzy
 msgid "Salem"
 msgstr "Salveaz�"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salmon"
 msgstr "Fum"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 #, fuzzy
 msgid "Salta"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "S�m"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "Fum"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samos"
 msgstr "Fum"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "Dum"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 #, fuzzy
 msgid "San Carlos"
 msgstr "Salveaz� �i �nchide"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "Dum"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sandberg"
 msgstr "Expeditor"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sanderson"
 msgstr "Expeditor"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sanford"
 msgstr "pentru"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "Umbrire"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "Salveaz� �i �nchide"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 #, fuzzy
 msgid "San Juan"
 msgstr "Dum"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "Expeditor"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santarem"
 msgstr "dup�"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr ""
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santorini"
 msgstr "Lapovi�� �i ninsoare"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "Stare"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr ""
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 #, fuzzy
 msgid "Sarasota"
 msgstr "Fum"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "Dum"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "Stare"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "Organiza�ie"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "Set�ri"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "V�zut"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "_Data �nceput:"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "Caut�"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "Umbrire"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "Caut�"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "S�mb�t�"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "S�mb�t�"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Shearwater"
 msgstr "Data �nceput"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "V�zut"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "Selec�ie"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 #, fuzzy
 msgid "Sheridan"
 msgstr "Dum"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "M�rime"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Shoreham"
 msgstr "Punctaj"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "Ninsoare superficial�"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 #, fuzzy
 msgid "Sidney"
 msgstr "Tip�re�te"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Silver City"
 msgstr "Securitate"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "M�rime"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skopje"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "Trimis"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "Fum"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "minute"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Snowshoe Lake"
 msgstr "Avers� de z�pad�"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Sochi"
 msgstr "Sud"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socorro"
 msgstr "Punctaj"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Socotra"
 msgstr "Punctaj"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 #, fuzzy
 msgid "Soda Springs"
 msgstr "Lapovi�� �i ninsoare"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 #, fuzzy
 msgid "Sofia"
 msgstr "Normal"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Somerset"
 msgstr "Ploaie toren�ial�"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Expeditor"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "Southampton"
 msgstr "Sud Est"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "Sud"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 #, fuzzy
 msgid "South Dakota"
 msgstr "Sud Est"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "Sud"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "Expeditor"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "Cea��"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "Simplificat"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "State College"
 msgstr "�nt�lnire �ncheiat�:"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "Set�ri"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "Set�ri"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "Stephenville"
 msgstr "Program"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "Stop"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 #, fuzzy
 msgid "St Louis"
 msgstr "Opre�te �nc�rcarea"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Data �nceput"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "Acum"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "St Paul"
 msgstr "Stare"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 #, fuzzy
 msgid "Strevell"
 msgstr "Subarbore"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "S�mb�t�"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "Punctaj"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "Rezumat"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 #, fuzzy
 msgid "Sutton"
 msgstr "Dum"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Tradi�ional"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "Sarcin�"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "Martie"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 #, fuzzy
 msgid "Taejon"
 msgstr "Atunci"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Taif"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Tainan"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Taiz"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "Ploaie"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Ploaie"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 #, fuzzy
 msgid "Tampa"
 msgstr "Japonez"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "H�rtie"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "Canada"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "Cea mai sc�zut�"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Taranto"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "Sarcin�"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Tarija"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "Tradi�ional"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 #, fuzzy
 msgid "Texas"
 msgstr "Sarcin�"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 #, fuzzy
 msgid "The Dalles"
 msgstr "Program"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "Titlu"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "Joi"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tianjin"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Tijuana"
 msgstr "Grindin� u�oar�"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tirana"
 msgstr "Ploaie"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "Grec"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "Titlu"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "Privat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 #, fuzzy
 msgid "Toledo"
 msgstr "Comut�"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "Ast�zi"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Topeka"
 msgstr "Sus:"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr ""
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "Sus:"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torrance"
 msgstr "Renun��"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Torreon"
 msgstr "Corean"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "_Data �nceput:"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 #, fuzzy
 msgid "Toulouse"
 msgstr "�nchide"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 #, fuzzy
 msgid "Trapani"
 msgstr "Japonez"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "Telex"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "Orientare"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "Precedent"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 #, fuzzy
 msgid "Trieste"
 msgstr "Test"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "Mar"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "Mar�i"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "Mar�i"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "Mar"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turaif"
 msgstr "Turc"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "Turc"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turku"
 msgstr "Mar"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 #, fuzzy
 msgid "Twenthe"
 msgstr "Tentativ�"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "Tip"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "Mar"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "(Mesaj f�r� titlu)"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 #, fuzzy
 msgid "Unst"
 msgstr "Nev�zut"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruapan"
 msgstr "Japonez"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Ucrainean"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 #, fuzzy
 msgid "Utah"
 msgstr "Ata�eaz�"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vadso"
 msgstr "Radio"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Variabil"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vagar"
 msgstr "Pager"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "Mail"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valencia"
 msgstr "Calendar"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 #, fuzzy
 msgid "Valentine"
 msgstr "Vedere inline"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr ""
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "Renun��"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 #, fuzzy
 msgid "Varadero"
 msgstr "Variabil"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Varna"
 msgstr "Variabil"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "dup�"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 #, fuzzy
 msgid "Venice"
 msgstr "Unicod"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 #, fuzzy
 msgid "Vermont"
 msgstr "lun�"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "General"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "Nume fi�ier:"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 #, fuzzy
 msgid "Villahermosa"
 msgstr "Alarme vizuale"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "Alarme vizuale"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr ""
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volkel"
 msgstr "Rol"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 #, fuzzy
 msgid "Volk Field"
 msgstr "C�mpul De la"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 #, fuzzy
 msgid "Waco"
 msgstr "Luni"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "Avertisment"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "Vremea"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 #, fuzzy
 msgid "Waterloo"
 msgstr "Vremea"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "Vremea"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 #, fuzzy
 msgid "Waterville"
 msgstr "Categorii"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Webster City"
 msgstr "Site web"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "Mi"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Vremea"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 #, fuzzy
 msgid "Wendover"
 msgstr "Expeditor"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "West Burke"
 msgstr "Europa de vest"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "Selec_teaz� �nl�n�uirea"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westfield"
 msgstr "Vest"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "Progra_mare �nt�lniri"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "Porecl�"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 #, fuzzy
 msgid "Wien"
 msgstr "Mi"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 #, fuzzy
 msgid "Williston"
 msgstr "Cea��"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 #, fuzzy
 msgid "Winslow"
 msgstr "acum"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 #, fuzzy
 msgid "Winter Park"
 msgstr "Introduce�i parola pentru %s"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 #, fuzzy
 msgid "Wisconsin"
 msgstr "secunde"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "Mi"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "Subsol:"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "�ntotdeauna"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "Finlanda"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "Lucrez"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "Lucrez"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 #, fuzzy
 msgid "Xiamen"
 msgstr "Nume"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 #, fuzzy
 msgid "Yao Airport"
 msgstr "Nu importa"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 #, fuzzy
 msgid "Yenbo"
 msgstr "V�zut"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zadar"
 msgstr "Calendar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 #, fuzzy
 msgid "Zagreb"
 msgstr "Pagin�"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zanesville"
 msgstr "Revocat"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr ""
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 #, fuzzy
 msgid "Zurich"
 msgstr "Turc"
@@ -23659,17 +24417,12 @@ msgstr "%A %d %B"
 msgid "No description"
 msgstr "Descriere:"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Sumar mail"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "Dosare V"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 #, fuzzy
 msgid "Local Folders"
 msgstr "Dosare speciale"
@@ -23679,57 +24432,48 @@ msgstr "Dosare speciale"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Vorba zilei"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Cotele zilei"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Adaug� o surs� de �tiri"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Introduce�i URL-ul sursei de �tiri pe care o ad�uga�i"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Nume:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Eroare �n timpul desc�rc�rii RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 #, fuzzy
 msgid "News Feed"
 msgstr "Dosar _nou"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr "Tot"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
-msgid "Add ->"
-msgstr "Adaug� ->"
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "<- Remove"
-msgstr "�te_rge"
+msgid "Add"
+msgstr "Adaug�"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Ploaie toren�ial�"
@@ -23776,10 +24520,48 @@ msgstr "Rezumat"
 msgid "Printing of Summary failed"
 msgstr "Tip�rirea mesajului nereu�it�"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Componenta sumar a activit��ilor nu poate ini�ializa Bonobo.\n"
 
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " F"
+msgstr ", "
+
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " C"
+msgstr ", "
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Fonturi"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Mut"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "_Filtre..."
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "_Filtre..."
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Cer senin"
@@ -24948,114 +25730,120 @@ msgid "C_elsius"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Adaug� o surs� de �tiri"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "C�te zile trebuie s� afi�eze calendarul?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 #, fuzzy
 msgid "Ma_x number of items shown:"
 msgstr "Num�rul maxim de elemente afi�ate:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 #, fuzzy
 msgid "One mont_h"
 msgstr "O lun�"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 #, fuzzy
 msgid "One w_eek"
 msgstr "O s�pt�m�n�"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 #, fuzzy
 msgid "R_efresh time (seconds):"
 msgstr "Durata de actualizare (secunde):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 #, fuzzy
 msgid "Refresh _time (seconds):"
 msgstr "Durata de actualizare (secunde):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "Arat� �ntreaga cale pentru dosare"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 #, fuzzy
 msgid "Show _all tasks"
 msgstr "Arat� toate sarcinile"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 #, fuzzy
 msgid "Show _today's tasks"
 msgstr "Arat� sarcilnile de azi"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Sarcini"
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Set�ri vreme"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 #, fuzzy
 msgid "_Five days"
 msgstr "Cinci zile"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "_Mail"
 msgstr "Mail"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 #, fuzzy
 msgid "_News Feeds"
 msgstr "Dosar _nou"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 #, fuzzy
 msgid "_One day"
 msgstr "O zi"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 #, fuzzy
 msgid "_Schedule"
 msgstr "Program"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 #, fuzzy
 msgid "_Weather"
 msgstr "Vremea"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Procesator pentru compozitorul Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Dosare speciale"
+msgid "Folder Settings"
+msgstr "Set�ri"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Shell Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -25066,6 +25854,40 @@ msgstr "Arat� detalii"
 msgid "Cancel Operation"
 msgstr "Anulare opera�ie"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Nu pot �terge dosarul `%s':\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Alege dosar"
+
+#: shell/e-local-storage.c:174
+#, fuzzy
+msgid "Drafts"
+msgstr "Ciorn�"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-local-storage.c:176
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:177
+#, fuzzy
+msgid "Sent"
+msgstr "V�zut"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Instalare Evolution"
@@ -25169,6 +25991,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Data terminare"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Dosare speciale"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Dosare speciale"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Dosare speciale"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Data terminare"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -25198,20 +26045,20 @@ msgstr "Nu pot muta un dosar �ntr-unul din descenden�ii s�i/"
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Preciza�i un dosar pentru a copia dosarul \"%s\" �n:"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Copiaz� dosarul"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Preciza�i un dosar pentru a muta dosarul \"%s\" �n:"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Mut� dosarul"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -25220,18 +26067,17 @@ msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "�terg"
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
+#: shell/e-shell-folder-commands.c:407
 #, fuzzy, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Sunte�i sigur c� dori�� s� �terge�i dosarul `%s'?"
+msgid "Really delete folder \"%s\"?"
+msgstr "�terge dosarul '%s'"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, fuzzy, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -25240,17 +26086,17 @@ msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Redenum�te dosarul '%s'"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 #, fuzzy
 msgid "Rename folder"
 msgstr "Redenum�te dosarul '%s'"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, fuzzy, c-format
 msgid "The specified folder name is not valid: %s"
@@ -25269,7 +26115,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Creare dosar nou"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -25277,7 +26123,7 @@ msgstr ""
 "Tipul fi�ierului selectat nu e valid pentru\n"
 "opera�ia cerut�."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Nou..."
 
@@ -25329,22 +26175,27 @@ msgstr ""
 "Se import� %s\n"
 "Se import� articol %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Alege dosar"
+
+#: shell/e-shell-importer.c:498
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Dosarul `%s' nu exist�."
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25353,11 +26204,11 @@ msgstr ""
 "Nu se reu�e�te importul\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Se import�"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25366,17 +26217,17 @@ msgstr ""
 "Se import� %s.\n"
 "Start %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Eroare la start %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Eroare la �nc�rcarea %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25385,62 +26236,107 @@ msgstr ""
 "Se import� %s\n"
 "Se import� elementul 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automat"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Nume fi�ier:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Selecteaz� un fi�ier"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Tip fi�ier:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 #, fuzzy
 msgid "Import a single file"
 msgstr "Import fi�iere"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De la:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Alege dosarul"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Alege�i dosarul destina�ie pentru importul datelor"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "�nchid conexiunile..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr "Sincronizare dosar"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Sincronizare dosar"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "Sincronizare dosar"
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Set�ri Evolution..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Deschid dosarul %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Deschid dosarul %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Deschide �n %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Nu pot crea dosarulul precizat:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
@@ -25453,8 +26349,8 @@ msgstr "Nu pot ini�ializa componenta mail Evolution."
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nou"
@@ -25477,45 +26373,45 @@ msgstr "Nu pot deschide directorul cache: %s"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nu a fost g�sit �n $PATH."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nu poate fi rulat."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "Despre Evolution..."
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Mergi la dosarul..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Alege�i dosarul pe care dori�i s�-l deschide�i"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Creaz� o scurt�tur� nou�"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Alege�i dosarul spre care dori�i s� indice scurt�tura:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 #, fuzzy
 msgid "_Work Online"
 msgstr "Lucreaz� offline"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "Lucreaz� deconectat"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Lucreaz� deconectat"
 
@@ -25554,7 +26450,7 @@ msgstr ""
 "Evolution este actualmente deconectat. Da�i clic pe buton pentru a lucra "
 "conectat."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25562,12 +26458,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nu pot seta stocarea local� -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25575,24 +26471,20 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Con�inut invalid al mesajului"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Eroare generic�"
 
@@ -25617,97 +26509,97 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Nu �nl�tura"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Redenume�te grupul de scurt�turi"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Redenume�te grupul de scurt�turi selectat �n:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "Iconuri mici"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Arat� scurt�turile ca iconuri mici"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "Iconuri mari"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Arat� scurt�turile ca iconuri mari"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "Grup _Nou..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Creaz� un grup nou de scurt�turi"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "�nl�tur� acest g_rup..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "�nl�tur� acest grup de scurt�turi"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "Rede_nume�te acest grup..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Redenume�te acest grup de scurt�turi"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "Ascunde bara de scurt�turi"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Ascunde bara de scurt�turi"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Redenume�te scurt�tura"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Redenume�te scurt�tura selectat� �n:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Deschide dosarul legat la aceast� scurt�tur�."
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Deschide �n fereastr� noua"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Deschide dosarul legat la aceast� scurt�tur� �ntr-o fereastr� nou�"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 #, fuzzy
 msgid "_Rename"
 msgstr "Redenume�te"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Redenume�te aceast� scurt�tur�"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 #, fuzzy
 msgid "Re_move"
 msgstr "�terge"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "�nl�tur� aceast� scurt�tur� din bara de scurt�turi"
 
@@ -25719,10 +26611,6 @@ msgstr "Eroare la salvarea scurt�turilor."
 msgid "Shortcuts"
 msgstr "Scurt�turi"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Inbox"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -25788,10 +26676,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<clic aici s� alege�i un dosar>"
 
@@ -25821,78 +26710,78 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 #, fuzzy
 msgid "CORBA error"
 msgstr "Eroare I/O"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 #, fuzzy
 msgid "Invalid argument"
 msgstr "Con�inut invalid al mesajului"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 #, fuzzy
 msgid "No owner"
 msgstr "Nimeni"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 #, fuzzy
 msgid "Not found"
 msgstr "Nu g�sesc fi�ierul"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Verific tipurile suportate"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Opera�ie anulat� de utilizator."
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 #, fuzzy
 msgid "Internal error"
 msgstr "Alt� eroare"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 #, fuzzy
 msgid "Exists"
 msgstr "Exist�"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Invalid"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Nu exist� dosarul %s"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 #, fuzzy
 msgid "No space left"
 msgstr "Nici un mesaj selectat"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Tip fi�ier:"
@@ -26023,52 +26912,98 @@ msgstr "Nu m� �ntreba din nou"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution a g�sit urm�toarea surs� de date:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Set�ri Evolution..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, fuzzy, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"Salut. Mul�umesc pentru timpul acordat pentru desc�rcarea acestui\n"
+"PREVIEW RELEASE al suitei Evolution.\n"
+"\n"
+"Evolution nu e �nc� complet. E pe aproape, dar exist� locuri unde\n"
+"facilit��ile sau lipsesc sau sunt �nc� �n lucru. \n"
+"\n"
+"Dac� g�si�i erori, v� rug�m raporta�i-le la bugzilla.ximian.com.\n"
+"Acest produs vine f�r� nici o garan�ie �i nu e destinat\n"
+"persoanelor predispuse la violen�� �i sup�r�cioase.\n"
+"\n"
+"Sper�m s� v� bucura�i de rezultatele eforturilor noastre, �i a�tept�m\n"
+"cu ner�bdare contribu�ia dumneavostr�!\n"
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"V� mul�umim\n"
+"Echipa Evolution\n"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Nu m� �ntreba din nou"
+
+#: shell/main.c:347
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nu pot accesa shell-ul Evolution."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nu pot accesa shell-ul Evolution."
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Invalideaz� ecranul de pornire"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "_Data �nceput:"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "_Data �nceput:"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Trimite ie�irile pentru depanare ale tuturor componentelor �ntr-un fi�ier."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nu pot ini�ializa sistemul de componente Bonobo."
 
@@ -26187,11 +27122,11 @@ msgstr "ora curent�"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Ac�iuni"
 
@@ -26326,8 +27261,8 @@ msgstr "�terge acest articol"
 msgid "Delete this item"
 msgstr "�terge acest articol"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Bara de unelte principal�"
 
@@ -26368,7 +27303,7 @@ msgstr "Salveaz� acest articol pe disc"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Fi�ier"
 
@@ -26434,19 +27369,19 @@ msgstr "�nainteaz� ca �i _calendar i"
 msgid "Forward this item via email"
 msgstr "�nainteaz� acest articol prin email"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "Actualizeaz� �nt�lnirea"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "Progra_mare �nt�lniri"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Programare �nt�lniri"
 
@@ -26454,10 +27389,6 @@ msgstr "Programare �nt�lniri"
 msgid "Customise My Evolution"
 msgstr "Personalizeaz� Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Renun��"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Renun�� la opera�ia de mail curent�"
@@ -26616,7 +27547,7 @@ msgstr "List� de mesaje �nl�n�uite"
 msgid "_Expunge"
 msgstr "Distrug_e"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "Dosar"
 
@@ -27037,7 +27968,7 @@ msgstr "Tip�re�te mesaj"
 msgid "_Quoted"
 msgstr "Cotat"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Unelte"
 
@@ -27052,12 +27983,12 @@ msgstr "�nchide aceast� fereastr�"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "�n_chide"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Vizualizare"
 
@@ -27248,7 +28179,7 @@ msgstr "Deschide..."
 msgid "_Reply-To Field"
 msgstr "C�mpul _R�spuns la"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Ajutor"
 
@@ -27401,112 +28332,121 @@ msgid "Move this folder to another place"
 msgstr "Mut� acest dosar �n alt� parte"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Crez� dosar nou..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Deschide �n fereastr� nou�"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Deschide acest dosar �n alt� fereastr�"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Trimite / Prime�te"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Trimite mailurile din coad� �i descarc� mailurile noi"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Arat� informa�ii despre Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Raporteaz� o eroare"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "Raporteaz� o eroare"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Raporteaz� o problem� folosind Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Comut�"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Comut� �n timp ce se arat� bara folder"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Comut� �n timp ce se arat� bara cu scurt�turi"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Selecteaz� �n timp lucr�m deconecta�i"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Vizualizeaz� dosarul selectat"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "Despre Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Copiaz�..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "Bara dosar"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "Mer_gi la dosarul..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Import�..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Mut�..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "Dosar _nou"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "Set�ri _pilot..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Redenume�te..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "Trimite / Prime�te"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Scurt�tur�"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "Bara cu _scurt�turi"
 
@@ -27592,22 +28532,22 @@ msgstr ""
 "selecta�i ora local�.\n"
 " Folosi�i butonul din dreapta al mausului pentru a mic�ora."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "Vizualizarea _curent�"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "Personalizeaz�"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 #, fuzzy
 msgid "Save Custom View"
 msgstr "Personalizeaz�"
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Define�te vizualiz�ri"
 
@@ -27730,16 +28670,21 @@ msgstr "Caut� �nainte"
 msgid "Save Search"
 msgstr "Salveaz� c�utarea"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Salveaz� c�utarea"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Salveaz� c�utarea"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Avansat..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informa�ie"
@@ -27761,22 +28706,22 @@ msgstr "Mesaj"
 msgid "Don't show this message again."
 msgstr "Nu ar�ta acest mesaj din nou"
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Leg�tura DN:"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "�terge"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 #, fuzzy
 msgid "Clear"
 msgstr "�terge"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 #, fuzzy
 msgid "Find Now"
 msgstr "Leg�tura DN:"
@@ -27803,6 +28748,191 @@ msgstr "init_corba(): nu pot ini�ializa GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Surse agend�"
+
+#, fuzzy
+#~ msgid "Configuration control for the Evolution Addressbook."
+#~ msgstr "Procesator pentru componentele agendei Evolution."
+
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr "Nu pot bifurca sendmail: %s: mailul nu este trimis"
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Procesator pentru componenta Centralizator a calendarului"
+
+#, fuzzy
+#~ msgid "Sta_rt of day:"
+#~ msgstr "�nceput zi:"
+
+#, fuzzy
+#~ msgid "_End of day:"
+#~ msgstr "Sfir�it zi:"
+
+#, fuzzy
+#~ msgid "before the start of the appointment"
+#~ msgstr "�nainte de �nceperea �nt�lnirii"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "Alt _organizator"
+
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Semnarea �n clar nu e suportat� de acest cifru"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "V� rog introduce�i %s fraza de trecere pentru %s"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "V� rog introduce�i fraza de trecere %s"
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Nu pot trimite mesajul: destinatar neprecizat."
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Nu pot trimite mesajul: adresa expeditorului invalid�."
+
+#, fuzzy
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Nu pot crea conexiunea la GPG/PGP: %s"
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Nu pot trimite mesajul: destinatar neprecizat."
+
+#, fuzzy
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Nu pot trimite mesajul: destinatar neprecizat."
+
+#, fuzzy
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Nu pot crea conexiunea la GPG/PGP: %s"
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Nu pot trimite mesajul: destinatar neprecizat."
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Nu pot trimite mesajul: adresa expeditorului invalid�."
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Nu pot crea conexiunea la GPG/PGP: %s"
+
+#, fuzzy
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "Nu pot trimite mesajul: destinatar neprecizat."
+
+#, fuzzy
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Nu pot crea conexiunea la GPG/PGP: %s"
+
+#~ msgid "%s server %s"
+#~ msgstr "%s server %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(gazd� necunoscut�)"
+
+#~ msgid "No such message: %s"
+#~ msgstr "Nu exist� mesajul: %s"
+
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Nu pute�i copia mesaje din acest dosar"
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Nu pot ad�uga mesajul la fi�ierul spool: %s: %s"
+
+#, fuzzy
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Nu pot �nc�rca %s: %s"
+
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Fi�ierul spool `%s' nu exist� sau nu e un fi�ier obi�nuit."
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Radio"
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "Editez"
+
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Nou"
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Op�iuni avansate LDAP "
+
+#, fuzzy
+#~ msgid "E_nable advanced options"
+#~ msgstr "Op�iuni avansate LDAP "
+
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Fi�ier semn�tur�:"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "�terge tot �n afar� de semn�tur�"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "Semn�tur� HTML:"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Nume fi�ier:"
+
+#, fuzzy
+#~ msgid "_HTML Signature:"
+#~ msgstr "Semn�tur� HTML:"
+
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Limbaj"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Radio"
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Nu pot crea un context pentru o criptare PGP."
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Nu pot crea un context pentru o decriptare PGP."
+
+#~ msgid "Moving"
+#~ msgstr "Mut"
+
+#~ msgid "Copying"
+#~ msgstr "Copiez"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Fi�ier semn�tur�:"
+
+#, fuzzy
+#~ msgid "Riga"
+#~ msgstr "Dreapta:"
+
+#~ msgid "Add ->"
+#~ msgstr "Adaug� ->"
+
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "�te_rge"
+
+#, fuzzy
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Sunte�i sigur c� dori�� s� �terge�i dosarul `%s'?"
+
 #~ msgid "Card: "
 #~ msgstr "Card: "
 
@@ -28045,13 +29175,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "_My server requires authentication"
 #~ msgstr "Serverul necesit� autentificare"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Alte contacte"
-
-#, fuzzy
-#~ msgid "(none)"
-#~ msgstr "(F�r� nume)"
-
 #, fuzzy
 #~ msgid "Co_ntacts:"
 #~ msgstr "Contacte"
@@ -28075,12 +29198,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "_Mobile"
 #~ msgstr "_Mobil"
 
-#, fuzzy
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont?"
-
 #~ msgid "Create a new appointment"
 #~ msgstr "Creaz� o �nt�lnire nou�"
 
@@ -28103,232 +29220,13 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "_Other"
 #~ msgstr "Alte"
 
-#, fuzzy
-#~ msgid "Click here to add an attendee"
-#~ msgstr "* Click aici s� ad�uga�i un contact *"
-
 #~ msgid "The journal entry has changed. Send an updated version?"
 #~ msgstr "Intrarea �n jurnal a fost schimbat�. Trimit o versiune actualizat�?"
 
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
-
 #, fuzzy
 #~ msgid "_Delete this Task"
 #~ msgstr "�terg aceast� sarcin�"
 
-#, fuzzy
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Informa�ie surs�"
-
-#, fuzzy
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Ora de sf�r�it a �nt�lnirii:"
-
-#, fuzzy
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Informa�ie surs�"
-
-#, fuzzy
-#~ msgid "Task Completed: <b>"
-#~ msgstr " (Terminat "
-
-#, fuzzy
-#~ msgid "iCalendar Information"
-#~ msgstr "informa�ie calendar"
-
-#, fuzzy
-#~ msgid "iCalendar Error"
-#~ msgstr "Calendar"
-
-#, fuzzy
-#~ msgid "An unknown person"
-#~ msgstr "Eroare necunoscut�"
-
-#, fuzzy
-#~ msgid "Choose an action:"
-#~ msgstr "Selectez o ac�iune"
-
-#, fuzzy
-#~ msgid "Update"
-#~ msgstr "a fost dup�"
-
-#, fuzzy
-#~ msgid "Accept"
-#~ msgstr " Accept� "
-
-#, fuzzy
-#~ msgid "Tentatively accept"
-#~ msgstr " Inten�ie "
-
-#, fuzzy
-#~ msgid "Decline"
-#~ msgstr " Refuz� "
-
-#, fuzzy
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Informa�ie surs�"
-
-#, fuzzy
-#~ msgid "Send Latest Information"
-#~ msgstr "Informa�ie"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
-
-#, fuzzy
-#~ msgid "Meeting Information"
-#~ msgstr "Informa�ie op�ional�"
-
-#, fuzzy
-#~ msgid "Meeting Proposal"
-#~ msgstr "�nt�lnire"
-
-#, fuzzy
-#~ msgid "Meeting Update"
-#~ msgstr "Ora de sf�r�it a �nt�lnirii:"
-
-#, fuzzy
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
-
-#, fuzzy
-#~ msgid "Meeting Update Request"
-#~ msgstr "Cerere de �nt�lnire (FIXME)"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "Acesta e un r�spuns la o cerere de �nt�lnire."
-
-#, fuzzy
-#~ msgid "Meeting Reply"
-#~ msgstr "�nt�lnire"
-
-#, fuzzy
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Selectez o ac�iune"
-
-#, fuzzy
-#~ msgid "Bad Meeting Message"
-#~ msgstr "G�se�te �n mesaj"
-
-#, fuzzy
-#~ msgid "Task Information"
-#~ msgstr "Informa�ie"
-
-#, fuzzy
-#~ msgid "Task Proposal"
-#~ msgstr "Panou sarcini"
-
-#, fuzzy
-#~ msgid "Task Update"
-#~ msgstr "a fost dup�"
-
-#, fuzzy
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "Aceasta e o cerere pentru ultima informa�ie despre sarcin�."
-
-#, fuzzy
-#~ msgid "Task Update Request"
-#~ msgstr "Ce_rere task (FIXME)"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "Acesta e un r�spuns la o cerere de �nt�lnire."
-
-#, fuzzy
-#~ msgid "Task Reply"
-#~ msgstr "R�spunde"
-
-#, fuzzy
-#~ msgid "Task Cancellation"
-#~ msgstr "Aceasta e o anulare a unei sarcini"
-
-#, fuzzy
-#~ msgid "Bad Task Message"
-#~ msgstr "Mesaj calendar"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "Aceasta e informa�ie liber-ocupat."
-
-#, fuzzy
-#~ msgid "Free/Busy Information"
-#~ msgstr "Informa�ie surs�"
-
-#, fuzzy
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "Aceasta e o cerere pentru o informa�ie liber-ocupat."
-
-#, fuzzy
-#~ msgid "Free/Busy Request"
-#~ msgstr "URL liber-ocupat"
-
-#, fuzzy
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "Acesta e un r�spuns la o cerere liber-ocupat."
-
-#, fuzzy
-#~ msgid "Free/Busy Reply"
-#~ msgstr "URL liber-ocupat"
-
-#, fuzzy
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Tip�re�te mesaj"
-
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Mesajul con�ine numai cererile nesuportate."
-
-#, fuzzy
-#~ msgid "Status: %s"
-#~ msgstr "_Stare"
-
-#, fuzzy
-#~ msgid "Percent Complete: %i"
-#~ msgstr "�nt�lnire �ncheiat�:"
-
-#, fuzzy
-#~ msgid "URL: %s"
-#~ msgstr "URL:"
-
-#, fuzzy
-#~ msgid "Categories: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Categorii:  "
-
-#, fuzzy
-#~ msgid "Contacts: "
-#~ msgstr "Contacte"
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Tip invalid �n con�inutul mesajului, necesar �ir"
 
@@ -28392,9 +29290,11 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "Nu pot recupera primi de la serverul POP %s: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
 #~ msgstr ""
-#~ "Aceasta v� va conecta la serverul POP folosind Kerberos 4 la autentificare."
+#~ "Aceasta v� va conecta la serverul POP folosind Kerberos 4 la "
+#~ "autentificare."
 
 #~ msgid "Could not authenticate to KPOP server: %s"
 #~ msgstr "Autentificare nereu�it� la serverul KPOP: %s"
@@ -28405,10 +29305,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "(Unknown)"
 #~ msgstr "(Necunoscut)"
 
-#, fuzzy
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "R�spuns nea�teptat de la serverul IMAP: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Nu g�sesc adresa 'De la' �n mesaj"
 
@@ -28458,18 +29354,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Mailbox Format"
 #~ msgstr "Format c�su�� de mail"
 
-#~ msgid " (default)"
-#~ msgstr " (implicit)"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Subiectul este %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Mail de la %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "%s lista de mail"
-
 #, fuzzy
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "Mesajul con�ine numai cererile nesuportate."
@@ -28489,10 +29373,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "Editeaz�..."
 
 #, fuzzy
-#~ msgid "HTML signature file:"
-#~ msgstr "Semn�tur� HTML:"
-
-#, fuzzy
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Selecteaz� un fi�ier"
 
@@ -28524,22 +29404,9 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "secunde"
 
 #, fuzzy
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr "Acest mesaj este semnat digital �i este autentic."
-
-#, fuzzy
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Nu recunosc acest tip de component� a calendarului."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Acest mesaj este semnat digital �i este autentic."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Acest mesaj este semnat digital dar nu se poate dovedi c� e autentic."
-
 #, fuzzy
 #~ msgid "Cannot initialize Evolution's Summary component."
 #~ msgstr "Nu pot ini�ializa componenta mail Evolution."
@@ -28552,48 +29419,20 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "<dd><b>Serverul pentru vreme nu a putut fi contactat</b></dd>"
 
 #, fuzzy
-#~ msgid "inHg"
-#~ msgstr "Mut"
-
-#, fuzzy
-#~ msgid "kilometers"
-#~ msgstr "_Filtre..."
-
-#, fuzzy
 #~ msgid "All _folders:"
 #~ msgstr "Toate dosarele:"
 
 #, fuzzy
-#~ msgid "All news _feeds:"
-#~ msgstr "Adaug� o surs� de �tiri"
-
-#, fuzzy
 #~ msgid "_Display folders:"
 #~ msgstr "Afi�eaz� dosarele:"
 
 #, fuzzy
-#~ msgid "_Display stations:"
-#~ msgstr "Afi�eaz� sta�iile:"
-
-#, fuzzy
 #~ msgid "_Displayed feeds:"
 #~ msgstr "Afi�eaz� dosarele:"
 
-#, fuzzy
-#~ msgid "Outbox"
-#~ msgstr "mbox"
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#, fuzzy
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nu pot �terge dosarul `%s':\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(F�r� nume)"
 
@@ -28683,7 +29522,8 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 
 #~ msgid "Notification about your appointment starting on %s and ending on %s"
 #~ msgstr ""
-#~ "Notificare depre �nt�lnirea dumneavoastr� ce �ncepe la %s �i se termin� la %s"
+#~ "Notificare depre �nt�lnirea dumneavoastr� ce �ncepe la %s �i se termin� "
+#~ "la %s"
 
 #~ msgid "Notification about your appointment starting on %s"
 #~ msgstr "Notificare depre �nt�lnirea dumneavoastr� ce �ncepe la %s"
@@ -28800,42 +29640,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ "Ooops! Vizualizarea pentru `%s' a murit nea�teptat. :-(\n"
 #~ "Aceasta �nseamn� c� probabil componenta %s a cr�pat."
 
-#, fuzzy
-#~ msgid ""
-#~ "Hi.  Thanks for taking the time to download this preview release\n"
-#~ "of the Ximian Evolution groupware suite.\n"
-#~ "\n"
-#~ "Ximian Evolution is not yet complete. It's getting close, but there are\n"
-#~ "places where features are either missing or only half working. \n"
-#~ "\n"
-#~ "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
-#~ "This product comes with no warranty and is not intended for\n"
-#~ "individuals prone to violent fits of anger.\n"
-#~ "\n"
-#~ "We hope that you enjoy the results of our hard work, and we\n"
-#~ "eagerly await your contributions!\n"
-#~ msgstr ""
-#~ "Salut. Mul�umesc pentru timpul acordat pentru desc�rcarea acestui\n"
-#~ "PREVIEW RELEASE al suitei Evolution.\n"
-#~ "\n"
-#~ "Evolution nu e �nc� complet. E pe aproape, dar exist� locuri unde\n"
-#~ "facilit��ile sau lipsesc sau sunt �nc� �n lucru. \n"
-#~ "\n"
-#~ "Dac� g�si�i erori, v� rug�m raporta�i-le la bugzilla.ximian.com.\n"
-#~ "Acest produs vine f�r� nici o garan�ie �i nu e destinat\n"
-#~ "persoanelor predispuse la violen�� �i sup�r�cioase.\n"
-#~ "\n"
-#~ "Sper�m s� v� bucura�i de rezultatele eforturilor noastre, �i a�tept�m\n"
-#~ "cu ner�bdare contribu�ia dumneavostr�!\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Ximian Evolution Team\n"
-#~ msgstr ""
-#~ "V� mul�umim\n"
-#~ "Echipa Evolution\n"
-
 #~ msgid "F_ormat"
 #~ msgstr "F_ormat"
 
@@ -28848,9 +29652,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "after start of appointment"
 #~ msgstr "dup� �nceperea �nt�lnirii"
 
-#~ msgid "before end of appointment"
-#~ msgstr "�nainte de sf�r�itul �nt�lnirii"
-
 #, fuzzy
 #~ msgid "Evolution Shortcuts"
 #~ msgstr "Progres Evolution"
@@ -28863,9 +29664,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "_Remember PGP Passphrase until exit"
 #~ msgstr "Memoreaz� fraza de trecere PGP p�n� la ie�ire"
 
-#~ msgid "Delete folder '%s'"
-#~ msgstr "�terge dosarul '%s'"
-
 #~ msgid "Rename"
 #~ msgstr "Redenume�te"
 
@@ -28914,9 +29712,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "m"
 #~ msgstr "m"
 
-#~ msgid "n"
-#~ msgstr "n"
-
 #~ msgid "o"
 #~ msgstr "o"
 
@@ -28963,8 +29758,8 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "Sfor�ie"
 
 #~ msgid ""
-#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-#~ "know."
+#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like "
+#~ "to know."
 #~ msgstr ""
 #~ "Este %s. Ora sistemului Unix este acum %ld. Ne-am g�ndit c� poate vrei s� "
 #~ "�ti."
@@ -29023,12 +29818,13 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "Nu pot deschide dosarul pentru rezumare: %s: %s"
 
 #~ 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."
+#~ "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 ""
-#~ "Pentru conectare la servere POP. Protocolul POP poate fi deasemenea folosit "
-#~ "pentru primirea mailurior de la anumi�i provideri de web mail �i sisteme de "
-#~ "email proprietare."
+#~ "Pentru conectare la servere POP. Protocolul POP poate fi deasemenea "
+#~ "folosit pentru primirea mailurior de la anumi�i provideri de web mail �i "
+#~ "sisteme de email proprietare."
 
 #, fuzzy
 #~ msgid "%d/%m/%Y"
@@ -29052,10 +29848,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Registering '%s'"
 #~ msgstr "Deschid '%s'"
 
-#, fuzzy
-#~ msgid "Synchronizing '%s'"
-#~ msgstr "Sincronizare dosar"
-
 #~ msgid "%l:%M%p"
 #~ msgstr "%l:%M%p"
 
@@ -29112,8 +29904,8 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "Creez calea dac� nu exist�."
 
 #~ msgid ""
-#~ "Select the kind of addressbook you have, and enter the relevant information "
-#~ "about it."
+#~ "Select the kind of addressbook you have, and enter the relevant "
+#~ "information about it."
 #~ msgstr ""
 #~ "Alege�i tipul de agend� pe care �l ave�i, �i introduce�i informa�iile "
 #~ "relevante"
@@ -29218,10 +30010,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Display folders starting with:"
 #~ msgstr "Afi�eaz� dosarele �ncep�nd cu:"
 
-#, fuzzy
-#~ msgid "My Evolution Settings"
-#~ msgstr "Set�ri Evolution..."
-
 #~ msgid "%A, %d %B %Y"
 #~ msgstr "%A, %d %B %Y"
 
@@ -29352,11 +30140,11 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "Mesaj �naintat (f�r� subiect)"
 
 #~ msgid ""
-#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-#~ "%s<br><b>Subject:</b> %s<br>"
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
+#~ "s<br><b>Subject:</b> %s<br>"
 #~ msgstr ""
-#~ "-----Mesaj �naintat-----<br><b>De la:</b> %s<br><b>La:</b> "
-#~ "%s<br><b>Subiect:</b> %s<br>"
+#~ "-----Mesaj �naintat-----<br><b>De la:</b> %s<br><b>La:</b> %"
+#~ "s<br><b>Subiect:</b> %s<br>"
 
 #~ msgid "Remove <-"
 #~ msgstr "�terge <-"
@@ -29454,9 +30242,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Items Not Yet Due:"
 #~ msgstr "Neterminate �nc�"
 
-#~ msgid "Overdue Items:"
-#~ msgstr "Termen dep�it"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Timp r�mas"
 
@@ -29559,7 +30344,8 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ "\n"
 #~ "Just leave it blank for the default"
 #~ msgstr ""
-#~ "Pute�i alege o alt� pagin� HTML pentru fundalul rezumatului activit��ilor.\n"
+#~ "Pute�i alege o alt� pagin� HTML pentru fundalul rezumatului "
+#~ "activit��ilor.\n"
 #~ "\n"
 #~ "Pentru cel implicit l�sa�i-l gol"
 
diff --git a/po/ru.po b/po/ru.po
index e5b1435a4e..ff4382eca0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-01-30 02:21+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team:  <ru@li.org>\n"
@@ -35,7 +35,7 @@ msgstr "����������� ����� VCard � Evolution."
 msgid "File As"
 msgstr "������� ���"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "���"
@@ -46,7 +46,7 @@ msgid "Email"
 msgstr "��.�����"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "��������"
 
@@ -56,7 +56,7 @@ msgstr "���."
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "��������"
@@ -64,8 +64,8 @@ msgstr "��������"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "�������"
 
@@ -75,12 +75,12 @@ msgid "Bus"
 msgstr "���."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "�������� ������"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "��������"
 
@@ -91,8 +91,8 @@ msgstr "����."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "��������"
 
@@ -107,18 +107,18 @@ msgstr "���."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "���������"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "����������"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "������� ����"
@@ -128,13 +128,13 @@ msgid "Bus Fax"
 msgstr "���. ����"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "�������� ����"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "������� 2"
 
@@ -143,43 +143,43 @@ msgid "Bus 2"
 msgstr "���. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "�������� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "������"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "������ ����"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "�������"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "�����"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "������"
@@ -191,14 +191,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "��.����� 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "��.����� 3"
@@ -336,7 +336,7 @@ msgstr "VCard ��� %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -344,7 +344,7 @@ msgid "Could not initialize Bonobo"
 msgstr "�� ������� ���������������� Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "�����..."
 
@@ -357,31 +357,31 @@ msgstr "��������..."
 msgid "Error in search expression."
 msgstr "������ � ���������."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "�������� �������� �� ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "�������� �������� � ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "��������� �������� �� ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "���������� ������."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "��������� ����������� ������ � ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 msgid "Error performing search"
 msgstr "������ ��� ���������� ������"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 msgid "Could not parse query string"
 msgstr "�� ������� ��������� ������ �������"
 
@@ -428,104 +428,141 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "������ ������������ �������� Bonobo ��� ����������� �������� �����"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Addressbook Settings"
-msgstr "��������� �������� ����"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 "����������� �������, ������� ���������� ������������ �������� ����� "
 "Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "��������� Evolution ��� ��������� ������������ �������� �����"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "��������� Evolution ��� ��������� ���������."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "������� ��� ������������ �������� ������������ �������� �����."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "������� ��� ������������ ������ �� �������� �����"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "������� ��� ������������ ���� ������ �� �������� �����"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "������� ��� ������� ������������ �������� �������� �����"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "��������"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "�����, ���������� ���������� ����������"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "������ LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "������ LDAP, ���������� ���������� ����������"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "������� ������ ���������"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "������ ���������"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "������� �������"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "�������"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "������� ������ ���������"
+#: addressbook/gui/component/addressbook-config.c:197
+msgid "Failed to connect to LDAP server"
+msgstr "���������� ������������ � ������� LDAP."
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "Contact _List"
-msgstr "������ ���������"
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"���� �������������� �� ������� IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "����� ������� IMAP �� �������� ���������� � %s"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"������ ��� �������� ���������� �������:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "����� ������� IMAP �� �������� ���������� � %s"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(� ���� ������ Evolution SSL �� ��������������)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "�� ������� ���������������� gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+#, fuzzy
+msgid "Other Contacts"
+msgstr "��������"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "�� ������� ������� �������� �����"
@@ -561,48 +598,57 @@ msgstr ""
 "�� ������� ������� ��� �������� �����. ���������, ��� ���� ����������\n"
 "� ��� � ��� ������� ����������� ����� �������."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "������� ������ ��� %s (������������ %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 msgid "Name begins with"
 msgstr "��� ���������� �"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 msgid "Email is"
 msgstr "��.�����"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "��������� "
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "����� ���� ��������"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "�����������..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "����� ���������"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ������� ����� ������������ ��������� ��������� �����"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(���)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "�������� ��.�����"
 
@@ -648,103 +694,57 @@ msgstr "��������� �������"
 msgid "Enable Queries (Dangerous!)"
 msgstr "�������� ������� (������!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-msgid "Failed to connect to LDAP server"
-msgstr "���������� ������������ � ������� LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"���� �������������� �� ������� IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"�������� ������� �������������� ����������:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "����� ������� IMAP �� �������� ���������� � %s"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(� ���� ������ Evolution SSL �� ��������������)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "�������� �����"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr " �������� �������������� ����� "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "���������"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-msgid "<- _Remove"
-msgstr "<- �������"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr "1234"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "<- _Remove"
+msgstr "<- �������"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "���������"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -753,8 +753,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "��������� �������� ����"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "������"
 
@@ -845,8 +845,8 @@ msgstr "���������"
 msgid "Mappings"
 msgstr "����"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "�������"
 
@@ -1026,14 +1026,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1056,8 +1056,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1089,7 +1089,7 @@ msgid "Using email address"
 msgstr "��.�����:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1097,7 +1097,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "��������"
 
@@ -1142,7 +1142,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1259,10 +1259,12 @@ msgstr "��������� ������ ����� � �������� ����� Evolution."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "������� ��� ���������� ������ ����� � �������� �����."
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "�������"
 
@@ -1392,7 +1394,7 @@ msgstr "��������������"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "�������� ���������"
 
@@ -1401,7 +1403,7 @@ msgid "D_epartment:"
 msgstr "�����:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "������"
 
@@ -1461,11 +1463,12 @@ msgstr "�������� �������� ����� � ������� HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "�������"
 
@@ -1494,7 +1497,7 @@ msgid "_Web page address:"
 msgstr "����� web-��������:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "��������� �����"
 
@@ -1999,12 +2002,11 @@ msgid "Laos"
 msgstr "����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "�����"
 
@@ -2013,7 +2015,7 @@ msgid "Lesotho"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "�������"
 
@@ -2022,12 +2024,12 @@ msgid "Liechtenstein"
 msgstr "�����������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "����������"
 
@@ -2060,7 +2062,7 @@ msgid "Mali"
 msgstr "����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "������"
 
@@ -2085,7 +2087,7 @@ msgid "Mayotte"
 msgstr "�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "�������"
 
@@ -2110,7 +2112,7 @@ msgid "Montserrat"
 msgstr "����������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "�������"
 
@@ -2135,7 +2137,7 @@ msgid "Nepal"
 msgstr "�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "����������"
 
@@ -2148,12 +2150,12 @@ msgid "New Caledonia"
 msgstr "����� ���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "����� ��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "���������"
 
@@ -2170,7 +2172,7 @@ msgid "Niue"
 msgstr "������� ����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "����������� �������"
 
@@ -2179,17 +2181,17 @@ msgid "Northern Mariana Islands"
 msgstr "�������� ���������� �������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "��������"
 
@@ -2202,7 +2204,7 @@ msgid "Palestinian Territory"
 msgstr "������������ ����������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "������"
 
@@ -2211,12 +2213,12 @@ msgid "Papua New Guinea"
 msgstr "����� ����� ������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "����"
 
@@ -2229,22 +2231,22 @@ msgid "Pitcairn"
 msgstr "�������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "����������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "������-����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "�����"
 
@@ -2253,7 +2255,7 @@ msgid "Reunion"
 msgstr "�������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "�������"
 
@@ -2290,7 +2292,7 @@ msgid "Sao Tome And Principe"
 msgstr "���-���� � ��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "���������� ������"
 
@@ -2307,17 +2309,17 @@ msgid "Sierra Leone"
 msgstr "������-�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "��������"
 
@@ -2330,7 +2332,7 @@ msgid "Somalia"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "����� ������"
 
@@ -2339,7 +2341,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "����� ������� � ����� ���������� �������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "�������"
 
@@ -2360,7 +2362,7 @@ msgid "Sudan"
 msgstr "�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "�������"
 
@@ -2373,17 +2375,17 @@ msgid "Swaziland"
 msgstr "���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "�������"
 
@@ -2420,7 +2422,7 @@ msgid "Tunisia"
 msgstr "�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "������"
 
@@ -2441,7 +2443,7 @@ msgid "Uganda"
 msgstr "������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "�������"
 
@@ -2450,7 +2452,7 @@ msgid "United Arab Emirates"
 msgstr "���������� �������� �������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "��������� �����������"
 
@@ -2459,7 +2461,7 @@ msgid "United States Minor Outlying Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "�������"
 
@@ -2472,12 +2474,12 @@ msgid "Vanuatu"
 msgstr "�������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "���������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "�������"
 
@@ -2498,12 +2500,12 @@ msgid "Western Sahara"
 msgstr "�������� ������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "�����"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "���������"
 
@@ -2516,26 +2518,33 @@ msgid "Zimbabwe"
 msgstr "��������"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "�� ������� ��� ������ ������� ��� �ޣ���� ������?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "������� �������?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "�������� ��������� ����������."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "���� ������� ����������� ��������� ����������:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "��������� ��� VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "�� ������� ������� ����� ������� ���������� ��� ����: \"%s\""
@@ -2562,11 +2571,11 @@ msgstr "��.�����"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2701,11 +2710,11 @@ msgid "contact-list-editor"
 msgstr "�������� ������ ���������"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "�������� ������ ���������"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "��������� ������ ��� VCard"
 
@@ -2783,21 +2792,21 @@ msgid "Error getting book view"
 msgstr "������ ��� �������� %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "������ ��� ��������� ��������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "�������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "����������� ������"
 
@@ -2806,7 +2815,7 @@ msgid "Repository offline"
 msgstr "����������� ��� ����"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "����� � �������"
 
@@ -2824,53 +2833,68 @@ msgstr "�������� �� ��������������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "��������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "���� ��������������."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "��������� ��������������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "���� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "������ ��������� ���������?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "������ ��� ���������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "������ ��� ���������� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "������ ��� ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "������ ��� �������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "������ ��� �������� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 msgid "Display Cards?"
 msgstr "�������� ��������?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards"
 msgstr "���������� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2878,19 +2902,19 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 msgid "Move card to"
 msgstr "����������� �������� �"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Copy card to"
 msgstr "���������� �������� �"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 msgid "Move cards to"
 msgstr "����������� �������� �"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 msgid "Copy cards to"
 msgstr "���������� �������� �"
 
@@ -2954,94 +2978,100 @@ msgstr "������ ��������"
 msgid "Other Address"
 msgstr "������ ������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "�������� �����"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "��������� ��� VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "New Contact..."
 msgstr "����� �������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "New Contact List..."
 msgstr "������� ������ ���������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Go to Folder..."
 msgstr "������� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Import..."
 msgstr "�������������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Search for Contacts..."
 msgstr "����� ��������..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "��������� �������� �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Pilot Settings..."
 msgstr "��������� Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "��������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "��������� ��������� � ��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "���������� �������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Copy to folder..."
 msgstr "����������� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Move to folder..."
 msgstr "����������� � �����..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "�����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3051,17 +3081,17 @@ msgstr "����������"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
-",123,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� "
-"�,abc,def,ghi,jkl,mno,pqr,stu,vwx,yz"
+",123,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,� �,abc,def,ghi,jkl,"
+"mno,pqr,stu,vwx,yz"
 
 #. Translators: put here a list of characters that correspond to buttons
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 ",0,��,��,��,��,��,��,��,��,��,��,��,��,��,��,abc,def,ghi,jkl,mno,pqr,stu,vwx,"
@@ -3211,7 +3241,7 @@ msgstr "����"
 msgid "Number of columns:"
 msgstr "����� ��������:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "���������"
 
@@ -3221,7 +3251,7 @@ msgid "Orientation"
 msgstr "����������"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "��������"
 
@@ -3295,29 +3325,33 @@ msgstr "������:"
 msgid "_Font..."
 msgstr "�����..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "��������������� �������"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "�������"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "����������"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "������"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "������������"
 
@@ -3360,42 +3394,34 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "������� ��� ��������� ����� ��������� Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "��������� Executive Summary ��������� ��������� Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "��������� ��� ��������� ��������� iTip/iMip ��������� Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "��������� Evolution ��� ��������� ���������."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "������� ��� ���������� \"��������� �������\"."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "������� ��� ������������ �������� Evolution ������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "������� ��� ������������ �������� ��������� iTip ���������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "������� ��� ������� ������������ �������� ���������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "������� ��� ������������� �������� ���������� ��������� ���������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "������� ��� �������� ������� ��������� �����������"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3407,10 +3433,25 @@ msgstr "������ ����������� � �������"
 msgid "Factory for the alarm notification service"
 msgstr "������� ��� ������� ����������� � �������"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "���������"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "��������������:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "������������ �����"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3450,7 +3491,7 @@ msgstr ""
 "�����������."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "��������������"
@@ -3476,15 +3517,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "�� ���������� � ��������� ���."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "�� ������� ���������������� GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "�� ������� ������� ������ ����������� � �������"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "�� ������� ������� ������� ������� ����������� � �������"
 
@@ -3500,7 +3541,7 @@ msgstr "�������� ��������"
 msgid "Comment contains"
 msgstr "����������� ��������"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "������"
 
@@ -3541,14 +3582,16 @@ msgstr ""
 "OAF."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "������"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "����������������"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "�����"
 
@@ -3569,27 +3612,32 @@ msgid "W"
 msgstr "�"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "�����"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "�� ������"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "� ��������"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "���������"
 
@@ -3604,11 +3652,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3623,12 +3672,14 @@ msgstr "����������"
 msgid "Assigned"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "���"
 
@@ -3648,64 +3699,66 @@ msgstr "��� ������"
 msgid "Month View"
 msgstr "��� �����"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "���������"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "�����, ���������� ������� � �������"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "������"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "����� ���������� �������� \"���������\""
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "New meeting"
 msgstr "����� ���������"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "_Meeting"
 msgstr "���������"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "New task"
 msgstr "������� ������"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "������"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "������� �������"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "����� �������"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 #, fuzzy
 msgid "New appointment"
 msgstr "������� �������"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "_Appointment"
 msgstr "�������"
 
 #: calendar/gui/control-factory.c:123
-#,  c-format
+#, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "�� ������� ������� ����� � \"%s\""
 
@@ -3910,7 +3963,7 @@ msgstr "�����������"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "�������:"
 
@@ -3939,7 +3992,7 @@ msgstr "���������� �������"
 msgid "hour(s)"
 msgstr "���(-�,-��)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "������(-�)"
 
@@ -3967,78 +4020,79 @@ msgstr "30 �����"
 msgid "60 minutes"
 msgstr "60 �����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+msgid "Alerts"
+msgstr "�������"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "��������� ��������� � �����..."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "���� ��� ������������ �����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "���� ��� ����� �� �������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "���"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "���������� ������ ������ � ���������� �� �����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "������ ���:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "���"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_asks due today:"
 msgstr "������, ������������� �� �������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "���"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Task List"
 msgstr "������ �����"
@@ -4066,78 +4120,93 @@ msgid "Tuesday"
 msgstr "�������"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "�����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "������� ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "12-������� (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "24-�������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "����������� ������������� ��� �������� ���������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "������� �������� ��� � ������������� ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "���������� �������:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "����� ���:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "�����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "�������� ����������� ������ �����"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Overdue tasks:"
 msgstr "������������ ������:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Show appointment end times in week and month views"
 msgstr "���������� ����� ��������� ������ � ������ ������ � ������"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Time divisions:"
 msgstr "����������� �������:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "���"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "���"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "�� ������ �������"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4220,40 +4289,61 @@ msgstr " (� "
 msgid "Due "
 msgstr "����������� ����"
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "�� ������� �������� ������!"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
 msgstr "�� ������� �������� ������!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "������� �������"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "������ � ������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "��� �������� ��������"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "��������� ���..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "�� ������� ��������� ������� ������!"
 
@@ -4311,27 +4401,27 @@ msgstr "��������:"
 msgid "Enter Delegate"
 msgstr "������ �������������"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "�������"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "����������"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "����������"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "���������"
 
@@ -4378,7 +4468,7 @@ msgid "Pu_blic"
 msgstr "�����"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "�������� ����� ���"
 
@@ -4400,19 +4490,19 @@ msgstr "����� ���������:"
 msgid "_Start time:"
 msgstr "����� ������:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "��������� �����������."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "��������� ��� ������� ���� ��������"
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "���� ������� ��� ��������� � ���������!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "��������..."
 
@@ -4425,51 +4515,58 @@ msgstr "�������"
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
 #, fuzzy
-msgid "Common Name"
-msgstr "�������� ������� ������"
+msgid "Click here to add an attendee"
+msgstr "* �������� ����� ����� �������� ������� *"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
 #, fuzzy
-msgid "Delegated From"
-msgstr "��������"
+msgid "Common Name"
+msgstr "�������� ������� ������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
-msgid "Delegated To"
-msgstr "��������:"
+msgid "Delegated From"
+msgstr "��������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "����"
+#, fuzzy
+msgid "Delegated To"
+msgstr "��������:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "����"
+msgid "Language"
+msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr ""
+msgid "Member"
+msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "����"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "���������"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "���"
@@ -4484,14 +4581,10 @@ msgid "_Change Organizer"
 msgstr "�������� ������������"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "���������� ������..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "������ �����������"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4672,7 +4765,7 @@ msgid "Progress"
 msgstr "�����������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4684,19 +4777,19 @@ msgstr "���������:"
 msgid "_Status:"
 msgstr "���������:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "��������"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "����������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "��������:"
 
@@ -4708,22 +4801,77 @@ msgstr "���� ������:"
 msgid "_Due Date:"
 msgstr "����������� ����:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:443
+#, fuzzy, c-format
+msgid "30%"
+msgstr "389"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:448
+#, fuzzy, c-format
+msgid "80%"
+msgstr "389"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:450
+#, fuzzy, c-format
+msgid "100%"
+msgstr "1:00"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "�������� ��������� ��������"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "�������"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 msgid "_Save as..."
 msgstr "��������� ���..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4731,20 +4879,20 @@ msgstr "��������� ���..."
 msgid "_Print..."
 msgstr "����������..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "��������"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "�����������"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4752,32 +4900,33 @@ msgstr "�����������"
 msgid "_Paste"
 msgstr "��������"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 msgid "_Assign Task"
 msgstr "��������� ������"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 msgid "_Forward as iCalendar"
 msgstr "��������� ��� i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "�������� ��� �����������"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Mark Selected Tasks as Complete"
 msgstr "�������� ��������� ������ ��� �����������"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "������� ��������� ������"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "���������� ��������"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "�������� ����� ����� �������� ������"
 
@@ -4785,49 +4934,50 @@ msgstr "�������� ����� ����� �������� ������"
 msgid "Alarms"
 msgstr "�������"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "���������"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 #, fuzzy
 msgid "Completion Date"
 msgstr "���������"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "����������� ����"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "����� ���������"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "���������"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "���� ������"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "�������"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 #, fuzzy
 msgid "Task sort"
 msgstr "������ �����"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4875,11 +5025,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -4918,7 +5070,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "������������ ���������� � ���������"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 msgid "_Configure..."
 msgstr "���������..."
 
@@ -4927,7 +5079,7 @@ msgid "_Configure Pilot..."
 msgstr "��������� Pilot..."
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "��������� ���..."
 
@@ -4952,74 +5104,420 @@ msgid "Delete _All Occurrences"
 msgstr "������� ��� ���������"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "������, ������� GNOME Pilot �� ����������� � ���� �������"
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "������ ���������� %s."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:688
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "���������� � ��������� (� %s �� %s)"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "����� ���������� ��������:"
+
+#: calendar/gui/e-itip-control.c:707
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "���������� � ��������� (� %s �� %s)"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:725
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr " (��������� "
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "���������� ���������"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "An unknown person"
+msgstr "����������� �������"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "���������:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "�������"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "�����������������"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "�����������"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "���� ��������� �� ����� ���� �����̣�!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#, fuzzy
+msgid "Choose an action:"
+msgstr "������� ��������"
+
+#: calendar/gui/e-itip-control.c:972
+#, fuzzy
+msgid "Update"
+msgstr "�������� ������"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "��"
+
+#: calendar/gui/e-itip-control.c:1000
+#, fuzzy
+msgid "Accept"
+msgstr "�������"
+
+#: calendar/gui/e-itip-control.c:1001
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "�����������������"
+
+#: calendar/gui/e-itip-control.c:1002
+#, fuzzy
+msgid "Decline"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:1026
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "������������ ���������� � ���������"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "���������� ���������"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "��������"
+
+#: calendar/gui/e-itip-control.c:1117
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "�������� ��������� ���������� �� ���������"
+
+#: calendar/gui/e-itip-control.c:1118
+#, fuzzy
+msgid "Meeting Information"
+msgstr "�������������� ����������"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1123
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "��������� ��.�����"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1128
+#, fuzzy
+msgid "Meeting Update"
+msgstr "����� ���������� ��������:"
+
+#: calendar/gui/e-itip-control.c:1132
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "�������� ��������� ���������� �� ���������"
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1157
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "�������� ��� ��������� ������"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1162
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "������� ��������"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1167
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "����� � ���������"
+
+#: calendar/gui/e-itip-control.c:1189
+#, fuzzy, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "�������� ��������� ���������� �� ������"
+
+#: calendar/gui/e-itip-control.c:1190
+#, fuzzy
+msgid "Task Information"
+msgstr "����������"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1200
+#, fuzzy
+msgid "Task Update"
+msgstr "������ �����"
+
+#: calendar/gui/e-itip-control.c:1204
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "�������� ��������� ���������� �� ������"
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1230
+#, fuzzy
+msgid "Task Reply"
+msgstr "��������� �����"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1235
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "�������� ��������"
+
+#: calendar/gui/e-itip-control.c:1240
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "��������� ���������"
+
+#: calendar/gui/e-itip-control.c:1259
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "������������ ���������� � ���������"
+
+#: calendar/gui/e-itip-control.c:1260
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "������������ ���������� � ���������"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1265
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "URL \"��������/�����\":"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1270
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "URL \"��������/�����\":"
+
+#: calendar/gui/e-itip-control.c:1275
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "����������� ���������"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "������, ����� ������������� ���������."
+
+#: calendar/gui/e-itip-control.c:1373
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "��� ��������� �������� ������ ����������� ������� �����."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "������� �� ����� ���� ������!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "���������� ���������\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "���� ��������� �� ����� ���� �����̣�!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "������ ��������� �� ����� ���� �����̣�, ������ ��� ������� ������ �� "
 "����������"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "������ ��������� �� ����� ���� �����̣� ��-�� ��������� �������� �������!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "������ ��������� �� ����� ���� �����̣�!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "������ ��������� �����̣�!\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "������ ��������� �� ����� ���� �����̣�!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "�������� ���������"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "������� ���������!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "������� �� ����� ���� ������!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 msgid "Select Calendar Folder"
 msgstr "������� ����� ���������"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 msgid "Select Tasks Folder"
 msgstr "������� ����� �������"
 
@@ -5060,93 +5558,92 @@ msgstr "����-����������"
 msgid "date-start"
 msgstr "����-������"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "������������"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "����������� ���������"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "�������������� ���������"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "�� ���������"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "�������������"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "������"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "��������"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "�������"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "������������"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "��������� ���������"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "�������������� ���������"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "�� ���������"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "����������� ��������"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "�������"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "���������"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "�����������������"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "��������"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "� ��������"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
@@ -5158,63 +5655,63 @@ msgstr "%a, %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "��� �����"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "��� ����������"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "���������� ������ ������� ����"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "���������� �����������"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "�������� ���������� � ���������"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "���������"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "��� ���� � �������"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "��� ���� � ���� ������"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "��������� ����"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "��������� ���� � ���� ������"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "����� ������ ��������:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "����� ���������� ��������:"
 
@@ -5233,16 +5730,21 @@ msgstr "�� ������� ��������� ������ � \"%s\""
 msgid "The method required to load `%s' is not supported"
 msgstr "�����, ����������� ��� �������� \"%s\", �� ��������������"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "�� ������� ������� ����� \"%s\""
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "����������� � �������..."
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 msgid "Deleting selected objects..."
 msgstr "�������� ��������� ��������..."
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 msgid "Expunging"
 msgstr "��������"
 
@@ -5254,17 +5756,17 @@ msgstr "����� �������..."
 msgid "_Delete this Appointment"
 msgstr "������� ��� �������"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "�� ������� ������� ����� \"%s\""
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "�����, ����������� ��� �������� \"%s\", �� ��������������"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�������� ��������� %s"
@@ -5325,19 +5827,58 @@ msgstr "�������"
 msgid "September"
 msgstr "��������"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "��������� ��� ������� ���� ��������"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "����������� ������ ���� ��������."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "���������� ���������"
+
+#: calendar/gui/itip-utils.c:356
+#, fuzzy
+msgid "Task information"
+msgstr "����������"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "�������������� ����������"
+
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "���������� � ��������� (� %s �� %s)"
+
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "���������� ���������"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "�������� ������"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "�������� ������"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "�� ������ ���� ���������� �������."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "�� ������� ������� ������� �������������� ����������"
 
@@ -5526,12 +6067,49 @@ msgstr "��������� ����� (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "��������� ��� (%Y)"
 
+#: calendar/gui/print.c:2249
+#, fuzzy
+msgid "Task"
+msgstr "������"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "���������:"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "���������:"
+
+#: calendar/gui/print.c:2338
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "���� ����������:"
+
+#: calendar/gui/print.c:2350
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2364
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr ""
+"\n"
+"���������: "
+
+#: calendar/gui/print.c:2375
+#, fuzzy
+msgid "Contacts: "
+msgstr "��������"
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "���������� ���������"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5567,8 +6145,8 @@ msgstr ""
 "\n"
 "���������� ��� �������?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "�� ���������� �����."
 
@@ -5628,6 +6206,11 @@ msgstr "����������� ����� iCalendar � Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "����������� ����� iCalendar � Evolution."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "�����������"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5720,8 +6303,8 @@ msgstr "contains? ������������ ������ � �������� ��������� 2"
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 "contains? ������������ ���� �� \"any\", \"summary\", \"description\" � "
 "�������� ��������� 1"
@@ -5735,8 +6318,8 @@ msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
-"has-categories? ������������, ��� ��� ��������� - ������ ��� "
-"����-������������ �������� - ���������� ���� (#f)"
+"has-categories? ������������, ��� ��� ��������� - ������ ��� ����-"
+"������������ �������� - ���������� ���� (#f)"
 
 #: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
@@ -6652,638 +7235,653 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "����/������"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "����/�������"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "����/�������"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "����/������"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "����/������"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "����/�����������"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "����/����"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "����/�����"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "����/�����"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "����/��-����"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "����/������"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "����/�������"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "����/���������"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "����/����"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "����/������"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "����/��������"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "����/������"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "����/�������"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "����/�������"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "����/�������"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "����/�����"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "����/����-�����"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "����/�����������"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "����/������"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "����/������������"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "����/������"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "���������/�����"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "���������/�������"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "���������/������"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "���������/���� �����"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "���������/�����"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "���������/������"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "���������/���������"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "���������/��.�����"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "���������/��������"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "���������/�������"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr ""
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "���������/������"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr ""
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr ""
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr ""
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "���������/��������"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "���������/����"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "���������/������"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "������/���������"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "������/�������"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "������/�����"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "������/�������"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "������/�������"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "������/������"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "������/����������"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "������/��������"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "������/��������"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "������/��������"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "������/����������"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "������/������"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "������/���������"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "������/���������"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "������/�������"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "������/�����������"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "������/����"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "������/��������"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "������/�������"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "������/������"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "������/����������"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "������/������"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "������/������"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "������/�����"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "������/������"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "������/������"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "������/����"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "������/�����"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "������/�����"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "������/����"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "������/���"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "������/������"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "������/���-������"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "������/�������"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "������/�����������"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "������/�����"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "������/���������"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "������/������"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "������/�������"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "������/�������"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "������/����"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "������/�������"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "������/�������"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "������/������"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "������/���������"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "������/�����"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "������/������"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr ""
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr ""
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr ""
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr ""
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "������� �� �������������� ���� ������"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "���������� ������� �� �������������� ���� ������"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "�������� �� �������������� ���� ������"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "���������� �� �������������� ���� ������"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "����������� �� �������������� ���� ������"
 
@@ -7291,12 +7889,12 @@ msgstr "����������� �� �������������� ���� ������"
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7307,7 +7905,7 @@ msgstr ""
 "���������� �������� �� ����� �������� �, ��������������, �� �����\n"
 "�������������� ����� ����������� � �������."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7318,11 +7916,16 @@ msgstr ""
 "%s\n"
 "���������, ��������� � ���� �����, �� ����� ����������������."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "������������� � ��������"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "���������� ����� \"%s\""
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "��� ���������� ������ �������� ���������� ����������� � ����"
 
@@ -7330,56 +7933,67 @@ msgstr "��� ���������� ������ �������� ���������� ����������� � ����"
 msgid "Syncing folders"
 msgstr "������������� �����"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "���������� ��������� ������: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ���������� �������: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "�� ������� ������� ����� �����"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "�� ������� ���������� ����� �����"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "��������� ��������� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "���������� ������� ���������"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "���� �� ��������� %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "������������� �����"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "��������� ��������� %d �� %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "���� �� ��������� %d �� %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 msgid "Failed to retrieve message"
 msgstr "�� ������� �������� ���������"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "���� ��� ����������� ��������� %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "���� ��� ����������� ��������� %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "������ ���������� ������ �������: %s: %s"
@@ -7411,26 +8025,104 @@ msgstr "(��������� ���) ������� ������������� ����������� ����������"
 msgid "Performing query on unknown header: %s"
 msgstr "������������� ����������� ���������: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "���������������� ��������: �������� ���������: ��� %s"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "���������������� ��������: ����� ���������: ��� %s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "���������������� ��������: ����� �� �������������� ������������: ��� %s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "����������� ���������"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "����������� ��������� � %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "��������."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "����������� ����� �� ������� POP: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "�� ������� ��� �����."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "���������� ����������� ��� ���������: �� ���������� ����������"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "���� ��� ����������� ��������� %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "���� ��� ����������� ��������� %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "�� ������� ������������ ���������."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+"���������� ��������� ��� ���������: �� ������� ������� ��������� ����: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7528,88 +8220,23 @@ msgstr "������ ���������� ���������� ��������� �����: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "������ ����������� ���������� ��������� �����: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "����������, ������� ��� %s ������ ��� %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "����������, ������� ��� %s ������."
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "���������� ��������� ��� ���������: ��� ������ ��� �������"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "���������� ��������� ��� ���������: �� ���ģ� ������"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"���������� ��������� ��� ���������: �� ������� ������� ����� � GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "���������� ��������� ��� ���������: ��� ������ ��� ���������� �������"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "���������� ��������� ��� ���������: ��� ������ ��� ��������"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"���������� ��������� ��� ���������: �� ������� ������� ����� � GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-"���������� ��������� ��� ���������: �� ������� ������� ��������� ����: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "���������� ����������� ��� ���������: ��� ������ ��� ����������"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "���������� ����������� ��� ���������: �� ���ģ� ������"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"���������� ����������� ��� ���������: �� ������� ������� ����� � GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "���������� ����������� ��� ���������: �� ���������� ����������"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"���������� ������������ ��� ���������: ��� �������������� ������ ��� "
-"�����������"
 
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "���������� ������������ ��� ���������: �� ���ģ� ������"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
-"���������� ������������ ��� ���������: �� ������� ������� ����� � GPG/PGP: %s"
 
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "���� ������"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7626,43 +8253,6 @@ msgstr "�� ������� ��������� %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "�� ������� ��������� %s: � ������ ��� ����������������� ����."
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s ������ %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s ������ ��� %s �� %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "���������� ��������"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "�� ������� ������������ � %s (���� %d): %s"
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(���� ����������)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "�������� ��������"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "������ ���������� ����������: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonymous"
@@ -7770,7 +8360,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "�������� ����� �� ������� ��� ��������������."
 
@@ -7802,11 +8392,9 @@ msgstr ""
 "����������� � ������� ����� ������������� � �������������� ��� "
 "�������������� ��������� Kerberos 4."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "������"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7833,51 +8421,51 @@ msgstr "POP �� SMTP, ��������� ��-POP ��������"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "���� ���������� ����������� ���������: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL \"%s\" ��������� � ���������� ����� ������������"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL \\\"%s\\\" ��������� � ���������� �����"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL \\\"%s\\\" ��������� � ���������� ����"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "����� ����: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "������ ��� ������ ����: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "���� ������ ����: %s: ���� �� ������"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "���� ������ ����: %s: ������� ����������"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "����� ����: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 msgid "Host lookup failed: host not found"
 msgstr "���� ������ ����: ���� �� ������"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 msgid "Host lookup failed: unknown reason"
 msgstr "���� ������ ����: ������� ����������"
 
@@ -7940,11 +8528,11 @@ msgstr "�� ������� ������������ ���������."
 msgid "Failed to verify certificates."
 msgstr "�� ������� ��������� �����������."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "�� ������� �������� �����: ������������ �������� � ���� ���������"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�� ������� ������� �����: ������������ �������� � ���� ���������"
 
@@ -7972,7 +8560,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7981,16 +8569,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8010,15 +8598,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "�� ������� ��������� URL \"%s\""
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "��� ��������� %s � %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "��� ������ ���������: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "��������� ����� ����� �� ���� ������"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8040,68 +8628,77 @@ msgstr "�� ������� ������������� �����: %s: ������������ ��������"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "�� ������� ������������� �����: %s: ��� ����� �����"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "�� �� ������ ����������� ��������� �� ���� �������� �������."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "�������� ��������"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "������ ���������� ����������: %s"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "����������� ����� �� ������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "���� ������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "�� ������ ����� �������."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "����� ������� IMAP �� �������� ���������� � %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "����������� ����� \"OK\" �� ������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "�� ������� ������� ������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "�� ������� ��������� ������� ���������� � %s"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "����� ���� ���������� � ������ ������� �� �������."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "����� �������� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "��� ��������� � ��������� ������ ����������"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "��������� ������� ���������� �� ����� ���������� "
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "����� ����� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "�� ������� ����� ���� ��������� � ������ �� ������� FETCH."
 
@@ -8155,34 +8752,82 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "��� ������ � �������� ����� �� �������� IMAP."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "������"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "����������� � ������� IMAP ����� ������������� � �������������� "
 "���������������� ������."
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP ������ %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s ������ ��� %s �� %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "���������� ��������"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "�� ������� ������������ � %s (���� %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "�� ������� ������������ � ������� SMTP %s � ���������� ������: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+msgid "SSL/TLS extension not supported."
+msgstr "���������� SSL/TLS �� ��������������."
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "���� ��������������."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "������ IMAP %s �� ������������ ������������� ��� �������������� %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "�������������� %s �� ��������������"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s����������, ������� ������ IMAP ��� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "�� �� ����� ������."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8193,69 +8838,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "��� ����� ����� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "��� ����� �� ����� ��������� ��������"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "���������� ������� �������� ����: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "�������� �������� � ������� UNIX MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "��� �������� ��������� ����� � �������� ��������� ���� MH."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "��������� ��������"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "��� ��������� ��������� ����� �� ����� � ����������� ������� mbox."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "��������� ������� � ����� ���������� � ����� \"��������\""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "�������� �������� � ������� Maildir"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "��� �������� ��������� ����� � �������� ��������� maildir."
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "����������� ���� Unix mbox"
-
-#: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
-"��� ������ � �������� ��������� ����� � ������ ������������ ����� mbox."
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "����������� ���� Unix mbox"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
+"��� ������ � �������� ��������� ����� � ������ ������������ ����� mbox."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "������������� ���� � ��������� %s"
@@ -8281,7 +8945,7 @@ msgstr "��������� ��������� �� ����� ����� ��������"
 msgid "Local mail file %s"
 msgstr "��������� �������� ���� %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�� ������� ������������� ����� %s � %s: %s"
@@ -8301,33 +8965,31 @@ msgstr "�� ������� ������� ���� ������� ���������� � ����� \"%s\": %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "�� ������� ������� ��������� ���� ����� \"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "�� ������� ��������� ������� ����������: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "���������� �������� ��������� � ������� ����������: ������� ����������"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "���������� ��������� � ����� ��������� �������� ��������"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "���������� �������� ��������� � ����� ��������� ��������: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8336,20 +8998,19 @@ msgstr ""
 "���������� �������� ���������: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "��� ������ ���������"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "�������� ���������� ���������"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8360,13 +9021,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "����� \"%s\" �� ����������."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8382,7 +9043,7 @@ msgstr "\"%s\" �� �������� �������� ���������."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "�� ������� ������� ����� \"%s\": %s"
@@ -8391,8 +9052,8 @@ msgstr "�� ������� ������� ����� \"%s\": %s"
 msgid "not a maildir directory"
 msgstr "�� �������� �������� ���������"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "�� ������� �������������� ����� \"%s\": %s"
@@ -8412,45 +9073,37 @@ msgstr "�������� ����������� �����"
 msgid "Checking for new messages"
 msgstr "����� ����� ���������"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "���������� �����"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "���������� ������������� ����� %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "���������� ������� �������� ����: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "���������� ����� ��������"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "���������� �������� ��������� � ����� mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8459,13 +9112,11 @@ msgstr ""
 "���������� �������� ���������: %s �� ����� %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "������, ����� ������������� ���������."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "���� ��� �������� ���������: �������� ���� ���������?"
 
@@ -8508,149 +9159,149 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "����� \"%s\" �� �����. �� �������."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "�� ������� ������� �����: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "��������� ������ ��������� ����������� ����� ������� %ld � ����� %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "���������� ��������� �����: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "�� ������� ������� ����: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "���������� ������� ��������� �������� ����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "������������ ����� � ������� ���������� � ��� ���� ����� �������������"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "������ ������ �� ��������� �������� ����: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "���� ������ �� ��������� �������� ����: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "�� ������� ������� �������� ����� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "�� ������� ������� ��������� �����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "�� ������� ������������� �����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "������������ ����� � ������� ���������� � ��� ���� ����� �������������"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "����������� ������: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "�� ������� ������������� �����: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "������ ������ �� ��������� �������� ����: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "���� ������ �� ��������� �������� ����: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "���������� ��������� � ����� MH ��������"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "���������� �������� ��������� � ����� mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" �� �������� ���������."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "���������� ������� MH �������: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "���������� �������� ��������� � ����� �����: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "����� ����� �� ����� ���� �������������"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "���� ����� \"%s\" �� ���������� ��� �� �������� ������� ������"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "��������� %s �� �������� ���������"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "����� \"%s%s\" �� ����������."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "���� ��������� ����� %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "����� ����� �� ����� ���� �������������"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "����� ����� �� ����� ���� �������������"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "����� ����� �� ����� ���� �������"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "�� ������� ���������������� ��������� ����� %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "�� ������� ���������������� ����� ����� %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8659,25 +9310,6 @@ msgstr ""
 "�� ������� ���������������� ����� �����: %s: %s\n"
 "����� ����� ���� ���������, ����� ��������� � \"%s\""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "�� ������� ��������: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "���� ����� \"%s\" �� ���������� ��� �� �������� ������� ������"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, c-format
-msgid "Mail tree %s"
-msgstr ""
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "������� USENET"
@@ -8687,12 +9319,22 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "��� ��������� ��� ������ � �������� ��������� � ������ �������� USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "�� ������� ������� ������� %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "������� USENET ����� %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8792,7 +9434,7 @@ msgstr "��������� ��������� �� �������"
 msgid "Delete after %s day(s)"
 msgstr "������� ����� %s ����"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8819,30 +9461,20 @@ msgstr ""
 "������ �� ��������� APOP. ��� ����� �������� �� ��� ���� ������������� ���� "
 "�� ��������, ������� ����� ������������ ���."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr ""
-"�� ������� ������������ � ������� POP %s � ���������� ������: %s"
+msgstr "�� ������� ������������ � ������� POP %s � ���������� ������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-msgid "SSL/TLS extension not supported."
-msgstr "���������� SSL/TLS �� ��������������."
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "���� ��������������."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "�� ������� ������������ � ������� POP �� %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8850,27 +9482,27 @@ msgstr ""
 "�� ������� ������������ � ������� POP.\n"
 "�� �������������� ������������� �������� �������������."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "���� ������� IMAP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr "������ �����/������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s����������, ������� ������ POP ��� %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8879,13 +9511,13 @@ msgstr ""
 "�� ������� ������������ � ������� POP.\n"
 "������ �������� ������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "��� ����� ����� \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9049,43 +9681,42 @@ msgstr "��������� ���� ��������������"
 msgid "Authentication required"
 msgstr "��������� ��������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "������ �� ������ ����������: %s: ������ �����, ��� �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr ""
-"�� ������� ������������ � ������� SMTP %s � ���������� ������: %s"
+msgstr "�� ������� ������������ � ������� SMTP %s � ���������� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "��������� ����� �������� ������ �� ������ AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "������ ��� ������ �� 'DATA'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP ������ %s �� ������������ ������������� ��� �������������� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s����������, ������� ������ SMTP ��� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9096,89 +9727,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "�������� SMTP ����� ����� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "���������� ��������� ���������: �������� ����� �����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "�������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "���������� ��������� ���������: �� ���������� ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "���������� ��������� ���������: ���� ��� ����� ������������ �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "����������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "��������� ����� �������� ������ �� HELO: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "������ ������ HELO: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "�������������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "������ ��� �������� ������� �������������� SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "��������� ����� �������� ������ �� ������ AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "������ ������� AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "�������� ����� �� ������� ��� ��������������.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "��������� ����� �������� ������ �� MAIL FROM: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr "������ ��� ������ �� 'MAIL FROM'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "��������� ����� �������� ������ �� RCPT TO: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "���� 'RCPT TO <%s>'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "��������� ����� �������� ������ �� 'DATA': %s: ����� �� ����������"
@@ -9186,36 +9817,36 @@ msgstr "��������� ����� �������� ������ �� 'DATA': %s: ����� �� ����������"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr "������ ��� ������ �� 'DATA'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "��������� ����� �������� DATA: ��������� ��������: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "��������� ����� �������� ������ �� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr "������ ��� ������ �� 'RSET'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "��������� ����� �������� ������ �� QUIT: %s: �� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr "������ ��� ������ �� 'QUIT'"
 
@@ -9288,52 +9919,52 @@ msgstr "��� MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "������������ �������������� ����������� ������������� �����"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "�������� ����� ����� ������� �������� �����"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "��:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "��������:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "����������� ����������� ���������"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "�����:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "������� ���������, ������� ������� ����� ���������"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "���.�����:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9346,7 +9977,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "������������ ����"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "�� ������� ������� �������� ������� PGP"
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9355,34 +9991,34 @@ msgstr ""
 "������ ��� ������ ����� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "��������������!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "���� ����������, ������������?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "������ ���������� �����: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ ��� �������� �����: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "������ ������� � �����: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "�� ������� �������� ��������� �� ���������"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9391,7 +10027,7 @@ msgstr ""
 "�� ������� ������������� �� �����: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9400,7 +10036,7 @@ msgstr ""
 "�� ������� ����� ����: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9409,7 +10045,7 @@ msgstr ""
 "������ ��� �������������� ���������: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9417,7 +10053,7 @@ msgstr ""
 "���������� ����������� ����� ���������� ������.\n"
 "���������� ������� ��������������?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9427,23 +10063,43 @@ msgstr ""
 "\n"
 "��������� ���������?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "��������: �������� ���������"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "������� ����"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "�������� ����"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "�������"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (��������)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "������� ���������"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9451,7 +10107,7 @@ msgstr ""
 "�� ������� ������� ���� ���������:\n"
 "���������� ������������ ����������� ������� ������ ������."
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9459,6 +10115,12 @@ msgstr ""
 "�� ������� ������� ���� ���������:\n"
 "���������� ������������ ��������� ��������� HTML."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9517,7 +10179,7 @@ msgstr "���� ��������"
 msgid "Subject does not contain"
 msgstr "���� �� ��������"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9661,7 +10323,7 @@ msgstr "���"
 msgid "minute"
 msgstr "������"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "�������"
 
@@ -9736,7 +10398,7 @@ msgstr " �����"
 msgid "ago"
 msgstr "�����"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9748,6 +10410,21 @@ msgstr "<ݣ������ ����� ����� ������� ����>"
 msgid "Filter Rules"
 msgstr "������� �������"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "������� ��� �����:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "���� ����� \"%s\" �� ���������� ��� �� �������� ������� ������"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "������� ����"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9766,7 +10443,7 @@ msgstr ""
 "����������, ��������� � ������� ���������� ����� ��� �������� �����."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "������� �����"
 
@@ -9779,7 +10456,11 @@ msgstr ""
 "������ � ���������� ��������� \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "��������"
 
@@ -9808,7 +10489,8 @@ msgid "if all criteria are met"
 msgstr "���� ������������� ���� ���������"
 
 #: filter/filter-rule.c:769
-msgid "if any criterion are met"
+#, fuzzy
+msgid "if any criteria are met"
 msgstr "���� ������������� ������ �� ���������"
 
 #: filter/filter-rule.c:780
@@ -9886,190 +10568,199 @@ msgid "Beep"
 msgstr "�����"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "��������"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "����������� � �����"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "���� ���������"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "���� ��������"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "���̣����"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "�� ��������"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "�� ������������� ��"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "�� ����������."
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "������ �� ���"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "�� ���������� �"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "�� ����������"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "������������� ��"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "c���������"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is after"
 msgstr "���� �����"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "is before"
 msgstr "���� ��"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "������ ���"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "������ ���"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "�� ��������"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "�� ��������"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+msgid "Label"
+msgstr "�����"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "������ ��������"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "���� ���������"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "��������� ���������"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "����������� � �����"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "������������� ����"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "���������� ���.���������"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "���"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "������ (��)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "������ ���"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "�������� ������� ������"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "����������� ���������"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "���������� �"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "����"
 
@@ -10124,7 +10815,8 @@ msgid "Scanning %s"
 msgstr "������������ %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "�����"
 
@@ -10140,10 +10832,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "�������� �����"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10193,7 +10881,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "�������������� ���������� �� Netscape"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "�����"
 
@@ -10325,31 +11015,31 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "�����, ���������� �����"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "����������� �������� �������"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "����� ����������� �������� �������"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "��� ����� �� ����� ��������� ���������."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "��������..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "�������� �������� ���� �����"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10357,226 +11047,236 @@ msgstr ""
 "��������� ���� �������� ��������� �������� ������������, ����������, "
 "���������, ��� �ӣ � �������."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "�� �� ���������� ����� ��������������� �����"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "��������: �������� ���������"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "����� �������� ���������"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "�������� ���������..."
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "���������� ���������������� �������� ��������� Evolution."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "���������� ���������������� ��������� ��������� ����� Evolution."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "���������� ���������������� ��������� ���������� � ����� Evolution."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 msgid "Connecting..."
 msgstr "�����������..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "�� ������� ���������������� ��������� � ������� ��������"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "�������� ��� \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "��������"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "�� ������� ������� ��������� �������: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "����� %d"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "������� %d"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "�������� %d"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "�������������� %d"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "������������ %d"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "����� %d"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "������� ����������� ����� �� ���������"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "����������� ����� �� ����"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "����������� ����� �� �����������"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "����������� ����� �� ����������"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "����������� ����� �� ������ ��������"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "������ �� ����"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "������ �� �����������"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "������ �� �����������"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "������ �� ������ ��������"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "������� ��� ����� ���������..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "����������"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "�������� �����������"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "�������� � ������"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "�������� ����"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "���������"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "���������"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 msgid "Cl_ear Flag"
 msgstr "�������� ����"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "�������� ��� �����������"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 msgid "Mark as _Unread"
 msgstr "�������� ��� �������������"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "�������� ��� ������"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 msgid "_Mark as Unimportant"
 msgstr "�������� ��� ��������"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 msgid "U_ndelete"
 msgstr "������������"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 msgid "Mo_ve to Folder..."
 msgstr "����������� � �����..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "����������� � �����..."
 
-#: mail/folder-browser.c:1645
-msgid "Label"
-msgstr "�����"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 msgid "Add Sender to Address_book"
 msgstr "�������� ����������� � �������� �����"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 msgid "Appl_y Filters"
 msgstr "��������� �������"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 msgid "Crea_te Rule From Message"
 msgstr "������� ������� �� ���������"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 msgid "VFolder on M_ailing List"
 msgstr "����������� ����� �� ������ ��������"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "������ �� ������ �������� (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "����������� ����� �� ������ �������� (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "������� ��������"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "��������� ���������� � �����"
 
@@ -10631,7 +11331,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "�� �� ����� ��� ����������� ����������."
 
@@ -10641,80 +11341,108 @@ msgid "Evolution News Editor"
 msgstr "�������� �������� Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "�������� �ޣ���� ������� Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "������:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 msgid "User_name:"
 msgstr "��� ������������:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "����:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "�����"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "�� �� ������ ������� ��� �ޣ���� ������ � ���������� ������."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "�� ������� ��� ������ ������� ��� �ޣ���� ������?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "�� �������"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "������������� ������� �ޣ���� ������?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "���������"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "��������"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "�� ������� ��� ������ ������� ��� �ޣ���� ������ ��������?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "��������"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "�������� �ޣ���� ������"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "��������"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "������� �����"
+
+#: mail/mail-autofilter.c:223
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "����"
+
+#: mail/mail-autofilter.c:239
+#, fuzzy, c-format
+msgid "Mail from %s"
+msgstr "�� %s:"
+
+#: mail/mail-autofilter.c:295
+#, fuzzy, c-format
+msgid "%s mailing list"
+msgstr "������ ��������"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "�������� ������� �������"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"��������� ����������� �����(�):\n"
+"%s������������ ���̣���� �����:\n"
+"    '%s'\n"
+"� ���� ���������."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10726,7 +11454,7 @@ msgstr ""
 "����������, ��������� ��� ������������� �����.\n"
 "�� ������ ��������� ��� ������?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10734,7 +11462,7 @@ msgstr ""
 "�� ������ ��������� ������������\n"
 "�� ����, ��� ������� ���������� �����."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10743,7 +11471,7 @@ msgstr ""
 "�� ����, ��� ������� ���������� �����."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10751,11 +11479,11 @@ msgstr ""
 "�� ��������� ��������� � HTML �������, �� ��������� ���������� �� ����� "
 "�������� ����� � HTML �������:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "�ӣ �� ���������?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10763,7 +11491,7 @@ msgstr ""
 "��� ��������� �� ����� ����.\n"
 "��������� ���?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10771,11 +11499,11 @@ msgstr ""
 "��� ��� ������ ����������� ��������������� �� �������� ������� �� ������, "
 "��� ��������� ����� ��������� ������ ����������� ������� �����."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "��� ��������� �������� ������ ����������� ������� �����."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10785,16 +11513,16 @@ msgstr ""
 "���������� Apparently-To ���������.\n"
 "�ӣ ����� ���������?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "�� ������ ������� �����������, ����� ��������� ��� ���������."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "�� ������ ��������� �ޣ���� ������ �� ����, ��� ������� ���������� �����."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10802,28 +11530,28 @@ msgstr ""
 "�� ������� ������� ����� ���������� ��� ���� ������� ������.\n"
 "������ ������������ ����� ���������� �� ���������?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "����������� �����������"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "� %a, %d.%m.%Y, � %H:%M, %%s �������:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "����������� ���������(�) �"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "����������� ���������(�) �"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�� �������, ��� ������ ������� ��� %d ���������?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10831,7 +11559,7 @@ msgstr ""
 "�� ������ ������� ������ ���������,\n"
 "����������� � ����� \"���������\"."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10839,38 +11567,38 @@ msgstr ""
 "�� ������ ������������� ���������\n"
 "������ �� ����� \"������������\"."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�� �������, ��� ������ ������������� ��� %d ���������?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "��� ��������� ���������"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "������������ ����?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "��������� ��������� ���..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "��������� ��������� ���..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 msgid "Go to next folder with unread messages?"
 msgstr "������� � ��������� ����� � �������������� �����������?"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10882,7 +11610,7 @@ msgstr ""
 "\n"
 "���������� ��� ���������?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10891,32 +11619,68 @@ msgstr ""
 "������ ��� �������� ���������� �������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "��������� ��������"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, c-format
 msgid "Page %d of %d"
 msgstr "�������� %d �� %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "���������� ���������"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "���� ������ ���������"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "�� ������� ��� ������ ������� ��� %d ��������� � ��������� �����?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "��� ��������"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "���������� �������"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "������������"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "�������� ��������"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "�������"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -10968,182 +11732,168 @@ msgstr ""
 "�������� ����� ������������ ������ ��� �����������."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "�������� �� �ޣ���� ������� Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "���������"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "����"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "�����"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"�� ������� �������� \"��������\" ��� ������ ��������� �����:\n"
-"%s\n"
-"����� �� ����� ������."
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "�������� �ޣ���� �������"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "�������� �������"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "����������� � �������..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "���������� �������"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 msgid " "
 msgstr " "
 
 #: mail/mail-config.glade.h:2
-msgid " Edit "
-msgstr " ������ "
-
-#: mail/mail-config.glade.h:3
-msgid " New "
-msgstr " ����� "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " �������� �������������� ����� "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(� ���� ������ Evolution SSL �� ��������������)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(� ���� ������ Evolution SSL �� ��������������)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "������ ��������� ���� ������, ����� ���������� ����������� �����"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 msgid "Account Editor"
 msgstr "�������� �ޣ���� �������"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "���������� �� �ޣ���� ������"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "���������� �ޣ����� ��������"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "�������� ��������"
+msgid "Add Sc_ript"
+msgstr "�������� ��������"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "��������"
+msgid "Add new signature..."
+msgstr "��������� �������"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "������ ��������� ���� ������, ����� ���������� ����������� �����"
 
 #: mail/mail-config.glade.h:14
-msgid "Alerts"
-msgstr "�������"
-
-#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 "������ ����������� ��������� ���������, ����� ������������ ��� �ޣ���� ������"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "������ ���������� ������� �����:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "������ ���������� �����:"
 
-#: mail/mail-config.glade.h:19
-msgid "Arabic"
-msgstr "��������"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "Attach original message"
 msgstr "������������ �������� ���������"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "������������ ����"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "��������������"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Automatically _detect links"
 msgstr "������������� ��������� ������"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "����� ��������:"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "�����"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "�������� ����� �����"
 
 #: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "���� ��� ���� � ��������: "
+
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr "�������� ���������"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11159,53 +11909,44 @@ msgstr ""
 "\n"
 "������� \"���������\", ����� ��������� ���� ���������."
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "�����"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "������� ��������"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "��������� �� ���������"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Default character _encoding:"
 msgstr "��������� �������� ��-���������:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "��������� ��.�����"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "�������� ID..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "���������� ������� ���������"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "Drafts _folder:"
 msgstr "����� ����������:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
@@ -11223,37 +11964,32 @@ msgstr "��.�����:"
 msgid "Empty _trash folders on exit"
 msgstr "������� �������� ������� ��� ������"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "��������� �������..."
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "������������� ��"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr "�������� �������"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "����������� ���������"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "�������� �������� �������������..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Highlight _quotations with"
 msgstr "�������� ������ � �������"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "��������"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
@@ -11304,66 +12040,62 @@ msgstr "Microsoft"
 msgid "NNTP Server:"
 msgstr "������ NNTP"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "��������� � ����� �����"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "News Servers"
 msgstr "������� ��������"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "�������������� ����������"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "�����������:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "ID ����� PGP/GPG:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "������� ����"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "������������� ��� �������� ���������, � ������� ���������� ������ ���������� "
 "������� �����."
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "���������� ��������� ��������"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "�������� ������� Qmail "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "���������� ������� ���������"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "�������������"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "��������� ���� ������"
@@ -11393,111 +12125,120 @@ msgid "S_ecurity"
 msgstr "������������"
 
 #: mail/mail-config.glade.h:104
-msgid "Same as text"
-msgstr ""
-
-#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "���������� MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Select PGP program"
 msgstr "������� ��������� PGP"
 
-#: mail/mail-config.glade.h:111
-msgid "Select a signature file"
-msgstr "������� ���� �������"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "������� �ӣ ����� �������"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "�������� ��.�����"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "����� ������������ ���������:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "������������ ��������� � ���������"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "������ ������� �������������"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "��������� �������"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "��� �������:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "������"
 
-#: mail/mail-config.glade.h:121
-msgid "Signature"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Signature #1"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "�������"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "���������� �� ���������"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 msgid "Specify _filename:"
 msgstr "������� ��� �����:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+#, fuzzy
+msgid "Spell Checking Language"
 msgstr "�������� ����������"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Spell _Checking"
+msgstr "�������� ����������"
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "����������� ���� Unix mbox"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-msgid "Use _HTML for this signature"
-msgstr "������������ ������ _HTML ��� ���� �������"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11507,135 +12248,130 @@ msgstr ""
 "\n"
 "������� \"����.\" ��� ������."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "�������"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "������ ��������� �����������"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "������ ����������� ���������, ����� ������������ ��� �ޣ���� ������"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "��� ��������������: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 msgid "_Authentication type: "
 msgstr "��� ��������������: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "������������� ��������� ����� �����"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "������������� ��������� ����� �����"
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr "����� �� �������� ����� �����"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "������������� �����������:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr "���� ��� ���� � ��������: "
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "������������ ����������� ���������, ���������� ��� ���̣����, � �����"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "���� ������� � ��������� ������� "
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "������� ��������"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr "�� ������������� ��� ������� ����� �����"
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
-msgid "_Filename:"
-msgstr "��� �����:"
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Enable"
+msgstr "��������"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "��������� ���"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 msgid "_Full name:"
 msgstr "������ ���:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 msgid "_HTML Mail"
 msgstr "����� � ������� HTML"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "���� ������� � ������� HTML:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Identity"
 msgstr "�����������"
 
-#: mail/mail-config.glade.h:163
-msgid "_Language:"
-msgstr "����"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "��������� �����������, ���� ����������� ���� � �������� �����"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 msgid "_Make this my default account"
 msgstr "������� ���� �������� �ޣ���� �������"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 msgid "_Mark messages as read after"
 msgstr "�������� ��������� ��� \"�����������\" �����:"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "���:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "������� �� ��������� �����������"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "���� � ��������� PGP:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Play sound file when new mail arrives"
 msgstr "������������� �������� ���� �� �������� ����� �����"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "������������� ��� �������� ��������� � ������� HTML ���, ��� �� ������ �����"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "������������� ��� �������� ��������� � ������ �����"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "�����"
-
 #: mail/mail-config.glade.h:175
 msgid "_Receiving Mail"
 msgstr "��������� ��.�����"
@@ -11671,67 +12407,51 @@ msgid "_Signatures"
 msgstr "�������"
 
 #: mail/mail-config.glade.h:183
-msgid "_Text Signature:"
-msgstr "���� ������� � ��������� ������� "
-
-#: mail/mail-config.glade.h:184
 msgid "_Use secure connection (SSL):"
 msgstr "������������ ���������� ���������� (SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "������"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 msgid "color"
 msgstr "����"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "�� ������� ������� �������� ������� PGP"
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "�� ������� ������� �������� �������� PGP"
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "�� ������� ������� �������� ���������� PGP"
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "�� ������� ������� �������� ������������ PGP"
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "�� ������� ������� �������� ������� s/MIME"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "�� ������� ������� �������� S/MIME certonly"
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "�� ������� ������� �������� ���������� S/MIME"
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "�� ������� ������� �������� �������� S/MIME"
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "�� ������� ������� �������� ������������� S/MIME"
 
@@ -11774,97 +12494,130 @@ msgstr "������� ��������� ���������"
 msgid "Loading message content"
 msgstr "�������� ����������� ���������"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "������������ ������:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "������� ������ � ��������"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "����������� ������"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "��������� ������ ���"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "��������� ����������� ���..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s ������������ ����"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "�� ������� ��������� ��������� MIME. ������������ ��� ����."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "�������� ��.�����"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "��"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "��������"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "�����"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "���.�����:"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 msgid "Mailer"
 msgstr "�������� ������: "
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "��������� ��������� ���..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "�� ������� ������� �������� �������� PGP"
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "��������� �� FTP ���� (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "��������� �� ��������� ���� (%s), ��������� �� ����� \"%s\""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "��������� �� ��������� ���� (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "��������� �� ���̣���� ������ (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "��������� �� ����������� ������� ������ (���� \"%s\")"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "����� external-body ������� ������������"
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "��������� �����"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "������������� �����"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11873,28 +12626,28 @@ msgstr ""
 "���������� ��������� ���������� �����, ��������, �� ����������\n"
 "��� ������ �� ������ ������� ��� �����: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "���������� ��������� ���������� ����� � %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "���������� ������� ���������� ����� %s: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "��������� ����� \"%s\" � ������ \"%s\""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 "%s ����� �� ��������� �������������, ��� ��� �� �������� ��������� ������"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11902,11 +12655,11 @@ msgstr ""
 "���� �� �� ������ ������ ������� ���� ����,\n"
 "��������, ��� ���ģ��� ������������ ��� �������."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "�� �� ������ �������� ������ ����������� �����."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "������������� /%s"
@@ -11964,81 +12717,73 @@ msgstr "���� �� ��������� %d �� %d"
 msgid "Complete."
 msgstr "���������."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "���������� ��������� � �����"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "����������� ��������� � %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "����������� ��������� � %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "�����������"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "�����������"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "������������ ����� �� \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "����������� ���������"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "�������� ����� \"%s\""
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "�������� ��������� %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "�������� ����� \"%s\""
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "���������� ����� \"%s\""
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "���������� �����"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "�������� �����"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "��������� ��������� %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "��������� %d ���������"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "���������� %d ���������"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12047,7 +12792,7 @@ msgstr ""
 "���������� ������� ���� ������: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12056,11 +12801,11 @@ msgstr ""
 "������ ���������� ��������� �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "���������� ������������� �����"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12069,27 +12814,27 @@ msgstr ""
 "�� ������� ������� ���� ������: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�� ������� �������� ������: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "���������� �� %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "��������������� � %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "���������� ������� ��������: %s"
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "�����"
 
@@ -12160,10 +12905,6 @@ msgstr "����������..."
 msgid "Waiting..."
 msgstr "��������..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "��������."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "�������� �������� �������������."
@@ -12177,16 +12918,16 @@ msgstr "������� ������ ��� %s"
 msgid "Enter Password"
 msgstr "���� ������"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "�� ������� ��������� ���� �������: %s"
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "��������� �������"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12196,10 +12937,30 @@ msgstr ""
 "\n"
 "�� ������ ��������� ���������?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "��������:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "���� �������:"
+msgid "Signature hint"
+msgstr "�������"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "���� ������� � ������� HTML:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12214,17 +12975,17 @@ msgstr "����������� ���������"
 msgid "Forwarded Message"
 msgstr "����������� ���������"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "��������� ����������� �����: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "���������� ����������� ����� ��� uri: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12237,89 +12998,94 @@ msgstr ""
 "    '%s'\n"
 "� ���� ���������."
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "����������� �����"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "����.�����"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "������� ����������� �����"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "������� �������������� �������������� ����������� ����� \"%s\"."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "����� ����������� �����"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(��� ����)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - ���������"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "�����������"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "���������"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "��������"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "��������� ������������� ���������"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "��������� ���������"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "����� ������"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "������"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "�������"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "����� �������"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "������� %I:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "����� %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "�������� ������ ���������"
 
@@ -12342,10 +13108,15 @@ msgstr ""
 
 #: mail/message-list.etspec.h:8
 #, fuzzy
+msgid "Original Location"
+msgstr "�������� �������:"
+
+#: mail/message-list.etspec.h:9
+#, fuzzy
 msgid "Received"
 msgstr "���� ���������"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "������"
 
@@ -17054,5227 +17825,5224 @@ msgstr ""
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr ""
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr ""
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr ""
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr ""
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr ""
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr ""
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr ""
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr ""
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr ""
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "����"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr ""
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr ""
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr ""
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr ""
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr ""
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr ""
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "����-���"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "������"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "������/����"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "������/������"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "������/������"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr ""
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "���-������"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "���-�������"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "������"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr ""
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr ""
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr ""
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr ""
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr ""
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr ""
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr ""
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr ""
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr ""
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr ""
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr ""
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "������"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr ""
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr ""
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr ""
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr ""
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr ""
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr ""
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr ""
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr ""
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr ""
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr ""
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr ""
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr ""
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr ""
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr ""
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr ""
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr ""
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr ""
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr ""
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr ""
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr ""
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr ""
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr ""
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr ""
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr ""
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr ""
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr ""
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "������"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr ""
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr ""
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr ""
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "������"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "������� ������"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr ""
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "�������-���������"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "����������� ����"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "����������� [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "����������� [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr ""
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr ""
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr ""
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr ""
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr ""
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr ""
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr ""
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr ""
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr ""
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr ""
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr ""
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr ""
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr ""
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr ""
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "������ ����������"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "������ �����������"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr ""
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "�������� (��������)"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr ""
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr ""
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr ""
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr ""
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "������"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr ""
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr ""
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr ""
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr ""
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr ""
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr ""
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr ""
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr ""
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr ""
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "���-����"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "���-���� - �������� JFK"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "���������� �������"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr ""
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr ""
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "������ ��������"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr ""
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr ""
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "������� NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr ""
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "�������� ��������"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr ""
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "�������� ������"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "��������������� �����������"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr ""
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr ""
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr ""
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr ""
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "������"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr ""
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr ""
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr ""
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr ""
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "�������� ����"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr ""
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "����"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr ""
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr ""
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "������"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr ""
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "����� (������������� ��������)"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "������"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr ""
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr ""
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr ""
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "���� �������"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "����-�����"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "������"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr ""
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr ""
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "�����/����� �� ����"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "�����/�� �����"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "�����/����"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr ""
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr ""
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr ""
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr ""
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr ""
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr ""
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "��������� �������� ����������"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "������"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr ""
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr ""
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "�������������-����������"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "������������"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "������"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "����"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "������"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr ""
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr ""
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr ""
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr ""
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr ""
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr ""
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr ""
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr ""
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr ""
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr ""
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr ""
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr ""
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr ""
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr ""
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr ""
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr ""
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr ""
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr ""
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "������"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "������ ����"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr ""
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr ""
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr ""
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr ""
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr ""
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr ""
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "�������"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr ""
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr ""
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr ""
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "����"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "������"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr ""
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr ""
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "��������"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "�����"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr ""
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr ""
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "������-��-����"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "������"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "����������"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr ""
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr ""
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr ""
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr ""
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr ""
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr ""
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "���������"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "������"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr ""
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr ""
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr ""
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr ""
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr ""
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr ""
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr ""
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "�����-���������"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr ""
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr ""
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr ""
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr ""
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr ""
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "������"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr ""
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr ""
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr ""
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr ""
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "������"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr ""
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr ""
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr ""
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr ""
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr ""
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr ""
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "����"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr ""
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr ""
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "����� ��������"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "����� ������"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr ""
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr ""
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "����������"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr ""
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "��������� (�������)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "��������� (������)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "����.���������"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "������"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr ""
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr ""
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr ""
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr ""
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "������"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "������"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr ""
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr ""
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr ""
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr ""
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr ""
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr ""
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "������"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "����� (������������� ��������)"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "������"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr ""
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr ""
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr ""
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr ""
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr ""
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr ""
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr ""
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr ""
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr ""
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr ""
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "������"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "���"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "����-���"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "���������� �������� �������"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr ""
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "���"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr ""
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr ""
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr ""
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr ""
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr ""
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr ""
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "�����"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr ""
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr ""
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "�����������"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr ""
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr ""
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr ""
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr ""
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr ""
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr ""
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "�������"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr ""
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "���������"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr ""
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr ""
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "��������"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "������"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "������������"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr ""
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "������"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr ""
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "�����"
 
@@ -22302,17 +23070,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "��� ��������"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "������� ���������� � �����"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "����������� �����"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "��������� �����"
 
@@ -22321,54 +23084,46 @@ msgstr "��������� �����"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "UWWW"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "����� ��� � Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "������ ���"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "�������� ����� ��������"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "���� URL ��������� ��������, ������� �� ������ ��������"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "��������:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "������ ��� �������� RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "�������� ��������"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr "���"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
-msgid "Add ->"
-msgstr "�������� ->"
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-msgid "<- Remove"
-msgstr "<- �������"
+#: my-evolution/e-summary-shown.c:545
+#, fuzzy
+msgid "Add"
+msgstr "��������"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "�����"
@@ -22409,10 +23164,43 @@ msgstr "���������� ������"
 msgid "Printing of Summary failed"
 msgstr "���� ������ ������"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "��������� Executive summary: �� ������� ���������������� Bonobo.\n"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " �"
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "������..."
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "��/�"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "���� ��.��."
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "��.��.��"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "����"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "���������"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "����� ����"
@@ -23564,100 +24352,106 @@ msgid "C_elsius"
 msgstr "�������� �������"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "��� ��������� ��������"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "����� ���������� ���� ������ ��������� ���������� ������������?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "����. ����� ������������ ���������:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "��������� ��������� ��������"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "���� �����"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "���� ������"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "������ ���������� (������):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "������ ���������� (������):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "���������� ������ ���� � ������"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "���������� ��� ������"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "���������� ������ �� �������"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "���������� ����������� �:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "������ "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "��������� ������"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "�������� ����������"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "���� ����"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "�����"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "��������� ��������"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "���� ����"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "����������"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "������"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "������� ��� ��������� ����� ��������� Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "������� �����"
+msgid "Folder Settings"
+msgstr "��������� �����"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "�������� Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -23668,6 +24462,38 @@ msgstr "���������� �����������"
 msgid "Cancel Operation"
 msgstr "�������� ��������"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"���������� ����������� �����:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "������� �����"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "���������"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "��������"
+
+#: shell/e-local-storage.c:176
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "������������"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "��������� Evolution"
@@ -23776,6 +24602,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "������� ��� ���"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "�������� �����"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "������� �����"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "������� �����"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "������� �����"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "�������� �����"
+
 #: shell/e-shell-folder-commands.c:140
 #, c-format
 msgid "Cannot copy folder: %s"
@@ -23803,20 +24654,20 @@ msgstr "���������� ����������� ����� � ����������� ��������."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "������� �����, � ������� ����� ����������� ����� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "����������� �����"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "������� �����, � ������� ����� ���������� ����� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "����������� �����"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23825,18 +24676,19 @@ msgstr ""
 "���������� ������� �����:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "������� \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "�� ������� � ���, ��� ������ ������� ����� \"%s\"?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"���������� ������� �����:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23845,16 +24697,16 @@ msgstr ""
 "���������� ������� �����:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "������������� ����� \"%s\" �:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "������������� �����"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23873,7 +24725,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - ����� �����"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -23881,7 +24733,7 @@ msgstr ""
 "��� ��������� ����� �� �������� ���\n"
 "������������ ��������."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "�����..."
 
@@ -23933,21 +24785,26 @@ msgstr ""
 "�������������� %s\n"
 "�������������� �������� %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "������� �����"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "���� \"%s\" �� ����������."
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "������ Evolution "
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "�� ������ ������������� ������ ��������� �����"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -23956,11 +24813,11 @@ msgstr ""
 "��� ���������, ������� �������� ����������\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "��������������"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -23969,17 +24826,17 @@ msgstr ""
 "�������������� %s.\n"
 "������ %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "������ ��� �������� %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "������ ��� �������� %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -23988,31 +24845,31 @@ msgstr ""
 "�������������� %s\n"
 "�������������� �������� 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "��������������"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "��� �����:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "������� ����"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "��� �����:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "������ ������ � �������� �� ������ ��������"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "������ ������ �����"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24020,31 +24877,78 @@ msgstr ""
 "���������� ���������...\n"
 "������������ ������������ ��������"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "������ ����������������� �����ԣ��"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "�� %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "������� �����"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "�������� ����� ���������� ��� ������� ���� ������"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "�������������"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "�������� ����������..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"������ ��� \"%s\":\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "������������� �����"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "�������� ����� \"%s\""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "�������� ����� \"%s\""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "������� � %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"���������� ������� ��������� �����:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -24058,8 +24962,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "�� ������� ��������� ��������� ��������� ��������� Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "�����"
@@ -24080,43 +24984,43 @@ msgstr "�������� ����� �� ����� ��������� ����� �����."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" � \"..\" -- ����������������� �������� �����."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy �� ������."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "�� ������� ��������� Bug buddy."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "� ��������� Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "������� � �����..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "�������� �����, ������� �� ������ �������"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "������� ����� �����"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "�������� �����, �� ������� ����� ����� ���������:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "������� � ������� �����"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "������� � ���������� �����"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "������� � ����� ������ ��� ����"
 
@@ -24151,7 +25055,7 @@ msgstr ""
 "Ximian Evolution ������ � ���������� ������ ������. ������� �� ��� ������ "
 "��� �������� � ����� ������ � ����."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24163,12 +25067,12 @@ msgstr ""
 "������ ������� ���������:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "���������� ���������� ��������� ��������� -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24179,23 +25083,19 @@ msgstr ""
 "���������� ����������. ��� ���������� ������������� Evolution ��� ����,\n"
 "����� ����� ����� ������ � ����� ������."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "��"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "������������ ���������"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "�� ������� ���������������� � OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "���� ������ �������� �� �������"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "������� ������"
 
@@ -24220,95 +25120,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "�� �������"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "������������� ������ �������"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "������������� ��������� ������ ������� �:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "��������� �����������"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "���������� ������ ��� ��������� �����������"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "������� �����������"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "���������� ������ ��� ������� �����������"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "����� ������..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "������� ����� ������ �������"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "������� ��� ������..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "������� ��� ������ �������"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "������������� ��� ������..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "������������� ��� ������ �������"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "������ ������ �������"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "������ ������ �������"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "������������� �����"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "������������� ��������� ����� �:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "������� �����, ��������� � ���� �������"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "������� � ����� ����"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "������� �����, ��������� � ���� �������, � ����� ����"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "�������������"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "������������� ���� �����"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "�������"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "������� ���� ����� �� ������ �������"
 
@@ -24320,10 +25220,6 @@ msgstr "������ ���������� �������."
 msgid "Shortcuts"
 msgstr "������"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "��������"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -24386,10 +25282,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ���������)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<ݣ������ ����� ����� ������� �����>"
 
@@ -24430,67 +25327,67 @@ msgstr ""
 "������ ������� ���������:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "������ CORBA"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "��������"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "������������ ��������"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "��� ����� ���������"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "��� ���������"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "�� �������"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "���������������� ���"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "���������������� �����"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "���������������� ��������"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "���������� ������"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "����������"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "������������ URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "����� ��������� �����"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "��� �����"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "������ �������� �������� ������"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 msgid "Test type"
 msgstr "��� ��������"
 
@@ -24620,49 +25517,81 @@ msgstr "�� ���������� �����"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution ����� ������������� ������ �� ��������� ������:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "����� �� Evolution..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "�� ���������� �����"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "��� ������� � �������� Ximian Evolution."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "���������� ���������������� �������� Evolution: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "��������� ��������"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "������ ��������������"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "������ ����������������� �����ԣ��"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "���������� ���������� ����� ���� ����������� � ����."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "���������� ���������������� ������������ ������� Bonobo."
 
@@ -24773,11 +25702,11 @@ msgstr "�������� �������� ��������"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "��������"
 
@@ -24898,8 +25827,8 @@ msgstr "������� ���� �������"
 msgid "Delete this item"
 msgstr "������� ���� �������"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "������� ������ ������������"
 
@@ -24939,7 +25868,7 @@ msgstr "��������� ���� ������� �� �����"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "����"
 
@@ -25004,19 +25933,19 @@ msgstr "��������� ��� i_Calendar"
 msgid "Forward this item via email"
 msgstr "��������� ���� ������� ����� ��.�����"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "�������� ��������� ���������� �� ���������"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "�������� ���������"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "�������� ��������� � ����������"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "�������� ��������� � ���������� ��� ����� ��������"
 
@@ -25024,10 +25953,6 @@ msgstr "�������� ��������� � ���������� ��� ����� ��������"
 msgid "Customise My Evolution"
 msgstr "��������� �� ����� My Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "��������"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "�������� ������� �������� ��������"
@@ -25181,7 +26106,7 @@ msgstr "���������� �������� �� ���� ��������� � ������ ���������"
 msgid "_Expunge"
 msgstr "���������� ���̣����"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "�����"
 
@@ -25577,7 +26502,7 @@ msgstr "����������� ���������"
 msgid "_Quoted"
 msgstr "�������������"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "�����������"
 
@@ -25592,12 +26517,12 @@ msgstr "������� ��� ����"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "�������"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "���"
 
@@ -25784,7 +26709,7 @@ msgstr "�������..."
 msgid "_Reply-To Field"
 msgstr "���� \"�����\""
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "�������"
 
@@ -25929,110 +26854,119 @@ msgid "Move this folder to another place"
 msgstr "����������� ��� ����� � ������ �����"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "������� ����� �����..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "������� � ����� ����"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "������� ��� ����� � ����� ����"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "�������� � ���������"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr "��������� ����� �� ������� � �������� ����� �����"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "�������� ���������� � ��������� Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "��������� ��������� �� ������"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "��������� ��������� �� ������"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "��������� ��������� �� ������ ��������� Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "�����������"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "����������� ����������� ������ �����"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "����������� ����������� ������ �������"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "����������� ������ �/��� ����."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "�������� ��������� �����"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "���� �� Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "� ��������� Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "�����������..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "������ �����"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "������� � �����..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "�������������..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "�����������..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "�������"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "������� �����"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "��������� Pilot..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "�������������..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "�������� � ���������"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "�����"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "������ �������"
 
@@ -26117,21 +27051,21 @@ msgstr ""
 "������� ����.\n"
 " ����������� ������ ������ ��� ���������� �������."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "����������"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "����������"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "���������� ���� ���������"
 
@@ -26252,16 +27186,21 @@ msgstr "�������� ������"
 msgid "Save Search"
 msgstr "��������� ���������� ������"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "��������� ���������� ������"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "�������� � ��������� ����������� ������"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "�����������..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "����������"
@@ -26283,19 +27222,19 @@ msgstr "���������"
 msgid "Don't show this message again."
 msgstr "�� ���������� ��� ��������� �����."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 msgid "_Find Now"
 msgstr "�����"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 msgid "_Clear"
 msgstr "��������"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "��������"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "�����"
 
@@ -26321,6 +27260,194 @@ msgstr "init_corba(): �� ������� ���������������� GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 
+#~ msgid "Addressbook Settings"
+#~ msgstr "��������� �������� ����"
+
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr ""
+#~ "�������� ������� �������������� ����������:\n"
+#~ "%s"
+
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "��������� Executive Summary ��������� ��������� Evolution."
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "������� ��� ���������� \"��������� �������\"."
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "������ ���:"
+
+#~ msgid "_End of day:"
+#~ msgstr "����� ���:"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "������ �����������"
+
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "���������� ������� �� �������������� ���� ������"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "����������, ������� ��� %s ������ ��� %s"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "����������, ������� ��� %s ������."
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "���������� ��������� ��� ���������: ��� ������ ��� �������"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "���������� ��������� ��� ���������: �� ���ģ� ������"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "���������� ��������� ��� ���������: �� ������� ������� ����� � GPG/PGP: %s"
+
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr ""
+#~ "���������� ��������� ��� ���������: ��� ������ ��� ���������� �������"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "���������� ��������� ��� ���������: ��� ������ ��� ��������"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "���������� ��������� ��� ���������: �� ������� ������� ����� � GPG/PGP: %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "���������� ����������� ��� ���������: ��� ������ ��� ����������"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "���������� ����������� ��� ���������: �� ���ģ� ������"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "���������� ����������� ��� ���������: �� ������� ������� ����� � GPG/PGP: "
+#~ "%s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "���������� ������������ ��� ���������: ��� �������������� ������ ��� "
+#~ "�����������"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "���������� ������������ ��� ���������: �� ���ģ� ������"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "���������� ������������ ��� ���������: �� ������� ������� ����� � GPG/"
+#~ "PGP: %s"
+
+#~ msgid "%s server %s"
+#~ msgstr "%s ������ %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(���� ����������)"
+
+#~ msgid "No such message: %s"
+#~ msgstr "��� ������ ���������: %s"
+
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "�� �� ������ ����������� ��������� �� ���� �������� �������."
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "���������� �������� ��������� � ����� �����: %s: %s"
+
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "�� ������� ��������: %s: %s"
+
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "���� ����� \"%s\" �� ���������� ��� �� �������� ������� ������"
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "�����"
+
+#~ msgid ""
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
+#~ msgstr ""
+#~ "�� ������� �������� \"��������\" ��� ������ ��������� �����:\n"
+#~ "%s\n"
+#~ "����� �� ����� ������."
+
+#~ msgid " Edit "
+#~ msgstr " ������ "
+
+#~ msgid " New "
+#~ msgstr " ����� "
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "�������� ��������"
+
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "��������"
+
+#~ msgid "Arabic"
+#~ msgstr "��������"
+
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "�����"
+
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "��������"
+
+#~ msgid "Select a signature file"
+#~ msgstr "������� ���� �������"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "������� �ӣ ����� �������"
+
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "������������ ������ _HTML ��� ���� �������"
+
+#~ msgid "_Filename:"
+#~ msgstr "��� �����:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "���� ������� � ������� HTML:"
+
+#~ msgid "_Language:"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "�����"
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "�� ������� ������� �������� ���������� PGP"
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "�� ������� ������� �������� ������������ PGP"
+
+#~ msgid "Moving"
+#~ msgstr "�����������"
+
+#~ msgid "Copying"
+#~ msgstr "�����������"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "���� �������:"
+
+#~ msgid "Riga"
+#~ msgstr "����"
+
+#~ msgid "Add ->"
+#~ msgstr "�������� ->"
+
+#~ msgid "<- Remove"
+#~ msgstr "<- �������"
+
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "�� ������� � ���, ��� ������ ������� ����� \"%s\"?"
+
 #~ msgid "Card: "
 #~ msgstr "��������: "
 
@@ -26529,13 +27656,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 
 #~ msgid ""
 #~ "\n"
-#~ "Categories: "
-#~ msgstr ""
-#~ "\n"
-#~ "���������: "
-
-#~ msgid ""
-#~ "\n"
 #~ "Comment: "
 #~ msgstr ""
 #~ "\n"
@@ -26595,16 +27715,16 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgstr "��� ���������� �� ��������� ��� ����������� �������� LDAP."
 
 #~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
 #~ msgstr ""
-#~ "��� ���������� ������������ ����� �������� LDAP ��� ����������� ����, ����� "
-#~ "���� ������������ � ������. ��������� � ��������������� ������ ������� ��� "
-#~ "��������� �������������� ����������."
+#~ "��� ���������� ������������ ����� �������� LDAP ��� ����������� ����, "
+#~ "����� ���� ������������ � ������. ��������� � ��������������� ������ "
+#~ "������� ��� ��������� �������������� ����������."
 
 #~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
 #~ msgstr ""
 #~ "��� �������� ���� ��� ������������ ������ �� ������� LDAP. ��������� � "
 #~ "��������������� ������ ������� ��� ��������� �������������� ����������."
@@ -26645,9 +27765,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "Name contains"
 #~ msgstr "��� ��������"
 
-#~ msgid "(none)"
-#~ msgstr "(���)"
-
 #~ msgid "C_ontaining:"
 #~ msgstr "��������:"
 
@@ -26687,9 +27804,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "���������� ���������������� ��� � ������ ����������!\n"
 
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr "���������� � ��������� (� %s �� %s)"
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "������������ ��� � ����-��������, ��������� ������"
 
@@ -26739,7 +27853,8 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgstr "�� ������� �������� ��������� � ������� POP %s: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
 #~ msgstr ""
 #~ "����������� � ������� POP ����� ������������� � �������������� "
 #~ "�������������� Kerberos 4."
@@ -26753,9 +27868,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "(Unknown)"
 #~ msgstr "(����������)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "����������� ����� �� ������� POP: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "� ��������� ����������� ���� \"From\""
 
@@ -26809,18 +27921,12 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "Update automatically"
 #~ msgstr "�������� �������������"
 
-#~ msgid "Update now"
-#~ msgstr "�������� ������"
-
 #~ msgid "Update every "
 #~ msgstr "��������� ������"
 
 #~ msgid "Enter folder URI"
 #~ msgstr "������ URI �����"
 
-#~ msgid "Needs Reply"
-#~ msgstr "��������� �����"
-
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "����� ��� �������� ����� (����������)"
 
@@ -26833,27 +27939,15 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "Create vFolder from Search"
 #~ msgstr "������� ����������� ����� �� ������"
 
-#~ msgid "Mark as Needing Reply"
-#~ msgstr "�������� ��� ��������� ������"
-
 #~ msgid "Mark as Not Needing Reply"
 #~ msgstr "�������� ��� ����������� ������"
 
 #~ msgid "Filter on Mailing List"
 #~ msgstr "������ �� ������ ��������"
 
-#~ msgid "Indexing:"
-#~ msgstr "��������������:"
-
 #~ msgid "Mailbox Format"
 #~ msgstr "������ ��������� �����"
 
-#~ msgid " (default)"
-#~ msgstr " (��������)"
-
-#~ msgid "Mail Settings"
-#~ msgstr "��������� �����"
-
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr "������ ��������� ���� ������, ����� ���������� ����������� �����"
 
@@ -26866,24 +27960,15 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "Display"
 #~ msgstr "�����������"
 
-#~ msgid "Drafts"
-#~ msgstr "���������"
-
 #~ msgid "Edit..."
 #~ msgstr "������..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "���� ������� � ������� HTML:"
-
 #~ msgid "News"
 #~ msgstr "�������"
 
 #~ msgid "Select Filter Log file..."
 #~ msgstr "������� ���� ������� ��� ��������..."
 
-#~ msgid "Sent"
-#~ msgstr "������������"
-
 #~ msgid "Sources"
 #~ msgstr "���������"
 
@@ -26920,55 +28005,21 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "Regions"
 #~ msgstr "�������"
 
-#~ msgid " F"
-#~ msgstr " F"
-
-#~ msgid " C"
-#~ msgstr " �"
-
-#~ msgid "kph"
-#~ msgstr "��/�"
-
-#~ msgid "inHg"
-#~ msgstr "���� ��.��."
-
-#~ msgid "mmHg"
-#~ msgstr "��.��.��"
-
-#~ msgid "miles"
-#~ msgstr "����"
-
-#~ msgid "kilometers"
-#~ msgstr "���������"
-
 #~ msgid "Al_l stations:"
 #~ msgstr "��� �������:"
 
 #~ msgid "All _folders:"
 #~ msgstr "��� �����:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "��� ��������� ��������"
-
 #~ msgid "_Display folders:"
 #~ msgstr "���������� �����:"
 
-#~ msgid "_Display stations:"
-#~ msgstr "���������� �������:"
-
 #~ msgid "_Displayed feeds:"
 #~ msgstr "������������ ���������"
 
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright (C) 1999-2001 Ximian, Inc."
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "���������� ����������� �����:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(��� �����)"
 
diff --git a/po/sk.po b/po/sk.po
index d1456a138f..dca56b12d0 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 27.02.2002 13:56\n"
 "Last-Translator: Stanislav Višňovský <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -34,7 +34,7 @@ msgstr "Importuje súbory VCard do Evolution."
 msgid "File As"
 msgstr "Uložiť ako"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Meno"
@@ -45,7 +45,7 @@ msgid "Email"
 msgstr "E-mail"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Primárny"
 
@@ -55,7 +55,7 @@ msgstr "Prim"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Asistent"
@@ -63,8 +63,8 @@ msgstr "Asistent"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Zamestnanie"
 
@@ -74,12 +74,12 @@ msgid "Bus"
 msgstr "Zam"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Spätné volanie"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Firma"
 
@@ -90,8 +90,8 @@ msgstr "Firma"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Domov"
 
@@ -106,18 +106,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Auto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Pracovný fax"
@@ -127,13 +127,13 @@ msgid "Bus Fax"
 msgstr "Prac. fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Domáci fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Zamestnanie 2"
 
@@ -142,43 +142,43 @@ msgid "Bus 2"
 msgstr "Zam 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Domov 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Iné"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Ďalší fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Pager"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Rádio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
@@ -190,14 +190,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "E-mail 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-mail 3"
@@ -335,7 +335,7 @@ msgstr "VKartapre %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Nie je možné inicializovať Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Hľadám...."
 
@@ -356,32 +356,32 @@ msgstr "Načítavam..."
 msgid "Error in search expression."
 msgstr "Chyba v hľadanom výraze."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Pridávam kartu do serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Odstraňujem kartu zo serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Upravujem kartu na serveri LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Spúšťam hľadanie znovu."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Prijímam výsledky hľadania LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Chyba pri odstraňovaní karty"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Nie je možné spracovať URL `%s'"
@@ -428,103 +428,139 @@ 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:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "Zdroje adresára"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Prehliadač minikariet adresára Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Komponent Evolution pre prácu s kontaktami."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 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:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Vytváracie rozhranie pre zobrazovač adries Adresára"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Vytváracie rozhranie pre rozhranie adresu z Adresára."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Vytváracie rozhranie pre ukážkový ovládací prvok Adresár"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Priečinok obsahujúci informácie o kontaktoch"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "LDAP server obsahujúci informácie o kontaktoch"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Nový zoznam kontaktov"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "Zoznam _kontaktov"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Nový kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Nový zoznam kontaktov"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Nepodarilo sa pripojiť k serveru LDAP."
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "Contact _List"
-msgstr "Zoznam _kontaktov"
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Nepodarilo sa overiť na IMAP serveri.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Odpoveď IMAP serveru neobsahovala informáciu %s"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Chyba pri načítavaní informácie o filtroch:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "Odpoveď IMAP serveru neobsahovala informáciu %s"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Nie je možné inicializovať gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Iné kontakty"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Nie je možné otvoriť adresár"
@@ -557,50 +593,59 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. Prosím, overte, že cesta\n"
 "existuje a že máte dostatočné práva."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Zadajte heslo pre %s (používateľ %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "končí na"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "E-mail 2"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategória je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Ľubovoľné pole obsahuje"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Pokročilé..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Ľubovoľná kategória"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ktoré zobrazí prehliadač priečinku"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(nič)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Primárny e-mail"
 
@@ -646,106 +691,59 @@ msgstr "Zakázať otázky"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Povoliť otázky (nebezpečné)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Nepodarilo sa pripojiť k serveru LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Nepodarilo sa overiť na IMAP serveri.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Neplatná informácia nepriehľadného krokovania:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "Odpoveď IMAP serveru neobsahovala informáciu %s"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(Táto verzia Evolution nepodporuje SSL)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Dátum dokončenia"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "Kontrolovať _podporované typy"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Nastavenie"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "_Odstrániť"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "_Odstrániť"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Nastavenie"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -754,8 +752,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Zdroje adresára"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Alarmy"
@@ -818,14 +816,12 @@ msgstr "Upozorňovanie Evolution"
 #: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution použije túto e-mailovú adresu pre prihlásenie na váš server"
+msgstr "Evolution použije túto e-mailovú adresu pre prihlásenie na váš server"
 
 #: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolution použije túto e-mailovú adresu pre prihlásenie na váš server"
+msgstr "Evolution použije túto e-mailovú adresu pre prihlásenie na váš server"
 
 #: addressbook/gui/component/ldap-config.glade.h:32
 #, fuzzy
@@ -851,8 +847,8 @@ msgstr "Nastavenie"
 msgid "Mappings"
 msgstr "Okraje"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_každých"
@@ -1035,19 +1031,19 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
-"Toto je maximálny počet sťahovaných kariet. Ak nastavíte príliš "
-"veľké číslo, tento adresár bude pomalý."
+"Toto je maximálny počet sťahovaných kariet. Ak nastavíte príliš veľké číslo, "
+"tento adresár bude pomalý."
 
 #: addressbook/gui/component/ldap-config.glade.h:90
 msgid ""
@@ -1056,8 +1052,7 @@ msgid ""
 "server."
 msgstr ""
 "Toto je metóda, ktorú Evolution použije pre prihlásenie. Uvedmte si, že "
-"použitie voľby \"E-mailová adresa\" vyžaduje anonymný prístup k "
-"serveru LDAP."
+"použitie voľby \"E-mailová adresa\" vyžaduje anonymný prístup k serveru LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
@@ -1066,13 +1061,13 @@ msgid ""
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
-"Toto meno sa bude identifikovať váš účet, ale používať sa bude iba "
-"pre zobrazenie."
+"Toto meno sa bude identifikovať váš účet, ale používať sa bude iba pre "
+"zobrazenie."
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1105,7 +1100,7 @@ msgid "Using email address"
 msgstr "E-mailová adresa"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1113,7 +1108,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Pridať"
 
@@ -1162,7 +1157,7 @@ msgid "_Download limit:"
 msgstr "Obmedzenie _sťahovania"
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1280,10 +1275,12 @@ 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."
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Odstrániť"
 
@@ -1326,14 +1323,10 @@ msgid ""
 "detailed description of the circumstances under which this error\n"
 "occurred.  Thank you."
 msgstr ""
-"Evolution sa nepodarilo získať lokálny uloženie pre adresár. Je to "
-"možno\n"
-"spôsobené pádom komponentu evolution-addressbook. Aby sme lepšie "
-"pochopili\n"
-"a vyriešili tento problém, pošlite e-mail Jonovi Trowbridgeovi "
-"<trow@ximian\n"
-"com> s detailným popisom okolností, pri ktorých sa chyba objavila. "
-"Ďakujeme."
+"Evolution sa nepodarilo získať lokálny uloženie pre adresár. Je to možno\n"
+"spôsobené pádom komponentu evolution-addressbook. Aby sme lepšie pochopili\n"
+"a vyriešili tento problém, pošlite e-mail Jonovi Trowbridgeovi <trow@ximian\n"
+"com> s detailným popisom okolností, pri ktorých sa chyba objavila. Ďakujeme."
 
 #: addressbook/gui/component/select-names/e-select-names.c:724
 msgid ""
@@ -1415,7 +1408,7 @@ msgstr "Spolupráca"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Editor kontaktov"
 
@@ -1424,7 +1417,7 @@ msgid "D_epartment:"
 msgstr "O_ddelenie:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Detaily"
 
@@ -1446,8 +1439,7 @@ msgid ""
 "Internet, enter the address\n"
 "of that information here."
 msgstr ""
-"Ak táto osoba poskytuje informácie o svojom voľnom čase a iné "
-"informácie\n"
+"Ak táto osoba poskytuje informácie o svojom voľnom čase a iné informácie\n"
 "pre kalendár, zadajte sem adresu týchto informácií."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
@@ -1484,11 +1476,12 @@ msgstr "Chce prijímať poštu ako _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Odstrániť"
 
@@ -1517,7 +1510,7 @@ msgid "_Web page address:"
 msgstr "Adresa _WWW stránky:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Spojené štáty"
 
@@ -2022,12 +2015,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Lotyšsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libanon"
 
@@ -2036,7 +2028,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Libéria"
 
@@ -2045,12 +2037,12 @@ msgid "Liechtenstein"
 msgstr "Lichtenštajnsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litva"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxembursko"
 
@@ -2083,7 +2075,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2108,7 +2100,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexiko"
 
@@ -2133,7 +2125,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Maroko"
 
@@ -2158,7 +2150,7 @@ msgid "Nepal"
 msgstr "Nepál"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Holandsko"
 
@@ -2171,12 +2163,12 @@ msgid "New Caledonia"
 msgstr "Nová Kaledónia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nový Zéland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
@@ -2193,7 +2185,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Ostrov Norfolk"
 
@@ -2202,17 +2194,17 @@ msgid "Northern Mariana Islands"
 msgstr "Severné Mariánske ostrovy"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Nórsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Omán"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2225,7 +2217,7 @@ msgid "Palestinian Territory"
 msgstr "Palestínske územia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2234,12 +2226,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Nová Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguaj"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2252,22 +2244,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Poľsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugalsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Portoriko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Katar"
 
@@ -2276,7 +2268,7 @@ msgid "Reunion"
 msgstr "Reunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rumunsko"
 
@@ -2313,7 +2305,7 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome a Principe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudská Arábia"
 
@@ -2330,17 +2322,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapur"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovensko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slovinsko"
 
@@ -2353,7 +2345,7 @@ msgid "Somalia"
 msgstr "Somálsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Južná Afrika"
 
@@ -2362,7 +2354,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Južná Georgia a Južné Sandwich ostrovy"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Španielsko"
 
@@ -2383,7 +2375,7 @@ msgid "Sudan"
 msgstr "Súdán"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -2396,17 +2388,17 @@ msgid "Swaziland"
 msgstr "Swazijsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Švédsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Švajčiarsko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
@@ -2443,7 +2435,7 @@ msgid "Tunisia"
 msgstr "Tunis"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turecko"
 
@@ -2464,7 +2456,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukrajina"
 
@@ -2473,7 +2465,7 @@ msgid "United Arab Emirates"
 msgstr "Spojené Arabské Emiráty"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Spojené kráľovstvo"
 
@@ -2482,7 +2474,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguaj"
 
@@ -2495,12 +2487,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2521,12 +2513,12 @@ msgid "Western Sahara"
 msgstr "Západná sahara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Juhoslávia"
 
@@ -2539,26 +2531,32 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Naozaj chcete odstrániť tento kontakt?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Odstrániť kontakt?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Editor kategórií nie je k dispozícii."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patrí do týchto kategórií:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Uložiť kontakt ako VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nie je možné nájsť prvok pre pole: `%s'"
@@ -2585,11 +2583,11 @@ msgstr "E-mail"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "zoznam"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2724,11 +2722,11 @@ msgid "contact-list-editor"
 msgstr "editor-zoznamu-kontaktov"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Editor zoznamu kontaktov"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Uložiť zoznam ako VCard"
 
@@ -2805,21 +2803,21 @@ msgid "Error getting book view"
 msgstr "Chyba pri vytváraní pohľadu na adresár"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Chyba pri zmene karty"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Úspech"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
@@ -2828,7 +2826,7 @@ msgid "Repository offline"
 msgstr "Sklad off-line"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Prístup zamietnutý"
 
@@ -2846,53 +2844,68 @@ msgstr "Protokol nepodporovaný"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Zrušený"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Overenie zlyhalo."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autentifikácia vyžadovaná"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Iná chyba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Chcete uložiť zmeny?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Chyba pri pridávaní zoznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Chyba pri pridávaní karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Chyba pri zmene zoznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Chyba pri odstraňovaní zoznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Chyba pri odstraňovaní karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 msgid "Display Cards?"
 msgstr "Zobraziť karty?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards"
 msgstr "Zobraziť karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2902,19 +2915,19 @@ msgstr ""
 "Požadujete, aby %d kariet bolo kartami. Otvorí sa %d nový okien.\n"
 "Naozaj chcete zobraziť všetky tieto karty?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 msgid "Move card to"
 msgstr "Presunúť kartu do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Copy card to"
 msgstr "Kopírovať kartu do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 msgid "Move cards to"
 msgstr "Presunúť karty do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 msgid "Copy cards to"
 msgstr "Kopírovať karty do"
 
@@ -2978,100 +2991,106 @@ msgstr "Iný telefón"
 msgid "Other Address"
 msgstr "Iná adresa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Adresár"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Uložiť ako VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Nový kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nový zoznam kontaktov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Prejsť do priečinku..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Import..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Hľadať kontakty"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Zdroje _adresára..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Nastavenie _pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Predať ďalej kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Poslať správu kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tlačiť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Tlačiť obálku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Copy to folder..."
 msgstr "Kopírovať do priečinku..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Move to folder..."
 msgstr "Presunúť do priečinka..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Vystrihnúť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Vložiť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3081,7 +3100,7 @@ msgstr "_Aktuálny pohľad"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3089,7 +3108,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3237,7 +3256,7 @@ msgstr "Okraje"
 msgid "Number of columns:"
 msgstr "Počet stĺpcov:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Nastavenie"
 
@@ -3247,7 +3266,7 @@ msgid "Orientation"
 msgstr "Orientácia"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Strana"
 
@@ -3321,29 +3340,33 @@ msgstr "Šírka:"
 msgid "_Font..."
 msgstr "_Písmo..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Schôdzka bez mena"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Vysoká"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normálny"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Nízka"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Nedefinovaná"
 
@@ -3385,43 +3408,34 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Vytváracie rozhranie pre editor správ Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Komponent Súhrn kalendára Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Prehliadač iTip/mTip kalendára Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Komponent Evolution pre prácu s kalendárom."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Vytváracie rozhranie pre komponent Súhrnu kalendára."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Vytváracie rozhranie pre ovládací prvok úloh Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Vytváracie rozhranie pre ovládací prvok pohľadu iTip kalendára"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Vytváracie rozhranie pre ukážkový ovládací prvok Kalendár."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
-msgstr ""
-"Vytváracie rozhranie pre centralizáciu komponent Kalendár Evolution."
+msgstr "Vytváracie rozhranie pre centralizáciu komponent Kalendár Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Vytváracie rozhranie pre vytváracie rozhrania komponentu editor"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3433,10 +3447,23 @@ msgstr "Služba upozorňovania na poplachy"
 msgid "Factory for the alarm notification service"
 msgstr "Vytváracie rozhranie pre službu na upozornenie na poplach"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "Od:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "Do:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "neplatný čas"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution "
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3475,7 +3502,7 @@ msgstr ""
 "Evolution preto zobrazí normálny dialóg."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varovanie"
@@ -3490,8 +3517,8 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Práve sa má vyvolať pripomenutie kalendára Evolution. Je nastavený tak, "
-"že sa má spustiť tento program:\n"
+"Práve sa má vyvolať pripomenutie kalendára Evolution. Je nastavený tak, že "
+"sa má spustiť tento program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -3501,18 +3528,17 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Pre tento program túto správu už nezobrazovať."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Nie je možné inicializovať GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "Nie je možné vytvoriť službu upozorňovania"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
-msgstr ""
-"Nie je možné vytvoriť vytváracie rozhranie pre službu upozorňovania"
+msgstr "Nie je možné vytvoriť vytváracie rozhranie pre službu upozorňovania"
 
 #: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
@@ -3526,7 +3552,7 @@ msgstr "Popis obsahuje"
 msgid "Comment contains"
 msgstr "Komentár obsahuje"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Nenájdené"
 
@@ -3563,18 +3589,20 @@ msgstr "%d %B"
 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."
+"Nie je možné vytvoriť kalendárový pohľad. Prosím, overte nastavenie ORBit a "
+"OAF."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Súkromný"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Tajný"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Verejný"
 
@@ -3595,27 +3623,32 @@ msgid "W"
 msgstr "Z"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Voľný"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Nezačal"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Prebieha"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Dokončený"
 
@@ -3630,11 +3663,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3649,12 +3683,14 @@ msgstr "Opakovanie"
 msgid "Assigned"
 msgstr "Priradené"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Áno"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Nie"
 
@@ -3674,58 +3710,60 @@ msgstr "Týždeň"
 msgid "Month View"
 msgstr "Mesiac"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalendár"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Priečinok obsahujúci schôdzky a udalosti"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Priečinok obsahujúci úlohy to-do"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "New meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "_Meeting"
 msgstr "_Stretnutie"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "New task"
 msgstr "Nová úloha"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "Ú_loha"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nová schôdzka"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "S_chôdzka"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "New appointment"
 msgstr "Nová schôdzka"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "_Appointment"
 msgstr "S_chôdzka"
 
@@ -3788,9 +3826,8 @@ msgid ""
 "This is an email reminder, but Evolution does not yet support this kind of "
 "reminders.  You will not be able to edit the options for this reminder."
 msgstr ""
-"Toto je poštové pripomenutie, ale Evolution túto funkciu zatiaľ "
-"nepodporuje. Pre toto pripomenutie nebudete môcť upravovať jeho "
-"nastavenia."
+"Toto je poštové pripomenutie, ale Evolution túto funkciu zatiaľ nepodporuje. "
+"Pre toto pripomenutie nebudete môcť upravovať jeho nastavenia."
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
@@ -3936,7 +3973,7 @@ msgstr "Pripomenutia"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Súhrn:"
 
@@ -3965,7 +4002,7 @@ msgstr "koniec schôdzky"
 msgid "hour(s)"
 msgstr "hodín"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minút"
 
@@ -3993,79 +4030,81 @@ msgstr "30 minút"
 msgid "60 minutes"
 msgstr "60 minút"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Nastavenie kalendára a úloh"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Farba pre nestihnuté úlohy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Farba pre úlohy do dnešného dňa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Dni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Piatok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Hodiny"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minúty"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Pondelok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "_Ne"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "_Začiatok dňa:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "_Ne"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Úlohy s _dnešným termínom:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "Š_tv"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "_Ut"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4094,81 +4133,96 @@ msgid "Tuesday"
 msgstr "Utorok"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Streda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Pracovný týždeň"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12-hodinový (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 hodín"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pýtať sa na potvrdenie pri odstraňovaní"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "Z_hustiť víkendy v mesačnom pohľade"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Úloha začína: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Zobrazenie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "_Koniec dňa:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "P_ia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Všeobecné"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_Skryť dokončené úlohy po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Úlohy _po termíne:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_So"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Zobraziť _koncové časy schôdzok v týždennom a mesačnom pohľade"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Ro_zdelenie času:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_Ut"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_Str"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "pred začiatkom schôdzky"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4251,40 +4305,61 @@ msgstr " (Termín do "
 msgid "Due "
 msgstr "Termín do "
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
 msgstr "Nepodarilo sa korektne aktualizovať objekt!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Nepodarilo sa korektne aktualizovať objekt!"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Upraviť schôdzku"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Schôdzka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Úloha - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Položka denníka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Žiadny súhrn"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Uložiť ako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Nepodarilo sa získať aktuálnu verziu!"
 
@@ -4342,27 +4417,27 @@ msgstr "Delegovať na:"
 msgid "Enter Delegate"
 msgstr "Zadajte na koho delegovať"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Schôdzka"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Pripomenutie"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Opakovanie"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Plánovanie"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Stretnutie"
 
@@ -4409,7 +4484,7 @@ msgid "Pu_blic"
 msgstr "_Verejné"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Zobraziť čas ako"
 
@@ -4431,19 +4506,19 @@ msgstr "Čas _konca:"
 msgid "_Start time:"
 msgstr "Čas _začiatku:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Organizátor je vyžadovaný."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Nutný je aspoň jeden účastník."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Táto osoba sa už zúčastňuje!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Delegovať na..."
 
@@ -4454,49 +4529,55 @@ msgstr "Účastník"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Spoločé meno"
+msgid "Click here to add an attendee"
+msgstr "Kliknutím pridáte účastníka"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delegované od"
+msgid "Common Name"
+msgstr "Spoločé meno"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegované na"
+msgid "Delegated From"
+msgstr "Delegované od"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Jazyk"
+msgid "Delegated To"
+msgstr "Delegované na"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Člen"
+msgid "Language"
+msgstr "Jazyk"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Člen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rola"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stav"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -4511,14 +4592,10 @@ msgid "_Change Organizer"
 msgstr "_Zmeniť organizátora"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Pozvať ostatných..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Iný organizátor"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4567,8 +4644,7 @@ msgstr " "
 
 #: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Táto schôdzka obsahuje opakovanie, ktoré Evolution nedokáže upraviť."
+msgstr "Táto schôdzka obsahuje opakovanie, ktoré Evolution nedokáže upraviť."
 
 #: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
@@ -4706,7 +4782,7 @@ msgid "Progress"
 msgstr "Priebeh"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4718,19 +4794,19 @@ msgstr "_Priorita:"
 msgid "_Status:"
 msgstr "_Stav:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Základné"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Priradenie"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Popis:"
 
@@ -4742,23 +4818,78 @@ msgstr "_Počiatočný dátum:"
 msgid "_Due Date:"
 msgstr "_Termín:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Odstráňujem vybrané objekty"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Uložiť ako..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4766,20 +4897,20 @@ msgstr "Uložiť ako..."
 msgid "_Print..."
 msgstr "_Tlačiť..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Vystri_hnúť"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopírovať"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4787,35 +4918,36 @@ msgstr "_Kopírovať"
 msgid "_Paste"
 msgstr "_Vložiť"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Priradiť úlohu"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Poslať ďalej ako i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_Označiť ako dokončenú"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Označiť úlohy ako dokončené"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "O_dstrániť vybrané úlohy"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Aktualizujem objekty"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknutím pridáte úlohu"
 
@@ -4823,47 +4955,48 @@ msgstr "Kliknutím pridáte úlohu"
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Hotovo"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Dátum dokončenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Termín"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Dátum konca"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Geografické umiestnenie"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Priorita"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Dátum štartu"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Súhrn"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Triedenie úloh"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4911,11 +5044,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "dopoludnia"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "popoludní"
 
@@ -4956,7 +5091,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Publikovať informácie o voľnom čase"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Nastaviť %s"
@@ -4967,7 +5102,7 @@ msgid "_Configure Pilot..."
 msgstr "Nastaviť %s"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "Uložiť _ako..."
 
@@ -4994,77 +5129,390 @@ msgid "Delete _All Occurrences"
 msgstr "Odstrániť _všetky výskyty"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-"Vyzerá to, že nemáte nainštalované nástroje pre PalmPilota GNOME."
+msgstr "Vyzerá to, že nemáte nainštalované nástroje pre PalmPilota GNOME."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Chyba pri vykonávaní %s."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "Stretnutie začína: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "Úloha začína: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "Informácia o voľnom čase začína: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Začína: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "Stretnutie končí: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "Informácia o voľnom čase končí: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "Končí: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "Úloha dokončená: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "Termín úlohy: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "Informácie o iCalendar"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "Chyba iCalendar"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "Neznáma osoba"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Prosím, skontrolujte tieto informácie a potom vyberte z menu akciu."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Žiadna</i>"
+
+#: calendar/gui/e-itip-control.c:903
+msgid "Status:"
+msgstr "Stav:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Akceptované"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+msgid "Tentatively Accepted"
+msgstr "Predbežne akceptové"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Odmietnuté"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "Súbor kalendára nie je aktualizovať!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "Vyberte akciu:"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Aktualizovať"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "Akceptovať"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "Predbežne akceptovať"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "Odmietnuť"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "Poslať informácie o voľnom čase"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "Aktualizovať stav respondenta"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "Poslať najnovšie informácie"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> poslal informácie o stretnutí."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Informácie o stretnutí"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> požaduje vašu účasť na stretnutí."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "Návrh na stretnutie"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> si praje byť pridaný na existujúce stretnutie."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "Aktualizácia stretnutia"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> si praje dostať najnovšie informácie o stretnutí."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "Požiadavka na aktualizáciu stretnutia"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> odpovedal na požiadavku o stretnutí."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "Odpoveď pre stretnutie"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> zrušil stretnutie."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "Zrušenie stretnutia"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> poslal nerozpoznateľnú správu."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Neplatná správa o stretnutí"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> poslal informácie o úlohe."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Informácia o úlohe"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> požaduje, aby ste vykonali úlohu."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Návrh úlohy"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> si praje byť pridaný do existujúcej úlohy."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Aktualizácia úlohy"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> si praje získať najnovšie informácie o úlohe."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Požiadavka na aktualizáciu úlohy"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> odpovedal na priradenie úlohy."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Odpoveď pre úlohu"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> zrušil úlohu."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Zrušenie úlohy"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Neplatná správa úlohy"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> publikoval informácie o voľnom čase."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Informácie o voľnom čase"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> požaduje informáciu o vašom voľnom čase."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Požiadavka na informácie o voľnom čase"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> odpovedal na požiadavku na informácie o voľnom čase"
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Odpoveď s informácio o voľnom čase"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Neplatná správa o voľnom čase"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Priečinok vyzerá ako nenapraviteľne poškodený."
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "Táto správa obsahuje iba nepodporované požiadavky."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "Príloha neobsahuje platnú správu kalendára"
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "Príloha nemá žiadne zobraziteľné položky kalendára"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#, fuzzy
+msgid "There was an error on the CORBA system\n"
+msgstr "Nastala chyba pri sťahovaní dát pre"
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Položku nie je možné poslať!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Aktualizácia dokončená\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Súbor kalendára nie je aktualizovať!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
-"Stav účastníka nie je možné aktualizovať, pretože položka už "
-"neexistuje"
+"Stav účastníka nie je možné aktualizovať, pretože položka už neexistuje"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
-"Stav účastníka nie je možné aktualizovať, pretože jeho stav nie je "
-"platný!\n"
+"Stav účastníka nie je možné aktualizovať, pretože jeho stav nie je platný!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "Stav účastníka nie je možné aktualizovať!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka bol aktualizovaný\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "Stav účastníka nie je možné aktualizovať!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Odstránenie dokončené"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Položka poslaná!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "Položku nie je možné poslať!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Vybrať priečinok"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vybrať priečinok"
@@ -5106,93 +5554,92 @@ msgstr "dátum konca"
 msgid "date-start"
 msgstr "dátum začiatku"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Predsedovia"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Vyžadovaní účastníci"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Nepovinní účastníci"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Bez účasti"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Individuálne"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Skupina"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Zdroj"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Miestnosť"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Predseda"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Vyžadovaný účastník"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Nepovinný účastník"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Bez účasti"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Potrebné úkony"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Akceptované"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Odmietnuté"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Predbežný"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Delegované"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "Prebieha"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5204,63 +5651,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Mimo kancelárie"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Žiadna informácia"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Nastavenie"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Zobraziť _iba pracovné hodiny"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Ukázať z_menšené"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Obnoviť voľno/zaneprázdnený"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Autovýber"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Všetky osoby a zdroje"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Všetky _osoby a jeden zdroj"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "_Vyžadované osoby"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Vyžadované osoby a _jeden zdroj"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "_Začiatok stretnutia:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "_Koniec stretnutia:"
 
@@ -5279,17 +5726,22 @@ msgstr "Nepodarilo sa načítať úlohy v `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metódy potrebná pre načítanie `%s' nie je podporovaná"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Nie je možné otvoriť priečinok v `%s'"
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Dátum dokončenia"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Odstráňujem vybrané objekty"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 msgid "Expunging"
 msgstr "Čistím"
 
@@ -5301,17 +5753,17 @@ msgstr "Nová _schôdzka..."
 msgid "_Delete this Appointment"
 msgstr "O_dstrániť túto schôdzku"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, 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:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metóda nutná k otvoreniu `%s' nie je podporovaná"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otváram kalendára na%s"
@@ -5372,19 +5824,53 @@ msgstr "Október"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Nutný je aspoň jeden účastník"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Organizátor musí byť nastavený."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr "informácie o udalosti"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "Informácie o úlohe"
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr "Informácie o denníku"
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr "Informácie o voľnom čase"
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr "Informácie o kalendári"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Aktualizovať"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Obnoviť zoznam"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Musíte byť účastníkom stretnutia."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "Nie je možné vytvoriť vytváracie rozhranie pre komponent editora"
 
@@ -5573,12 +6059,45 @@ msgstr "Vybraný mesiac (%b - %Y)"
 msgid "Selected year (%Y)"
 msgstr "Vybraný rok (%Y)"
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "Úloha"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Stav: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Priorita:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Dokončených percent: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Kategórie: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Kontakty: "
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Tlačiť kalendár"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5596,8 +6115,7 @@ msgstr "Nastavenie tlačiarne"
 msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr ""
-"Nie je možné vytvoriť pohľad úloh. Prosím, overte nastavenie ORBit a "
-"OAF."
+"Nie je možné vytvoriť pohľad úloh. Prosím, overte nastavenie ORBit a OAF."
 
 #: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
@@ -5610,14 +6128,13 @@ msgid ""
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Táto operácia natrvalo odstráni všetky úlohy označené ako "
-"dokončené. Ak budete pokračovať, nebude už možné tieto úlohy "
-"obnoviť.\n"
+"Táto operácia natrvalo odstráni všetky úlohy označené ako dokončené. Ak "
+"budete pokračovať, nebude už možné tieto úlohy obnoviť.\n"
 "\n"
 "Naozaj odstrániť tieto úlohy?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Túto správu už nezobrazovať."
 
@@ -5641,10 +6158,9 @@ msgid ""
 "Some of the tasks could not be migrated, so this process may be attempted "
 "again in the future."
 msgstr ""
-"Evolution sa pokúsil automaticky previesť úlohy z priečinku kalendára "
-"do nového priečinku úloh.\n"
-"Niektoré úlohy nebolo možné preniesť, takže je možné sa o to "
-"pokúsiť neskôr."
+"Evolution sa pokúsil automaticky previesť úlohy z priečinku kalendára do "
+"nového priečinku úloh.\n"
+"Niektoré úlohy nebolo možné preniesť, takže je možné sa o to pokúsiť neskôr."
 
 #: calendar/gui/tasks-migrate.c:120
 #, c-format
@@ -5661,8 +6177,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 ""
-"Metóda pre načítanie `%s' nie je podporovaná, žiadne položky z "
-"priečinku kalendára nebudú prenesené do priečinku úloh."
+"Metóda pre načítanie `%s' nie je podporovaná, žiadne položky z priečinku "
+"kalendára nebudú prenesené do priečinku úloh."
 
 #: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
 msgid "SMTWTFS"
@@ -5680,6 +6196,11 @@ msgstr "Importuje súbory iCalendar do Evolution"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importuje súbory vCalendar do Evolution"
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Pripomenutie"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5713,8 +6234,7 @@ msgstr "make-time očakáva ako prvý argument reťazec"
 
 #: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr ""
-"make-time očakáva prvý argument reťazec dátumu/času podľa ISO 8601"
+msgstr "make-time očakáva prvý argument reťazec dátumu/času podľa ISO 8601"
 
 #: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
@@ -5774,8 +6294,8 @@ msgstr "contains? očakáva ako druhý argument reťazec"
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 "contains? očakáva ako prvý argument jednu z hodnôt \"any\", \"summary\", "
 "\"description\""
@@ -6706,638 +7226,654 @@ msgid "Asia/Macao"
 msgstr "Ázia/Makao"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Ázia/Makao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Ázia/Magadan"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Ázia/Magadan"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Ázia/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Ázia/Muscat"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Ázia/Nikózia"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Ázia/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Ázia/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Ázia/Kábul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Ázia/Phnom_Penh"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Ázia/Pontianak"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Ázia/Pchjongjang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Ázia/Katar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Ázia/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Ázia/Rangoon"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Ázia/Riyád"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Ázia/Saigon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Ázia/Sachalin"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Ázia/Samarkand"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Ázia/Soul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Ázia/Šanghaj"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Ázia/Singapur"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Ázia/Taipei"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Ázia/Taškent"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Ázia/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Ázia/Teherán"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Ázia/Thimphu"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Ázia/Tokio"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Ázia/Ujung_Pandang"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Ázia/Ulanbátár"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Ázia/Urumqi"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Ázia/Vientiane"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Ázia/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Ázia/Jakutsk"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Ázia/Jekaterinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Ázia/Jerevan"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azorské ostrovy"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermudy"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Kanárske ostrovy"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Kapverdy"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faerské ostrovy"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Mayen"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madeira"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Rejkjavík"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/Južná_Georgia"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/Svätá Helena"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlantik/Stanley"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Austrália/Adelaide"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Austrália/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Austrália/Broken_Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Austrália/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Austrália/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Austrália/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Austrália/Lord_Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Austrália/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Austrália/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Austrália/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Európa/Amsterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Európa/Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Európa/Atény"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Európa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Európa/Belehrad"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Európa/Berlín"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Európa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Európa/Brusel"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Európa/Bukurešť"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Európa/Budapešť"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Európa/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Európa/Kodaň"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Európa/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Európa/Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Európa/Helsinki"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Európa/Istanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Európa/Kaliningrad"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Európa/Kyjev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Európa/Lisabon"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Európa/Lublaň"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Európa/Londýn"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Európa/Luxembourg"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Európa/Madrid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Európa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Európa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Európa/Monako"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Európa/Moskva"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Európa/Nikózia"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Európa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Európa/Paríž"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Európa/Praha"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Európa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Európa/Rím"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Európa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Európa/San_Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Európa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Európa/Simferopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Európa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Európa/Sofia"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Európa/Stockholm"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Európa/Talin"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Európa/Tirana"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Európa/Užhorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Európa/Vaduz"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Európa/Vatikán"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Európa/Viedeň"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Európa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Európa/Varšava"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Európa/Záhreb"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Európa/Záporožné"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Európa/Curych"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Indický oceán/Antananarivo"
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Indický oceán/Chagos"
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Indický oceán/Vianočné ostrovy"
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Indický oceán/Kokosové ostrovy"
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indický oceán/Komory"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Indický oceán/Kerguelen"
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indický oceán/Mahe"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indický oceán/Maledivy"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indický oceán/Maurícius"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indický oceán/Mayotte"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indický oceán/Reunion"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Tichý oceán/Apia"
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Tichý oceán/Auklandy"
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Tichý oceán/Chatham"
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Tichý oceán/Velkonočné ostrovy"
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Tichý oceán/Efate"
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Tichý oceán/Enderbury"
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Tichý oceán/Fakaofo"
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Tichý oceán/Fidži"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Tichý oceán/Funafuti"
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Tichý oceán/Galapágy"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Tichý oceán/Gambier"
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Tichý oceán/Guadalcanal"
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Tichý oceán/Guam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Tichý oceán/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Tichý oceán/Johnston"
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Tichý oceán/Kiritimati"
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Tichý oceán/Kosrae"
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Tichý oceán/Kwajalein"
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Tichý oceán/Majuro"
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Tichý oceán/Marquesas"
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Tichý oceán/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Tichý oceán/Nauru"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Tichý oceán/Niue"
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Tichý oceán/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Tichý oceán/Noumea"
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Tichý oceán/Pago_Pago"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Tichý oceán/Palau"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Tichý oceán/Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Tichý oceán/Ponape"
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Tichý oceán/Port_Moresby"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Tichý oceán/Rarotonga"
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Tichý oceán/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Tichý oceán/Tahiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Tichý oceán/Tarawa"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Tichý oceán/Tongatapu"
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Tichý oceán/Truk"
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Tichý oceán/Wake"
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Tichý oceán/Wallis"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Tichý oceán/Yap"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Digitálny podpis nie je podporovaný touto šifrou"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Digitálny podpis v čistom texte nie je podporovaný touto šifrou"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Overenie podpisu nie je podporované touto šifrou"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Šifrovanie nie je podporované touto šifrou"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Dešifrovanie nie je podporované touto šifrou"
 
@@ -7345,12 +7881,12 @@ msgstr "Dešifrovanie nie je podporované touto šifrou"
 msgid "Unable to create cache path"
 msgstr "Nepodarilo sa vytvoriť cestu pre vyrovnávaciu pamäť"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nie je možné odstrániť položku vyrovnávacej pamäti: %s: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7361,7 +7897,7 @@ msgstr ""
 "Ďalšie operácie na tomto serveri nebudú znovu vykonané\n"
 "pri ďalšom pripojení na sieť."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7372,11 +7908,16 @@ msgstr ""
 "%s\n"
 "Zmeny v tomto priečinku nebudú zosynchronizované."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Obnovujem synchronizáciu so serverom"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Ukladám priečinok '%s'"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Pre dokončenie tejto operácie musíte pracovať on-line"
 
@@ -7384,56 +7925,67 @@ msgstr "Pre dokončenie tejto operácie musíte pracovať on-line"
 msgid "Syncing folders"
 msgstr "Synchronizujem priečinky"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Chyba pri spracovávaní filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Chyba pri vykonávaní filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Nie je možné otvoriť priečinok fronty"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Nie je možné spracovať priečinok fronty"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Získavam správu %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Nie je možné otvoriť správu"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Zlyhala správa %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Synchronizujem priečinok"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Získavam správu %d z %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 msgid "Failed to retrieve message"
 msgstr "Nepodarilo sa prijať správu"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Nepodarilo sa uložiť správu %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Nepodarilo sa uložiť správu %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Chyba pri vykonávaní hľadania filtra: %s: %s"
@@ -7465,25 +8017,102 @@ msgstr "(odpovedá všetkému) vyžaduje jeden pravdivostný výsledok"
 msgid "Performing query on unknown header: %s"
 msgstr "Vykonanie otázky na neznámej hlavičke: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodporovaná operácia: pridať správu: pre %s"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodporovaná operácia: hľadanie výrazom: %s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodporovaná operácia: hľadanie pomocou uid: %s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Presúvam správy"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Kopírujem správy do %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Zrušené."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Nezadané meno súboru."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Nie je možné zašiftovať správu: adresáti nie sú definovaní"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Nepodarilo sa uložiť správu %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Nepodarilo sa uložiť správu %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Nepodarilo sa dekódovať správu."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Nie je možné overiť správu: nie je možné vytvoriť dočasný súbor: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7579,91 +8208,24 @@ msgstr "Chyba pri zápise pošty do dočasného súboru: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Chyba kopírovaní dočasného súboru: pošty %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Prosím, zadajte vaše %s heslo pre %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Prosím, zadajte vaše %s heslo"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Nie je možné podpísať správu: žiadny text na podpis"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "Nie je možné podpísať správu: nezadané heslo"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Nie je možné podpísať správu: nie je možné vytvoriť rúru do "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Nie je možné podpísať správu: žiadny text pre podpis v texte"
-
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Nie je možné overiť správu: žiadny text na overenie"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Nie je možné overiť správu: nie je možné vytvoriť rúru do GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Nie je možné overiť správu: nie je možné vytvoriť dočasný súbor: %s"
 
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Nie je možné zašifrovať správu: žiadny text na zašifrovanie"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Nie je možné zašifrovať správu: nezadané heslo"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Nie je možné zašifrovať správu: nie je možné vytvoriť rúru do "
-"GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Nie je možné zašiftovať správu: adresáti nie sú definovaní"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-"Nie je možné dešifrovať správu: žiadny šifrovaný text na "
-"dešifrovanie"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Nie je možné dešifrovať správu: nezadané heslo"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Nie je možné dešifrovať správu: nie je možné vytvoriť rúru do "
-"GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+#, fuzzy
+msgid "Failed to decrypt MIME part: parse error"
+msgstr "Nepodarilo sa dešifrovať: Neznáme"
 
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Toto je digitálne podpísaná časť správy"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Iná chyba"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7681,43 +8243,6 @@ msgstr "Nie je možné načítať %s: %s"
 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:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s server %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s služba pre %s na %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Spojenie zrušené"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, 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:258
-msgid "(unknown host)"
-msgstr "(neznámy hostiteľ)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Operácia zrušená"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Server neočakávane zrušil spojenie: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonymný"
@@ -7778,8 +8303,8 @@ 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 bezpečného hesla DIGEST-MD5, "
-"ak ho podporuje server."
+"Táto voľba vás pripojí k serveru pomocou bezpečného hesla DIGEST-MD5, ak ho "
+"podporuje server."
 
 #: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
@@ -7824,7 +8349,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpoveď na overenie od serveru."
 
@@ -7835,8 +8360,7 @@ msgstr "Prihlásenie"
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr ""
-"Táto voľba pripojí na server pomocou hesiel prenášaných ako čistý "
-"text."
+"Táto voľba pripojí na server pomocou hesiel prenášaných ako čistý text."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -7853,11 +8377,9 @@ msgid ""
 "Password Authentication."
 msgstr "Táto voľba vás pripojí na server pomocou overenia Kerberos 4."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Heslo"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7884,52 +8406,52 @@ msgstr "Prihlásenie POP pred SMTP nie pomocou zdroja POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Preklad regulárneho výrazu zlyhal: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vyžaduje komponentu používateľského mena"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vyžaduje komponentu hostiteľa"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vyžaduje komponentu cesty"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Zisťujem adresu: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Zlyhalo hľadanie mena: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: hostiteľ nenájdený"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: neznámy dôvod"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Zisťujem adresu: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: hostiteľ nenájdený"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: neznámy dôvod"
@@ -7993,15 +8515,13 @@ msgstr "Nepodarilo sa dekódovať správu."
 msgid "Failed to verify certificates."
 msgstr "Nepodarilo sa overiť certifikáty"
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
-msgstr ""
-"Nie je možné získať priečinok: Neplatná operácia pre tento sklad"
+msgstr "Nie je možné získať priečinok: Neplatná operácia pre tento sklad"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
-msgstr ""
-"Nie je možné vytvoriť priečinok: Neplatná operácia pre tento sklad"
+msgstr "Nie je možné vytvoriť priečinok: Neplatná operácia pre tento sklad"
 
 #: camel/camel-tcp-stream-openssl.c:614
 #, c-format
@@ -8029,7 +8549,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8042,16 +8562,16 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Podpis:         %s"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr "DOBRE"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr "ZLE"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8071,15 +8591,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nie je možné spracovať URL `%s'"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Taká správa neexistuje %s v %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Žiadna taká správa: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Kontrolujem novú poštu vo všetkých priečinkoch"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8101,68 +8621,77 @@ msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Nemôžete skopírovať správy z tohto priečinku s odpadkami."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Operácia zrušená"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Server neočakávane zrušil spojenie: %s"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Odpoveď serveru skončila príliš skoro."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odpoveď IMAP serveru neobsahovala informáciu %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Neočakávaná odpoveď OK od IMAP serveru: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie je možné vytvoriť priečinok %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nie je možné načítať súhrn pre %s"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Priečinok bol zničený a znovu vytvorený na serveri."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Hľadám zmenené správy"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Táto správa momentálne nie je k dipozícii"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Sťahujem súhrnné informácie pre nové správy"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Hľadám nové správy"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Nie je možné nájsť telo správy v odpovedi FETCH."
 
@@ -8216,34 +8745,84 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pre čítanie a ukladanie pošty na IMAP serveroch."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Heslo"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 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."
+"Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako čistý text."
+
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s služba pre %s na %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Spojenie zrušené"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Nie je možné spojenie s %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Nepodarilo sa pripojiť k POP serveru.\n"
+"Chyba pri posielaní hesla: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Operácia nepodporovaná"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Overenie zlyhalo."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Požadovaný spôsob overenia %s nie je podporovaný IMAP serverom %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Overenie typu %s nie je podporované."
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, 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:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Nezadali ste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8254,74 +8833,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Priečinok %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodičovský priečinok nesmie obsahovať podpriečinky"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Nie je možné otvoriť poštovú schránku: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Poštové priečinky vo formáte MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Pre ukladanie lokálnej pošty v poštových priečinkoch typu MH."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Lokálne doručenie"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Pre ukladanie lokálnej pošty v štandardnom formáte mbox."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Aplikovať filtre na nové správy v priečinku novej pošty"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Poštové priečinky vo formáte maildir"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Pre ukladanie lokálnej pošty v priečinkov vo formáte maildir."
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Štandardný Unixový súbor mbox"
-
-#: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
-"Pre čítanie a ukladanie lokálnej pošty v priečinkov v štandardnom "
-"formáte Unix mbox."
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr "Strom priečinkov zo súborov mbox"
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Štandardný Unixový súbor mbox"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"Pre prístup k pošte uloženej v externom strome súborov mbox.\n"
-"To umožňuje priamy prístup k priečinkom pine a elm.\n"
-"POZNÁMKA: Tento poskytovateľ je stále ešte experimentálny, takže\n"
-"nezabudnite najprv svoju poštu zálohovať."
+"Pre čítanie a ukladanie lokálnej pošty v priečinkov v štandardnom formáte "
+"Unix mbox."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Koreň ukladania %s nie je absolútna cesta"
@@ -8347,7 +8941,7 @@ msgstr "Lokálne ukladanie nemá priečinok pre novú poštu"
 msgid "Local mail file %s"
 msgstr "Lokálny poštový súbor %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nie je možné premenovať priečinok %s na %s: %s"
@@ -8367,33 +8961,31 @@ msgstr "Nie je možné odstrániť súbor súhrnu priečinku `%s': %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nie je možné odstrániť indexový súbor priečinku`%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nie je možné uložiť súhrn: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nie je možné pridať správu do súhrnu: neznámy dôvod"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Pridanie správy maildir zrušené"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nie je možné pridať správu do priečinku maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8402,20 +8994,19 @@ msgstr ""
 "Nie je možné získať správu: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Taká správa neexistuje"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Neplatný obsah správy"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8426,13 +9017,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Priečinok `%s' neexistuje."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8448,7 +9039,7 @@ msgstr "`%s' nie je priečinok maildir."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie je možné odstrániť priečinok `%s': %s"
@@ -8457,8 +9048,8 @@ msgstr "Nie je možné odstrániť priečinok `%s': %s"
 msgid "not a maildir directory"
 msgstr "nie je priečinok maildir"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nie je možné prehľadať priečinok `%s': %s"
@@ -8479,45 +9070,37 @@ msgstr "Kontrolujem novú poštu"
 msgid "Checking for new messages"
 msgstr "Hľadám nové správy"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Ukladám priečinok"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Nie je možné získať zámok na priečinok %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nie je možné otvoriť poštovú schránku: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Pridanie pošty zrušené"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nie je možné pridať správu do súboru mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8526,13 +9109,11 @@ msgstr ""
 "Nie je možné získať správu: %s z priečinku %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Priečinok vyzerá ako nenapraviteľne poškodený."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Vytvorenie správy zlyhalo: Poškodená poštová schránka?"
 
@@ -8575,149 +9156,149 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Priečinok `%s' nie je prázdny. Neodstránený."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nie je možné otvoriť priečinok %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Kritická chyba spracovania správy na pozícii %ld v priečinku %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nie je možné skontrolovať priečinok: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nie je možné otvoriť súbor %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nie je možné otvoriť dočasnú poštovú schránku: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Súhrn a priečinok si neodpovedajú, ani po synchronizácii"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Chyba pri zápise do dočasnej schránky: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Zápis do dočasnej schránky zlyhal: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nie je možné zatvoriť zdrojový priečinok: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie je možné zatvoriť dočasný priečinok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie je možné premenovať priečinok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Súhrn a priečinok si neodpovedajú, ani po synchronizácii"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznáma chyba: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Nie je možné premenovať priečinok: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Chyba pri zápise do dočasnej schránky: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Zápis do dočasnej schránky zlyhal: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Pridanie správy MH zrušené"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nie je možné pridať správu do priečinok mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' nie je priečinok."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Nie je možné otvoriť cestu MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Nie je možné pridať správu do súboru fronty: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Lokálne priečinky nie je možné premenovať"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Fronta `%s' neexistuje alebo nie je normálny súbor."
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "Koreň ukladania %s nie je normálny priečinok"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Priečinok `%s/%s' neexistuje."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Lokálny poštový súbor %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Lokálne priečinky nie je možné premenovať"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Lokálne priečinky nie je možné premenovať"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Lokálne priečinky nie je možné odstrániť"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nie je možné synchronizovať dočasný priečinok %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nie je možné synchronizovať priečinok fronty %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8726,40 +9307,30 @@ msgstr ""
 "Nie je možné synchronizovať priečinok fronty %s: %s\n"
 "Priečinok je asi poškodený, kópia uložená do `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Nie je uložiť: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Fronta `%s' neexistuje alebo nie je normálny súbor."
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "Pošta pre %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Diskusné skupiny USENET"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
+msgstr "Toto je prístup k čítaniu a posielaniu do Diskusných skupín USENET."
+
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Nie je možné vytvoriť priečinok %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
-"Toto je prístup k čítaniu a posielaniu do Diskusných skupín USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Diskusné skupiny USENET pomocou %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8859,7 +9430,7 @@ msgstr "Nechať poštu na serveri"
 msgid "Delete after %s day(s)"
 msgstr "Odstrániť po %s dňoch"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8872,8 +9443,8 @@ msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 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ú."
+"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-provider.c:81
 msgid ""
@@ -8881,36 +9452,26 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"Táto voľba vás spojí s POP serverom pomocou šifrovaného hesla "
-"protokolom APOP. Nemusí to fungovať pre všetkých používateľov aj keď "
-"server tvrdí, že tento protokol podporuje."
+"Táto voľba vás spojí s POP serverom pomocou šifrovaného hesla protokolom "
+"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:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "Operácia nepodporovaná"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Overenie zlyhalo."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, 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:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8918,27 +9479,27 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Požadovaný spôsob overenia nie je podporovaný."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "SASL `%s' Prihlásenie zlyhalo: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr "SASL chyba protokolu"
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr "Chyba V/V: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sProsím, zadajte POP heslo pre %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8947,13 +9508,13 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Priečinok `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9011,8 +9572,7 @@ msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
 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"
+msgstr "Pre doručenie pošty spojením sa so vzdialeným serverom pomocou SMTP.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
@@ -9061,13 +9621,11 @@ msgstr "Používateľ nie je lokálny, bude predaná podľa <forward-path>"
 #: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
-"Požadovaná poštová akcia nevykonaná, poštová schránka nie je k "
-"dispozícii"
+"Požadovaná poštová akcia nevykonaná, poštová schránka nie je k dispozícii"
 
 #: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
-msgstr ""
-"Požadovaná akcia nevykonaná, poštová schránka nie je k dispozícii"
+msgstr "Požadovaná akcia nevykonaná, poštová schránka nie je k dispozícii"
 
 #: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
@@ -9083,8 +9641,7 @@ msgstr "Požadovaná akcia nevykonaná: nedostatok miesta v systéme"
 
 #: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
-"Požadovaná poštová akcia prerušená: presiahnutá alokácia miesta"
+msgstr "Požadovaná poštová akcia prerušená: presiahnutá alokácia miesta"
 
 #: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
@@ -9118,45 +9675,45 @@ msgstr "Dočasné zlyhanie overenia."
 msgid "Authentication required"
 msgstr "Autentifikácia vyžadovaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, 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:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Správa nevyzerá ako platná."
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Vypršal čas požiadavky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Chyba odpovede DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Požadovaný spôsob overenia %s nie je podporovaný SMTP serverom %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sProsím, zadajte SMTP heslo pre %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9167,88 +9724,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Doručenie pošty SMTP pomocou %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 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:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Posielam správu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 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:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nie je možné poslať správu: adresáti nie sú platní"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, 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:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Chyba odpovede HELO: %s: nie je kritická"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "Prihlásenie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Chyba pri vytváraní overovacieho objektu SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Vypršal čas požiadavky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "Požiadavka AUTH zlyhala."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Neplatná odpoveď na overenie od serveru.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, 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:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr "Chyba odpovede MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, 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:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> zlyhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Vypršal čas posielania DATA: %s: pošta neodoslaná"
@@ -9256,35 +9813,35 @@ msgstr "Vypršal čas posielania DATA: %s: pošta neodoslaná"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr "Chyba odpovede DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, 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:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr "Chyba odpovede ukončenia DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Vypršal čas odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr "Chyba odpovede RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, 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:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr "Chyba odpovede QUIT"
 
@@ -9357,52 +9914,52 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Navrhnúť automatické zobrazovanie príloh"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Kliknutím zobrazíte adresár"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Zadajte adresátov správy"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 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:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9415,7 +9972,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Priložiť súbor"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Nepodarilo sa vytvoriť kontext podpisu PGP."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9424,34 +9986,34 @@ msgstr ""
 "Chyba pri čítaní súboru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Varovanie!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Súbor existuje, prepísať ho?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladaní súboru: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri načítavaní súboru: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba pri prístupe k súboru: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Nie je možné získať správu z editora"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9460,7 +10022,7 @@ msgstr ""
 "Nepodarilo sa hľadať v súbore: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9469,7 +10031,7 @@ msgstr ""
 "Nepodarilo sa skrátiť súbor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9478,7 +10040,7 @@ msgstr ""
 "Chyba pri automatickom ukladaní správ: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9486,7 +10048,7 @@ msgstr ""
 "Ximian Evolution našiel neuložené súbory z predchádzajúceho sedenia.\n"
 "Chcete sa pokúsiť o ich záchranu?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9496,23 +10058,43 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Varovanie: Zmenená správa"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Otvoriť súbor"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Vložiť súbor"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Uložiť podpis"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (štandard)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Napísať správu"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9520,7 +10102,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať ovládací prvok pre výber adresy."
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9528,6 +10110,12 @@ msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať komponent HTML editor."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9588,7 +10176,7 @@ msgstr "Predmet obsahuje"
 msgid "Subject does not contain"
 msgstr "Predmet neobsahuje"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9732,7 +10320,7 @@ msgstr "hodiny"
 msgid "minute"
 msgstr "minúty"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "sekúnd"
 
@@ -9807,7 +10395,7 @@ msgstr " naspäť"
 msgid "ago"
 msgstr "späť"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9819,6 +10407,21 @@ msgstr "<kliknutím vyberiete dátum>"
 msgid "Filter Rules"
 msgstr "Pravidlá filtra"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Zadajte meno súboru:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Fronta `%s' neexistuje alebo nie je normálny súbor."
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Vyberte akciu:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9837,7 +10440,7 @@ msgstr ""
 "Prosím, vráťte sa a zadajte platný priečinok, kam doručiť poštu."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Vybrať priečinok"
 
@@ -9850,7 +10453,11 @@ msgstr ""
 "Chyba v regulárnom výraze '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
@@ -9880,7 +10487,7 @@ msgstr "ak odpovedajú všetky kritériá"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "ak odpovedá niektoré kritérium"
 
 #: filter/filter-rule.c:780
@@ -9959,190 +10566,200 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Firma"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "obsahuje"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Kopírovať do priečinku"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Dátum prijatia"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Dátum odoslania"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Odstránené"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "neobsahuje"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "nekončí na"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "neexistuje"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "nevyzerá ako"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "nezačína na"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Neexistuje"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Návrh"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "končí na"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr "Vykonať príkaz"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Existuje"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "existuje"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Výraz"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Dôležité"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is after"
 msgstr "je po"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "is before"
 msgstr "bolo pred"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr "je označený"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "je viac než"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "je menej než"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "nie je"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 msgid "is not Flagged"
 msgstr "nie je označený"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Konferencia"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Telo správy"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Hlavička správy"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Presunúť do priečinku"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Prehrať zvuk:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Prečítaná"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Adresáti"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regul. výraz"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Odpovedaná"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Skóre"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Odosielateľ"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Nastaviť stav"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Veľkosť (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "vyzerá ako"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Zdrojový účet"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Špecifická hlavička"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "začína na"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Zastaviť spracovanie"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Predmet"
 
@@ -10197,7 +10814,8 @@ msgid "Scanning %s"
 msgstr "Prehľadávam %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Pošta"
 
@@ -10213,10 +10831,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Adresár"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10266,7 +10880,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje vaše staré dáta Netscape"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Odpadky"
 
@@ -10402,273 +11018,279 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Priečinok obsahujúci poštu"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Virtuálne odpadky"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Virtuálny priečinok s odpadkami"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Tento priečinok nemôže obsahovať správy."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Zmení vlastnosti tohto priečinku"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
-"Niektoré vaše nastavenia pošty vyzerajú ako poškodené. Prosím, "
-"skontrolujte, že je všetko v poriadku."
+"Niektoré vaše nastavenia pošty vyzerajú ako poškodené. Prosím, skontrolujte, "
+"že je všetko v poriadku."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Nemáte nastavený spôsob prenosu pošty"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Varovanie: Zmenená správa"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Nová správa"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Poslať správu"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie je možné inicializovať poštový komponent Evolution."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
-msgstr ""
-"Nie je možné inicializovať konfiguračný komponent pre poštu Evolution."
+msgstr "Nie je možné inicializovať konfiguračný komponent pre poštu Evolution."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
-"Nie je možné inicializovať komponent pre infomácie o priečinkoch "
-"Evolution."
+"Nie je možné inicializovať komponent pre infomácie o priečinkoch Evolution."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Pripájam sa na server..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Nie je možné zaregistrovať sklad u shellu"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Vlastnosti \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d nových"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "skrytých %d"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr "%d viditeľných"
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d vybraných"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d neposlaných"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d poslaných"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "celkovo %d"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Vytvoriť _virtuálny priečinok zo správy"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "Vpriečinok na _predmet"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "Vpriečinok na _adresátov"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "VPriečinok na _konferenciu"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielateľovi"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresátoch"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Odpovedať _zoznamu"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Odpovedať _všetkým"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Follow _Up..."
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Označiť ako _Dokončený"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Vymazať _značky"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Označiť ako _prečítanú"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Označiť ako _dôležitú"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Označiť ako nedô_ležitú"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Obnoviť _zmazané"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Presunúť do priečinka..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Kopírovať do priečinku..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "Laurel"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Pridať odosielateľa do _adresára"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Použiť filtre"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VPriečinok na konferenciu"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VPriečinok na konferenciu (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Štandard"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Získanie informácie o priečinku"
 
@@ -10682,8 +11304,7 @@ msgstr "Importuje súbory mbox do Evolution"
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
 msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-"Vytváracie rozhranie pre import súborov Outlook Express 4 do Evolution"
+msgstr "Vytváracie rozhranie pre import súborov Outlook Express 4 do Evolution"
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
 msgid "Imports Outlook Express 4 files into Evolution"
@@ -10724,7 +11345,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Nevyplnili ste všetky povinné informácie."
 
@@ -10734,83 +11355,111 @@ msgid "Evolution News Editor"
 msgstr "Editor diskusných skupín Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Editor účtov Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Hostiteľ:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Meno po_užívateľa:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Cesta:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Rádio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Nemôžete vytvoriť dva účty s rovnakým menom."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Naozaj chcete odstrániť tento účet?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Neodstraňovať"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Naozaj odstrániť účet?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Zakázať"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Povoliť"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Naozaj chcete odstrániť tento účet diskusných skupín?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Povolené"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Meno úč_tu:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Portoriko"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Pošta pre %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Predmet je %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "Pošta od %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "%s konferencia"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Pridať pravidlo filtra"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"Tieto vpriečinky:\n"
+"%spoužívali odstránený priečinok:\n"
+"    '%s'\n"
+"A boli aktualizované."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10822,7 +11471,7 @@ msgstr ""
 "posielať, prijímať alebo písať poštu.\n"
 "Chcete ho nastaviť teraz?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10830,7 +11479,7 @@ msgstr ""
 "Predtým, ako začnete písať správu,\n"
 "musíte nastaviť identitu."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10839,7 +11488,7 @@ msgstr ""
 "musíte nastaviť spôsob prenosu.."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10847,11 +11496,11 @@ msgstr ""
 "Posielate správu formátovanú ako HTML, ale nasledujúci adresáti nechcú "
 "dostávať takto formátovanú poštu:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Poslať aj tak?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10859,37 +11508,37 @@ msgstr ""
 "Táto správa nemá predmet.\n"
 "Naozaj ju chcete poslať?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
-"Kedže je zoznam kontaktov, ktorý posielate, nastavený tak, aby skryl "
-"adresy, táto správa bude obsahovať iba adresátov Bcc."
+"Kedže je zoznam kontaktov, ktorý posielate, nastavený tak, aby skryl adresy, "
+"táto správa bude obsahovať iba adresátov Bcc."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Táto správa obsahuje iba adresátov Bcc."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"Je možné, že poštový server zverejní zoznam adresátov pridaním "
-"hlavičky Apparently-To.\n"
+"Je možné, že poštový server zverejní zoznam adresátov pridaním hlavičky "
+"Apparently-To.\n"
 "Poslať aj tak?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 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:497
+#: mail/mail-callbacks.c:499
 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:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10897,28 +11546,28 @@ msgstr ""
 "Nei je možné otvoriť priečinok na koncepty pre tento účet.\n"
 "Chcete použiť štandardný priečinok na koncepty?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "neznámy odosielateľ"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Dňa %a, %Y-%m-%d at %H:%M, %%s napísal:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Presunúť správu do"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopírovať správu do"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Naozaj chcete upraviť všetkých %d správ?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10926,7 +11575,7 @@ msgstr ""
 "Upravovať môžete iba správy uložené\n"
 "v priečinku Koncepty."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10934,32 +11583,32 @@ msgstr ""
 "Iba správy z priečinku Odoslané je možné\n"
 "znovu poslať."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Žiadna vybraná správa"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Prepísať súbor?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Uložiť správu ako..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Uložiť správy ako..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 msgid "Go to next folder with unread messages?"
 msgstr "Prejsť na nasledujúci priečinok s neprečítanými správami?"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -10967,19 +11616,19 @@ msgstr ""
 "V tomto priečinku už nie sú žiadne nové správy.\n"
 "Chcete prejsť na nasledujúci priečinok?"
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"Táto operácia natrvalo odstráni všetky správy označené ako zmazané. "
-"Ak budete pokračovať, nebude už možné tieto správy obnoviť.\n"
+"Táto operácia natrvalo odstráni všetky správy označené ako zmazané. Ak "
+"budete pokračovať, nebude už možné tieto správy obnoviť.\n"
 "\n"
 "Naozaj odstrániť tieto správy?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10988,32 +11637,68 @@ msgstr ""
 "Chyba pri načítavaní informácie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stránka %d z %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Tlač správy zlyhala"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Naozaj chcete otvoriť všetkých %d správ v samostatných oknách?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Bez popisu"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Kontakt bez mena"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Odoslané"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Pridať kritérium"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Uložiť podpis"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11030,8 +11715,7 @@ msgid ""
 "administrator or Internet Service Provider."
 msgstr ""
 "Prosím, zadajte informácie o vašom serveri pre prijímanú poštu.\n"
-"Ak neviete, ktorý typ serveru použiť, kontaktujte vášho "
-"administrátora\n"
+"Ak neviete, ktorý typ serveru použiť, kontaktujte vášho administrátora\n"
 "alebo poskytovateľa pripojenia na Internet."
 
 #: mail/mail-config-druid.c:150
@@ -11060,201 +11744,181 @@ msgid ""
 "space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"Už ste skoro na konci nastavenia pošty. Vaše meno, server pre príjem "
-"pošty\n"
-"a spôsob odosielania budú použité pre vytvorenie poštového účtu "
-"Evolution.\n"
+"Už ste skoro na konci nastavenia pošty. Vaše meno, server pre príjem pošty\n"
+"a spôsob odosielania budú použité pre vytvorenie poštového účtu Evolution.\n"
 "Prosím, zadajte meno pre tento účet.\n"
 "Toto meno bude používané iba pre zobrazenie."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Sprievodca účtom Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "po"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"Nie je možné získať schránku pre nové správy v sklade:\n"
-"%s\n"
-"Skratka nebude vytvorená."
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Účet"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Kontrolujem službu"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Pripájam sa na server..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Kontakt bez mena"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "_Upraviť"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Nová"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "Kontrolovať _podporované typy"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "_Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Účet %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Informácia o účte"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Správa účtu"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Zrušiť operáciu"
+msgid "Add Sc_ript"
+msgstr "Pridať kritérium"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "Arkansas"
+msgid "Add new signature..."
+msgstr "Uložiť podpis"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Vždy _podpisovať správy pri použití tohto účtu"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Vždy poslať _slepú kópiu (Bcc):"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Vždy poslať _kópiu (Cc):"
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "Arica"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Priloží súbor k správe"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Príloha"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Overenie"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Automaticky kontrolovať novú poštu"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Neznáma znaková sada: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_Zavrieť"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Kontrolujem novú poštu"
 
 #: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Farba pre úlohy do dnešného dňa"
+
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr "Písanie správ"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Nastavenie"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11270,56 +11934,47 @@ msgstr ""
 "\n"
 "Kliknutím na \"Dokončiť\" uložíte vaše nastavenie."
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "Bari"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "Š_tandardné"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Štandardná priorita:"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Štandardná znaková sada:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Prijímam poštu"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Digitálne IDs..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Nie je možné otvoriť správu"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "Priečinok _konceptov:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Povoliť"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11340,39 +11995,34 @@ msgstr "_E-mailová adresa:"
 msgid "Empty _trash folders on exit"
 msgstr "Vyprázdniť priečinky na O_dpadky pri ukončení"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Vykonať príkaz..."
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "končí na"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Vlastnosti"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Správy predané ďalej"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Získať digitálne ID..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Zvýrazniť citácie pomocou"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Honolulu"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11426,67 +12076,63 @@ msgstr "Mikronézia"
 msgid "NNTP Server:"
 msgstr "NNTP server:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Upozornenie na novú poštu"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "_Kanály správ"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Nepovinné informácie"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Or_ganizácia:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "ID PGP/GPG _kľúča:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Vyberte farbu"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pýtať sa pri posielaní správ s adresátmi iba v _Bcc"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Tlačiť vybrané kontakty"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Nie je možné otvoriť správu"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citovať"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Uložiť toto heslo"
@@ -11520,117 +12166,120 @@ msgid "S_ecurity"
 msgstr "Bezpečnosť"
 
 #: mail/mail-config.glade.h:104
-#, fuzzy
-msgid "Same as text"
-msgstr "Somerset"
-
-#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Bezpečné MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Vyberte program PGP"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Súbor s podpisom:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Odstrániť všetko okrem podpisu"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Priečinok pre _odoslané správy:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Odoslané a koncepty"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Server vyžaduje _prihlásenie"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Typ serveru:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Skratky"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Uložiť podpis"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Uložiť podpis"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Zdroj"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Informácia o zdrojovom kóde"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Zadajte meno súboru:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Štandardný Unixový súbor mbox"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "_HTML podpis:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Premenlivo"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11640,148 +12289,139 @@ msgstr ""
 "\n"
 "Kliknutím \"Nasledujúci\" začneme."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Východ"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "Súbor s po_dpisom:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "_Vždy načítavať obrázky zo siete"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Vždy podpisovať správy pri použití tohto účtu"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Typ overenia:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 msgid "_Authentication type: "
 msgstr "_Typ overenia:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "_Automaticky kontrolovať novú poštu"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_Automaticky kontrolovať novú poštu"
+
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Pípnuť pri príchode novej správy"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "ID _certifikátu:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Potvrdenie pri čistení priečinku"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "_HTML podpis:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Štandardné"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Neuprozorňovať na príchod novej správy"
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Meno súboru:"
+msgid "_Enable"
+msgstr "Povoliť"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Správy _predané ďalej"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 msgid "_Full name:"
 msgstr "_Celé meno:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "v HTML pošte"
 
-#: mail/mail-config.glade.h:160
-#, fuzzy
-msgid "_HTML Signature:"
-msgstr "_HTML podpis:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identita"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Jazyk"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_Načítať obrázky ak je odosielateľ v adresári"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Použiť ho ako š_tandardný účet"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Označiť správy ako \"Prečítané\" po"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Nikdy nenačítať obrázky zo siete"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "Cesta k spustiteľnému _súboru PGP:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Zahrať zvuk pri príchode novej správy"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
-"Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
+msgstr "Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pýtať sa pri posielaní správ be_z predmetu"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Rádio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11822,69 +12462,52 @@ msgstr "Súbor s po_dpisom:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "_HTML podpis:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Použiť _bezpečné pripojenie (_SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Premenlivo"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_každých"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " farba"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "popis"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Nepodarilo sa vytvoriť kontext podpisu PGP."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Nepodarilo sa vytvoriť kontext overenia PGP."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Nepodarilo sa vytvoriť kontext zašifrovania PGP."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Nepodarilo sa vytvoriť kontext dešifrovania PGP."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Nepodarilo sa vytvoriť kontext podpisu S/MIME."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Nepodarilo sa vytvoriť kontext certsonly S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nepodarilo sa vytvoriť kontext zašifrovania S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Nepodarilo sa vytvoriť kontext obálky S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Nepodarilo sa vytvoriť kontext dekódovania S/MIME."
 
@@ -11927,98 +12550,133 @@ msgstr "Externý zobrazovač"
 msgid "Loading message content"
 msgstr "Načítavam obsah správy"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Úlohy _po termíne:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Otvoriť odkaz v prehliadači"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Kopírovať umiestnenie odkazu"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Uložiť odkaz ako"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Uložiť obrázok ako..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s príloha"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dátum"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Neplatná adresa"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Komu"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "Pošta"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Uložiť správu ako..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Táto správa je digitálne podpísaná. Kliknutím na ikonu zámku získate "
+"podrobnosti."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Nepodarilo sa vytvoriť kontext overenia PGP."
+
+#: mail/mail-format.c:1868
+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:1876
+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:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, 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:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokálny súbor (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzdialené dáta (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Nesprávna časť externého tela."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Lokálne priečinky"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Znovu nastavujem priečinok"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12027,28 +12685,27 @@ msgstr ""
 "Nie je možné uložiť metainformácie priečinku, asi zistíte,\n"
 "že ho nie je možné ani otvoriť: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nie je možné uložiť metainformácie priečinku do %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nie je možné odstrániť metainformácie priečinku %s: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Mení priečinok \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
-msgstr ""
-"%s nie je možné znovu nastaviť, pretože to nie je lokálny priečinok"
+msgstr "%s nie je možné znovu nastaviť, pretože to nie je lokálny priečinok"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12056,11 +12713,11 @@ msgstr ""
 "Ak nemôžete otvoriť túto poštovú schránku, potom\n"
 "ju budete musieť opraviť ručne."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nemôžete zmeniž formát nelokálnych priečinkov."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Znovu nastaviť /%s"
@@ -12118,81 +12775,73 @@ msgstr "Zlyhanie na správe %d z %d"
 msgid "Complete."
 msgstr "Dokončené."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Ukladám správu do priečinku"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Presúvam správy do %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírujem správy do %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Premiestňujem"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Kopírujem"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prechádzam priečinky v \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Správy predané ďalej"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otváram priečinok %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "Otváram sklad %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňujem priečinok %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Aktualizujem priečinok"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Čistím priečinok"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získavam správu %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Získavam %d správ"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ukladám %d správ"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12201,7 +12850,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12210,11 +12859,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12223,27 +12872,27 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu sa pripojujem na %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Vykonávam príkaz shellu: %s"
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Nájsť"
 
@@ -12314,10 +12963,6 @@ msgstr "Obnovujem..."
 msgid "Waiting..."
 msgstr "Čakám..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Zrušené."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Používateľ zrušil operáciu."
@@ -12331,16 +12976,16 @@ msgstr "Zadajte vaše heslo pre %s"
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Nepodarilo sa uložiť súbor podpisu."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Uložiť podpis"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12350,10 +12995,30 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Meno:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "Súbor s podpisom:"
+msgid "Signature hint"
+msgstr "Uložiť podpis"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "Súbor s HTML podpisom:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12368,17 +13033,17 @@ msgstr "Predaná správa"
 msgid "Forwarded Message"
 msgstr "Predaná správa"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Nastavujem vpriečinok: '%s'"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Aktualizujem vpriečinky pre uri: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12391,89 +13056,94 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "VPriečinky"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "vPriečinky"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Upraviť vpriečinok"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Pokús o úpravu vpriečinku '%s', ktorý neexistuje."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Nový vPriečinok"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Bez predmetu)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Správa"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Nevidené"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Videné"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Odpovedané"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Viacero neprečítaných správ"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Viacero správ"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Najnižšia"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Nižšia"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Vyššia"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Najvyššia"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Dnes %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Generujem zoznam správ"
 
@@ -12494,10 +13164,15 @@ msgid "Follow Up Flag"
 msgstr "Značka Follow up"
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Pôvodný kontakt:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Prijaté"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Veľkosť"
 
@@ -17210,5227 +17885,5224 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds and Bradford"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Lipsko-Schkeuditz"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Líbya"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linec"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisabon"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljublana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "Londýn"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "Londýn/City"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "Londýn/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "Londýn/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "Londýn/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Lousiana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "Lubeck-Blankensee"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr "Lvov"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makačkala"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malmo/Sturup"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto letisko"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsušima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsujama letisko"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekorjuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu letisko"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Stredný východ"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milán/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milán/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralne Vody"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Mijakejima letisko"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Mijazaki letisko"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile regionálne letisko"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldavsko"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu letisko"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Moskva Domodedovo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moskva Šeremetevo"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "Mníchov"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki letisko"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoja letisko"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Naha letisko"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakašibetsu letisko"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama letisko"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "Naples"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Neapol"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "Nové Dilí/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "Tokio Nové medzinárodné letisko"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata letisko"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nižný Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "Severmí Karolina"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "Severná Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Severovýchodná Philadelphia"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Severozápadné teritóriá"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro letisko"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr "Odesa"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita letisko"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okajama letisko"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki letisko"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Oranžová"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Osaka medzinárodné letisko"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Oshima letisko"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Paríž"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Paríž/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Paríž/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Paríž/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "Čínska ľudová republika"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamčatsky"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung Sever"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung Juh"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Piza"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Apt"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznaň"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pchjongjang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Radužný"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Načítavam"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavík"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhodos"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr "Rivne"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Rijád"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Rím/Ciampino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Rím/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Rím/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov na Done"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Rusko"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal letisko"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvádor"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Petrohrad"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Sendai letisko"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Soul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Soul/Kimp'O medzinárodné letisko"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Soul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Šanghaj"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Soči"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "Južná Karolína"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "Južná Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "Južné Marshallove ostrovy"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Sttockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Štrasburg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr "Symferopol"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syrakúzy"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Štetín"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu letisko"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talin"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talin"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Tanegashima letisko"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Teherán-Mehrabad"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Soluň"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Taiwan"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Litva"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokušima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokio medzinárodné letisko"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokio nové medzinárodné letisko"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Turín/Bric Della Croce"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Turín/Caselle"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori letisko"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama letisko"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripolis"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Tsušima letisko"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turín"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Uljanovsk"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "Spojené Arabské Emiráty"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr "Užhorod"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Benátky"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnjus"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech letisko"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronež"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser letisko"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai letisko"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Varšava"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "Západná Virginia"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "VIedeň"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow letisko"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Jakušima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Jakutsk"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Yamagata letisko"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube letisko"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao letisko"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Jekaterinburg"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Južno-Sachalinsk"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Záhreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama letisko"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Curych"
 
@@ -22458,17 +23130,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Bez popisu"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Súhrn pošty"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "VPriečinky"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Lokálne priečinky"
 
@@ -22477,57 +23144,47 @@ msgstr "Lokálne priečinky"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Slovo dňa"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Citát dňa"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Pridať nový kanál správ"
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Zadajte URL nového kanálu správ, ktorý chcete pridať"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Meno:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Chyba načítavania RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Kanály správ"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
+msgid "Add"
 msgstr "_Pridať"
 
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "Odstrániť"
-
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
@@ -22568,10 +23225,42 @@ msgstr "Tlač súhrnu"
 msgid "Printing of Summary failed"
 msgstr "Tlač súhrnu zlyhala"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponent súhrnu nemohol inicializovať Bonobo.\n"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "uzlov"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "kph"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "míľ"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometrov"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Jasná obloha"
@@ -23723,100 +24412,106 @@ msgid "C_elsius"
 msgstr "C_elzius"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Pridať nový k_anál"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Koľko dní má naraz kalendár zobraziť?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Ma_ximálny počet zobrazených položiek:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Nastavenie kanálov správ"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Jeden _mesiac"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "Jeden _týždeň"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "_Aktualizácia (sekundy):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "_Aktualizácia (sekundy):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "Zobraziť _celé cesty k priečinkom"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Zobraziť _všetky úlohy"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Zobraziť _dnešné úlohy"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Zobraziť teplotu v:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Úlohy "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Nastavenie počasia"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Päť dní"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Pošta"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "_Kanály správ"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Jeden deň"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "Na_plánovať"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Počasie"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Vytváracie rozhranie pre editor správ Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Vybrať priečinok"
+msgid "Folder Settings"
+msgstr "Nastavenie pošty"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Shell Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -23827,6 +24522,37 @@ msgstr "Zobraziť detaily"
 msgid "Cancel Operation"
 msgstr "Zrušiť operáciu"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Nie je možné preniesť priečinok:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Ako priečinok odoslaných"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Koncepty"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Doručená pošta"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Odoslaná pošta"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Odoslané"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Inštalácia Evolution"
@@ -23842,8 +24568,7 @@ msgstr ""
 #: shell/e-setup.c:131
 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."
+"Prosím, stlačte \"OK\" pre inštaláciu súborov, alebo \"Zrušiť\" pre koniec."
 
 #: shell/e-setup.c:171
 msgid "Could not update files correctly"
@@ -23940,6 +24665,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Pre vás vytvoril"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Dátum dokončenia"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Vybrať priečinok"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Vybrať priečinok"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Vybrať priečinok"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Dátum dokončenia"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -23962,28 +24712,27 @@ msgstr "Nie je možné skopírovať priečinok sám do seba."
 
 #: shell/e-shell-folder-commands.c:206
 msgid "Cannot move a folder into one of its descendants."
-msgstr ""
-"Nie je možné presunúť priečinok do jednoho zo svojích podpriečinkov."
+msgstr "Nie je možné presunúť priečinok do jednoho zo svojích podpriečinkov."
 
 #: shell/e-shell-folder-commands.c:321
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Zadajte priečinok, kam chcete skopírovať priečinok \"%s\":"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Kopírovať priečinok"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Zadajte priečinok, kam presunúť prečinok \"%s\":"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Presunúť priečinok"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23992,18 +24741,19 @@ msgstr ""
 "Nie je možné odstrániť priečinok:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Odstrániť \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Naozaj chcete odstrániť priečinok \"%s\"?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"Nie je možné odstrániť priečinok:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24012,16 +24762,16 @@ msgstr ""
 "Nie je možné premenovať priečinok:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Premenovať priečinok \"%s\" na:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24040,7 +24790,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Vytvoriť nový priečinok"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -24048,7 +24798,7 @@ msgstr ""
 "Typ vybraného priečinku nie je platný\n"
 "pre požadovanú operáciu."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Nová..."
 
@@ -24100,21 +24850,26 @@ msgstr ""
 "Importujem %s\n"
 "Importujem položku %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Vybrať priečinok"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Súbor %s neexistuje"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Chyba Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Do lokálnych priečinkov môžete iba importovať"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24124,11 +24879,11 @@ msgstr ""
 "%s\n"
 "nie je k dispozícii importér."
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importujem"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24137,17 +24892,17 @@ msgstr ""
 "Importujem %s\n"
 "Začínam %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Chyba pri štarte %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Chyba pri načítavaní %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24156,31 +24911,31 @@ msgstr ""
 "Importujem %s\n"
 "Importujem položku 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Meno súboru:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Vyberte súbor"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Typ súboru:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Importovať dáta a nastavenia zo starších programov"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Importovať jeden súbor"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24188,31 +24943,78 @@ msgstr ""
 "Prosím, čakajte...\n"
 "Hľadám existujúce nastavenie"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Spúšťam inteligentné importy"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Vybrať priečinok"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Vyberte cieľový priečinok pre import týchro dát"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Zatváram spojenia..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Chyba počas '%s':\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Synchronizujem priečinok"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Otváram priečinok %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Otváram priečinok %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Otvoriť v %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Zadaný priečinok sa nedá vytvoriť:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -24226,8 +25028,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Nie je možné spustiť rozhranie Evolution Poštový asistent\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nová"
@@ -24248,43 +25050,43 @@ msgstr "Meno pre priečinok nemôže obsahovať lomítka."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' a '..' sú rezervované mená priečinkov."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Nástroj pre oznamovanie chýb nebol nájdený v $PATH."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Nedá sa spustiť nástroj pre oznamovanie chýb"
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "O Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Prejsť na priečinku..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Vyberte priečinok, ktorý chcete otvoriť"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Vytvorí novú skratku"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vyberte priečinok, kam má skratka smerovať:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "Pracovať _on-line"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "_Pracovať off-line"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Pracovať off-line"
 
@@ -24305,8 +25107,8 @@ msgstr "(Žiadna)"
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
-"Ximian Evolution je momentálne on-line. Stlačením tohto tlačidla "
-"prejdete do módu off-line."
+"Ximian Evolution je momentálne on-line. Stlačením tohto tlačidla prejdete do "
+"módu off-line."
 
 #: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
@@ -24316,10 +25118,10 @@ msgstr "Ximian Evolution prechádza do módu off-line."
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Ximian Evolution je momentálne off-line. Stlačením tohto tlačidla "
-"prejdete do módu on-line."
+"Ximian Evolution je momentálne off-line. Stlačením tohto tlačidla prejdete "
+"do módu on-line."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24331,12 +25133,12 @@ msgstr ""
 "Chyba z aktivačného systému:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nepodarilo sa vytvoriť lokálny sklad -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24347,23 +25149,19 @@ msgstr ""
 "neočakávane skončil. Musíte ukončiť Evolution a znovu ju\n"
 "spustiť, aby ste získali prístup k vašim dátam."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Neplatné argumenty"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Nie je možné zaregistrovať u OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Konfiguračná databáza nenájdená"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Všeobecná chyba"
 
@@ -24388,95 +25186,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Neodstraňovať"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Premenovať skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Premenovať túto skupinu skratiek na:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Malé ikony"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Zobraziť skratky ako malé ikony"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "_Veľké ikony"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Zobraziť skratky ako veľké ikony"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Nová skupina..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Vytvoriť novú skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "Odst_rániť túto skupinu..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Odstrániť túto skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "_Premenovať túto skupinu..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Premenuje túto skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skryť panel skratiek"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Skryť panel skratiek"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Premenovať skratku"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Premenovať túto skratku na:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Otvoriť priečinok skratky v novom okn"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Otvoriť v _novom okne"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Otvorí priečinok spojený s touto skratkou v novom okne"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Premenuje túto skratku"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "O_dstrániť"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrániť túto skratku z panelu skratiek"
 
@@ -24488,10 +25286,6 @@ msgstr "Chyba pri ukladaní skratiek."
 msgid "Shortcuts"
 msgstr "Skratky"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Doručená pošta"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -24543,8 +25337,7 @@ msgstr "Uvedený priečinok nie je možné zmeniť alebo odstrániť"
 
 #: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
-"Nie je možné presunúť priečinok do jednoho zo svojích podpriečinkov."
+msgstr "Nie je možné presunúť priečinok do jednoho zo svojích podpriečinkov."
 
 #: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
@@ -24556,10 +25349,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotových)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<kliknutím vyberiete priečinok>"
 
@@ -24600,67 +25394,67 @@ msgstr ""
 "Chyba z aktivačného systému:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "Chyba CORBA"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Prerušené"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Neplatné argumenty"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Už je vlastník"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Žiadny vlastník"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Nenájdený"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Nepodporovaný typ"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Nepodporovaná schéma"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Nepodporovaná operácia"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Interná chyba"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Existuje"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "Neplatné URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Má podpriečinky"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Žiadne voľné miesto"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "Starý vlastník skončil"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 msgid "Test type"
 msgstr "Typ testu"
 
@@ -24788,40 +25582,72 @@ msgstr "Túto správu už nezobrazovať"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution našiel tieto súbory dát pre import:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution končí..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Túto správu už nezobrazovať"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nie je možné inicializovať shell Ximian Evolution."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nie je možné inicializovať shell Ximian Evolution: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Zakázať úvodné okno"
 
-#: shell/main.c:318
+#: shell/main.c:438
 msgid "Start in offline mode"
 msgstr "Spustiť v režime off-line"
 
-#: shell/main.c:319
+#: shell/main.c:439
 msgid "Start in online mode"
 msgstr "Spustiť v režime on-line"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Poslať ladiaci výstup zo všetkých komponent od súboru."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -24830,7 +25656,7 @@ msgstr ""
 "%s: --online a --offline nie je možné použiť naraz.\n"
 "  Použite %s --help pre zobrazenie dalších informácií.\n"
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie je možné inicializovať komponentový systém Bonobo."
 
@@ -24939,11 +25765,11 @@ msgstr "Zobraziť aktuálny kontakt"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "A_kcie"
 
@@ -25064,8 +25890,8 @@ msgstr "Zatvorí túto položku"
 msgid "Delete this item"
 msgstr "Odstráni túto položku"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Hlavný panel nástrojov"
 
@@ -25105,7 +25931,7 @@ msgstr "Uložiť túto položku na disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Súbor"
 
@@ -25170,19 +25996,19 @@ msgstr "Poslať ďalej ako i_Calendar"
 msgid "Forward this item via email"
 msgstr "Poslať ďalej pomocou pošty"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Získať najnovšie informácie o stretnutí"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "_Aktualizovať stretnutie"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "Naplánovať _stretnutie"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Naplánovať stretnutie pre túto položku"
 
@@ -25190,10 +26016,6 @@ msgstr "Naplánovať stretnutie pre túto položku"
 msgid "Customise My Evolution"
 msgstr "Prispôsobiť moje Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Zrušiť"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Zrušiť aktuálnu poštovú operáciu"
@@ -25347,7 +26169,7 @@ msgstr "Zoznam vlákien"
 msgid "_Expunge"
 msgstr "_Vyčistiť"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Priečinok"
 
@@ -25505,8 +26327,7 @@ msgstr "Predá niekomu vybranú správu v tele novej správy"
 
 #: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
-msgstr ""
-"Predá túto správu vloženú do vašej správy podobne ako pri odpovedi"
+msgstr "Predá túto správu vloženú do vašej správy podobne ako pri odpovedi"
 
 #: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
@@ -25752,7 +26573,7 @@ msgstr "Predchádzajúca správa"
 msgid "_Quoted"
 msgstr "_Citované"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Nástroje"
 
@@ -25767,12 +26588,12 @@ msgstr "Zavrie toto okno"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_Zavrieť"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Pohľad"
 
@@ -25959,7 +26780,7 @@ msgstr "_Otvoriť..."
 msgid "_Reply-To Field"
 msgstr "Pole _Reply-To"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Pomocník"
 
@@ -26106,113 +26927,121 @@ msgid "Move this folder to another place"
 msgstr "Presunúť tento priečinok inam"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Vytvoriť _nový priečinok..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Otvoriť v novom okne"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Otvoriť tento priečinok v inom okne"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Príjem / odoslanie"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Poslať neodoslanú poštu a prijať novú poštu"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Zobrazí informáciu o Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Pošle správu o chybe"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "_Poslať správu o chybe"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
-"Pošle správu o chybe pomocou nástroja pre oznamovanie chýb Priateľ v "
-"núdzi."
+"Pošle správu o chybe pomocou nástroja pre oznamovanie chýb Priateľ v núdzi."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Prepnúť"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Prepne, či sa má zobrazovať panel priečinkov"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prepne, či sa má zobrazovať panel skratiek"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Prepne, či pracujete on alebo off-line."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Zobraziť vybraný priečinok"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "O Ximian _Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Kopírovať..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "Pru_h priečinkov"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_Prejsť do priečinku..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Presunúť..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nový"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "Nový _priečinok"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "Nastavenie _pilota..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Premenovať..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Poslať / Prijať"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Skratka"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "_Panel skratiek"
 
@@ -26292,24 +27121,24 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"Pomocou ľavého tlačidla myši môžete zväčšiť oblasť mapy a vybrať "
-"časovú zónu.\n"
+"Pomocou ľavého tlačidla myši môžete zväčšiť oblasť mapy a vybrať časovú "
+"zónu.\n"
 "Pre zmenšenie použite pravé tlačidlo myši."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Aktuálny pohľad"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 msgid "Custom View"
 msgstr "Vlastný pohľad"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr "Uložiť vlastný pohľad"
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Definovať pohľady"
 
@@ -26430,16 +27259,21 @@ msgstr "Editor hľadania"
 msgid "Save Search"
 msgstr "Uložiť hľadanie"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Uložiť hľadanie"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Pridať do uložených hľadaní"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Pokročilé..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Informácia"
@@ -26461,21 +27295,21 @@ msgstr "Správa"
 msgid "Don't show this message again."
 msgstr "Túto správu už nezobrazovať."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Nájsť"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Vymazať"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Vymazať"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Nájsť"
 
@@ -26501,347 +27335,305 @@ 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 "Connecting to LDAP server..."
-#~ msgstr "Pripájam sa na server LDAP..."
-
-#~ msgid "Waiting for connection to LDAP server..."
-#~ msgstr "Čakám na spojenie so serverom LDAP..."
-
-#~ msgid "Edit Addressbook"
-#~ msgstr "Upraviť adresár"
-
-#~ msgid "A_uthenticate with server using:"
-#~ msgstr "_Prihlásiť sa k serveru pomocou:"
-
-#~ msgid "Account Name"
-#~ msgstr "Meno účtu"
-
-#~ msgid "Add Addressbook"
-#~ msgstr "Pridať adresár"
-
-#~ msgid "Advanced"
-#~ msgstr "Pokročilé"
-
-#~ msgid "Base"
-#~ msgstr "Sústava"
-
-#~ msgid "Check this if the server requires you to authenticate."
-#~ msgstr "Použite túto voľbu, ak server vyžaduje prihlásenie."
-
-#~ msgid ""
-#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
-#~ "server"
-#~ msgstr ""
-#~ "Evolution použije toto známe meno (DN) pre prihlásenie na váš server"
-
-#~ msgid "Server Name"
-#~ msgstr "Meno serveru"
-
-#~ msgid "The information below is required in order to add an addressbook.  "
-#~ msgstr "Údaje uvedené dole sú nutné pre pridanie adresára."
-
-#~ msgid "This information is not required for most ldap servers. "
-#~ msgstr "Táto informácia nie je pre väčšinu serverov LDAP nutná."
-
-#~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
-#~ msgstr ""
-#~ "Túto informáciu používa váš server LDAP pre určenie, ktoré uzly "
-#~ "použiť pre hľadanie. Detaily by vám mal poskytnúť váš systémový "
-#~ "administrátor."
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Zdroje adresára"
 
-#~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
+#, fuzzy
+#~ msgid "Could not query for schema information"
 #~ msgstr ""
-#~ "Toto je základný uzol pre všetky hľadania na serveri LDAP. Detaily by "
-#~ "ste mali získať od vášho systémového administrátora."
-
-#~ msgid "This is the name of the server where your addressbook is located."
-#~ msgstr "Toto je meno serveru, kde je umiestnený adresár."
-
-#~ msgid "This is the port that your ldap server uses."
-#~ msgstr "Toto je port, ktorý používa váš server LDAP."
-
-#~ msgid "Other Contacts"
-#~ msgstr "Iné kontakty"
-
-#~ msgid "Name contains"
-#~ msgstr "Meno obsahuje"
-
-#~ msgid "(none)"
-#~ msgstr "(nič)"
-
-#~ msgid "C_ontaining:"
-#~ msgstr "O_bsahuje:"
-
-#~ msgid "Show contacts matching the following criteria:"
-#~ msgstr "Zobraziť kontakty odpovedajúce týmto kritériám:"
-
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr "Naozaj chcete odstrániť tento kontakt?"
+#~ "Neplatná informácia nepriehľadného krokovania:\n"
+#~ "%s"
 
-#~ msgid "Starting:"
-#~ msgstr "Od:"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Komponent Súhrn kalendára Evolution."
 
-#~ msgid "Ending:"
-#~ msgstr "Do:"
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Vytváracie rozhranie pre komponent Súhrnu kalendára."
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Vytvoriť novú schôdzku so štandardným _pripomenutím"
+#~ msgid "Sta_rt of day:"
+#~ msgstr "_Začiatok dňa:"
 
-#~ msgid "First day of wee_k:"
-#~ msgstr "_Prvý deň týždňa:"
+#~ msgid "_End of day:"
+#~ msgstr "_Koniec dňa:"
 
-#~ msgid "_Other"
-#~ msgstr "_Iné"
+#~ msgid "_Other Organizer"
+#~ msgstr "_Iný organizátor"
 
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Kliknutím pridáte účastníka"
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Digitálny podpis v čistom texte nie je podporovaný touto šifrou"
 
-#~ msgid "0%"
-#~ msgstr "0%"
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Prosím, zadajte vaše %s heslo pre %s"
 
-#~ msgid "10%"
-#~ msgstr "10%"
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Prosím, zadajte vaše %s heslo"
 
-#~ msgid "20%"
-#~ msgstr "20%"
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Nie je možné podpísať správu: žiadny text na podpis"
 
-#~ msgid "30%"
-#~ msgstr "30%"
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Nie je možné podpísať správu: nezadané heslo"
 
-#~ msgid "40%"
-#~ msgstr "40%"
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nie je možné podpísať správu: nie je možné vytvoriť rúru do GPG/PGP: %s"
 
-#~ msgid "50%"
-#~ msgstr "50%"
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Nie je možné podpísať správu: žiadny text pre podpis v texte"
 
-#~ msgid "60%"
-#~ msgstr "60%"
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Nie je možné overiť správu: žiadny text na overenie"
 
-#~ msgid "70%"
-#~ msgstr "70%"
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nie je možné overiť správu: nie je možné vytvoriť rúru do GPG/PGP: %s"
 
-#~ msgid "80%"
-#~ msgstr "80%"
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Nie je možné zašifrovať správu: žiadny text na zašifrovanie"
 
-#~ msgid "90%"
-#~ msgstr "90%"
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Nie je možné zašifrovať správu: nezadané heslo"
 
-#~ msgid "100%"
-#~ msgstr "100%"
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nie je možné zašifrovať správu: nie je možné vytvoriť rúru do GPG/PGP: %s"
 
-#~ msgid "_Delete this Task"
-#~ msgstr "O_dstrániť túto úlohu"
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "Nie je možné dešifrovať správu: žiadny šifrovaný text na dešifrovanie"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "Stretnutie začína: <b>"
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Nie je možné dešifrovať správu: nezadané heslo"
 
-#~ msgid "Task begins: <b>"
-#~ msgstr "Úloha začína: <b>"
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nie je možné dešifrovať správu: nie je možné vytvoriť rúru do GPG/PGP: %s"
 
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Informácia o voľnom čase začína: <b>"
+#~ msgid "%s server %s"
+#~ msgstr "%s server %s"
 
-#~ msgid "Begins: <b>"
-#~ msgstr "Začína: <b>"
+#~ msgid "(unknown host)"
+#~ msgstr "(neznámy hostiteľ)"
 
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Stretnutie končí: <b>"
+#~ msgid "No such message: %s"
+#~ msgstr "Žiadna taká správa: %s"
 
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Informácia o voľnom čase končí: <b>"
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Nemôžete skopírovať správy z tohto priečinku s odpadkami."
 
-#~ msgid "Ends: <b>"
-#~ msgstr "Končí: <b>"
+#~ msgid "Directory tree of mbox files"
+#~ msgstr "Strom priečinkov zo súborov mbox"
 
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Úloha dokončená: <b>"
+#~ msgid ""
+#~ "For accessing mail storedin an external tree of mbox files.\n"
+#~ "This will allow you to directly access pine and elm folders.\n"
+#~ "NOTE: This provider is still experimental so ensure you backup any mail "
+#~ "folders first."
+#~ msgstr ""
+#~ "Pre prístup k pošte uloženej v externom strome súborov mbox.\n"
+#~ "To umožňuje priamy prístup k priečinkom pine a elm.\n"
+#~ "POZNÁMKA: Tento poskytovateľ je stále ešte experimentálny, takže\n"
+#~ "nezabudnite najprv svoju poštu zálohovať."
 
-#~ msgid "Task Due: <b>"
-#~ msgstr "Termín úlohy: <b>"
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Nie je možné pridať správu do súboru fronty: %s: %s"
 
-#~ msgid "iCalendar Information"
-#~ msgstr "Informácie o iCalendar"
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Nie je uložiť: %s: %s"
 
-#~ msgid "iCalendar Error"
-#~ msgstr "Chyba iCalendar"
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Fronta `%s' neexistuje alebo nie je normálny súbor."
 
-#~ msgid "An unknown person"
-#~ msgstr "Neznáma osoba"
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Rádio"
 
 #~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
 #~ msgstr ""
-#~ "<br> Prosím, skontrolujte tieto informácie a potom vyberte z menu akciu."
+#~ "Nie je možné získať schránku pre nové správy v sklade:\n"
+#~ "%s\n"
+#~ "Skratka nebude vytvorená."
 
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Žiadna</i>"
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "_Upraviť"
 
-#~ msgid "Status:"
-#~ msgstr "Stav:"
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Nová"
 
-#~ msgid "Tentatively Accepted"
-#~ msgstr "Predbežne akceptové"
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Zrušiť operáciu"
 
-#~ msgid "Choose an action:"
-#~ msgstr "Vyberte akciu:"
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "Arkansas"
 
-#~ msgid "Update"
-#~ msgstr "Aktualizovať"
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "Arica"
 
-#~ msgid "Accept"
-#~ msgstr "Akceptovať"
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "Bari"
 
-#~ msgid "Tentatively accept"
-#~ msgstr "Predbežne akceptovať"
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Honolulu"
 
-#~ msgid "Decline"
-#~ msgstr "Odmietnuť"
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "Somerset"
 
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Poslať informácie o voľnom čase"
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Súbor s podpisom:"
 
-#~ msgid "Update respondent status"
-#~ msgstr "Aktualizovať stav respondenta"
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Odstrániť všetko okrem podpisu"
 
-#~ msgid "Send Latest Information"
-#~ msgstr "Poslať najnovšie informácie"
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "_HTML podpis:"
 
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> poslal informácie o stretnutí."
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Meno súboru:"
 
-#~ msgid "Meeting Information"
-#~ msgstr "Informácie o stretnutí"
+#, fuzzy
+#~ msgid "_HTML Signature:"
+#~ msgstr "_HTML podpis:"
 
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> požaduje vašu účasť na stretnutí."
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Jazyk"
 
-#~ msgid "Meeting Proposal"
-#~ msgstr "Návrh na stretnutie"
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Rádio"
 
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> si praje byť pridaný na existujúce stretnutie."
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Nepodarilo sa vytvoriť kontext zašifrovania PGP."
 
-#~ msgid "Meeting Update"
-#~ msgstr "Aktualizácia stretnutia"
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Nepodarilo sa vytvoriť kontext dešifrovania PGP."
 
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> si praje dostať najnovšie informácie o stretnutí."
+#~ msgid "Moving"
+#~ msgstr "Premiestňujem"
 
-#~ msgid "Meeting Update Request"
-#~ msgstr "Požiadavka na aktualizáciu stretnutia"
+#~ msgid "Copying"
+#~ msgstr "Kopírujem"
 
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> odpovedal na požiadavku o stretnutí."
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Súbor s podpisom:"
 
-#~ msgid "Meeting Reply"
-#~ msgstr "Odpoveď pre stretnutie"
+#~ msgid "Riga"
+#~ msgstr "Riga"
 
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> zrušil stretnutie."
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_Pridať"
 
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Zrušenie stretnutia"
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "Odstrániť"
 
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> poslal nerozpoznateľnú správu."
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Naozaj chcete odstrániť priečinok \"%s\"?"
 
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Neplatná správa o stretnutí"
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Pripájam sa na server LDAP..."
 
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> poslal informácie o úlohe."
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Čakám na spojenie so serverom LDAP..."
 
-#~ msgid "Task Information"
-#~ msgstr "Informácia o úlohe"
+#~ msgid "Edit Addressbook"
+#~ msgstr "Upraviť adresár"
 
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> požaduje, aby ste vykonali úlohu."
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "_Prihlásiť sa k serveru pomocou:"
 
-#~ msgid "Task Proposal"
-#~ msgstr "Návrh úlohy"
+#~ msgid "Account Name"
+#~ msgstr "Meno účtu"
 
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> si praje byť pridaný do existujúcej úlohy."
+#~ msgid "Add Addressbook"
+#~ msgstr "Pridať adresár"
 
-#~ msgid "Task Update"
-#~ msgstr "Aktualizácia úlohy"
+#~ msgid "Advanced"
+#~ msgstr "Pokročilé"
 
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> si praje získať najnovšie informácie o úlohe."
+#~ msgid "Base"
+#~ msgstr "Sústava"
 
-#~ msgid "Task Update Request"
-#~ msgstr "Požiadavka na aktualizáciu úlohy"
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Použite túto voľbu, ak server vyžaduje prihlásenie."
 
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> odpovedal na priradenie úlohy."
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with "
+#~ "the server"
+#~ msgstr ""
+#~ "Evolution použije toto známe meno (DN) pre prihlásenie na váš server"
 
-#~ msgid "Task Reply"
-#~ msgstr "Odpoveď pre úlohu"
+#~ msgid "Server Name"
+#~ msgstr "Meno serveru"
 
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> zrušil úlohu."
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "Údaje uvedené dole sú nutné pre pridanie adresára."
 
-#~ msgid "Task Cancellation"
-#~ msgstr "Zrušenie úlohy"
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "Táto informácia nie je pre väčšinu serverov LDAP nutná."
 
-#~ msgid "Bad Task Message"
-#~ msgstr "Neplatná správa úlohy"
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "Túto informáciu používa váš server LDAP pre určenie, ktoré uzly použiť "
+#~ "pre hľadanie. Detaily by vám mal poskytnúť váš systémový administrátor."
 
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> publikoval informácie o voľnom čase."
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
+#~ msgstr ""
+#~ "Toto je základný uzol pre všetky hľadania na serveri LDAP. Detaily by ste "
+#~ "mali získať od vášho systémového administrátora."
 
-#~ msgid "Free/Busy Information"
-#~ msgstr "Informácie o voľnom čase"
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Toto je meno serveru, kde je umiestnený adresár."
 
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> požaduje informáciu o vašom voľnom čase."
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Toto je port, ktorý používa váš server LDAP."
 
-#~ msgid "Free/Busy Request"
-#~ msgstr "Požiadavka na informácie o voľnom čase"
+#~ msgid "Name contains"
+#~ msgstr "Meno obsahuje"
 
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> odpovedal na požiadavku na informácie o voľnom čase"
+#~ msgid "C_ontaining:"
+#~ msgstr "O_bsahuje:"
 
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Odpoveď s informácio o voľnom čase"
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Zobraziť kontakty odpovedajúce týmto kritériám:"
 
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Neplatná správa o voľnom čase"
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Vytvoriť novú schôdzku so štandardným _pripomenutím"
 
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Táto správa obsahuje iba nepodporované požiadavky."
+#~ msgid "First day of wee_k:"
+#~ msgstr "_Prvý deň týždňa:"
 
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "Príloha neobsahuje platnú správu kalendára"
+#~ msgid "_Other"
+#~ msgstr "_Iné"
 
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "Príloha nemá žiadne zobraziteľné položky kalendára"
+#~ msgid "_Delete this Task"
+#~ msgstr "O_dstrániť túto úlohu"
 
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
-#~ msgstr ""
-#~ "Nepodarilo sa nájsť žiadnu z vašich identít v zozname účastníkov!\n"
-
-#~ msgid "Event information"
-#~ msgstr "informácie o udalosti"
-
-#~ msgid "Task information"
-#~ msgstr "Informácie o úlohe"
-
-#~ msgid "Journal information"
-#~ msgstr "Informácie o denníku"
-
-#~ msgid "Free/Busy information"
-#~ msgstr "Informácie o voľnom čase"
-
-#~ msgid "Calendar information"
-#~ msgstr "Informácie o kalendári"
+#~ msgstr "Nepodarilo sa nájsť žiadnu z vašich identít v zozname účastníkov!\n"
 
 #~ msgid "Free/Busy information (%s to %s)"
 #~ msgstr "Informácie o voľnom čase (%s do %s)"
@@ -26849,24 +27641,6 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgid "iCalendar information"
 #~ msgstr "Informácie iCalendar"
 
-#~ msgid "Task"
-#~ msgstr "Úloha"
-
-#~ msgid "Status: %s"
-#~ msgstr "Stav: %s"
-
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Dokončených percent: %i"
-
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
-
-#~ msgid "Categories: %s"
-#~ msgstr "Kategórie: %s"
-
-#~ msgid "Contacts: "
-#~ msgstr "Kontakty: "
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Neplatný typ v body-contains, očakávam reťazec"
 
@@ -26887,20 +27661,14 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgstr "Nepodarilo sa zašifrovať: zlyhalo vytvorenie obálky pre dáta."
 
 #~ msgid "Could not encrypt: failed to create encryption context."
-#~ msgstr ""
-#~ "Nepodarilo sa zašifrovať: zlyhalo vytvorenie kontextu zašifrovania."
+#~ msgstr "Nepodarilo sa zašifrovať: zlyhalo vytvorenie kontextu zašifrovania."
 
 #~ msgid "Could not encrypt data: invalid user key: \"%s\"."
-#~ msgstr ""
-#~ "Nie je možné zašifrovať dáta: neplatný používateľský kľúč: "
-#~ "\"%s\"."
+#~ msgstr "Nie je možné zašifrovať dáta: neplatný používateľský kľúč: \"%s\"."
 
 #~ msgid "Could not encrypt: encoding failed."
 #~ msgstr "Nepodarilo sa zašifrovať: kodovanie zlyhalo."
 
-#~ msgid "Failed to decrypt: Unknown"
-#~ msgstr "Nepodarilo sa dešifrovať: Neznáme"
-
 #~ msgid "Please enter the NNTP password for %s@%s"
 #~ msgstr "Prosím, zadajte NNTP heslo pre %s@%s"
 
@@ -26929,8 +27697,7 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgstr "Nie je možné nájsť v správe adresu 'Od'"
 
 #~ msgid "Cannot send message: sender address not defined."
-#~ msgstr ""
-#~ "Nie je možné poslať správu: adresa odosielateľa nie je definovaná."
+#~ msgstr "Nie je možné poslať správu: adresa odosielateľa nie je definovaná."
 
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "Komponent Evolution pre Súhrn."
@@ -27049,36 +27816,15 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgid "Filter on Mailing List"
 #~ msgstr "Filter na konferenciu"
 
-#~ msgid "Default"
-#~ msgstr "Štandard"
-
 #~ msgid "Indexing:"
 #~ msgstr "Index:"
 
 #~ msgid "Mailbox Format"
 #~ msgstr "Formát poštová schránky"
 
-#~ msgid " (default)"
-#~ msgstr " (štandard)"
-
-#~ msgid "Mail Settings"
-#~ msgstr "Nastavenie pošty"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Predmet je %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "Pošta od %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "%s konferencia"
-
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Doručená pošta"
 
-#~ msgid "Account"
-#~ msgstr "Účet"
-
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr "Vždy ši_frovať kópiu sebe pri posielaní šifrovanej správy"
 
@@ -27091,24 +27837,15 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgid "Display"
 #~ msgstr "Zobrazenie"
 
-#~ msgid "Drafts"
-#~ msgstr "Koncepty"
-
 #~ msgid "Edit..."
 #~ msgstr "Upraviť..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "Súbor s HTML podpisom:"
-
 #~ msgid "News"
 #~ msgstr "Diskusné skupiny"
 
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Vyberte súbor pre ukladanie záznamu filtrovania..."
 
-#~ msgid "Sent"
-#~ msgstr "Odoslané"
-
 #~ msgid "Sources"
 #~ msgstr "Zdroje"
 
@@ -27133,22 +27870,9 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgid "seconds."
 #~ msgstr "sekúnd."
 
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "Táto správa je digitálne podpísaná. Kliknutím na ikonu zámku získate "
-#~ "podrobnosti."
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Evolution nerozpoznala tento typ podpísanej správy."
 
-#~ 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ý."
-
-#~ 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ý."
-
 #~ msgid "Incomplete message written on pipe!"
 #~ msgstr "Do rúry nebola zapísaná úplná správa!"
 
@@ -27158,52 +27882,15 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgid "Cannot initialize Evolution's Summary component."
 #~ msgstr "Nie je možné inicializovať komponent súhrnu Evolution."
 
-#~ msgid " F"
-#~ msgstr " F"
-
-#~ msgid " C"
-#~ msgstr " C"
-
-#~ msgid "knots"
-#~ msgstr "uzlov"
-
-#~ msgid "kph"
-#~ msgstr "kph"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "míľ"
-
-#~ msgid "kilometers"
-#~ msgstr "kilometrov"
-
 #~ msgid "Factory for the Evolution notes component."
 #~ msgstr "Vytváracie rozhranie pre komponent poznámok Evolution."
 
 #~ msgid "Factory for the Notes control"
 #~ msgstr "Vytváracie rozhranie pre ovládací prvok Poznámky"
 
-#~ msgid "Outbox"
-#~ msgstr "Odoslaná pošta"
-
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
 #~ msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nie je možné preniesť priečinok:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(Bez mena)"
 
diff --git a/po/sl.po b/po/sl.po
index 20a80b7db3..a595a01484 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-03-10 20:58+0100\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\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"
@@ -30,21 +30,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Uvozi datoteke vVizitk v Evolucijo. "
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:332
+#: addressbook/gui/widgets/e-addressbook-view.c:335
 msgid "File As"
 msgstr "Zavedi kot"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ime"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:334
+#: addressbook/gui/widgets/e-addressbook-view.c:337
 msgid "Email"
 msgstr "E-pošta"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Prvi"
 
@@ -54,16 +55,16 @@ msgstr "Prvi"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
-#: addressbook/gui/widgets/e-addressbook-view.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Pomočnik"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Služba"
 
@@ -73,12 +74,12 @@ msgid "Bus"
 msgstr "Služ."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Povratni klic"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Podjetje"
 
@@ -89,13 +90,13 @@ msgstr "Podj."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Doma"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:341
+#: addressbook/gui/widgets/e-addressbook-view.c:344
 msgid "Organization"
 msgstr "Organizacija"
 
@@ -105,19 +106,19 @@ msgstr "Org."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Prenosni telefon"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Avto"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
-#: addressbook/gui/widgets/e-addressbook-view.c:346
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Službeni faks"
 
@@ -126,13 +127,13 @@ msgid "Bus Fax"
 msgstr "Služb. fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
-#: addressbook/gui/widgets/e-addressbook-view.c:347
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Domači faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Služba"
 
@@ -141,69 +142,68 @@ msgid "Bus 2"
 msgstr "Služba 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Doma 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
-#: addressbook/gui/widgets/e-addressbook-view.c:350
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Drugo"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
-#: addressbook/gui/widgets/e-addressbook-view.c:352
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Drugi faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
-#: addressbook/gui/widgets/e-addressbook-view.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Pozivnik"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
-#: addressbook/gui/widgets/e-addressbook-view.c:354
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radijo"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
-#: addressbook/gui/widgets/e-addressbook-view.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Teleks"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/widgets/e-addressbook-view.c:359
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
+#: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "E-naslov 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
-#: addressbook/gui/widgets/e-addressbook-view.c:359
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-naslov 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:360
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Web Site"
 msgstr "Spletna stran"
 
@@ -212,7 +212,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:361
+#: addressbook/gui/widgets/e-addressbook-view.c:364
 msgid "Department"
 msgstr "Oddelek"
 
@@ -221,7 +221,7 @@ msgid "Dep"
 msgstr "Odd."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:365
 msgid "Office"
 msgstr "Pisarna"
 
@@ -230,12 +230,12 @@ msgid "Off"
 msgstr "Pisar."
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:366
 msgid "Title"
 msgstr "Naziv"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:364
+#: addressbook/gui/widgets/e-addressbook-view.c:367
 msgid "Profession"
 msgstr "Poklic"
 
@@ -244,7 +244,7 @@ msgid "Prof"
 msgstr "Pokl."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.c:368
 msgid "Manager"
 msgstr "Upravljalec"
 
@@ -257,7 +257,7 @@ msgid "Ass"
 msgstr "Pomoč."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:367
+#: addressbook/gui/widgets/e-addressbook-view.c:370
 msgid "Nickname"
 msgstr "Vzdevek"
 
@@ -266,12 +266,12 @@ msgid "Nick"
 msgstr "Vzdevek"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:368
+#: addressbook/gui/widgets/e-addressbook-view.c:371
 msgid "Spouse"
 msgstr "Partner(ka)"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:369
+#: addressbook/gui/widgets/e-addressbook-view.c:372
 msgid "Note"
 msgstr "Opomba"
 
@@ -284,7 +284,7 @@ msgid "CALUri"
 msgstr "URI koledarja"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/widgets/e-addressbook-view.c:373
 msgid "Free-busy URL"
 msgstr "URL zasedenosti"
 
@@ -318,11 +318,11 @@ msgstr "Družinsko ime"
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "Več vVizitk"
 
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VVizitka za %s"
@@ -335,7 +335,7 @@ msgstr "VVizitka za %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2727
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Iščem..."
 
@@ -356,31 +356,31 @@ msgstr "Nalagam..."
 msgid "Error in search expression."
 msgstr "Napaka v iskalnem izrazu."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1120
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Dodajam vizitko v strežnik LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1223
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Odstranjujem vizitko iz strežnika LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1459
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Spreminjam vizitko iz strežnika LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2580
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Znova začenjam iskanje."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2672
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Dobivam rezultate iskanja LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2754
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 msgid "Error performing search"
 msgstr "Napaka ob iskanju"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2778
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 msgid "Could not parse query string"
 msgstr "Nisem mogel razčleniti niza poizvedbe"
 
@@ -422,269 +422,139 @@ msgid "A Bonobo control for displaying an address."
 msgstr "Kontrola Bonobo za prikaz naslova."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-#: notes/GNOME_Evolution_Notes.oaf.in.h:1
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Vzorčna kontrola Bonobo, ki prikaže adresar."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Addressbook Storages."
+msgstr "Nastavitveno orodje za Evolucijin adresarjev veznik.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Kontrola, ki prikaže mini vizitko iz Evolucijinega adresarja."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#, fuzzy
+msgid "Directory Servers"
+msgstr "N_ov strežnik imenikov"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Evolucijina komponenta za urejanje stikov."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Tovarna za orodje mini vizitk adresarja"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Tovarna za prikazovalnik adresarjeve adrese"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Tovarna za Adresarjev vznik naslova"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#, fuzzy
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr "Nastavitveno orodje za Evolucijin adresarjev veznik.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Tovarna za vzorčno kontrolo adresarja"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Stiki"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Mapa, ki vsebuje podatke o stikih"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "Strežnik LDAP, ki vsebuje podatke o stikih"
 
-#: addressbook/gui/component/addressbook-component.c:558
-msgid "New Contact"
-msgstr "Nov stik"
-
-#: addressbook/gui/component/addressbook-component.c:558
-#: ui/evolution-addressbook.xml.h:34
-msgid "_Contact"
-msgstr "_Stik"
-
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:578
 msgid "New Contact List"
 msgstr "Nov seznam stikov"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:578
 msgid "Contact _List"
 msgstr "Seznam _stikov"
 
-#: addressbook/gui/component/addressbook-config.c:225
-msgid "Edit Addressbook"
-msgstr "Uredi adresar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "100"
-msgstr "100"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "A_uthenticate with server using:"
-msgstr "_Avtentificiraj se pri srežniku z uporabo:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "Ime računa"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "Dodaj adresar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Addressbook Sources"
-msgstr "Viri adresarja"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Napredno"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Osnovno"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Osnove"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr "Izberite to, če strežnik zahteva od vas avtentifikacijo."
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "De_lete"
-msgstr "Z_briši"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr "Razločno ime (DN)"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "E-poštni naslov"
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
-msgstr ""
-"Evolucija bo uporabila to Razločno ime (DN), za vašo avtentifikacijo pri "
-"strežniku"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
-"Evolucija bo uporabila ta e-poštni naslov, za vašo avtentifikacijo pri "
-"strežniku"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr "Ena"
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "Iskanje v _zbirki:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
-msgstr "_Doseg iskanja:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "Ime strežnika"
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
-msgstr "Pod"
+#: addressbook/gui/component/addressbook-component.c:581
+msgid "New Contact"
+msgstr "Nov stik"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Podatki spodaj so potrebni za dodajanje adresarja.  "
+#: addressbook/gui/component/addressbook-component.c:581
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_Stik"
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "Te podatki za večino strežnikov ldap niso potrebni"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Nisem se mogel povezati s strežnikom LDAP."
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid ""
-"This information is used by your ldap server to specify which nodes are used "
-"in a search. Contact your server administrator for more information."
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
 msgstr ""
-"Te podatke potrebuje vaš strežnik ldap za določitev katera vozlišča naj se "
-"uporabljajo za iskanja. Za več podatkov se obrnite na svojega "
-"administratorja."
+"Strežniku IMAP se nisem mogel avtentificirati.\n"
+"%s\n"
+"\n"
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
-msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
-msgstr ""
-"To je izhodiščno vozlišče vseh vaših iskanj na strežniku ldap. Za več "
-"podatkov se obrnite na svojega administratorja."
+#: addressbook/gui/component/addressbook-config.c:239
+#, fuzzy
+msgid "Could not perform query on Root DSE"
+msgstr "Nisem mogel razčleniti niza poizvedbe"
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
-msgid ""
-"This is the maximum number of cards to download.  Setting this number too "
-"large will slow down this addressbook."
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
 msgstr ""
-"To je največje število vizik za prenos.  Če je to nastavljeno na preveč, bo "
-"upočasnilo ta adresar."
 
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid ""
-"This is the method evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema information"
 msgstr ""
-"To je način, ki ga bo Evolucija uporabila, za vašo avtentifikacijo.  Če "
-"boste to nastavili na \"E-poštni naslov\", bo potrebovan anonimni dostop do "
-"vašega strežnika LDAP"
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
-msgstr "To je ime strežnika, kjer se nahaja vaš adresar"
-
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "To so vrata, ki jih uporablja vaš strežnik ldap."
-
-#: addressbook/gui/component/addressbook-config.glade.h:29
-msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
 msgstr ""
-"To ime bo uporabljeno za identifikacijo vašega računa. Uporablja se le za "
-"prikaz."
-
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "Ime _računa:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:31
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:126
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr "_Razločno ime:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr "_Omejitev prenosov"
-
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:135
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:39
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:21
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: addressbook/gui/component/addressbook-config.glade.h:35
-msgid "_Email address:"
-msgstr "_E-poštni naslov:"
+"Napaka ob nalaganju podatkov o filtrih:\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Vrata:"
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
 
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "Ime _strežnika:"
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL v to zgradbi Evolucije ni vgrajen)"
 
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Nisem mogel inicializirati gnome-vfs"
 
@@ -692,11 +562,11 @@ msgstr "Nisem mogel inicializirati gnome-vfs"
 msgid "Other Contacts"
 msgstr "Drugo stiki"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:525
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -705,7 +575,7 @@ msgstr ""
 "Ne morem odpreti tega adresarja. To pomeni, da \n"
 "ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:530
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -717,7 +587,7 @@ msgstr ""
 "ko boste s spodnje povezave prenesli program OpenLDAP,\n"
 "Evolucijo prevesti iz izvorne kode CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:547
+#: addressbook/gui/component/addressbook.c:538
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -725,43 +595,42 @@ msgstr ""
 "Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
 "pot obstaja in ali imate dovoljenje za dostop."
 
-#: addressbook/gui/component/addressbook.c:655
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Vpišite geslo za %s (uporabnik %s)"
 
-#: addressbook/gui/component/addressbook.c:836
+#: addressbook/gui/component/addressbook.c:776
 msgid "Name begins with"
 msgstr "Ime se začne z"
 
-#: addressbook/gui/component/addressbook.c:837
+#: addressbook/gui/component/addressbook.c:777
 msgid "Email is"
 msgstr "E-naslov je"
 
-#: addressbook/gui/component/addressbook.c:838
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:778
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:55
+#: addressbook/gui/component/addressbook.c:779
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Katerokoli polje vsebuje"
 
-#: addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Napredno..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1082
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1008
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "katerakoli kategorija"
 
-#: addressbook/gui/component/addressbook.c:1167
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
@@ -776,7 +645,7 @@ msgstr "(brez)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "prvi e-naslov"
 
@@ -822,6 +691,588 @@ msgstr "Izključi poizvedbe"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Vključi poizvedbe (nevarno!)"
 
+#: addressbook/gui/component/ldap-config.glade.h:1
+#, fuzzy
+msgid "  S_how Supported Bases "
+msgstr "_Preveri za podprte vrste  "
+
+#: addressbook/gui/component/ldap-config.glade.h:2
+#, fuzzy
+msgid "1234"
+msgstr "123"
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+#, fuzzy
+msgid "380"
+msgstr "80%"
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "666"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr " _Odstrani"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Možnosti"
+
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:14
+msgid "Addressbook Sources"
+msgstr "Viri adresarja"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
+msgid "Always"
+msgstr "Vedno"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonimno"
+
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:18
+msgid "Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:19
+msgid ""
+"Congratulations, you are finished setting up this LDAP server. You\n"
+"are now ready to access this directory.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Connecting"
+msgstr "Connecticut"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "DN Customization"
+msgstr "Ni podatkov"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "Z_briši"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "_Razločno ime:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "E-poštni naslov:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Alarm Evolucije"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr ""
+"Evolucija bo uporabila ta e-poštni naslov, za vašo avtentifikacijo pri "
+"strežniku"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+"Evolucija bo uporabila ta e-poštni naslov, za vašo avtentifikacijo pri "
+"strežniku"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "_Poišči"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Splošno"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+#, fuzzy
+msgid "LDAP Attribute"
+msgstr "Avtentifikacija LDAP"
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Nastavitev"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Robovi"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
+msgid "Never"
+msgstr "Nikoli"
+
+#: addressbook/gui/component/ldap-config.glade.h:38
+msgid ""
+"Now, you must specify how you want to connect to the LDAP server. The SSL "
+"(Secure Sockets Layer)\n"
+"and TLS (Transport Layer Security) protocols are used by some servers to "
+"cryptographically protect\n"
+"your connection. Ask your system administrator if your LDAP server uses "
+"these protocols."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
+msgid "Objectclasses"
+msgstr "_Predmet"
+
+#: addressbook/gui/component/ldap-config.glade.h:42
+msgid "Objectclasses Used in Evolution:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:43
+msgid "Objectclasses Used on Server:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:44
+msgid "One"
+msgstr "Ena"
+
+#: addressbook/gui/component/ldap-config.glade.h:45
+msgid ""
+"Please select and Evolution attribute and an\n"
+"LDAP attribute to associate with it."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
+msgid "R_estore Defaults"
+msgstr "Privzeto"
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "Privzeto"
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "_Doseg iskanja:"
+
+#. No time range is set, so don't start a query
+#: addressbook/gui/component/ldap-config.glade.h:50
+#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
+#: calendar/gui/e-week-view.c:1213
+msgid "Searching"
+msgstr "Iskanje"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Izberi vse"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Zbrisano"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if\n"
+"your LDAP server supports SSL or TLS."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:55
+msgid ""
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
+"secure."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:59
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This \n"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
+"exploits. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:62
+msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:64
+msgid ""
+"Specifying a display name is the last required step in configuring an LDAP "
+"server."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:65
+#, fuzzy
+msgid "Step 1: Server Information"
+msgstr "Podatki o izvorni kodi"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Vzpostavljam povezavo s strežnikom..."
+
+#: addressbook/gui/component/ldap-config.glade.h:67
+msgid "Step 3: Searching the Directory"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+#, fuzzy
+msgid "Step 4: Display Name"
+msgstr "Piskaj ob zaslonskih alarmih"
+
+#: addressbook/gui/component/ldap-config.glade.h:69
+msgid "Sub"
+msgstr "Pod"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Shranjena iskanja"
+
+#: addressbook/gui/component/ldap-config.glade.h:71
+msgid ""
+"The first step in configuring an LDAP server is to provide its name, and "
+"your log in\n"
+"information. Please ask your system administrator if you are unsure of this "
+"information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:73
+msgid ""
+"The options on this page control how many entries should be included in "
+"your\n"
+"searches, and how long a search should take. Ask your system administrator "
+"if you\n"
+"need to change these options."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:76
+msgid ""
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:78
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the \n"
+"directory tree. A search scope of \"sub\" will include all entries below "
+"your search base.\n"
+"A search scope of \"one\" will only include the entries one level beneath "
+"your base."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:81
+msgid ""
+"This assistant will help you to access online directory services\n"
+"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"\n"
+"Adding a new LDAP server requires some specialized information\n"
+"about the server. Please contact your system administrator if you \n"
+"need help finding this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:87
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:88
+#, fuzzy
+msgid ""
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
+"too large will slow down your addressbook."
+msgstr ""
+"To je največje število vizik za prenos.  Če je to nastavljeno na preveč, bo "
+"upočasnilo ta adresar."
+
+#: addressbook/gui/component/ldap-config.glade.h:90
+msgid ""
+"This is the method evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your ldap "
+"server."
+msgstr ""
+"To je način, ki ga bo Evolucija uporabila, za vašo avtentifikacijo.  Če "
+"boste to nastavili na \"E-poštni naslov\", bo potrebovan anonimni dostop do "
+"vašega strežnika LDAP"
+
+#: addressbook/gui/component/ldap-config.glade.h:91
+#, fuzzy
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
+"It is for display purposes only. "
+msgstr ""
+"To ime bo uporabljeno za identifikacijo vašega računa. Uporablja se le za "
+"prikaz."
+
+#: addressbook/gui/component/ldap-config.glade.h:93
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
+"list of standard ports has been provided. Ask your system administrator\n"
+"what port you should specify."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:96
+msgid "This option controls how long a search will be run."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:97
+msgid ""
+"To add an attribute to the DN, select it from the list and click the \"Add "
+"Attribute\" button.\n"
+"Any values that you add to the DN will become required values for any new "
+"contacts\n"
+"that you add to the directory on the LDAP server. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:100
+msgid "U_se SSL/TLS:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:101
+#, fuzzy
+msgid "Using distinguished name (DN)"
+msgstr "Razločno ime (DN)"
+
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+msgid "Using email address"
+msgstr "E-poštni naslov"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+msgid "Whenever Possible"
+msgstr "Kadar je možno"
+
+#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:141
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "Dodaj >>"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Dodaj dejanje"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Dodaj dejanje"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Vedno"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Zbriši vse"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Prikaz"
+
+#: addressbook/gui/component/ldap-config.glade.h:111
+#, fuzzy
+msgid "_Distinguished Name (DN):"
+msgstr "Razločno ime (DN)"
+
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:113
+#, fuzzy
+msgid "_Download limit:"
+msgstr "_Omejitev prenosov"
+
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Uredi sestanek"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Alarm Evolucije"
+
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Možnosti"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "Številka vrat:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "Privzeto"
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "Iskanje v _zbirki:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "Ime _strežnika:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Čas podaljška spanja (minut)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Račun %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "Urejevalnik stikov"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "ni vizitk"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Znova se povezujem z %s"
+
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "Splošno"
+
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "Iskanje"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
@@ -830,10 +1281,12 @@ 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"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:849
+#: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Odstrani"
 
@@ -863,6 +1316,11 @@ msgid "Unnamed Contact"
 msgstr "Neimenovan stik"
 
 #: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Poišči stik"
+
+#: addressbook/gui/component/select-names/e-select-names.c:716
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -878,7 +1336,7 @@ msgstr ""
 "Vsebuje naj podroben opis okoliščin v katerih se je ta napaka tgodila.\n"
 "Hvala."
 
-#: addressbook/gui/component/select-names/e-select-names.c:608
+#: addressbook/gui/component/select-names/e-select-names.c:724
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "Under normal circumstances, this should never happen.\n"
@@ -890,31 +1348,40 @@ msgstr ""
 "Za rešitev tega problema boste morali zapustiti in znova\n"
 "pognati Evolucijo."
 
-#: addressbook/gui/component/select-names/e-select-names.c:690
+#: addressbook/gui/component/select-names/e-select-names.c:806
 msgid "Select Contacts from Addressbook"
 msgstr "Izberi stike iz adresarja"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "_Vsebujejo:"
+msgid "Select Names"
+msgstr "Izberi imena"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "_Poišči"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Zbriši stik?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Izberi imena"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Stiki"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "Kaži stike, ki ustrezajo naslednjim kriterijem:"
+msgid ""
+"Type a name into the entry, or\n"
+"select one from the list below:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "_Browse..."
+msgstr "_Prestavi..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategorija:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_Mapa:"
 
@@ -950,7 +1417,7 @@ msgstr "Sodelovanje"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
@@ -959,7 +1426,7 @@ msgid "D_epartment:"
 msgstr "O_ddelek:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Podrobnosti"
 
@@ -975,10 +1442,6 @@ msgstr "Zavedi _kot:"
 msgid "Full _Name..."
 msgstr "_Polno ime..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Splošno"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1022,10 +1485,12 @@ msgstr "Želi dobivati _HTML e-pošto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1492 mail/mail-config.glade.h:133
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:107
-#: ui/evolution-tasks.xml.h:20 ui/evolution.xml.h:35
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Zbriši"
 
@@ -1054,7 +1519,7 @@ msgid "_Web page address:"
 msgstr "Naslov _spletne strani:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Združene države amerike"
 
@@ -1559,12 +2024,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Latvija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libanon"
 
@@ -1573,7 +2037,7 @@ msgid "Lesotho"
 msgstr "Lesoto"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberija"
 
@@ -1582,12 +2046,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litvanija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
@@ -1620,7 +2084,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -1645,7 +2109,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mehika"
 
@@ -1670,7 +2134,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Maroko"
 
@@ -1695,7 +2159,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Nizozemska"
 
@@ -1708,12 +2172,12 @@ msgid "New Caledonia"
 msgstr "Nova Kaledonija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nova Zelandija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nikaragva"
 
@@ -1730,7 +2194,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolški otoki"
 
@@ -1739,17 +2203,17 @@ msgid "Northern Mariana Islands"
 msgstr "Severni marianski otoki"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norveška"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -1762,7 +2226,7 @@ msgid "Palestinian Territory"
 msgstr "Palestinsko osvobojeno ozemlje"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -1771,12 +2235,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Nova Gvineja"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paragvaj"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -1789,22 +2253,22 @@ msgid "Pitcairn"
 msgstr "Pitcairin"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Poljska"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugalska"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Portoriko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Katar"
 
@@ -1813,7 +2277,7 @@ msgid "Reunion"
 msgstr "Reunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Romunija"
 
@@ -1850,7 +2314,7 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome in Principe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Savdska Arabija"
 
@@ -1867,17 +2331,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapur"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovaška"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slovenija"
 
@@ -1890,7 +2354,7 @@ msgid "Somalia"
 msgstr "Somalija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Južno afriška republika"
 
@@ -1899,7 +2363,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Južna Georgija in Južni Sandwichovi otoki"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Španija"
 
@@ -1920,7 +2384,7 @@ msgid "Sudan"
 msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -1933,17 +2397,17 @@ msgid "Swaziland"
 msgstr "Svazi"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Švedska"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Švica"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Tajvan"
 
@@ -1980,7 +2444,7 @@ msgid "Tunisia"
 msgstr "Tunizija"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turčija"
 
@@ -2001,7 +2465,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukrajina"
 
@@ -2010,7 +2474,7 @@ msgid "United Arab Emirates"
 msgstr "Združeni arabski emirati"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Velika Britanija"
 
@@ -2019,7 +2483,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "Ameriški zunajležeči otoki"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Urugvaj"
 
@@ -2032,12 +2496,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2058,12 +2522,12 @@ msgid "Western Sahara"
 msgstr "Zahodna sahara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslavija"
 
@@ -2087,23 +2551,23 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "Zbriši stik?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Urejevalnik kategorij ni na voljo."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada sledečim kategorijam:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Shrani stik kot vVizitko"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nisem mogel najti gradnika za polje `%s'"
@@ -2117,7 +2581,7 @@ msgid "Edit Full"
 msgstr "Uredi celoto"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:333
+#: addressbook/gui/widgets/e-addressbook-view.c:336
 msgid "Full Name"
 msgstr "Polno ime"
 
@@ -2130,11 +2594,11 @@ msgstr "E-pošta"
 msgid "card.vcf"
 msgstr "vizitka.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "seznam"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2269,11 +2733,11 @@ msgid "contact-list-editor"
 msgstr "Urejevalnik stikov"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Shrani kot vVizitko"
 
@@ -2323,7 +2787,7 @@ msgstr ""
 "obstaja v tej mapi. Ga želite vseeno dodati?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:238
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
@@ -2332,114 +2796,39 @@ msgstr "Napredno iskanje"
 msgid "Search"
 msgstr "Iskanje"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:136
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "ni vizitk"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:139
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 vizitka"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d vizitk"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:369
+#: addressbook/gui/widgets/e-addressbook-model.c:370
 msgid "Error getting book view"
 msgstr "Napaka ob dobivanju pogleda knjige"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:313
-#: addressbook/gui/widgets/e-addressbook-view.c:902
-#: addressbook/gui/widgets/e-addressbook-view.c:1016
-#: addressbook/gui/widgets/e-addressbook-view.c:1638
-#: ui/evolution-addressbook.xml.h:22
-msgid "Save as VCard"
-msgstr "Shrani kot vVizitko"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:312
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Odpri"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1017
-#: ui/evolution-addressbook.xml.h:13
-msgid "Forward Contact"
-msgstr "Posreduj _stik"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:1018
-msgid "Send Message to Contact"
-msgstr "Stiku pošlji sporočilo"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1019
-#: ui/evolution-addressbook.xml.h:19 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:71
-#: ui/my-evolution.xml.h:2
-msgid "Print"
-msgstr "Natisni"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:318
-#: addressbook/gui/widgets/e-addressbook-view.c:1021
-msgid "Print Envelope"
-msgstr "Natisni kuverto"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:322
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-msgid "Copy to folder..."
-msgstr "Kopiraj v mapo..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
-#: addressbook/gui/widgets/e-addressbook-view.c:1026
-msgid "Move to folder..."
-msgstr "Prestavi v mapo..."
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:1029
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:7
-msgid "Cut"
-msgstr "Izreži"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
-#: addressbook/gui/widgets/e-addressbook-view.c:1030
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Kopiraj"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: addressbook/gui/widgets/e-addressbook-view.c:1031
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:12
-msgid "Paste"
-msgstr "Prilepi"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1032
-#: filter/libfilter-i18n.h:10 mail/mail-accounts.c:306
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:22
-msgid "Delete"
-msgstr "Zbriši"
-
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Napaka ob spreminjanju vizitke"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1020
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Uspeh"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1945
-#: shell/e-storage.c:468 shell/evolution-shell-component.c:1057
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
@@ -2447,8 +2836,8 @@ msgstr "Neznana napaka"
 msgid "Repository offline"
 msgstr "Skladišče, ki ni na mreži"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:456
-#: shell/evolution-shell-component.c:1048
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
@@ -2467,52 +2856,67 @@ msgstr "Protokol ni podprt"
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2276
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "preklicano"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Avtentifikacija ni usplea."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Potrebna je avtentifikacija"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Drugačna napaka"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Želite shraniti spremembe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Napaka ob dodajanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Napaka ob dodajanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Napaka ob spreminjanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Napaka ob odstranjevanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1436
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Napaka ob odstranjevanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 msgid "Display Cards?"
 msgstr "Prikaži vizitke?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards"
 msgstr "Prikaži vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2522,86 +2926,192 @@ msgstr ""
 "Zahtevali ste prikaz %d vizitk. To bo povzročilo odprtje %d novih oken na \n"
 " vašem zaslonu. Resnično želite prikazati vse te vizitke?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:342
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 msgid "Move card to"
 msgstr "Prestavi vizitko v"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Copy card to"
 msgstr "Kopiraj vizitko v"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 msgid "Move cards to"
 msgstr "Prestavi vizitke v"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 msgid "Copy cards to"
 msgstr "Kopiraj vizitke v"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:331
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Kliknite tu za dodajo stika *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Osnovni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Pomožni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Službebni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Povratni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Telefon podjetja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Domač telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Službeni naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Domači naslov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Telefon v avtu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Službeni telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Domač telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:351
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Drug telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 msgid "Other Address"
 msgstr "Drug naslov"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Adresar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Shrani kot vVizitko"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:877
+#, fuzzy
+msgid "New Contact..."
+msgstr "Nov stik"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:878
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Nov seznam stikov"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:881
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "Pojdi v _mapo..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Import..."
+msgstr "_Uvozi..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Išči po kontaktih"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "Viri _adresarja..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:887
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "_Nastavitve pilota..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Posreduj _stik"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:892
+msgid "Send Message to Contact"
+msgstr "Stiku pošlji sporočilo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/my-evolution.xml.h:1
+msgid "Print"
+msgstr "Natisni"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+msgid "Print Envelope"
+msgstr "Natisni kuverto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+msgid "Copy to folder..."
+msgstr "Kopiraj v mapo..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:900
+msgid "Move to folder..."
+msgstr "Prestavi v mapo..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Izreži"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopiraj"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+msgid "Paste"
+msgstr "Prilepi"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+msgid "Delete"
+msgstr "Zbriši"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Trenutni pogled"
+
+#. Minicard view stuff
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,ć,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,š,t,u,v,w,x,y,z,ž"
 
@@ -2609,7 +3119,7 @@ msgstr ",123,a,b,c,ć,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,š,t,u,v,w,x,y,z,ž"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,ć,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,š,t,u,v,w,x,y,z,ž"
 
@@ -2626,7 +3136,7 @@ msgstr "in ena druga vizitka."
 msgid "Save in addressbook"
 msgstr "Shranite v adresarju"
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
@@ -2640,7 +3150,7 @@ msgstr ""
 "\n"
 "Če želite ustvariti nov stik, dvojno kliknite tu."
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
+#: addressbook/gui/widgets/e-minicard-view.c:143
 msgid ""
 "\n"
 "\n"
@@ -2737,7 +3247,7 @@ msgid "Include:"
 msgstr "Vključi:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:643
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Ležeče"
 
@@ -2757,17 +3267,17 @@ msgstr "Robovi"
 msgid "Number of columns:"
 msgstr "Število stolpcev:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Možnosti"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:630
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Usmerjenost"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Stran"
 
@@ -2785,7 +3295,7 @@ msgstr "Vir papirja:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:636
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Pokončno"
 
@@ -2841,33 +3351,33 @@ msgstr "Širina:"
 msgid "_Font..."
 msgstr "_Pisava..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Neimenovan sestanek"
 
-#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
+#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "visoka"
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "običajna"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
+#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:648
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "nizka"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:518
+#: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "ni definirana"
 
@@ -2899,21 +3409,23 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Kontrola Bonobo, ki prikaže koledar."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar executive summary component."
-msgstr "Evolucijina komponenta za povzetke."
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Nastavitve koledarja in nalog"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Calendar."
+msgstr "Nastavitveno orodje za Evolucijin veznik koledarja.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolucijin pregledovalnik iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Komponenta Evolucije za urejanje koledarja."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Calendar Summary component."
-msgstr "Tovarna komponent za povzetke koledarja."
-
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Tovarna za Evolucijino komponento nalog."
@@ -2934,6 +3446,10 @@ msgstr "Tovarna za centralzacijo dialogov urejevalnika komponent koledarja."
 msgid "Factory to create a component editor factory"
 msgstr "Tovarna za ustvarjanje tovarne komponent urejevalnika."
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+msgid "This page can be used to configure Calendar and Task preferences"
+msgstr ""
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "Storitev opozorilnega alarma"
@@ -2997,7 +3513,7 @@ msgstr ""
 "prikazala običajen opozorilni dialog."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:447 mail/mail-callbacks.c:2581
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Opozorilo"
@@ -3023,64 +3539,64 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "O tem programu me ne sprašuj več."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Nisem mogel inicializirati GNOMEa"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "Nisem mogel ustvariti storitve alarma"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Povzetek vsebuje"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Opis vsebuje"
 
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentar vsebuje"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1118
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Brez zadetka"
 
-#: calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%A, %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:460 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:469
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:480 calendar/gui/calendar-commands.c:487
-#: calendar/gui/calendar-commands.c:493 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. 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/calendar-commands.c:485
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1468
+#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:834
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3088,16 +3604,16 @@ msgstr ""
 "in OAF-a."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:385
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "osebno"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "zaupno"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "javno"
 
@@ -3118,32 +3634,32 @@ msgid "W"
 msgstr "W"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Prost"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
-#: calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1042
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Zaseden"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2267
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "ni pričeto"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2270
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "v teku"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2273
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "končano"
 
@@ -3158,11 +3674,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1035
-#: mail/mail-account-gui.c:1036 mail/mail-account-gui.c:1617
-#: mail/mail-accounts.c:151 mail/mail-accounts.c:416
-#: mail/mail-config.glade.h:74
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3177,23 +3694,17 @@ msgstr "Ponovi se"
 msgid "Assigned"
 msgstr "Določena"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
-#: calendar/gui/e-meeting-model.c:821
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Ne"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-#: calendar/gui/e-week-view.c:1188
-msgid "Searching"
-msgstr "Iskanje"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Dnevni pogled"
@@ -3210,59 +3721,77 @@ msgstr "Tedenski pogled"
 msgid "Month View"
 msgstr "Mesečni pogled"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:3
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Koledar"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Mapa, ki vsebuje sestanke in dogodke"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1754
-#: calendar/gui/tasks-control.c:517 my-evolution/e-summary-tasks.c:250
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
 #: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
 #: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Naloge"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Mapa, ki vsebuje predmete za opravit"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:704
 msgid "New meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:704
 msgid "_Meeting"
 msgstr "_Sestanek"
 
-#: calendar/gui/component-factory.c:687
+#: calendar/gui/component-factory.c:708
 msgid "New task"
 msgstr "Nova naloga"
 
-#: calendar/gui/component-factory.c:687 ui/evolution-tasks.xml.h:25
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Naloga"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:712
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Nov sestanek"
+
+#: calendar/gui/component-factory.c:712
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "_Sestanek"
+
+#: calendar/gui/component-factory.c:716
 msgid "New appointment"
 msgstr "Nov sestanek"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:716
 msgid "_Appointment"
 msgstr "_Sestanek"
 
-#: calendar/gui/control-factory.c:103
+#: calendar/gui/control-factory.c:123
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Nisem mogel odpreti imenika v '%s'"
 
-#: calendar/gui/control-factory.c:130
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "Spremeni pogled na %s"
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Možnosti zvočnega alarma"
@@ -3327,9 +3856,7 @@ msgstr "dodatnih ponovitev vsakih"
 msgid "hours"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "minut"
 
@@ -3457,7 +3984,7 @@ msgstr "Opomnilniki"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:758 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Povzetek:"
 
@@ -3486,7 +4013,7 @@ msgstr "konec sestanka"
 msgid "hour(s)"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:160
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minut"
 
@@ -3514,32 +4041,34 @@ msgstr "30 minut"
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Nastavitve koledarja in nalog"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Barva za opravila, katerim je rok že pretekel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Barva za opravila, ki so na vrsti danes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Ustvari nove sestanke s privzetim _opomnilnikom"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Days"
-msgstr "Dni"
+#, fuzzy
+msgid "Day _ends:"
+msgstr "Konec dneva:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Prvi dan ted_na:"
+msgid "Days"
+msgstr "Dni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "petek"
 
@@ -3552,147 +4081,161 @@ msgid "Minutes"
 msgstr "Minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "ponedeljek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Naloge s p_rekoračenim rokom"
+#, fuzzy
+msgid "S_un"
+msgstr "_ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "sobota"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
-msgstr "Kaži čase _koncev sestankov v tedenskih in mesečnih pogledih"
+msgid "Sh_ow a reminder"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Kaži številke tednov v navigatorju po dnevih"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Sta_rt of day:"
-msgstr "Zače_tek dneva:"
+#: calendar/gui/dialogs/recurrence-page.c:1127
+msgid "Sunday"
+msgstr "nedeljo"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Su_n"
-msgstr "_ned"
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "Nalo_ge z današnjim rokom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Sunday"
-msgstr "nedeljo"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "T_hu"
 msgstr "č_et"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "T_ue"
-msgstr "_tor"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "Nalo_ge z današnjim rokom"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "Seznam _nalog"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Thursday"
 msgstr "četrtek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Čas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Časovni _pas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Časovne _delitve:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Oblika izpisa časa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1122
 msgid "Tuesday"
 msgstr "torek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "sreda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Delavni teden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 urna (dop./pop.)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 urna"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Vprašaj za potrditev ob brisanju predmetov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "_Skrči vikende v mesečnem pogledu"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Konec dneva:"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Prikaz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "_End of day:"
-msgstr "_Konec dneva:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Fri"
 msgstr "_pet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Splošno"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_Skrij opravljene naloge po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "po_n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Drugo"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Naloge s p_rekoračenim rokom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "so_b"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "Kaži čase _koncev sestankov v tedenskih in mesečnih pogledih"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "Seznam _nalog"
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Časovne _delitve:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_tor"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_sre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "before the start of the appointment"
-msgstr "pred pričetkom sestanka"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
+msgstr "pred koncem sestanka"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
@@ -3754,73 +4297,81 @@ msgstr "%s  Naredili ste spremembe. Pozabi spremembe in posodobi urejevalnik?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Ničesar niste spremenili, posodobi urejevalnik?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2185
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
 msgid " to "
 msgstr " do "
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2189
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
 msgid " (Completed "
 msgstr " (Končano "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2191
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
 msgid "Completed "
 msgstr "končano "
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2196
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
 msgid " (Due "
 msgstr " (Rok "
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2198
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
 msgid "Due "
 msgstr "Rok"
 
-#: calendar/gui/dialogs/comp-editor.c:321
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Nisem mogel posodobiti predmeta!"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
 msgstr "Nisem mogel posodobiti predmeta!"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Uredi sestake"
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sestanek - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Vpis v dnevniku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2234
-#: mail/mail-display.c:113
-msgid "Overwrite file?"
-msgstr "Prepiši datoteko?"
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+msgid "Save as..."
+msgstr "Shrani kot..."
 
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2241
-#: mail/mail-display.c:117
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
 msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+"Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
-"Datoteka z enakim imenom že obstaja.\n"
-"Naj jo prepišem?"
 
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Shrani kot..."
-
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Ne morem dobiti trenutne različice!"
 
@@ -3878,27 +4429,27 @@ msgstr "Delegirano komu:"
 msgid "Enter Delegate"
 msgstr "Vnesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2224
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Sestanek"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Opomnilnik"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Ponovitev"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Načrtovanje časa"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Sestanek"
 
@@ -3967,19 +4518,19 @@ msgstr "_Čas konca:"
 msgid "_Start time:"
 msgstr "_Čas pričetka:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Potreben je organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Potreben je vsaj en udeleženec."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Ta oseba se je že udeleženec sestanka!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Delegiraj komu..."
 
@@ -4019,7 +4570,7 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4031,14 +4582,14 @@ msgstr "Vloga"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:51
-#: mail/message-list.etspec.h:11
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stanje"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:118
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Vrsta"
@@ -4053,35 +4604,101 @@ msgid "_Change Organizer"
 msgstr "_Spremeni organizatorja"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Povabi ostale..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Drug organizator"
+#: calendar/gui/dialogs/recurrence-page.c:126
+#: calendar/gui/dialogs/recurrence-page.c:146
+#: calendar/gui/dialogs/recurrence-page.c:156
+#, fuzzy
+msgid "st"
+msgstr "1."
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "2."
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "3."
+
+#: calendar/gui/dialogs/recurrence-page.c:129
+#: calendar/gui/dialogs/recurrence-page.c:130
+#: calendar/gui/dialogs/recurrence-page.c:131
+#: calendar/gui/dialogs/recurrence-page.c:132
+#: calendar/gui/dialogs/recurrence-page.c:133
+#: calendar/gui/dialogs/recurrence-page.c:134
+#: calendar/gui/dialogs/recurrence-page.c:135
+#: calendar/gui/dialogs/recurrence-page.c:136
+#: calendar/gui/dialogs/recurrence-page.c:137
+#: calendar/gui/dialogs/recurrence-page.c:138
+#: calendar/gui/dialogs/recurrence-page.c:139
+#: calendar/gui/dialogs/recurrence-page.c:140
+#: calendar/gui/dialogs/recurrence-page.c:141
+#: calendar/gui/dialogs/recurrence-page.c:142
+#: calendar/gui/dialogs/recurrence-page.c:143
+#: calendar/gui/dialogs/recurrence-page.c:144
+#: calendar/gui/dialogs/recurrence-page.c:145
+#: calendar/gui/dialogs/recurrence-page.c:149
+#: calendar/gui/dialogs/recurrence-page.c:150
+#: calendar/gui/dialogs/recurrence-page.c:151
+#: calendar/gui/dialogs/recurrence-page.c:152
+#: calendar/gui/dialogs/recurrence-page.c:153
+#: calendar/gui/dialogs/recurrence-page.c:154
+#: calendar/gui/dialogs/recurrence-page.c:155
+msgid "th"
+msgstr "4."
+
+#: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ta sestanek vsebuje ponovitve, ki jih Evolucija ne zna urejati."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+msgid "first"
+msgstr "prvi"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "sekunda"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "ta"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "sever"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "seznam"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Drugi faks"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "dan"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr "4."
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr "pojavitve"
 
@@ -4177,7 +4794,7 @@ msgid "Progress"
 msgstr "Napredek"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:755
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4189,15 +4806,19 @@ msgstr "_Prioriteta:"
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:325
+#: calendar/gui/dialogs/task-editor.c:182
+msgid "Basic"
+msgstr "Osnove"
+
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Dodelitev"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:801
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:39
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Opis:"
 
@@ -4209,115 +4830,135 @@ msgstr "Datum _pričetka:"
 msgid "_Due Date:"
 msgstr "_Do datuma:"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:440
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:441
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:442
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:443
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:444
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:445
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:446
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:447
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:448
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:449
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:450
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
-#: calendar/gui/e-week-view.c:1828
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3433 mail/folder-browser.c:1463
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:41
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Odpri"
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3442 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Save as..."
+msgstr "Shrani kot..."
+
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
+#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+msgid "_Print..."
+msgstr "Na_tisni..."
+
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Izreži"
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3557
-#: calendar/gui/e-week-view.c:3444 ui/evolution-addressbook.xml.h:36
-#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:19
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:968 calendar/gui/e-day-view.c:3532
-#: calendar/gui/e-day-view.c:3559 calendar/gui/e-week-view.c:3420
-#: calendar/gui/e-week-view.c:3446 ui/evolution-addressbook.xml.h:42
-#: ui/evolution-calendar.xml.h:41 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:23
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
+#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Prilepi"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:996
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Dodeli nalogo"
+
+#: calendar/gui/e-calendar-table.c:997
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Posreduj naprej kot i_Koledar"
+
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_Označi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "_Zbriši to opravilo"
-
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:999
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "_Označi opravila kot opravljena"
 
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_Zbriši izbrana opravila"
 
-#: calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7140
-#: calendar/gui/e-week-view.c:3930
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Posodabljam predmete"
 
-#: calendar/gui/e-calendar-table.c:1247
+#: calendar/gui/e-calendar-table.c:1354
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknite tu za dodajanje opravila"
@@ -4326,8 +4967,8 @@ msgstr "Kliknite tu za dodajanje opravila"
 msgid "Alarms"
 msgstr "Alarmi"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
-#: camel/camel-filter-driver.c:1026
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Končano"
 
@@ -4358,7 +4999,7 @@ msgstr "Datum pričetka"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:44 shell/e-shell.c:661
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
 #: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Povzetek"
@@ -4401,114 +5042,166 @@ msgstr "%02i deljenj minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1389
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1484
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1416
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1440
 #: calendar/gui/e-week-view-main-item.c:347
 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:614 calendar/gui/e-week-view.c:350
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "dop"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pop"
 
-#: calendar/gui/e-day-view.c:3525
+#: calendar/gui/e-day-view.c:3549
 msgid "New _Appointment"
 msgstr "Nov _sestanek"
 
-#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3415
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _dogodek"
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3425
-#: ui/evolution-calendar.xml.h:19
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#, fuzzy
+msgid "New Meeting"
+msgstr "Nov sestanek"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#, fuzzy
+msgid "New Task"
+msgstr "Nova _naloga"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Natisni..."
+
+#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Pojdi na _danes"
 
-#: calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3427
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 msgid "_Go to Date..."
 msgstr "_Pojdi na datum..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3435
-msgid "_Delete this Appointment"
-msgstr "_Zbriši ta sestanek"
+#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: ui/evolution-calendar.xml.h:31
+msgid "_Publish Free/Busy Information"
+msgstr "_Objavi podatek o zasedenosti"
+
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:39
+#, fuzzy
+msgid "_Configure..."
+msgstr "Nastavi mapo..."
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+msgid "_Configure Pilot..."
+msgstr "Nastavi mapo..."
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+msgid "_Save As..."
+msgstr "_Shrani kot..."
+
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "_Načrtuj sestanek"
+
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Posreduj naprej kot i_Koledar"
+
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "Naredi to pojavitev _prestavljivo"
 
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3462
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3464
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 msgid "Delete _All Occurrences"
 msgstr "Zbriši _vse pojavitve"
 
-#: calendar/gui/e-itip-control.c:545
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:638
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "Orodja GNOME Pilot niso nameščena na vašem sistemu."
+
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:646
+#, c-format
+msgid "Error executing %s."
+msgstr "Napaka ob izvajanju %s."
+
+#: calendar/gui/e-itip-control.c:678
 msgid "Meeting begins: <b>"
 msgstr "Čas pričetka sestanka: <b>"
 
-#: calendar/gui/e-itip-control.c:550
+#: calendar/gui/e-itip-control.c:683
 msgid "Task begins: <b>"
 msgstr "Čas pričetka opravila: <b>"
 
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:688
 msgid "Free/Busy info begins: <b>"
 msgstr "Podatki o zasedenosti se pričnejo: <b>"
 
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:692
 msgid "Begins: <b>"
 msgstr "Pričetek: <b>"
 
-#: calendar/gui/e-itip-control.c:571
+#: calendar/gui/e-itip-control.c:704
 msgid "Meeting ends: <b>"
 msgstr "Čas zaključka sestanka: <b>"
 
-#: calendar/gui/e-itip-control.c:574
+#: calendar/gui/e-itip-control.c:707
 msgid "Free/Busy info ends: <b>"
 msgstr "Podatki o zasedenosti se končajo: <b>"
 
-#: calendar/gui/e-itip-control.c:578
+#: calendar/gui/e-itip-control.c:711
 msgid "Ends: <b>"
 msgstr "Konec: <b>"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:725
 msgid "Task Completed: <b>"
 msgstr "Opravilo končano: <b>"
 
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:735
 msgid "Task Due: <b>"
 msgstr "Rok opravila: <b>"
 
-#: calendar/gui/e-itip-control.c:639 calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
 msgid "iCalendar Information"
 msgstr "Podatki o iKoledarju"
 
 #. Title
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:787
 msgid "iCalendar Error"
 msgstr "Napaka iKoledarja"
 
-#: calendar/gui/e-itip-control.c:719 calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
 msgid "An unknown person"
 msgstr "neznana oseba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:875
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -4516,297 +5209,325 @@ msgstr ""
 "<br> Prosimo, preglejte sledeče podatke in izberite dejanje iz spodnjega "
 "menuja."
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:891
 msgid "<i>None</i>"
 msgstr "<i>Nič</i>"
 
-#: calendar/gui/e-itip-control.c:770
+#: calendar/gui/e-itip-control.c:903
 msgid "Status:"
 msgstr "Stanje:"
 
-#: calendar/gui/e-itip-control.c:775 calendar/gui/e-meeting-model.c:318
-#: calendar/gui/e-meeting-model.c:341 calendar/gui/e-meeting-model.c:835
-#: calendar/gui/itip-utils.c:323
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
 msgid "Accepted"
 msgstr "Sprejeto"
 
-#: calendar/gui/e-itip-control.c:779 calendar/gui/itip-utils.c:326
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
 msgid "Tentatively Accepted"
 msgstr "Poskusno sprejeto"
 
-#: calendar/gui/e-itip-control.c:783 calendar/gui/e-meeting-model.c:320
-#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:836
-#: calendar/gui/itip-utils.c:329 calendar/gui/itip-utils.c:355
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
 msgid "Declined"
 msgstr "Zavrnjeno"
 
-#: calendar/gui/e-itip-control.c:787 calendar/gui/e-itip-control.c:986
-#: calendar/gui/e-itip-control.c:1057 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:289 calendar/gui/e-meeting-model.c:354
-#: calendar/gui/e-meeting-model.c:793 calendar/gui/e-meeting-model.c:809
-#: camel/providers/smtp/camel-smtp-transport.c:180
-#: camel/providers/smtp/camel-smtp-transport.c:235 mail/folder-browser.c:317
-#: mail/mail-display.c:817 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:442
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "neznano"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:849
-#: calendar/gui/e-itip-control.c:865 calendar/gui/e-itip-control.c:878
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
 msgid "Choose an action:"
 msgstr "Izberi dejanje:"
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:972
 msgid "Update"
 msgstr "Posodobi"
 
-#: calendar/gui/e-itip-control.c:835 calendar/gui/e-itip-control.c:854
-#: calendar/gui/e-itip-control.c:867 calendar/gui/e-itip-control.c:880
-#: calendar/gui/e-itip-control.c:893 calendar/gui/e-itip-control.c:906
-#: shell/e-shell.c:1935 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "V redu"
 
-#: calendar/gui/e-itip-control.c:850
+#: calendar/gui/e-itip-control.c:1000
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: calendar/gui/e-itip-control.c:851
+#: calendar/gui/e-itip-control.c:1001
 msgid "Tentatively accept"
 msgstr "Poskusno sprejmi"
 
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:1002
 msgid "Decline"
 msgstr "Odbij"
 
-#: calendar/gui/e-itip-control.c:866
+#: calendar/gui/e-itip-control.c:1026
 msgid "Send Free/Busy Information"
 msgstr "Pošlji podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:879
+#: calendar/gui/e-itip-control.c:1039
 msgid "Update respondent status"
 msgstr "Osveži stanje respondenta"
 
-#: calendar/gui/e-itip-control.c:892
+#: calendar/gui/e-itip-control.c:1052
 msgid "Send Latest Information"
 msgstr "Pošlji zadnje podatke"
 
-#: calendar/gui/e-itip-control.c:905 calendar/gui/itip-utils.c:343
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:1117
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je izdal(a) podatke o sestanku."
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1118
 msgid "Meeting Information"
 msgstr "Podatki o sestanku"
 
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1122
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> zahteva vašo prisotnost na sestanku."
 
-#: calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:1123
 msgid "Meeting Proposal"
 msgstr "Predlog sestanka"
 
-#: calendar/gui/e-itip-control.c:963
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vas želi dodati k obstoječem sestanku."
 
-#: calendar/gui/e-itip-control.c:964
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Update"
 msgstr "Posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:1132
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi dobiti najnovejše podatke o sestanku."
 
-#: calendar/gui/e-itip-control.c:969
+#: calendar/gui/e-itip-control.c:1133
 msgid "Meeting Update Request"
 msgstr "Zahtevek za posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:992
+#: calendar/gui/e-itip-control.c:1156
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovoril(a) na zahtevek po sestanku."
 
-#: calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1157
 msgid "Meeting Reply"
 msgstr "Odgovor na sestanek"
 
-#: calendar/gui/e-itip-control.c:997
+#: calendar/gui/e-itip-control.c:1161
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je preklical(a) sestanek."
 
-#: calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1162
 msgid "Meeting Cancellation"
 msgstr "Preklic sestanka"
 
-#: calendar/gui/e-itip-control.c:1002 calendar/gui/e-itip-control.c:1073
-#: calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> je poslal(a) nerazumljivo sporočilo."
 
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1167
 msgid "Bad Meeting Message"
 msgstr "Nerazumljivo sporočilo o sestanku"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1189
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavil(a) podatke o nalogi."
 
-#: calendar/gui/e-itip-control.c:1024
+#: calendar/gui/e-itip-control.c:1190
 msgid "Task Information"
 msgstr "Podatki o nalogi"
 
-#: calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> zahteva, da opravite nalogo."
 
-#: calendar/gui/e-itip-control.c:1029
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Proposal"
 msgstr "Predlog naloge"
 
-#: calendar/gui/e-itip-control.c:1033
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> vas želi dodati k obstoječi nalogi."
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1200
 msgid "Task Update"
 msgstr "Posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi dobiti najnovejše podatke o nalogi."
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1205
 msgid "Task Update Request"
 msgstr "Zahtevek za posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1229
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovoril(a) na dodelitev naloge."
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1230
 msgid "Task Reply"
 msgstr "Odgovor na nalogo"
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je preklical(a) nalogo."
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Cancellation"
 msgstr "Preklic naloge"
 
-#: calendar/gui/e-itip-control.c:1074
+#: calendar/gui/e-itip-control.c:1240
 msgid "Bad Task Message"
 msgstr "Nerazumljivo sporočilo o nalogi"
 
-#: calendar/gui/e-itip-control.c:1093
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavil(a) podatke o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1260
 msgid "Free/Busy Information"
 msgstr "Podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1098
+#: calendar/gui/e-itip-control.c:1264
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> zahteva vaše podatke o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1265
 msgid "Free/Busy Request"
 msgstr "Zahtevek po podatkih o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovoril(a) na zahtevek po podatkih o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1270
 msgid "Free/Busy Reply"
 msgstr "Odgovor zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1275
 msgid "Bad Free/Busy Message"
 msgstr "Nerazumljivo sporočilo o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1354
 msgid "The message does not appear to be properly formed"
 msgstr "Zdi se, da sporočilo ni pravilno oblikovano"
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1373
 msgid "The message contains only unsupported requests."
 msgstr "To sporočilo vsebuje le nepodprte zahtevke."
 
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Priloga ne vsebuje veljavnega sporočila koledarja"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1432
 msgid "The attachment has no viewable calendar items"
 msgstr "Priloga nima gledljivih predmetov koledarja"
 
-#: calendar/gui/e-itip-control.c:1338
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr "Ne morem najti nobene od vaših identitet v seznamu udeležencev!\n"
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:1369
-msgid "Calendar file could not be updated!\n"
-msgstr "Datoteke koledarja ni bilo mogoče posodobiti!\n"
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#, fuzzy
+msgid "There was an error on the CORBA system\n"
+msgstr "Napaka ob prenašanju podatkov za"
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/e-itip-control.c:1371
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Posodobitev končana\n"
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Datoteke koledarja ni bilo mogoče posodobiti!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Stanja udeleženca ni bilo možno posodobiti, ker predmet ne obstaja več"
+
+#: calendar/gui/e-itip-control.c:1632
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stanja udeleženca ni bilo možno posodobiti zaradi neveljavnega stanja!\n"
 
-#: calendar/gui/e-itip-control.c:1424
-msgid "Attendee status could not be updated!\n"
-msgstr "Stanja udeleženca ni bilo možno posodobiti!\n"
-
-#: calendar/gui/e-itip-control.c:1426
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Stanje udeleženca posodobljeno\n"
 
-#: calendar/gui/e-itip-control.c:1428
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Stanja udeleženca ni bilo možno posodobiti, ker predmet ne obstaja več"
+#: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "Stanja udeleženca ni bilo možno posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Odstranjevanje končano"
 
-#: calendar/gui/e-itip-control.c:1486 calendar/gui/e-itip-control.c:1536
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Predmet poslan!\n"
 
-#: calendar/gui/e-itip-control.c:1488 calendar/gui/e-itip-control.c:1540
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
+#: calendar/gui/e-itip-control.c:1896
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Izberi mapo"
+
+#: calendar/gui/e-itip-control.c:1903
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Izberi mapo"
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4844,92 +5565,92 @@ msgstr "končni-datum"
 msgid "date-start"
 msgstr "začetni-datum"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Predsedujoči"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Potrebni udeleženci"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Možni udeleženci"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Ne-udeleženci"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533 calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Individualno"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Skupina"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Vir"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Soba"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Stol"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535 calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Potrebni udeleženci"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:807
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Možni sodelujoči"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:808
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Ne-sodelujoči"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543 calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Potrebuje dejanje"
 
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Poskusno"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:838
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "V obdelavi"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -4941,100 +5662,119 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Iz pisarne"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Ni podatkov"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Možnosti"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Kaži le delavne ure"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Kaži poman_jšano"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Posodobi prosto/zasedeno"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Samodeno izberi"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Vsi ljudje in vsa sredstva"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Vsi ljudje in eno sredstvo"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "_Potrebni ljudje"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Potrebni ljudje in eno sredstvo"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Čas pričetka sestanka:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Čas zaključka sestanka:"
 
-#: calendar/gui/e-tasks.c:351
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Odpiram naloge v %s"
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nisem mogel naložiti nalog v `%s'"
 
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#: calendar/gui/e-tasks.c:643
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Nisem mogel odpreti imenika v `%s'"
+
+#: calendar/gui/e-tasks.c:558
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Datum zaključka"
+
+#: calendar/gui/e-tasks.c:581
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Brišem izbrane predmete"
+
+#: calendar/gui/e-tasks.c:674
 msgid "Expunging"
 msgstr "Uničujem"
 
-#: calendar/gui/e-week-view.c:3413 calendar/gui/e-week-view.c:3451
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Nov _sestanek..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "_Zbriši ta sestanek"
+
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#: calendar/gui/gnome-cal.c:1872
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Odpiram koledar v %s"
@@ -5095,51 +5835,51 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Potreben je vsaj en udeleženec"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Organizator mora biti naveden."
 
-#: calendar/gui/itip-utils.c:295
+#: calendar/gui/itip-utils.c:354
 msgid "Event information"
 msgstr "Podatki o dogodku"
 
-#: calendar/gui/itip-utils.c:297
+#: calendar/gui/itip-utils.c:356
 msgid "Task information"
 msgstr "Podatki o nalogi"
 
-#: calendar/gui/itip-utils.c:299
+#: calendar/gui/itip-utils.c:358
 msgid "Journal information"
 msgstr "Podatki o dnevniku"
 
-#: calendar/gui/itip-utils.c:301
+#: calendar/gui/itip-utils.c:360
 msgid "Free/Busy information"
 msgstr "Podatki o zasedenosti"
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:362
 msgid "Calendar information"
 msgstr "Podatki o kodledarju"
 
-#: calendar/gui/itip-utils.c:339
+#: calendar/gui/itip-utils.c:398
 msgid "Updated"
 msgstr "Posodobljen"
 
-#: calendar/gui/itip-utils.c:347
+#: calendar/gui/itip-utils.c:406
 msgid "Refresh"
 msgstr "Osveži"
 
-#: calendar/gui/itip-utils.c:351
+#: calendar/gui/itip-utils.c:410
 msgid "Counter-proposal"
 msgstr "Proti-predlog"
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Biti morate udeleženec dogodka."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "Nisem mogel ustvariti tovarne komponent urejevalnikov"
 
@@ -5296,87 +6036,87 @@ msgid "Sa"
 msgstr "so"
 
 #. Day
-#: calendar/gui/print.c:1840
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Izbrann dan (%b %a %d %Y)"
 
-#: calendar/gui/print.c:1865 calendar/gui/print.c:1869
+#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1870 calendar/gui/print.c:1872
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
+#: calendar/gui/print.c:1896
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1877
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Izbran teden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1885
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Izbran mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Izbrano leto (%Y)"
 
-#: calendar/gui/print.c:2226
+#: calendar/gui/print.c:2249
 msgid "Task"
 msgstr "Naloga"
 
-#: calendar/gui/print.c:2283
+#: calendar/gui/print.c:2306
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: calendar/gui/print.c:2301
+#: calendar/gui/print.c:2324
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriteta: %s"
 
-#: calendar/gui/print.c:2315
+#: calendar/gui/print.c:2338
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Procentov opravljeno: %i"
 
-#: calendar/gui/print.c:2327
+#: calendar/gui/print.c:2350
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2364
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: calendar/gui/print.c:2352
+#: calendar/gui/print.c:2375
 msgid "Contacts: "
 msgstr "Stiki: "
 
-#: calendar/gui/print.c:2407
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Natisni koledar"
 
-#: calendar/gui/print.c:2498 calendar/gui/print.c:2590
-#: calendar/gui/tasks-control.c:598 mail/mail-callbacks.c:2890
-#: my-evolution/e-summary.c:605 ui/evolution-addressbook.xml.h:20
-#: ui/evolution-mail-message.xml.h:72
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
-#: calendar/gui/print.c:2527
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "Natisni predmet"
 
-#: calendar/gui/print.c:2608
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
@@ -5387,11 +6127,11 @@ msgstr ""
 "Nisem mogel ustvariti pogleda nalog. Prosim preverite nastavitve ORBit-a in "
 "OAF-a."
 
-#: calendar/gui/tasks-control.c:150
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "URI mape nalog, ki naj se kaže"
 
-#: calendar/gui/tasks-control.c:455
+#: calendar/gui/tasks-control.c:456
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -5403,12 +6143,12 @@ msgstr ""
 " \n"
 "Resnično zbriši te naloge? "
 
-#: calendar/gui/tasks-control.c:462 mail/mail-callbacks.c:2367
-#: mail/mail-callbacks.c:2595
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Ne sprašuj me več."
 
-#: calendar/gui/tasks-control.c:627
+#: calendar/gui/tasks-control.c:612
 msgid "Print Tasks"
 msgstr "Natisni naloge"
 
@@ -5466,79 +6206,102 @@ msgstr "Uvozi datoteke iCalendar v Evolucijo."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Uvozi datoteke vCalendar v Evolucijo."
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Opomnilnik"
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Sporočilo koledarja"
+
+#: calendar/importers/icalendar-importer.c:663
+#, fuzzy
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolucija je našla poštne datoteke programa Pine.\n"
+"Jih želite uvoziti v Evolucijo?"
+
+#: calendar/importers/icalendar-importer.c:670
+msgid "Gnome Calendar"
+msgstr "Gnome Koledar"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time pričakuje 1 argument"
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time pričakuje, da je 1. argument niz"
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "1. argument make-time mora biti niz ISO 8601 datuma/časa"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:317
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:324
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day pričakuje, da je 2. argument celo število (integer)"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin pričakuje 1 argument"
 
-#: calendar/pcs/query.c:356
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end pričakuje 1 argument"
 
-#: calendar/pcs/query.c:388
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? pričakuje, da je 2. argument time_t"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? pričakuje, da je 1. argument niz"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? pričakuje, da je 2. argument niz"
 
-#: calendar/pcs/query.c:691
+#: calendar/pcs/query.c:693
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -5546,11 +6309,11 @@ msgstr ""
 "contains? pričakuje, da je 1. argument eden od \"any\" (karkoli), \"summary"
 "\" (povzetek), \"description\"(opis)"
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? pričakuje vsaj 1 argument"
 
-#: calendar/pcs/query.c:745
+#: calendar/pcs/query.c:747
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -5558,15 +6321,15 @@ msgstr ""
 "has-categories? pričakuje, da so vsi argumenti nizi ali da je natanko en "
 "argument boolean neresničen (#f)"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? pričakuje 1 argument"
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? pričakuje, da je 1. argument time_t"
 
@@ -6473,651 +7236,667 @@ msgid "Asia/Macao"
 msgstr "Azija/Makao"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Azija/Makao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Azija/Jakarta"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Azija/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr ""
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Azija/Nikozija"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Azija/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Azija/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Azija/Kabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Azija/Pjongjang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Azija/Katar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Azija/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Azija/Saigon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Azija/Seul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Azija/Shanghai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Azija/Singapur"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Azija/Teheran"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Azija/Tokijo"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Azija/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azori"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermudi"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Zelenortski otoki"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Reykjavik"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/Sveta_Helena"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australija/Adelaide"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australia/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australija/Broken_Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australija/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australija/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australija/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australija/Lord_Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australija/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australija/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australija/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Evropa/Amsterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Evropa/Andora"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Evropa/Atene"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Evropa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Evropa/Beograd"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Evropa/Berlin"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Evropa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Evropa/Brusel"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Evropa/Bukarešta"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Evropa/Budimpešta"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Evropa/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Evropa/Kobenhavn"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Evropa/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Evropa/Gibrlaltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Evropa/Helsinki"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Evropa/Istanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Evropa/Kijev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Evropa/Lizbona"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Evropa/Ljubljana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Evropa/London"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Evropa/Luksemburg"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Evropa/Madrid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Evropa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Evropa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Evropa/Monako"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Evropa/Moskva"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Evropa/Nikozija"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Evropa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Evropa/Pariz"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Evropa/Praga"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Evropa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Evropa/Rim"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Evropa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Evropa/San_Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Evropa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Evropa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Evropa/Sofija"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Evropa/Stockholm"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Evropa/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Evropa/Tirana"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Evropa/Užgorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Evropa/Vatikan"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Evropa/Dunaj"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Evropa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Evropa/Varšava"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Evropa/Zagreb"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Evropa/Zaporožje"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Evropa/Zurich"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indijski_ocean/Komori"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indijski_ocean/Maldivi"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indijski_ocean/Mauritius"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indijski_ocean/Mayotte"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr ""
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Pacifik/Fidži"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Pacifik/Galapagos"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Pacifik/Gvam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Pacifik/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Pacifik/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Pacifik/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Pacifik/Pitcairin"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Pacifik/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Pacifik/Tahiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Podpisovanje v tem kodirniku ni podprto"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Čisto podpisovanje v tem šifrirniku ni podprto"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Preverjanje v tem šifrirniku ni podprto"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Šifriranje v tem šifrirniku ni podprto"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Dešifriranje v tem šifrirniku ni podprto"
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 msgid "Unable to create cache path"
 msgstr "Nisem mogel ustvariti poti predpomnilnika"
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:443
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Nisem mogel odstraniti vnosa v predpomnilnišk: %s: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7128,7 +7907,7 @@ msgstr ""
 "Nadalnje operacije na tem strežniku ne bodo pomnjene, ko se boste\n"
 "znova povezali v mrežo."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7139,74 +7918,89 @@ msgstr ""
 "%s\n"
 "Spremembe storjene v tej mapi ne bodo sinhronizirane."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Sinhroniziram s strežnikom"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Odstranjujem mapo %s"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Za dokončanje te operacije morate delati z mrežo"
 
-#: camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
+#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
 msgid "Syncing folders"
 msgstr "Uskljajujem mape"
 
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Napaka ob razčlenjanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Napaka ob izvajanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Ne morem odpreti mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Nisem mogel obdelati mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:889
+#: camel/camel-filter-driver.c:908
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dobivam sporočilo %d (%d%%)"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Ne morem dobiti sporočila"
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nauspeh ob sporočilu %d"
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dobivam sporočilo %d od %d"
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 msgid "Failed to retrieve message"
 msgstr "Nisem uspel prenesti sporočila"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Nisem mogel ustvariti cevi do %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Nisem uspel predpomniti sporočila %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -7215,7 +8009,7 @@ msgstr ""
 "Nisem mogel razčleniti iskalnega izraza %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -7224,38 +8018,113 @@ msgstr ""
 "Napaka ob izvajanju iskalnega izraza %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
+#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) zahteva enojen booleanov rezultat"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Opravljam poizvedbo na neznani glavi: %s"
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Neveljaven tip v body-contains, pričakovan niz"
-
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodprto dejanje: dodaj sporočilo: za %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodprto dejanje: iskanje z izrazom: za %s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodprto dejanje: iskanje po uid-jih: za %s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Prestavljam sporočila"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Kopiram sporočila v %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Preklicano."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Nepričakovan odgovor strežnika POP: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Ime datoteke ni navedeno."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Ne morem zašifirati tega sporočila: naslovniki niso navedeni"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Nisem uspel predpomniti sporočila %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Nisem uspel predpomniti sporočila %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Nisem uspel dešifrirati sporočila"
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr ""
+"Nisem mogel preveriti tega sporočila: nisem mogel ustvariti začasne "
+"datoteke: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7353,187 +8222,39 @@ msgstr "Napaka ob pisanju v začasno poštno datoteko: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Napaka ob kopiranju začasne poštne datoteke: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Prosim vpišite svoje %s geslo za %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Prosim vpišite svoje %s geslo"
-
-#: camel/camel-pgp-context.c:622
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Ne morem podpisati sporočila: osnovnega besedila ni"
-
-#: camel/camel-pgp-context.c:629 camel/camel-pgp-context.c:803
-msgid "Cannot sign this message: no password provided"
-msgstr "Ne morem podpisati sporočila: geslo ni podano"
-
-#: camel/camel-pgp-context.c:635 camel/camel-pgp-context.c:809
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Ne morem podpisati tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:796
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Ne morem podpisati tega sporočila: ni osnovnega besedila"
 
-#: camel/camel-pgp-context.c:988
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Ne morem preveriti tega sporočila: ni osnovnega besedila za preverbo"
-
-#: camel/camel-pgp-context.c:994
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Nisem mogel preveriti tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: "
-"%s"
-
-#: camel/camel-pgp-context.c:1005
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-"Nisem mogel preveriti tega sporočila: nisem mogel ustvariti začasne "
-"datoteke: %s"
-
-#: camel/camel-pgp-context.c:1178
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Ne morem zašifirati tega sporočila: ni besedila za zašifriranje"
-
-#: camel/camel-pgp-context.c:1188
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Ne morem zašifirati tega sporočia: geslo ni podano"
-
-#: camel/camel-pgp-context.c:1195
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Ne morem zašifirati tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1204
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Ne morem zašifirati tega sporočila: naslovniki niso navedeni"
-
-#: camel/camel-pgp-context.c:1373
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-"Ne morem dešifrirati tega sporočila: ni zašifriranega besedila za "
-"dekodiranje."
-
-#: camel/camel-pgp-context.c:1381
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Ne morem dešifrirati tega sporočila: geslo ni podano"
-
-#: camel/camel-pgp-context.c:1388
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Ne morem dešifrirati tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: %"
-"s"
+#: camel/camel-multipart-encrypted.c:325
+#, fuzzy
+msgid "Failed to decrypt MIME part: parse error"
+msgstr "Nisem uspel dešifirati: vzrok neznan"
 
-#: camel/camel-pgp-mime.c:332
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "To je digitalno podpisan del sporočila"
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Prosim vpišite svoje geslo za %s"
-
-#: camel/camel-pkcs7-context.c:213
-msgid "Error hashing password."
-msgstr "Napaka ob razprševanju gesla."
-
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr "Neveljavno geslo.7"
-
-#: camel/camel-pkcs7-context.c:329
-#, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "Nisem mogel podpisati: certifikat za \"%s\" ni bil najden."
-
-#: camel/camel-pkcs7-context.c:378
-#, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "Nisem mogel čistopodpisati: certifikat za \"%s\" ni bil najden."
-
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "Nisem mogel šifrirati: nisem uspel ustvariti podatkovne ovojnice."
-
-#: camel/camel-pkcs7-context.c:590
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "Nisem mogel šifrirati: nisem uspel ustvariti konteksta šifriranja"
-
-#: camel/camel-pkcs7-context.c:620
-#, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "Nisem mogel šifrirati podatkov: neveljaven ključ uporabnika \"%s\"."
-
-#: camel/camel-pkcs7-context.c:626
-msgid "Could not encrypt: encoding failed."
-msgstr "Nisem mogel šifirirati: enkodiranje ni uspelo."
-
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr "Nisem uspel dešifirati: vzrok neznan"
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Drugačna napaka"
 
-#: camel/camel-provider.c:130
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Nisem mogel naložiti %s: Nalaganje modulov na tem sistemu ni podprto."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nisem mogel naložiti %s: %s"
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, 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:203
-#, c-format
-msgid "%s server %s"
-msgstr "strežnik %s %s"
-
-#: camel/camel-remote-store.c:207
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "storitev %s za %s na %s"
-
-#: camel/camel-remote-store.c:264 camel/providers/pop3/camel-pop3-store.c:194
-msgid "Connection cancelled"
-msgstr "Povezava prekinjena"
-
-#: camel/camel-remote-store.c:267 camel/providers/pop3/camel-pop3-store.c:197
-#: camel/providers/smtp/camel-smtp-transport.c:294
-#, 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:268 camel/providers/pop3/camel-pop3-store.c:198
-msgid "(unknown host)"
-msgstr "(neznan gostitelj)"
-
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Operacija razveljavljena"
-
-#: camel/camel-remote-store.c:484
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonimno"
@@ -7642,7 +8363,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
@@ -7658,11 +8379,21 @@ msgstr "Ta možnost narekuje povezavo s strežnikom z uporabo enostavnega gesla.
 msgid "Unknown authentication state."
 msgstr "Neznano stanje avtentifikacije."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:79
-msgid "Password"
-msgstr "Geslo"
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+#: camel/camel-sasl-ntlm.c:33
+#, fuzzy
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"Ta možnost narekuje povezavo s strežnikom z uporabo avtentikacije Kerberos 4."
+
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr "ČISTO"
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7689,41 +8420,56 @@ msgstr "Avtentifikacija POP pred SMTP z uporabo ne-pop vira"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Prevajanje regularnega izraza ni uspelo: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' potrebuje komponento uporabniškega imena"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' potrebuje komponento gostitelja"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' potrebuje komponento poti"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Razvozlujem: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Napaka ob poizvedbi imena: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Poizvedba po gostitelju ni uspela: %s: gostitelj ni bil najden"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
 
+#: camel/camel-service.c:850
+#, fuzzy
+msgid "Resolving address"
+msgstr "Razvozlujem: %s"
+
+#: camel/camel-service.c:912
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Poizvedba po gostitelju ni uspela: %s: gostitelj ni bil najden"
+
+#: camel/camel-service.c:915
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Nuditelj virutalne mape e-pošte"
@@ -7732,12 +8478,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:346 camel/camel-session.c:415
+#: camel/camel-session.c:351 camel/camel-session.c:419
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7746,6 +8492,11 @@ msgstr ""
 "Nisem mogel ustvariti imenika %s:\n"
 "%s"
 
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "Prosim vpišite svoje geslo za %s"
+
 #: camel/camel-smime-context.c:203
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Prosim navedite vzdevek certifikata s katerim se želite podpisati."
@@ -7778,15 +8529,15 @@ msgstr "Nisem uspel dešifrirati sporočila"
 msgid "Failed to verify certificates."
 msgstr "Nisem mogel preveriti certifikatov."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ne morem dobiti mape: neveljavno dejanje na tej shrambi"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne morem ustvariti mape: neveljavno dejanje na tej shrambi"
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -7795,7 +8546,7 @@ msgstr ""
 "Proizvedel: %s\n"
 "Zadeva: %s"
 
-#: camel/camel-tcp-stream-openssl.c:617
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7812,7 +8563,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:458
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7825,16 +8576,16 @@ msgstr ""
 "Prstni odtis:      %s\n"
 "Podpis:            %s"
 
-#: camel/camel-tcp-stream-ssl.c:464
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr "V REDU"
 
-#: camel/camel-tcp-stream-ssl.c:464
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr "SLABO"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:467
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7854,110 +8605,119 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Ne morem odpreti razčleniti URLja '%s'"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ni takšnega sporočila %s v %s"
 
-#: camel/camel-vee-folder.c:749
-#, c-format
-msgid "No such message: %s"
-msgstr "Ni takšnega sporočila: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne morem preimenovati mape: %s: mapa ne obstaja"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Ne morete kopirati sporočil iz te mape smeti."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Operacija razveljavljena"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nepričakovan odgovor strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Ukaz IMAP ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Odgovor strežnika se je prehitro končal."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nepričakovan odgovor OK strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nisem mogel naložiti povzetka za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mapa je bila uničena in na novo ustvarjena na strežniku."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:466
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Pregledujem za spremenjenimi sporočili"
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "To sporočilo trenutno ni na voljo"
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Prenašam povzetke novih sporočil"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Pregledujem za novimi sporočili"
 
-#: camel/providers/imap/camel-imap-folder.c:2145
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporočila v odgovoru FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Nisem mogel odpreti predpomnilniškega imenika: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:256
-#: camel/providers/imap/camel-imap-message-cache.c:313
-#: camel/providers/imap/camel-imap-message-cache.c:344
-#: camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/providers/imap/camel-imap-message-cache.c:257
+#: camel/providers/imap/camel-imap-message-cache.c:314
+#: camel/providers/imap/camel-imap-message-cache.c:345
+#: camel/providers/imap/camel-imap-message-cache.c:377
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
@@ -7998,32 +8758,79 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Geslo"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 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:518
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Strežnik SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "storitev %s za %s na %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Povezava prekinjena"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+msgid "SSL/TLS extension not supported."
+msgstr "Razširitev SSL/TLS ni podprta"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+msgid "SSL negotiations failed"
+msgstr "Pogajanje SSL ni uspelo"
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, 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:528
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ni podpore za način avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:903
 #, 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:567
-#: camel/providers/smtp/camel-smtp-transport.c:553
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8034,138 +8841,158 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takšne mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Starševski mapi ni dovoljeno vsebovati podmape"
 
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Ne morem odpreti poštnega predala: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
 #: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Poštni imeniki vrste MH"
 
-#: camel/providers/local/camel-local-provider.c:44
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Za shranjevanje krajevne pošte v imenikih vrste MH."
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Krajevna dostava"
 
-#: camel/providers/local/camel-local-provider.c:54
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Za pobiranje krajevne pošte iz datotek vrste mbox."
 
-#: camel/providers/local/camel-local-provider.c:63
+#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Uveljavi filtre na novih sporočilih v mapi INBOX tega strežnika"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Poštni imeniki vrste maildir"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Za shranjevanje krajevne pošte v imenikih vrste maildir."
 
-#: camel/providers/local/camel-local-provider.c:80
-msgid "Standard Unix mbox spools"
-msgstr "Običajni Unix poštni predali mbox"
-
-#: camel/providers/local/camel-local-provider.c:81
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
-"Za branje in shranjevanje krajevne pošte v običajnih Unix mbox datotekah"
 
-#: camel/providers/local/camel-local-provider.c:91
-msgid "Directory tree of mbox files"
-msgstr "Imeniško drevo datotek mbox"
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Običajni Unix poštni predali mbox"
 
-#: camel/providers/local/camel-local-provider.c:92
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"Za dostopanje do pošte shranjene v zunanjem drevesu datotek mbox.\n"
-"To vam bo omogočilo, da neposredno dostopate do map pine in elm.\n"
-"OPOZORILO: Ta nudilnik je še vedno preizkusen, zato pred uporabo naredite "
-"varnostno kopijo mape."
+"Za branje in shranjevanje krajevne pošte v običajnih Unix mbox datotekah"
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:109
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Korenski imenik shrambe %s ni absolutna pot"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Korenski imenik shrambe %s ni običajnen imenik"
 
-#: camel/providers/local/camel-local-store.c:153
-#: camel/providers/local/camel-local-store.c:169
-#: camel/providers/local/camel-local-store.c:235
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:236
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 msgid "Local stores do not have an inbox"
 msgstr "Krajevno shrambe nimajo vhodnega predala"
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Krajevna datoteka s pošto %s"
 
-#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nisem mogel preimenovati mape %s v %s: %s"
 
-#: camel/providers/local/camel-local-store.c:374
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Nisem mogel preimenovati mape: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nisem mogel zbrisati datoteke povzetka mape `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:389
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nisem mogel zbrisati datoteke kazala mape `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Nisem mogel odpreti povzetka: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne morem dodati sporočila k povzetku: razlog neznan"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Dodajanje sporočila v mailidr preklicano"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ne morem dodati sporočila v mapo vrste maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8174,20 +9001,19 @@ msgstr ""
 "Ne morem dobiti sporočila: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Ni takšnega sporočila"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Neveljavna vsebina sporočila"
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8196,15 +9022,15 @@ msgstr ""
 "Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mapa `%s' ne obstaja."
 
-#: camel/providers/local/camel-maildir-store.c:116
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-maildir-store.c:117
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8213,60 +9039,75 @@ msgstr ""
 "Nisem mogel ustvariti mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:131
+#: camel/providers/local/camel-maildir-store.c:132
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' ni imenik vrste maildir."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisem mogel zbrisati mape `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "ni imenik vrste maildir"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nisem mogel prebrati mape `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:405
-#: camel/providers/local/camel-maildir-summary.c:526
+#: camel/providers/local/camel-maildir-summary.c:408
+#: camel/providers/local/camel-maildir-summary.c:531
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ne morem odpreti poštnega imenika maildir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Preverjam za novo pošto"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+msgid "Checking for new messages"
+msgstr "Pregledujem za novimi sporočili"
+
+#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
+msgid "Storing folder"
+msgstr "Shranjujem mapo"
+
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ne morem ustvariti ključavnice na mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ne morem odpreti poštnega predala: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Dodajanje sporočila razveljavljeno"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ne morem pripeti sporočila k datoteki vrste mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8275,17 +9116,15 @@ msgstr ""
 "Ne morem dobiti sporočila: %s iz mape %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Zdi se, da je mapa poškodovana in je ni mogoče popraviti."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Konstrukcija sporočila ni uspela: Naj pokvarim poštni predal?"
 
-#: camel/providers/local/camel-mbox-store.c:93
+#: camel/providers/local/camel-mbox-store.c:95
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -8294,7 +9133,7 @@ msgstr ""
 "Ne morem odpreti datoteke '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:109
+#: camel/providers/local/camel-mbox-store.c:111
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -8303,14 +9142,14 @@ msgstr ""
 "Nisem mogel ustvariti datoteke `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:118
-#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:120
+#: camel/providers/local/camel-mbox-store.c:147
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ni običajna datoteka."
 
-#: camel/providers/local/camel-mbox-store.c:137
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:139
+#: camel/providers/local/camel-mbox-store.c:162
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -8319,162 +9158,154 @@ msgstr ""
 "Nisem mogel zbrisati mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:152
+#: camel/providers/local/camel-mbox-store.c:154
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' ni prazna. Ni zbrisana."
 
-#. 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:248
-#: camel/providers/local/camel-mbox-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:378
-#: camel/providers/local/camel-spool-summary.c:643
-#: camel/providers/local/camel-spool-summary.c:935
-msgid "Storing folder"
-msgstr "Shranjujem mapo"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Nisem mogel odpreti imenika %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Usodna napaka razčlenjevanja pošte na mestu %ld v mapi %s"
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ne morem preveriti mape: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:648
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nisem mogel odpreti datoteke: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nisem mogel odpreti začasnega poštnega predala: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:544
-#: camel/providers/local/camel-mbox-summary.c:552
-#: camel/providers/local/camel-mbox-summary.c:741
-#: camel/providers/local/camel-mbox-summary.c:749
-#: camel/providers/local/camel-spool-summary.c:697
-#: camel/providers/local/camel-spool-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:978
-#: camel/providers/local/camel-spool-summary.c:986
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Povzetek se ne ujema z mapo, celo po uskladitvi"
-
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-spool-summary.c:749
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Napaka ob pisanju v začasni poštni predal: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-spool-summary.c:771
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Pisanje v začasni poštni predal ni uspelo: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisem mogel zapreti izvorne mape %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisem mogel zapreti začasne mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:873
-#: camel/providers/local/camel-spool-summary.c:544
-#: camel/providers/local/camel-spool-summary.c:1110
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Povzetek se ne ujema z mapo, celo po uskladitvi"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Nisem mogel preimenovati mape: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Napaka ob pisanju v začasni poštni predal: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Pisanje v začasni poštni predal ni uspelo: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Dodajanje sporočila v MH preklicano"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ne morem dodati sporočila v mapo vrste mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ni imenik."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ne morem odpreti poštnega imenika MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Ne morem pripeti sporočila k datoteki vrste 'spool': %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Map vrste 'spool' ni možno preimenovati"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "Korenski imenik shrambe %s ni običajnen imenik"
 
-#: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mapa `%s/%s' ne obstaja."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Datoteka vrste 'spool' s pošto %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Map vrste 'spool' ni možno preimenovati"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Map vrste 'spool' ni možno preimenovati"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Map vrste 'spool' ni možno zbrisati."
 
-#: camel/providers/local/camel-spool-summary.c:788
-#: camel/providers/local/camel-spool-summary.c:797
-#: camel/providers/local/camel-spool-summary.c:806
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Nisem mogel uskladiti začasne mape %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Nisem mogel uskladiti mape vrste 'spool' %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8483,66 +9314,6 @@ msgstr ""
 "Nisem mogel uskladiti mape vrste 'spool' %s: %s\n"
 "Mapa je morda pokvarjena, kopija shranjena v `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:940
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Nisem mogel shraniti: %s: %s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Prosim vpišite geslo NNTP za %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Strežnik je zavrnil uporabniško ime"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Nisem uspel poslati uporabniškega imena strežniku"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Strežnik je zavrnil uporabniško ime/geslo"
-
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Notranja napaka: uid ima neveljavno obliko: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:153
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:439
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:502
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Ne morem dobiti sporočila %s: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/pop3/camel-pop3-folder.c:278
-#: camel/providers/pop3/camel-pop3-folder.c:437
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:510
-msgid "User cancelled"
-msgstr "Uporabnik je preklical"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Nisem mogel dobiti seznama skupin s strežnika."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Nisem mogel naložiti datoteke s seznamom skupin za %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET novičke"
@@ -8551,12 +9322,22 @@ msgstr "USENET novičke"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "To je nuditelj za branje in pisanje v novičkarske skupine USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Nisem mogel ustvariti imenika %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USNET Novičke preko %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8598,32 +9379,47 @@ msgstr "Uporabite preklic"
 msgid "Operation failed: %s"
 msgstr "Operacija ni uspela: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Prenašam povzetek POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:280
+#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:446
+#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:522
+msgid "User cancelled"
+msgstr "Uporabnik je preklical"
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ne morem dobiti povzetka POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:316
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Uničujem zbrisana sporočila"
 
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ni sporočila z uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:418
+#: camel/providers/pop3/camel-pop3-folder.c:427
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Prenašam sporočilo POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: camel/providers/pop3/camel-pop3-folder.c:448
+#: camel/providers/pop3/camel-pop3-folder.c:507
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:524
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Ne morem dobiti sporočila %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
 msgid "Unknown reason"
 msgstr "Neznan razlog"
 
@@ -8640,7 +9436,7 @@ msgstr "Pusti sporočila na strežniku"
 msgid "Delete after %s day(s)"
 msgstr "Zbriši po %s dneh"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:78
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8666,27 +9462,20 @@ msgstr ""
 "preko protokola APOP. To ni nujno, da bo delovalo za vse uporabnike in celo "
 "za strežnike, ki trdijo, da jo podpirajo."
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:272
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
+#, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr ""
-"Nisem se mogel povezati s strežnikom POP %s v varnem načinu: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:228
-msgid "SSL/TLS extension not supported."
-msgstr "Razširitev SSL/TLS ni podprta"
-
-#: camel/providers/pop3/camel-pop3-store.c:273
-msgid "SSL negotiations failed"
-msgstr "Pogajanje SSL ni uspelo"
+msgstr "Nisem se mogel povezati s strežnikom POP %s v varnem načinu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:371
+#: camel/providers/pop3/camel-pop3-store.c:351
+#, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Nisem se mogel povezati s strežnikom POP na %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:412
-#: camel/providers/pop3/camel-pop3-store.c:515
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8694,26 +9483,27 @@ msgstr ""
 "Ne morem se povezati s strežnikom POP.\n"
 "Ni podpore za zahtevan avtentifikacijski mehanizm."
 
-#: camel/providers/pop3/camel-pop3-store.c:428
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "Prijava SASL `%s' ni uspela: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr "Napaka protokola SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr "V/I napaka: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:475
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sProsimo vpišite geslo POP za %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:526
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8722,13 +9512,13 @@ msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:616
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -8739,54 +9529,50 @@ msgid ""
 msgstr ""
 "Za dostavljanjem pošte preko programa \"sendmail\" na krajevnem sistemu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+msgid "Could not parse recipient list"
+msgstr "Ne morem razčleniti seznama prejemnikov"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Nisem mogel ustvariti cevi do programa sendmail: %s: pošta ni bila poslana"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nisem mogel vejiti programa sendmail: %s: pošta ni bila poslana"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nisem mogel poslati sporočila: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:178
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "program sendmail je zaključil s signalom %s: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:185
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nisem mogel izvršiti %s: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:190
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "program sendmail je zaključil s stanjem %d: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-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:226
-msgid "Could not parse recipient list"
-msgstr "Ne morem razčleniti seznama prejemnikov"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:259
+#: camel/providers/sendmail/camel-sendmail-transport.c:204
 msgid "sendmail"
 msgstr "program sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:94
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -8796,140 +9582,141 @@ msgstr ""
 "Za dostavo pošte preko povezave z oddaljenim poštnim razdelilcem z uporabo "
 "SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaktična napaka, ukaz ni prepoznan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintaktična napaka v parametrih ali argumentih"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Ukaz ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Parameter ukaza ni implementiran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Stanje sistema ali odgvor na pomoč"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Sporčilo pomoči"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Storitev pripravljena"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Storitev zapira kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Storitev ni na voljo, zapiram kanal za prenos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Zahtevano dejanje v redu, opravljeno"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:194
 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:204
+#: camel/providers/smtp/camel-smtp-transport.c:196
 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:206
+#: camel/providers/smtp/camel-smtp-transport.c:198
 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:208
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Zahtevano dejanje preklicano: napaka ob obdelavi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "Uporabnik ni krajeven; prosimo poskusite <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:204
 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:214
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Zahtevano dejanje preklicano: prekoračena obremenitev diska"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:208
 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:218
+#: camel/providers/smtp/camel-smtp-transport.c:210
 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:220
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Transakcija ni uspela"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Potreben je prenos gesla"
 
-#: camel/providers/smtp/camel-smtp-transport.c:226
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Mehanizem avtentifikacije je prešibak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:228
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Za zahtevan mehanizem avtentifikacije je potrebno šifriranje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:230
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Začasna napaka avtentifikacije"
 
-#: camel/providers/smtp/camel-smtp-transport.c:232
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, 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:374
-#: camel/providers/smtp/camel-smtp-transport.c:420
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
+#, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr ""
-"Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %s"
+msgstr "Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:375
+#: camel/providers/smtp/camel-smtp-transport.c:338
 msgid "server does not appear to support SSL"
 msgstr "zdi se, da strežnik n e podpira SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:389
+#: camel/providers/smtp/camel-smtp-transport.c:352
+#, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Zahtevek STARTTLS je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:404
+#: camel/providers/smtp/camel-smtp-transport.c:367
 msgid "STARTTLS response error"
 msgstr "Napaka v odgovoru na STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:502
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Strežnik SMTP %s ne podpira zahtevanega načina avtentifikacije %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:540
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, 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:561
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8940,94 +9727,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "Strežnik SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Dostava pošte s SMTP preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:710
-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:717
+#: camel/providers/smtp/camel-smtp-transport.c:665
 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:722 mail/mail-ops.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:733
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ne morem poslati sporočila: eden ali več neveljavnih naslovnikov"
 
-#: camel/providers/smtp/camel-smtp-transport.c:917
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, 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:959
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, 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:1006
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "Avtentifikacija SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1012
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Napak ob ustvarjanju avtentifikacijskega predmeta SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1027
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "Zahtevek AUTH ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1096
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Strežnik je sporočil slab odgovor avtentifikacije.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1122
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, 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:1136
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr "Napaka v ogovoru na MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1161
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, 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:1177
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9036,37 +9819,37 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1227
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr "Napaka v odgovoru na DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1267
-#: camel/providers/smtp/camel-smtp-transport.c:1285
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, 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:1299
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr "Napaka v odgovoru za končanje DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1322
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zahtevek RSET je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr "Napaka v odgovoru na RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1359
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, 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:1373
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr "Napaka v odgovoru na QUIT"
 
@@ -9095,7 +9878,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:147
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
 msgid "attachment"
 msgstr "priloga"
 
@@ -9135,56 +9918,56 @@ msgid "MIME type:"
 msgstr "Vrsta MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:180
+#: composer/e-msg-composer-select-file.c:156
 msgid "Suggest automatic display of attachment"
 msgstr "Predlagan samodejen prikaz priloge"
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Kliknite tu za adresar"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Od:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Odgovori-na:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporočila"
 
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:406
 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:395
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9192,12 +9975,17 @@ msgstr ""
 "Vnesite naslove, ki bodo prejeli karbonske kopije sporočila, a  se ne bodo "
 "pojavili v seznamu prejemnikov sporočila."
 
-#: composer/e-msg-composer-select-file.c:291
+#: composer/e-msg-composer-select-file.c:267
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Priloži datoteko"
 
-#: composer/e-msg-composer.c:715
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Nisem mogel ustvariti konteksta podpisovanja PGP."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9206,38 +9994,34 @@ msgstr ""
 "Napaka ob branju datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:955
-msgid "Save as..."
-msgstr "Shrani kot..."
-
-#: composer/e-msg-composer.c:964
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Opozorilo!"
 
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Datoteka obstaja, prepiši?"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:1009
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:1040
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Napaka ob dostopanju do datoteke: %s"
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Od urejevalnika nisem uspel dobiti sporočila"
 
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9246,7 +10030,7 @@ msgstr ""
 "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1062
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9255,7 +10039,7 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9264,7 +10048,7 @@ msgstr ""
 "Napaka ob samodejnem shranjevanju sporočila: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1173
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9272,7 +10056,7 @@ msgstr ""
 "Evolucija je zaznala neshranjene datoteke iz prejšnjih sej.\n"
 "Jih želite poskusiti obnoviti?"
 
-#: composer/e-msg-composer.c:1331
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9282,23 +10066,43 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:1338
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Opozorilo: Spremenjeno sporočilo"
 
-#: composer/e-msg-composer.c:1361
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1510
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Vstavi datoteko"
 
-#: composer/e-msg-composer.c:2044 composer/e-msg-composer.c:2641
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Podpisi"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (privzeto)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:2658
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9306,7 +10110,7 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Nisem mogel aktivirati gradnika za izbiro naslova."
 
-#: composer/e-msg-composer.c:2681 composer/e-msg-composer.c:2736
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9314,7 +10118,13 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Ne morem aktivirati komponente urejevalnika HTML."
 
-#: composer/evolution-composer.c:383
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
+#: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -9322,7 +10132,7 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja, ker še niste nastavili\n"
 "identitet v komponenti pošte."
 
-#: composer/evolution-composer.c:398
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne morem inicializirati Evolucijinega sestavljalca."
 
@@ -9374,12 +10184,21 @@ msgstr "Zadeva vsebuje"
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Datoteka z enakim imenom že obstaja.\n"
+"Naj jo prepišem?"
+
 #. Remember the password?
-#: e-util/e-passwords.c:360 mail/mail-session.c:269
+#: e-util/e-passwords.c:363 mail/mail-session.c:269
 msgid "Remember this password"
 msgstr "Zapomni si geslo"
 
-#: e-util/e-passwords.c:362 mail/mail-session.c:270
+#: e-util/e-passwords.c:365 mail/mail-session.c:270
 msgid "Remember this password for the remainder of this session"
 msgstr "Pomni geslo do konca seje"
 
@@ -9477,170 +10296,6 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "Evolucijina komponenta za povzetke."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Tovarna za Evolucijine komponente za povzetke."
-
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
-
-#: executive-summary/component/e-summary-callbacks.c:125
-msgid "Select a service"
-msgstr "Izberi storitev"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-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 ""
-"Za ozadje izvlečka lahko izberete drugačno HTML stran.\n"
-"\n"
-"Pustite pravno za privzete nastavitve"
-
-#: 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 "Odpri %s s privzetim GNOMEovim programom"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Odpri %s s privzetim GNOMEovim brskalnikom"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Pošlji e-pošto %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "Spremeni pogled na %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Poženi %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Zapri %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Premakni %s na levo"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Premakni %s na desno"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Premakni %s v prešnjo vrstico"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Premakni %s v naslednjo vrstico"
-
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "Nastavi /%s"
-
-#: executive-summary/component/e-summary-url.c:553
-msgid "page"
-msgstr "stran"
-
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Nisem mogel odpreti HTML datoteke:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Napaka ob branju podatkov:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr "Datoteka nima mesta za storitve.\n"
-
-#: executive-summary/component/main.c:61
-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 ""
-"Komponenta Povzetek ni mogla inicializirati Bonoba.\n"
-"Če se je pokazalo opozorilo o RootPOA, to verjetno pomeni,\n"
-"da ste prevedli Bonobo z GOAD-om namesto z OAF-om."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "Tovarna za povzetke RDF."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "Povzetek RDF"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "Tovarna za preizkusno komponento bonobo."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
-msgstr "Tovarna za preizkusno komponento."
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "Preizkusi storitev bonobo"
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "Preizkusi storitev"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Napaka"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "Samodejno posodobi"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "Posodobi zdaj"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "Posodobi vsakih"
-
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "leto"
@@ -9673,11 +10328,7 @@ msgstr "ura"
 msgid "minute"
 msgstr "minuta"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "sekunda"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr " sekund"
 
@@ -9752,7 +10403,7 @@ msgstr " nazaj "
 msgid "ago"
 msgstr "nazaj"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:993
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
@@ -9764,6 +10415,21 @@ msgstr "<kliknite tukaj za izbiro datuma>"
 msgid "Filter Rules"
 msgstr "Pravila filtriranja"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Navedite ime datoteke:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Odpri datoteko"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9773,7 +10439,7 @@ msgstr "Potem"
 msgid "Add action"
 msgstr "Dodaj dejanje"
 
-#: filter/filter-folder.c:156
+#: filter/filter-folder.c:147
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -9781,19 +10447,11 @@ msgstr ""
 "Pozabili ste izbrati mapo.\n"
 "Pojdite nazaj in navedite veljavno mapo v katero naj se dostavlja pošta."
 
-#: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:858
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Vnesite URI mape"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<kliknite tukaj za izbiro mape>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9803,7 +10461,11 @@ msgstr ""
 "Napaka v regularnem izrazu '%s':\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:44
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Preizkus"
 
@@ -9889,204 +10551,220 @@ msgstr "z vsemi krajevnimi mapami"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Dodeli točke"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Dodeli barvo"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Dodeli točke"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Priloge"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:6
 msgid "Beep"
 msgstr "Pisk"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Podjetje"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "vsebuje"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Kopiraj v mapo"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Sprejeto dne"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Poslano dne"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Zbrisano"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "ne vsebuje"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "se ne konča z"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "ne obstaja"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "ne zveni kot"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "se ne začne z"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "ne obstaja"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Osnutek"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "se konča z"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr "Izvedi ukaz lupine"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Izraz"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr "Navezava"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Pomembno"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:29
 msgid "is after"
 msgstr "je po"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:30
 msgid "is before"
 msgstr "je pred"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr "je označeno"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "je večje"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "je manjše"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "ni"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:35
 msgid "is not Flagged"
 msgstr "ni označeno"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "oznaka9"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Dopisni seznam"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Jedro sporočila"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Glava sporočila"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Predvajaj zvok"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Beri"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Prejemnik"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Regularni izraz"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Odgovorjeno na"
 
-#: filter/libfilter-i18n.h:43 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:8
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Točke"
 
-#: filter/libfilter-i18n.h:44 mail/mail-callbacks.c:1558
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Nastavi stanje"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Velikost (kB)"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "zveni kot"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Izvorni račun"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "se začne z"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:53 mail/mail-format.c:933
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Zadeva"
 
@@ -10094,11 +10772,11 @@ msgstr "Zadeva"
 msgid "Rules"
 msgstr "Pravila"
 
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
@@ -10118,30 +10796,31 @@ msgstr "Kot vir morate navesti vsaj eno mapo."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolucija uvaža vašo staro pošto Elm."
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Uvažam..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Prosim pokačajte"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:689
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Uvažam %s kot %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:782
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Pregledujem %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:958
-#: importers/pine-importer.c:637 mail/component-factory.c:100
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Pošta"
 
@@ -10157,10 +10836,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Adresar"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10169,23 +10844,76 @@ msgstr ""
 "Evolucija je našla datoteke GnomeCard-a.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Prioriteta: %s"
+
+#: importers/netscape-importer.c:653
+msgid ""
+"Some of your Netscape email filters are based on\n"
+"email priorities, which are not used in Evolution.\n"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
+
+#: importers/netscape-importer.c:677
+msgid ""
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
+msgstr ""
+
+#: importers/netscape-importer.c:694
+msgid ""
+"Some of your Netscape email filters test the\n"
+"body of emails for (in)equality to a given string,\n"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+msgstr ""
+
+#: importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolucija uvaža vaše podatke iz Netscapea"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
+msgid "Trash"
+msgstr "Smeti"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Krajevna datoteka s pošto %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Pregledujem mapo"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Pričenjam uvoz"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Uredi filtre"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10209,72 +10937,119 @@ msgstr ""
 msgid "Pine"
 msgstr "Program Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Nastavitve koledarja"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Nastavitveno orodje za Evolucijin veznik koledarja.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Nastavitveno orodje za Evolucijin veznik koledarja.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Nastavitveno orodje za Evolucijin veznik koledarja.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Nastavitveno orodje za Evolucijin veznik koledarja.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Evolucijina komponenta za obravnavo pošte."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolucijin setavljalnik pošte."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Evolucijina komponenta za povzetke."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Evolucijina komponenta za poštne mape."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Evolucijina komponenta za tovarne poštnih map."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Tovarna za Evolucijinega skladatelja."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "Tovarna za komponento povzetka pošte."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "Nastavitve"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Poštni račun"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Nastavitve"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "Vmesnik za nastavitev pošte"
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Mapa, ki vsebuje pošto"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+msgid "This Page can be used to configure the Fonts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+msgid "This page can be used to configure E-Mail Accounts"
+msgstr ""
 
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr "Mapa v kateri se hrani pošta (notranja)"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19
+msgid "This page can be used to configure Mailer preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
+msgid "This page can be used to configure the Composer"
+msgstr ""
 
 #: mail/component-factory.c:102
+msgid "Folder containing mail"
+msgstr "Mapa, ki vsebuje pošto"
+
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Navidezne smeti"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Mapa navideznih smeti"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Nisem se mogel povezati s hrambo: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Ta mapa ne more vsebovati sporočil."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Lastnosti..."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Spremeni lastnosti te mape"
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10282,218 +11057,234 @@ msgstr ""
 "Nekatere vaše nastavitve pošte se zdijo neveljavne. Prosim, preverite, če je "
 "vse v redu."
 
-#: mail/component-factory.c:971
+#: mail/component-factory.c:929
+msgid "You have not set a mail transport method"
+msgstr "Niste nastavili postopka prenašanja pošte"
+
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Opozorilo: Spremenjeno sporočilo"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Novo poštno sporočilo"
 
-#: mail/component-factory.c:971 ui/evolution-mail-global.xml.h:19
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_Pošlji sporočilo"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Ne morem inicializirati Evolucijine komponente za nastavitev pošte."
 
-#: mail/component-factory.c:1013
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Ne morem inicializirati Evolucijine komponente za podatke o mapah"
 
-#: mail/component-factory.c:1230
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#, fuzzy
+msgid "Connecting..."
+msgstr "Vzpostavljam povezavo s strežnikom..."
+
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser-ui.c:348
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Lastnosti za \"%s\""
 
-#: mail/folder-browser-ui.c:350
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: mail/folder-browser.c:299 mail/mail-display.c:300 mail/mail-display.c:809
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti začasnega imenika: %s"
 
-#: mail/folder-browser.c:754
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d novih"
 
-#: mail/folder-browser.c:757 mail/folder-browser.c:765
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d skritih"
 
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr "%d vidnih"
 
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d izbranih"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d neposlanih"
 
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d poslanih"
 
-#: mail/folder-browser.c:775
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "skupaj %d"
 
-#: mail/folder-browser.c:1062
-msgid "Create vFolder from Search"
-msgstr "Ustvari vMapo iz iskanja"
+#: mail/folder-browser.c:1091
+msgid "Create _Virtual Folder From Search..."
+msgstr "Iz iskanja ustvari na_videzno mapo..."
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/folder-browser.c:1453
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/folder-browser.c:1455
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/folder-browser.c:1456 mail/folder-browser.c:1693
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oštni seznam"
 
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporočilo..."
 
-#: mail/folder-browser.c:1465 ui/evolution-mail-message.xml.h:124
-msgid "_Save As..."
-msgstr "_Shrani kot..."
-
-#: mail/folder-browser.c:1466
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/folder-browser.c:1470 ui/evolution-mail-message.xml.h:123
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/folder-browser.c:1471 ui/evolution-mail-message.xml.h:79
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/folder-browser.c:1472 ui/evolution-mail-message.xml.h:78
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:1477
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr "Nave_zuj se..."
 
-#: mail/folder-browser.c:1478
+#: mail/folder-browser.c:1691
 msgid "Fla_g Completed"
 msgstr "Postavi zastavico končano"
 
-#: mail/folder-browser.c:1479
+#: mail/folder-browser.c:1692
 msgid "Cl_ear Flag"
 msgstr "Zb_riši zastavico"
 
 #. separator here?
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:49
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Označi kot _prebrano"
 
-#: mail/folder-browser.c:1484
+#: mail/folder-browser.c:1697
 msgid "Mark as _Unread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/folder-browser.c:1485
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Označi kot po_membno"
 
-#: mail/folder-browser.c:1486
+#: mail/folder-browser.c:1699
 msgid "_Mark as Unimportant"
 msgstr "Označi kot _nepomembno"
 
-#: mail/folder-browser.c:1490
+#: mail/folder-browser.c:1704
+msgid "U_ndelete"
+msgstr "O_dbriši"
+
+#: mail/folder-browser.c:1708
 msgid "Mo_ve to Folder..."
 msgstr "Presta_vi v mapo..."
 
-#: mail/folder-browser.c:1491 ui/evolution-addressbook.xml.h:37
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:1493
-msgid "U_ndelete"
-msgstr "O_dbriši"
-
-#: mail/folder-browser.c:1497
+#: mail/folder-browser.c:1717
 msgid "Add Sender to Address_book"
 msgstr "Pošiljatelja dodaj v _adresar"
 
-#: mail/folder-browser.c:1500
+#: mail/folder-browser.c:1721
 msgid "Appl_y Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:1502
+#: mail/folder-browser.c:1725
 msgid "Crea_te Rule From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1990
 msgid "VFolder on M_ailing List"
 msgstr "vMapa glede na dopisni seznam"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1992
+#, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1993
+#, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "vMapa glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.h:26
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
 msgid "Default"
 msgstr "Privzeto"
 
-#: mail/folder-info.c:64
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Dobivam podatke o mapi"
 
@@ -10514,26 +11305,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Uvozi datoteke Outlook Express 4 v Evolucijo"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Telo vsebuje"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Trenutna oblika hranjenja:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "Ustvarjanje kazala:"
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Vrsta poštnega predala"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Telo vsebuje"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Nova oblika hranjenja:"
 
-#: mail/local-config.glade.h:6
+#: 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"
@@ -10543,19 +11327,19 @@ msgstr ""
 "napaka (na primer pomanjkanje prosotra na disku) ni nujno samodejno\n"
 " odpravljiva. Prosimo to možnost uprabljajte pazljivo."
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:10
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:11
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Niste vpisali vseh potrebnih podatkov."
 
@@ -10565,99 +11349,111 @@ msgid "Evolution News Editor"
 msgstr "Urejevalnik Evolucijinih novic"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih računov"
 
-#: mail/mail-account-gui.c:52 mail/mail-config.glade.h:15
-msgid "Always"
-msgstr "Vedno"
-
-#: mail/mail-account-gui.c:53 mail/mail-config.glade.h:125
-msgid "Whenever Possible"
-msgstr "Kadar je možno"
-
-#: mail/mail-account-gui.c:54 mail/mail-config.glade.h:71
-msgid "Never"
-msgstr "Nikoli"
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+msgid "_Host:"
+msgstr "_Gostitelj:"
 
-#: mail/mail-account-gui.c:1039 mail/mail-account-gui.c:1040
-#: mail/mail-account-gui.c:1279 mail/mail-account-gui.c:1284
-#: mail/mail-config.glade.h:88
-msgid "Random"
-msgstr "Naključno"
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#, fuzzy
+msgid "User_name:"
+msgstr "_Uporabniško ime:"
 
-#: mail/mail-account-gui.c:1109 mail/mail-account-gui.c:1124
-#: mail/mail-accounts.c:904
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-"Prosim navedite datoteko s podpisom\n"
-"v naprednem odseku nastavitev podpisa."
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+msgid "_Path:"
+msgstr "_Pot:"
 
-#: mail/mail-account-gui.c:1790
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Ne morete ustvariti dveh računov z enakim imenom."
 
-#: mail/mail-accounts.c:152
-msgid " (default)"
-msgstr " (privzeto)"
-
-#: mail/mail-accounts.c:197
-msgid "Disable"
-msgstr "Izključi"
-
-#: mail/mail-accounts.c:199
-msgid "Enable"
-msgstr "Vključi"
-
-#: mail/mail-accounts.c:303
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Ste prepričani, da želite zbrisati ta račun?"
 
-#: mail/mail-accounts.c:307
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Ne zbriši"
 
-#: mail/mail-accounts.c:310
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Resnično zbriši račun?"
 
-#: mail/mail-accounts.c:543 mail/mail-accounts.c:547
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
+msgid "Disable"
+msgstr "Izključi"
+
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
+msgid "Enable"
+msgstr "Vključi"
+
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Ste prepričani, želite zbrisati ta novičarski račun?"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:1247 mail/mail-config.glade.h:64
-msgid "Mail Settings"
-msgstr "Nastavitev pošte"
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
+msgid "Enabled"
+msgstr "Vključeno"
+
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Ime _računa:"
 
-#: mail/mail-autofilter.c:72
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Portoriko"
+
+#: mail/mail-autofilter.c:78
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: mail/mail-autofilter.c:217
+#: mail/mail-autofilter.c:223
 #, c-format
 msgid "Subject is %s"
 msgstr "Zadeva je %s"
 
-#: mail/mail-autofilter.c:233
+#: mail/mail-autofilter.c:239
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:289
+#: mail/mail-autofilter.c:295
 #, c-format
 msgid "%s mailing list"
 msgstr "%s poštnih seznamov"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"Sledeče vMape:\n"
+"%s so uporabljale odstranjeno mapo:\n"
+"    '%s'\n"
+"in so bile posodobljene."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10669,7 +11465,7 @@ msgstr ""
 "ali skladate pošto.\n"
 "Bi ga želeli nastaviti sedaj?"
 
-#: mail/mail-callbacks.c:145
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10677,7 +11473,7 @@ msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10685,12 +11481,8 @@ msgstr ""
 "Nastaviti morate način prenosa pošte\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:189
-msgid "You have not set a mail transport method"
-msgstr "Niste nastavili postopka prenašanja pošte"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10698,11 +11490,11 @@ msgstr ""
 "Pošiljate pošto v obliki HTML, a naslednji prejemniki ne želijo prejemati "
 "takšne pošte:\n"
 
-#: mail/mail-callbacks.c:239
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Vseeno pošlji?"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10710,7 +11502,7 @@ msgstr ""
 "To poročilo nima 'zadeve'.\n"
 "Resnično pošlji?"
 
-#: mail/mail-callbacks.c:325
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10718,11 +11510,11 @@ msgstr ""
 "Ker je seznam kontaktov, ki mu pošiljate, nastavljen, da skrije seznam "
 "naslovov, bo to sporočilo vsebovalo le naslovnike bcc."
 
-#: mail/mail-callbacks.c:329
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "To sporočilo vsebuje le prejemnike bcc"
 
-#: mail/mail-callbacks.c:333
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10732,15 +11524,15 @@ msgstr ""
 "To(očitno-za).\n"
 "Vseeno pošlji?"
 
-#: mail/mail-callbacks.c:438
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 
-#: mail/mail-callbacks.c:527
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Nastaviti morate račun preden lahko pošljete to e-pošto."
 
-#: mail/mail-callbacks.c:646
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10748,28 +11540,28 @@ msgstr ""
 "Ni mogoče odpreti mape osnutkov za ta račun.\n"
 "Želite uporabiti privzeto mapo osnutkov?"
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "neznan pošiljatelj"
 
-#: mail/mail-callbacks.c:983
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Na %s, %Y-%m-%d ob %H:%M, je %%s napisal(a):"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Prestavi sporočilo(a) v"
 
-#: mail/mail-callbacks.c:1437 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:2085
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ste prepričani, da želite urediti vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:2110
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10777,7 +11569,7 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:2149
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10785,28 +11577,32 @@ msgstr ""
 "Znova lahko pošljete le sporočila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:2163
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ste prepričani, da želite znova poslati vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:2189
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Izbrano ni nilo nobeno sporočilo"
 
-#: mail/mail-callbacks.c:2288
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Prepiši datoteko?"
+
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/mail-callbacks.c:2290
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Shrani sporočila kot..."
 
-#: mail/mail-callbacks.c:2352
+#: mail/mail-callbacks.c:2415
 msgid "Go to next folder with unread messages?"
 msgstr "Pojdi v naslednjo mapo z neprebranimi sporočili?"
 
-#: mail/mail-callbacks.c:2359
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -10814,7 +11610,7 @@ msgstr ""
 "V tej mapi ni več novih sporočil.\n"
 "Želite iti v naslednjo mapo?"
 
-#: mail/mail-callbacks.c:2588
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10826,7 +11622,7 @@ msgstr ""
 " \n"
 "Resnično zbriši ta sporočila? "
 
-#: mail/mail-callbacks.c:2698
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10835,32 +11631,69 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2710
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stran %d od %d"
 
-#: mail/mail-callbacks.c:2835
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:2862
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "ZDA-pismo"
 
-#: mail/mail-callbacks.c:2897
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
-#: mail/mail-callbacks.c:3063
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ste prepričani, želite odpreti vseh %d sporočil v ločenih oknih?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+"Prosim navedite datoteko s podpisom\n"
+"v naprednem odseku nastavitev podpisa."
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "_Skripta"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+msgid "Unnamed"
+msgstr "Neimenovan"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "n"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Dodaj nov podpis"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Dodaj nov podpis"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -10913,105 +11746,104 @@ msgstr ""
 "prikaz."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolucijin druid za račune"
 
-#: mail/mail-config.c:612
-#, c-format
-msgid "Account %d"
-msgstr "Račun %d"
+#. red
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
+#, fuzzy
+msgid "Work"
+msgstr "Delam"
 
-#: mail/mail-config.c:2326
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"Nisem mogel dobiti vhodnega predala za novo hrambo pošte:\n"
-"%s\n"
-"Bližnjica ne bo ustvarjena."
+#. orange
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Personal"
+msgstr "Priština"
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2337
+#. forest green
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
+#, fuzzy
+msgid "To Do"
+msgstr "Seznam opravil"
+
+#. blue
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "po"
+
+#: mail/mail-config.c:625
 #, c-format
-msgid "%s: Inbox"
-msgstr "%s: Dohdona pošta"
+msgid "Account %d"
+msgstr "Račun %d"
 
-#: mail/mail-config.c:2587
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Preverjam storitev"
 
-#: mail/mail-config.c:2665 mail/mail-config.c:2669
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: mail/mail-config.c:2860
-msgid "Unnamed"
-msgstr "Neimenovan"
-
-#: mail/mail-config.c:3035
-msgid "Cannot execute signature script"
-msgstr "Nisem mogel izvesti skripte podpisa"
-
 #: mail/mail-config.glade.h:1
-msgid "                        "
-msgstr "                        "
+#, fuzzy
+msgid " "
+msgstr " C"
 
 #: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_Preveri za podprte vrste  "
 
 #: mail/mail-config.glade.h:3
-msgid " color"
-msgstr " barvo"
-
-#: mail/mail-config.glade.h:4
-msgid "&lt;&lt; S_imple"
-msgstr "&lt;&lt; _Enostavno"
-
-#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL v to zgradbi Evolucije ni vgrajen)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL v tej zgradbi Evolucije ni vgrajen)"
 
-#: mail/mail-config.glade.h:7
-msgid "/home/rodo/cvs/evolution/mail/"
-msgstr "/home/rodo/cvs/evolution/mail/"
-
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Kadar pošiljam šifrirano pošto, _vedno šifriraj sebi"
 
-#: mail/mail-config.glade.h:9
-msgid "Account"
-msgstr "Račun"
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Account Editor"
+msgstr "Račun %d"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Podatki o računu"
 
-#: mail/mail-config.glade.h:11 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Upravljanje z računom"
 
-#: mail/mail-config.glade.h:12
-msgid "Accounts"
-msgstr "Računi"
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "_Skripta"
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Add new signature..."
+msgstr "Dodaj nov podpis"
 
-#: mail/mail-config.glade.h:13
-msgid "Ad_vanced &gt;&gt;"
-msgstr "Napredno &gt;&gt;"
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "Kadar pošiljam šifrirano pošto, _vedno šifriraj sebi"
 
 #: mail/mail-config.glade.h:14
-msgid "Add new signature"
-msgstr "Dodaj nov podpis"
+#, fuzzy
+msgid "Alwa_ys sign outgoing messages when using this account"
+msgstr "Ob uporabi tega računa vedno _podpiši odhodno pošto"
 
 #: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
@@ -11022,12 +11854,13 @@ msgid "Always _carbon-copy (Cc) to:"
 msgstr "Vedno pošlji _kopije (Cc) na:"
 
 #: mail/mail-config.glade.h:18
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "Kadar pošiljam ši_frirano pošto, vedno šifriraj sebi"
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
 #: mail/mail-config.glade.h:19
-msgid "Always _sign outgoing messages when using this account"
-msgstr "Ob uporabi tega računa vedno _podpiši odhodno pošto"
+#, fuzzy
+msgid "Attach original message"
+msgstr "Priloži datoteko k sporočilu"
 
 #: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
@@ -11038,30 +11871,50 @@ msgid "Authentication"
 msgstr "Avtentifikacija"
 
 #: mail/mail-config.glade.h:22
-msgid "Beep when new mail arrives"
-msgstr "Ob prihodu nove pošte zapiskaj"
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "_Samodejno preveri za novo pošto"
 
 #: mail/mail-config.glade.h:23
-msgid "Checking for New Mail"
-msgstr "Preverjam za novo pošto"
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
 
 #: mail/mail-config.glade.h:24
-msgid "Composer"
-msgstr "Skladatelj"
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
 
 #: mail/mail-config.glade.h:25
-msgid "Composing Messages"
-msgstr "Sestavljanje sporočil"
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Neznan nabor znakov: %s"
 
 #: mail/mail-config.glade.h:26
-msgid "Configuration"
-msgstr "Nastavitev"
+#, fuzzy
+msgid "C_olors"
+msgstr "_Zapri"
 
 #: mail/mail-config.glade.h:27
-msgid "Confirm when Expunging a folder"
-msgstr "Potrdi ob uničevanju mape"
+msgid "Check spelling while I _type"
+msgstr ""
 
 #: mail/mail-config.glade.h:28
+msgid "Checking for New Mail"
+msgstr "Preverjam za novo pošto"
+
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Barva za opravila, ki so na vrsti danes"
+
+#: mail/mail-config.glade.h:30
+msgid "Composing Messages"
+msgstr "Sestavljanje sporočil"
+
+#: mail/mail-config.glade.h:31
+msgid "Configuration"
+msgstr "Nastavitev"
+
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11077,317 +11930,354 @@ msgstr ""
 "\n"
 "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: mail/mail-config.glade.h:35
-msgid "Default Forward style is: "
-msgstr "Privzet način posredovanja naprej je: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Privzeta prioriteta:"
 
-#: mail/mail-config.glade.h:36
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Privzet nabor znakov: "
 
-#: mail/mail-config.glade.h:37
-msgid "Defaults"
-msgstr "Privzeto"
-
-#: mail/mail-config.glade.h:38
-msgid "Delete selected signature"
-msgstr "Zbriši izbran podpis"
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Sprejemanje pošte"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Digitalni IDji..."
 
-#: mail/mail-config.glade.h:41
-msgid "Display"
-msgstr "Prikaz"
-
-#: mail/mail-config.glade.h:42
-msgid "Do not notify me when new mail arrives"
-msgstr "Ob prihodu nove pošte me ne obvesti"
+#: mail/mail-config.glade.h:45
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Ne morem dobiti sporočila"
 
-#: mail/mail-config.glade.h:43 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Opravljeno"
 
-#: mail/mail-config.glade.h:44 shell/e-local-storage.c:174
-msgid "Drafts"
-msgstr "Osnutki"
-
-#: mail/mail-config.glade.h:45
-msgid "E_mail address:"
-msgstr "_E-poštni naslov:"
-
-#: mail/mail-config.glade.h:46
-msgid "E_nable"
-msgstr "_Vključi"
-
 #: mail/mail-config.glade.h:47
-msgid "Ed_it..."
-msgstr "_Uredi..."
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Mapa _osnutkov:"
 
 #: mail/mail-config.glade.h:48
-msgid "Edi_t..."
-msgstr "Ur_edi..."
+msgid "E_nable"
+msgstr "_Vključi"
 
 #: mail/mail-config.glade.h:49
-msgid "Edit signature content in editor"
-msgstr "Uredi vsebino podpisa v urejevalniku"
+#, fuzzy
+msgid "Emacs"
+msgstr "vzhod"
 
 #: mail/mail-config.glade.h:50
-msgid "Enabled"
-msgstr "Vključeno"
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Poštni račun"
 
 #: mail/mail-config.glade.h:51
-msgid "Execute Command..."
-msgstr "Izvrši ukaz..."
+#, fuzzy
+msgid "Email _address:"
+msgstr "_E-poštni naslov:"
 
 #: mail/mail-config.glade.h:52
-msgid "File containing signature"
-msgstr "Datoteka, ki vsebuje podpis"
-
-#: mail/mail-config.glade.h:53
-msgid "Get Digital ID..."
-msgstr "Dobi digitalni ID..."
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "Ob izhodu _sprazni mapo smeti"
 
 #: mail/mail-config.glade.h:54
-msgid "Hide advanced settings"
-msgstr "Skrij napredne nastavitve"
+msgid "Execute Command..."
+msgstr "Izvrši ukaz..."
 
 #: mail/mail-config.glade.h:55
-msgid "IMAPv4 "
-msgstr "IMAPv4 "
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "se konča z"
 
-#: mail/mail-config.glade.h:56 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Identiteta"
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Font Properties"
+msgstr "Lastnosti računa"
 
 #: mail/mail-config.glade.h:57
-msgid "If selected signature will be included in random signature list"
-msgstr "Če bo izbran podpis vključen v seznamu naključnih podpisov"
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Posredovana sporočila"
 
 #: mail/mail-config.glade.h:58
-msgid "In HTML mail"
-msgstr "V pošti HTML"
+msgid "Get Digital ID..."
+msgstr "Dobi digitalni ID..."
 
 #: mail/mail-config.glade.h:59
-msgid "Include in _random signatures list"
-msgstr "Vključi v seznamu na_ključnih podpisov"
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "_Osvetli citiranja z"
 
 #: mail/mail-config.glade.h:60
+msgid "IMAPv4 "
+msgstr "IMAPv4 "
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
+msgid "Identity"
+msgstr "Identiteta"
+
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "Kot del sporočila"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:62
-msgid "List of signatures"
-msgstr "Seznam podpisov"
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Shrani in zapri"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Naloži _slike"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Mesto poštnega predala"
 
-#: mail/mail-config.glade.h:66
-msgid "Make this my _default account"
-msgstr "Naj bo to moj p_rivzet račun"
-
-#: mail/mail-config.glade.h:67
-msgid "NNTP Server:"
-msgstr "Strežnik NNTP"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Sporočila"
 
-#: mail/mail-config.glade.h:68
-msgid "N_ew..."
-msgstr "N_ova..."
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "Prikaz _sporočila"
 
-#: mail/mail-config.glade.h:69
-msgid "Name of selected signature"
-msgstr "Ime izbranega podpisa"
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Mikronezija"
 
-#: mail/mail-config.glade.h:70
-msgid "Ne_w..."
-msgstr "No_va..."
+#: mail/mail-config.glade.h:75
+msgid "NNTP Server:"
+msgstr "Strežnik NNTP"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Opozorilo o novi pošti"
 
-#: mail/mail-config.glade.h:73
-msgid "News"
-msgstr "Novice"
+#: mail/mail-config.glade.h:79
+#, fuzzy
+msgid "News Servers"
+msgstr "Uredi novičarski strežnik"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:81
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Podatki po želji"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organi_zacija:"
+
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _ključa PGP/GPG:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: mail/mail-config.glade.h:81
-msgid "Play sound file when new mail arrives"
-msgstr "Ob prihodu nove pošte zaigraj zvočno datoteko"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "Zahtevaj potrditev ob pošiljanju sporočil, ki imajo le BCC prejemnike"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:83
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
-"Zahtevaj potrditev ob pošiljanju v obliki HTML tistim stikom, ki tega nočejo"
-
-#: mail/mail-config.glade.h:84
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Zahtevaj potrditev ob pošiljanju sporočil bre_z predmeta"
-
-#: mail/mail-config.glade.h:85
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "Zahtevaj potrditev ob pošiljanju sporočil, ki imajo le BCC prejemnike"
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "Natisni izbrane stike"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Poštni imenik Qmail"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:94
+#, fuzzy
+msgid "Quote original message"
+msgstr "Ne morem dobiti sporočila"
+
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Zapo_mni si to geslo"
 
-#: mail/mail-config.glade.h:90 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Odgovori-na:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Sprejemam e-pošto"
 
-#: mail/mail-config.glade.h:91
-msgid "Receiving Mail"
-msgstr "Sprejemanje pošte"
-
-#: mail/mail-config.glade.h:92
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Možnosti sprejema"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Zapomni si geslo"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Potrebni podatki"
 
-#: mail/mail-config.glade.h:95
-msgid "Same as text"
-msgstr "Enako kot besedilo"
-
-#: mail/mail-config.glade.h:96
-msgid "Script which is run before signature loading from specified filename"
-msgstr "Skripta, ki se požene pred nalaganjem podpisa iz navedene datoteke"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+msgstr "Varnost"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "Varni MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:98
-msgid "Security"
-msgstr "Varnost"
+#: mail/mail-config.glade.h:105
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:99
-msgid "Select Filter Log file..."
-msgstr "Izberi datoteko za dnevnik filtra..."
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:100
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:107
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Select PGP program"
 msgstr "Izberi datoteko PGP"
 
-#: mail/mail-config.glade.h:101 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Pošiljam e-pošto"
 
-#: mail/mail-config.glade.h:102
-msgid "Sending Mail"
-msgstr "Pošiljanje pošte"
-
-#: mail/mail-config.glade.h:104 mail/message-list.etspec.h:9
-#: shell/e-local-storage.c:177
-msgid "Sent"
-msgstr "Poslano"
-
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Mapa _poslanih sporočil:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Poslana sporočila in osnutki"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "St_režnik zahteva avtentifikacijo"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Nastavitev strežnika"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Vrs_ta strežnika:"
 
-#: mail/mail-config.glade.h:110
-msgid "Show advanced settings"
-msgstr "Kaži napredne nastavitve"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Bližnjice"
+
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Signature #1"
+msgstr "Podpisi"
 
-#: mail/mail-config.glade.h:111
-msgid "Signatures"
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
 msgstr "Podpisi"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Podatki o izvorni kodi"
 
-#: mail/mail-config.glade.h:114
-msgid "Sources"
-msgstr "Viri"
-
-#: mail/mail-config.glade.h:115
-msgid "Specify filename:"
+#: mail/mail-config.glade.h:122
+#, fuzzy
+msgid "Specify _filename:"
 msgstr "Navedite ime datoteke:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
+msgstr ""
+
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:117
-msgid "Text _Signature:"
-msgstr "Besedilo _podpisa:"
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
-"Vpišite ime s katerimi želite imenovati ta račun. Na primer:\"službeni\" "
-"ali \"domači\"."
+"Vpišite ime s katerimi želite imenovati ta račun. Na primer:\"službeni\" ali "
+"\"domači\"."
 
-#: mail/mail-config.glade.h:121
-msgid "Use s_ecure connection (SSL):"
-msgstr "Uporabi _varno povezavo (SSL)"
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Spremenljivo"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11397,328 +12287,395 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "XEmacs"
+msgstr "vzhod"
+
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_Podpisi"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "_Vedno naloži slike s spleta"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:146
 msgid "_Authentication type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_Samodejno preveri za novo pošto"
+
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "Ob prihodu nove pošte zapiskaj"
+
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "ID _certifikata:"
 
-#: mail/mail-config.glade.h:134
-msgid "_Drafts folder:"
-msgstr "Mapa _osnutkov:"
+#: mail/mail-config.glade.h:151
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Potrdi ob uničevanju mape"
 
-#: mail/mail-config.glade.h:136
-msgid "_Edit..."
-msgstr "_Uredi..."
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Zbriši vse razen podpisa"
 
-#: mail/mail-config.glade.h:137
-msgid "_Empty trash folders on exit"
-msgstr "Ob izhodu _sprazni mapo smeti"
+#: mail/mail-config.glade.h:153
+#, fuzzy
+msgid "_Defaults"
+msgstr "Privzeto"
+
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Do not notify me when new mail arrives"
+msgstr "Ob prihodu nove pošte me ne obvesti"
+
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Enable"
+msgstr "Vključi"
+
+#: mail/mail-config.glade.h:158
+msgid "_Fixed-width:"
+msgstr ""
 
-#: mail/mail-config.glade.h:138
-msgid "_Filename"
-msgstr "_Ime datoteke:"
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Posreduj naprej kot"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:160
 msgid "_Full name:"
 msgstr "_Polno ime:"
 
-#: mail/mail-config.glade.h:140
-msgid "_HTML Signature:"
-msgstr "Podpis _HTML:"
-
-#: mail/mail-config.glade.h:141
-msgid "_Highlight citations with"
-msgstr "_Osvetli citiranja z"
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "V pošti HTML"
 
-#: mail/mail-config.glade.h:142
-msgid "_Host:"
-msgstr "_Gostitelj:"
+#: mail/mail-config.glade.h:164
+#, fuzzy
+msgid "_Identity"
+msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_Naloži slike, če je pošiljatelj v adresarju"
 
-#: mail/mail-config.glade.h:144
-msgid "_Log filter actions to:"
-msgstr "Zapisuj dejanja filtra v:"
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Naj bo to moj p_rivzet račun"
 
-#: mail/mail-config.glade.h:145
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:167
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "_Označi sporočila kot prebrana po:"
 
-#: mail/mail-config.glade.h:146
-msgid "_Name"
-msgstr "_Ime"
-
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Nikoli ne naloži slik s spleta"
 
-#: mail/mail-config.glade.h:149
-msgid "_Organization:"
-msgstr "_Organizacija:"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "Pot do izvršljive datoteke _PGP"
 
-#: mail/mail-config.glade.h:151
-msgid "_Path:"
-msgstr "_Pot:"
+#: mail/mail-config.glade.h:172
+#, fuzzy
+msgid "_Play sound file when new mail arrives"
+msgstr "Ob prihodu nove pošte zaigraj zvočno datoteko"
 
-#: mail/mail-config.glade.h:152
-msgid "_Remember this password"
-msgstr "_Zapomni si to geslo"
+#: mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr ""
+"Zahtevaj potrditev ob pošiljanju v obliki HTML tistim stikom, ki tega nočejo"
 
-#: mail/mail-config.glade.h:153
-msgid "_Script"
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "Zahtevaj potrditev ob pošiljanju sporočil bre_z predmeta"
+
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Sprejemanje pošte"
+
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Odgovori vsem"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
 msgstr "_Skripta"
 
-#: mail/mail-config.glade.h:154
-msgid "_Send mail in HTML format by default."
-msgstr "Privzeto pošiljaj pošto v _HTML obliki."
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Varnost"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Pošiljanje pošte"
 
-#: mail/mail-config.glade.h:155
-msgid "_Server type: "
-msgstr "Vrsta _strežnika: "
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Kaži čas kot"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:182
 msgid "_Signatures"
 msgstr "_Podpisi"
 
-#: mail/mail-config.glade.h:157
-msgid "_Username:"
-msgstr "_Uporabniško ime:"
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "Uporabi _varno povezavo (SSL)"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:184
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Spremenljivo"
+
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_vsakih"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:186
+#, fuzzy
+msgid "color"
+msgstr " barvo"
+
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "oknonovic1"
 
-#: mail/mail-config.glade.h:162
-msgid "placeholder"
-msgstr "držalec mesta"
-
-#: mail/mail-config.glade.h:163
-msgid "seconds."
-msgstr "sekund."
-
-#: mail/mail-config.glade.h:164
-msgid "use _HTML for this signature"
-msgstr "za ta podpis uporabi _HTML"
-
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Nisem mogel ustvariti konteksta podpisovanja PGP."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Nisem mogel ustvariti konteksta preverjanja PGP."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Nisem mogel ustvariti konteksta šifiranja PGP."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Nisem mogel ustvariti konteksta dešifriranja PGP."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Nisem mogel ustvariti konteksta podpisa S/MIME"
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Nisem mogel ustvariti konteksta certifikatov S/MIME."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Nisem mogel ustvariti konteksta šifriranja S/MIME."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Nisem mogel ustvariti konteksta ovojnice S/MIME."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Nisem mogel ustvariti konteksta dešifriranja S/MIME."
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:310
+#: mail/mail-display.c:344
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nisem mogel ustvariti začasne datoteke '%s': %s"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:358
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:360
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:425
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-display.c:446
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "zunanjem pregledovalniku"
 
-#: mail/mail-display.c:1231
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporočila"
 
-#: mail/mail-display.c:1723
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Naloge s prekoračenim rokom:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:1725
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/mail-display.c:1728
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:1731
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Shrani sliko kot..."
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "priloga %s"
 
-#: mail/mail-format.c:693
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
 
-#: mail/mail-format.c:776
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:868
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Slab naslov"
 
-#: mail/mail-format.c:911 mail/message-list.etspec.h:6
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:920 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Za"
 
-#: mail/mail-format.c:925
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:930
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1785
+#: mail/mail-format.c:945
+#, fuzzy
+msgid "Mailer"
+msgstr "Pošta"
+
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Shrani sporočilo kot..."
+
+#: mail/mail-format.c:1832
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "To sporočilo ima elektronski podpis. Za več podatkov kliknite na ikono "
 "ključavnice."
 
-#: mail/mail-format.c:1808
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolucija ne pozna te vrste podpisa sporočila"
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Nisem mogel ustvariti konteksta preverjanja PGP."
 
-#: mail/mail-format.c:1816
+#: mail/mail-format.c:1868
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "To sporočilo ima elektronski podpis in je ugotovljeno za avtentično."
 
-#: mail/mail-format.c:1824
+#: mail/mail-format.c:1876
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
 
-#: mail/mail-format.c:2067
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:2081
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kazalec na krajevno datoteko (%s) veljaven na strežniku \"%s\""
 
-#: mail/mail-format.c:2086
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:2115
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Kazalec na oddaljen podatek (%s)"
 
-#: mail/mail-format.c:2123
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (vrsta \"%s\")"
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Krajevne mape"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Prenastavljam mapo"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11727,27 +12684,27 @@ msgstr ""
 "Ne morem shraniti meta podatkov mape; verjetno te mape ne boste mogli več "
 "odpreti: %s: %s"
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ne morem shraniti meta podatkov mape v %s: %s"
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ne morem zbrisati meta podatkov mape %s: %s"
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s se ne da nasatviti, saj ni krajevna mapa"
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11755,11 +12712,11 @@ msgstr ""
 "Če ne morete več odpreti tega poštnega predala, potem\n"
 "ga boste morda morali popraviti ročno."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Ne morete spremeniti oblike zapisa map, ki niso krajevne."
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Znova nastavi /%s"
@@ -11786,117 +12743,104 @@ msgstr ""
 msgid "Working"
 msgstr "Delam"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Mapa filtrov"
 
-#: mail/mail-ops.c:259
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-ops.c:535 mail/mail-ops.c:564
+#: mail/mail-ops.c:538 mail/mail-ops.c:567
 msgid "However, the message was successfully sent."
 msgstr "Sporočilo je bilo vseeno uspešno poslano."
 
-#: mail/mail-ops.c:600
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pošiljam \"%s\""
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Pošiljam sporočilo %d od %d"
 
-#: mail/mail-ops.c:739
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: mail/mail-ops.c:741 mail/mail-send-recv.c:545
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "Končano."
 
-#: mail/mail-ops.c:834
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporočila v %s"
 
-#: mail/mail-ops.c:941
-msgid "Moving"
-msgstr "Prestavljam"
-
-#: mail/mail-ops.c:944
-msgid "Copying"
-msgstr "Kopiram"
-
-#: mail/mail-ops.c:1054
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pregledujem mape v \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1104 shell/e-local-storage.c:179
-msgid "Trash"
-msgstr "Smeti"
-
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1280
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1352
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1421
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1515
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1566
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Osvežujem mapo"
 
-#: mail/mail-ops.c:1602
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Prenašam %d sporočil"
 
-#: mail/mail-ops.c:1804
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Shranjujem %d sporočil"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11905,7 +12849,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11914,11 +12858,11 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:2034
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11927,27 +12871,27 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2065
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znova se povezujem z %s"
 
-#: mail/mail-ops.c:2234
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Izvajam ukaz lupine: %s"
 
-#: mail/mail-search-dialogue.c:113 ui/evolution-mail-message.xml.h:126
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "I_skanje"
 
@@ -11983,45 +12927,41 @@ msgstr "Poišči"
 msgid "Matches:"
 msgstr "Ustreza:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Preklicujem..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Strežnik: %s, vrsta: %s:"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Pot: %s, vrsta: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Vrsta: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Pošlji in spreji pošto"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Prekliči vse"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Posodabljam..."
 
-#: mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
+#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
 msgid "Waiting..."
 msgstr "Čakam..."
 
-#: mail/mail-send-recv.c:541
-msgid "Cancelled."
-msgstr "Preklicano."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Uporabnik je dejanje preklical."
@@ -12035,38 +12975,78 @@ msgstr "Vpišite geslo za %s"
 msgid "Enter Password"
 msgstr "Vpišite geslo"
 
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "V cev je bilo zapisano nepopolno sporočilo!"
+#: mail/mail-signature-editor.c:81
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Nisem mogel shraniti datoteke s podpisom."
 
-#: mail/mail-summary.c:467
-msgid "Mail Summary"
-msgstr "Povzetek pošte"
+#: mail/mail-signature-editor.c:174
+#, fuzzy
+msgid "Save signature"
+msgstr "Podpisi"
+
+#: mail/mail-signature-editor.c:180
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Podpis je bil spremenjen, a ni bil shranjen.\n"
+"\n"
+"Želite shraniti spremembe?"
+
+#: mail/mail-signature-editor.c:378
+#, fuzzy
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+"Vpišite ime s katerimi želite imenovati ta račun. Na primer:\"službeni\" ali "
+"\"domači\"."
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Ime:"
+
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "Datoteka s podpisom"
 
-#: mail/mail-tools.c:256
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "Datoteka s podpisom HTML:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Posredovano sporočilo %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Posredovano sporočilo"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Posredovano sporočilo"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Nastavljam vMapo: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Posodabljam vmape za uri: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12079,120 +13059,172 @@ msgstr ""
 "    '%s'\n"
 "in so bile posodobljene."
 
-#: mail/mail-vfolder.c:728
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Uredi VMapo"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Poskus ureditve vmape '%s', ki ne obstaja."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(brez zadeve)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - sporočilo"
 
-#: mail/message-list.c:638
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:640
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "več nevidenih sporočil"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Več sporočil"
 
-#: mail/message-list.c:646
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "najnižja"
 
-#: mail/message-list.c:647
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:651
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "najvišja"
 
-#: mail/message-list.c:957
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:964
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:973
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %l:%M %p"
 
-#: mail/message-list.c:985
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:995
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2362
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Ustvarjam seznam sporočil"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Rok do"
 
-#: mail/message-list.etspec.h:3
+#: mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "Stanje zastavice"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Označeno"
 
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr "Zastavica navezave"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Prvotni stik:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Sprejeto"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Velikost"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "Povratni klic"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Posreduj naprej"
+
+#: mail/message-tag-followup.c:59
+#, fuzzy
+msgid "Follow-Up"
+msgstr "Navezava"
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Podatki o izvorni kodi"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Posreduj naprej"
+
+#: mail/message-tag-followup.c:62
+msgid "No Response Necessary"
+msgstr ""
+
+#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr "Odgovori"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Odgovori vsem"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Predogled"
+
+#: mail/message-tag-followup.c:315
+#, fuzzy
+msgid "Flag to Follow Up"
+msgstr "FIXME: _Zastavica za nadaljevanje..."
+
 #: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -12214,7 +13246,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Preklicujem naročnino na mapo \"%s\""
 
 #: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mapa"
 
@@ -12258,6 +13290,35 @@ msgstr "_Naroči se"
 msgid "_Unsubscribe"
 msgstr "_Prekliči naročnino"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "Nastavitveno orodje za Evolucijin veznik opravil.\n"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolucijin setavljalnik pošte."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Tovarna za Evolucijino komponento nalog."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Tovarna za Evolucijine komponente za povzetke."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "Nastavitve"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+msgid "This page can be used to customize the appearance of the Summary page."
+msgstr ""
+
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
 msgstr ""
@@ -16827,5238 +17888,5231 @@ msgstr ""
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr ""
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr ""
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr ""
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr ""
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr ""
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr ""
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr ""
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr ""
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr ""
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libija"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr ""
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr ""
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr ""
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr ""
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr ""
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisbona"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr ""
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr ""
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "London"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "London/City"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "London/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "London/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "London/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr ""
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr ""
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr ""
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr ""
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr ""
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr ""
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr ""
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr ""
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr ""
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr ""
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Medina"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr ""
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr ""
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr ""
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr ""
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr ""
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr ""
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr ""
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr ""
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr ""
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr ""
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Mancheser"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr ""
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr ""
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr ""
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr ""
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr ""
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr ""
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr ""
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr ""
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr ""
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr ""
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr ""
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr ""
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr ""
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr ""
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr ""
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr ""
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr ""
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr ""
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr ""
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr ""
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr ""
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr ""
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr ""
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr ""
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr ""
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr ""
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr ""
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr ""
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr ""
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr ""
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr ""
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr ""
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr ""
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr ""
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr ""
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Srednji vzhod"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Solomonovi otoki"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr ""
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr ""
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr ""
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr ""
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr ""
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr ""
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr ""
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr ""
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr ""
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr ""
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr ""
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr ""
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Misisipi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr ""
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr ""
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr ""
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr ""
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr ""
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr ""
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr ""
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr ""
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr ""
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldavija"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr ""
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr ""
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr ""
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr ""
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr ""
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr ""
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr ""
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr ""
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr ""
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr ""
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr ""
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr ""
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr ""
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr ""
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr ""
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr ""
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr ""
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr ""
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr ""
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr ""
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr ""
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr ""
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr ""
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr ""
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr ""
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr ""
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr ""
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr ""
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr ""
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr ""
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr ""
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Neapelj"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr ""
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr ""
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr ""
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr ""
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr ""
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr ""
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "Novi Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Nova Fundlandija"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr ""
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "Nova Mehika"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr ""
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr ""
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr ""
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-Letališče JFK"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagarski slapovi"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr ""
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr ""
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr ""
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr ""
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr ""
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr ""
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr ""
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "Norveška"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "Severna Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Severovzhodna Filadelfija"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr ""
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr ""
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Severozahodni teritoriji"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr ""
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr ""
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr ""
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr ""
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr ""
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr ""
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr ""
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr ""
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr ""
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr ""
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr ""
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr ""
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr ""
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr ""
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr ""
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr ""
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr ""
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr ""
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr ""
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr ""
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr ""
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr ""
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr ""
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr ""
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr ""
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr ""
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr ""
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr ""
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr ""
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Pariz"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Pariz/Charles de Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Pariz/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Pariz/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr ""
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr ""
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr ""
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr ""
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr ""
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr ""
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr ""
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr ""
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr ""
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Filadelfija"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr ""
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pizza"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr ""
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr ""
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr ""
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr ""
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr ""
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr ""
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr ""
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr ""
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portorož"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr ""
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr ""
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr ""
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praga"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr ""
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr ""
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Priština"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr ""
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr ""
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr ""
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr ""
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr ""
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr ""
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr ""
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr ""
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr ""
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr ""
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr ""
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr ""
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr ""
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr ""
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr ""
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr ""
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio de Jeneiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr ""
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr ""
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr ""
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr ""
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr ""
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosvelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr ""
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr ""
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Rusija"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr ""
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr ""
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr ""
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr ""
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr ""
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr ""
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr ""
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr ""
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr ""
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr ""
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-Severni otok"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr ""
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr ""
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr ""
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr ""
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr ""
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr ""
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr ""
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago na Kubi"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Samoa"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr ""
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr ""
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr ""
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr ""
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr ""
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr ""
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seul/Mednarodno letališče Kimp'O"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr ""
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr ""
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr ""
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr ""
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr ""
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr ""
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr ""
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr ""
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr ""
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr ""
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr ""
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr ""
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr ""
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr ""
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr ""
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr ""
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr ""
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "Južna Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr ""
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr ""
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr ""
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr ""
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr ""
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St. Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St. Lousi-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr ""
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr ""
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr ""
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr ""
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr ""
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr ""
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr ""
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr ""
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr ""
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr ""
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Evropa/Tallinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr ""
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr ""
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr ""
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr ""
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr ""
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennesee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Teksas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr ""
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr ""
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokijo heliport"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokijo - mednarodno letališče"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokijo - novo mednarodno letališče"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr ""
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr ""
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr ""
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr ""
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr ""
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr ""
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr ""
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr ""
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trst"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr ""
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr ""
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr ""
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr ""
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr ""
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr ""
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr ""
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "Združeni arabski emirati "
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr ""
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr ""
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Radijo"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr ""
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr ""
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr ""
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr ""
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr ""
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr ""
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr ""
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Benetke"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr ""
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr ""
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr ""
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr ""
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr ""
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr ""
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr ""
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Varšava"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr ""
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr ""
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr ""
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr ""
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr ""
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr ""
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr ""
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "Zahodna Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr ""
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr ""
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "Zahodni Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "Zahodna Virginija"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr ""
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr ""
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Dunaj"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr ""
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr ""
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr ""
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr ""
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr ""
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr ""
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr ""
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr ""
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr ""
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "Mapa, ki vsebuje povzetek Evolucije"
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Ne morem inicializirati Evolucijine komponente za povzetek."
-
 #: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "Sestanki"
@@ -22079,52 +23133,63 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Brez opisa"
 
-#: my-evolution/e-summary-mail.c:120
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Povzetek pošte"
 
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+msgid "Local Folders"
+msgstr "Krajevne mape"
+
 #. translators: Put a list of codes for locations you want to see in
 #. My Evolution by default here. You can find the list of all
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:82
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "LJLJ:LJMB:LJPZ"
 
-#: my-evolution/e-summary-preferences.c:453
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com beseda dneva"
 
-#: my-evolution/e-summary-preferences.c:474
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Citati dneva"
 
-#: my-evolution/e-summary-preferences.c:735
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Dodaj vir novic"
 
-#: my-evolution/e-summary-preferences.c:743
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Vpišite vir novic, ki ga želite dodati"
 
-#: my-evolution/e-summary-preferences.c:747
-msgid "Name:"
-msgstr "Ime:"
-
-#: my-evolution/e-summary-preferences.c:1225
-msgid "Summary Settings"
-msgstr "Nastavitev povzetka"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Napaka ob prenašanju RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Viri novic"
 
+#: my-evolution/e-summary-shown.c:536
+msgid "All"
+msgstr ""
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:545
+msgid "Add"
+msgstr "Dodaj"
+
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Sneži"
+
 #: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "Brez nalog"
@@ -22145,23 +23210,23 @@ msgstr "Napaka ob prenašanju podatkov za"
 msgid "Weather"
 msgstr "Vreme"
 
-#: my-evolution/e-summary.c:190
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %e %B %Y"
 
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "Prosim pokačajte..."
 
-#: my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Natisni povzetek"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "Tiskanje povzetka ni uspelo"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Komponenta povzetka ni mogla inicializirati Bonoba.\n"
 
@@ -23350,97 +24415,108 @@ msgid "C_elsius"
 msgstr "_Stopinjah"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Vsi viri _novic:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Koliko dni naj koledar pokaže hkrati?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "Na_jvečje število prikazanih predmetov:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Nastavitve virov novic"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "En _mesec"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "En _teden"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "Čas _osvežitve (sekund):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "Čas _osvežitve (sekund):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "_Kaži celotne poti map"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Kaži _vse naloge"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Kaži _današnje naloge"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Kaži temperaturo v:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Naloge "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Nastavitve vremena"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheitih"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_pet dni"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_Pošta"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "_Viri novic"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_En dan"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Načrtuj"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Vreme"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
-msgstr "Tovarna komponent Evolucije zaznamkov."
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Nastavitveno orodje za Evolucijin veznik opravil.\n"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr "Tovarna za kontrolo zaznamkov"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Nastavitev pošte"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolucijina lupina."
 
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure various folder settings"
+msgstr ""
+
 #: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Kaži podrobnosti"
@@ -23449,6 +24525,24 @@ msgstr "Kaži podrobnosti"
 msgid "Cancel Operation"
 msgstr "Prekliči operacijo"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Nisem mogel prenesti mape:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Dodaj pravilo vMape"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Osnutki"
+
 #: shell/e-local-storage.c:175 shell/e-shell-view.c:385
 #: shell/e-shortcuts.c:1033
 msgid "Inbox"
@@ -23458,15 +24552,15 @@ msgstr "Dohodna pošta"
 msgid "Outbox"
 msgstr "Odhodna pošta"
 
-#: shell/e-local-storage.c:1022
-msgid "Local Folders"
-msgstr "Krajevne mape"
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Poslano"
 
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Namestitev Evolucije"
 
-#: shell/e-setup.c:128
+#: shell/e-setup.c:130
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -23474,16 +24568,16 @@ msgstr ""
 "Ta različica Evolucije mora namestiti dodatne datoteke\n"
 "v vaš osebni imenik Evolucije"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Prosim kliknite \"V redu\" za namestitev datotek ali \"Prekliči\" za izhod."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Nisem mogel pravilno posodobiti datotek"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -23494,7 +24588,7 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -23504,7 +24598,7 @@ msgstr ""
 "`%s'\n"
 " se je zgodila napaka."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -23515,7 +24609,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -23526,7 +24620,7 @@ msgstr ""
 "nima pravilnih dovoljenj. Prosim naredite ga\n"
 "berljivega in pisljivega ter znova poženite Evolucijo."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -23537,7 +24631,7 @@ msgstr ""
 "mora biti odstranjena, da bi Evolucija delovala pravilno.\n"
 "Prosim, odstranite to datoteko ter znova poženite Evolucijo."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -23548,7 +24642,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabniških datotek nadaljuje."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -23562,7 +24656,7 @@ msgstr ""
 "lahko Evolucija požene.\n"
 "Želite, da odstranim ta imenik?"
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -23577,14 +24671,40 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "K vam prinešeno od"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Datum zaključka"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Izberi mapo"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Izberi mapo"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Mapa filtrov"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Krajevne mape"
+
 #: shell/e-shell-folder-commands.c:140
+#, c-format
 msgid "Cannot copy folder: %s"
 msgstr "Ne morem kopirati mape: %s"
 
 #: shell/e-shell-folder-commands.c:143
+#, c-format
 msgid "Cannot move folder: %s"
-msgstr ""
-"Ne morem prestaviti mape: %s"
+msgstr "Ne morem prestaviti mape: %s"
 
 #: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
@@ -23603,20 +24723,20 @@ msgstr "Ne morem kopirati mape v eno od naslednic."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Navedite mapo kamor naj se skopira mapa \"%s\":"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Kopiraj mapo"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Navedite mapo, kamor naj se prestavi mapa \"%s\":"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Prestavi mapo"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23625,18 +24745,17 @@ msgstr ""
 "Nisem mogel zbrisati mape:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Zbriši \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Ste prepričani, da želite zbrisati mapo \"%s\"?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr "Zbriši mapo '%s'"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23645,16 +24764,16 @@ msgstr ""
 "Nisem mogel preimenovati mape:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj mapo \"%s\" v:"
 
-#: shell/e-shell-folder-commands.c:559
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: shell/e-shell-folder-commands.c:569
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23673,7 +24792,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolucija - Ustvar novo mapo"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -23681,7 +24800,7 @@ msgstr ""
 "Vrsta izbrane mape ni veljavna za zahtevano\n"
 "operacijo."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Nova..."
 
@@ -23733,21 +24852,26 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Izberi mapo"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Mapa %s ne obstaja"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Napaka Evolucije"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Uvažate lahko le v krajevne mape"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -23756,11 +24880,11 @@ msgstr ""
 "Ni uvoznika, ki bi lahko obravnaval\n"
 " %s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Uvažam"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -23769,17 +24893,17 @@ msgstr ""
 "Uvažam %s.\n"
 "Pričenjam %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Napaka ob zagonu %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Napaka ob nalaganju %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -23788,31 +24912,31 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Ime datoteke:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Uvozi podatke in nastavitve iz starejših programov"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Uvozi eno samo datoteko"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -23820,31 +24944,76 @@ msgstr ""
 "Prosim počakajte...\n"
 "Iščem že obstoječe namestitve"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Poganjam pametne uvoznike"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Od: %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Uvozi"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Prekinjam povezave..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr "Uskladi \"%s\""
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Uskljajujem mapo"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "Uskladi \"%s\""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolucija "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Odpiram mapo %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Odpiram mapo %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Odpri v %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Ne morem ustvariti izbrane mape:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -23858,8 +25027,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Nisem mogel pognati Evolucijinega vmesnika za pomoč pri pošti\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nov"
@@ -23880,52 +25049,43 @@ msgstr "Ime mape ne more vsebovati poševnic"
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' in '..' sta rezervirana za imena map."
 
-#: shell/e-shell-view-menu.c:170
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Program 'Bug buddy' ni bil najden v vaši poti ($PATH)."
 
-#: shell/e-shell-view-menu.c:178
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
-#: shell/e-shell-view-menu.c:220
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "_O Ximianovi Evoluciji..."
 
-#: shell/e-shell-view-menu.c:432
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view-menu.c:433
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Izberite mapo, ki jo želite odpreti"
 
-#: shell/e-shell-view-menu.c:553
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Ustvari novo bližnjico"
 
-#: shell/e-shell-view-menu.c:554
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Izberite mapo na katero naj kaže bližnjica:"
 
-#: shell/e-shell-view-menu.c:602
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Orodja GNOME Pilot niso nameščena na vašem sistemu."
-
-#: shell/e-shell-view-menu.c:610
-#, c-format
-msgid "Error executing %s."
-msgstr "Napaka ob izvajanju %s."
-
-#: shell/e-shell-view-menu.c:715
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "Delaj na _mreži"
 
-#: shell/e-shell-view-menu.c:728 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "Delaj _brez mreže"
 
-#: shell/e-shell-view-menu.c:741 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
@@ -23933,38 +25093,50 @@ msgstr "Delaj brez mreže"
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shell-view.c:1802
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1804
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(brez)"
 
-#: shell/e-shell-view.c:1851
+#: shell/e-shell-view.c:1867
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolucija je trenutno na mreži.  Kliknite na ta gumb za delo brez "
 "mreže."
 
-#: shell/e-shell-view.c:1858
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolucija je v procesu odklapljanja od mreže."
 
-#: shell/e-shell-view.c:1864
+#: shell/e-shell-view.c:1880
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolucija trenutno ni na mreži.  Kliknite ta gumb za delo z mrežo."
 
-#: shell/e-shell.c:652
+#: shell/e-shell.c:171
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Napaka iz aktivacijskega sistema je:\n"
+"%s"
+
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
 
-#: shell/e-shell.c:1710
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23975,19 +25147,19 @@ msgstr ""
 "je nepričakovano zaključila. Morali boste zapreti in znova\n"
 "pognati Evolucijo, če želite dostopati do teh podatkov."
 
-#: shell/e-shell.c:1937
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Neveljavni argumenti"
 
-#: shell/e-shell.c:1939
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Ne morem se registrirati pri OAF"
 
-#: shell/e-shell.c:1941
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 
-#: shell/e-shell.c:1943 shell/e-storage.c:440
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Generična napaka"
 
@@ -24012,95 +25184,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Ne odstrani"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Preimenuj skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Preimenuj izbrano skupino bližnjic v:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Majhne ikone"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Kaži bližnjice kot majhne ikone"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "_Velike ikone"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Kaži bližnjice kot velike ikone"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Nova skupina..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "_Odstrani to skupino..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Odstrani to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "_Preimenuj to skupino..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Preimenuj to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Preimenuj bližnjico"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Preimenuj izbrano bližnjico v:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Odpri mapo povezano s to bližnjico"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Odpri v novem _oknu"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Odpri mapo povezano s to bližnjico v novem oknu"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "P_reimenuj"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Preimenuj to bližnjico"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "_Odstrani"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrani to bližnjico iz vrstice bližnjic"
 
@@ -24112,64 +25284,59 @@ msgstr "Napaka ob shranjevanju bližnjic."
 msgid "Shortcuts"
 msgstr "Bližnjice"
 
-#: shell/e-storage-set-view.c:648
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
 msgstr ""
-"Nisem mogel prenesti mape:\n"
-"%s"
 
-#: shell/e-storage.c:438
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:442
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Mapa z enakim imenom že obstaja"
 
-#: shell/e-storage.c:444
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Izbrana vrsta mape ni veljavna"
 
-#: shell/e-storage.c:446
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:448
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:450
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Mapa ni prazna"
 
-#: shell/e-storage.c:452
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:454
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:458
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:460
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Izbrana vrsta ni podprta v tem hranilniku"
 
-#: shell/e-storage.c:462
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "Izbrane mape ni možno spremeniti ali odstraniti"
 
-#: shell/e-storage.c:464
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Mapa ne more postati otrok svojih potomcev"
 
-#: shell/e-storage.c:466
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "Ne morem ustvariti mape s takšnim imenom"
 
@@ -24183,6 +25350,10 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% končano)"
 
+#: shell/evolution-folder-selector-button.c:86
+msgid "<click here to select a folder>"
+msgstr "<kliknite tukaj za izbiro mape>"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -24220,67 +25391,67 @@ msgstr ""
 "Napaka iz aktivacijskega sistema je:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "Napaka CORBA"
 
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Prekinjen"
 
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Neveljaven argument"
 
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Že ima lastnika"
 
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Brez lastnika"
 
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Ni bil(a) najden(a)"
 
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Nepodprta vrsta"
 
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Nepodprta shema"
 
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Nepodprto dejanje"
 
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Notranja napaka"
 
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Obstaja"
 
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "Neveljaven URI"
 
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Ima podmape"
 
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Ni več prostora"
 
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "Star lastnik je umru"
 
-#: shell/evolution-test-component.c:44
+#: shell/evolution-test-component.c:49
 msgid "Test type"
 msgstr "Preveri vrsto"
 
@@ -24407,40 +25578,86 @@ msgstr "Ne sprašuj me več"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolucija lahko uvozi podatke iz sledečih datotek:"
 
-#: shell/main.c:88
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: shell/main.c:94
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolucije se sedaj zapira..."
 
-#: shell/main.c:223
+#: shell/main.c:222
+#, fuzzy, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"Pozdrav.  Hvala, ker ste si vzeli čas za prenos te predogledne izdaje\n"
+"programja za delovne skupine Evolucija.\n"
+"\n"
+"Evolucija še ni končana. Še vedno so kraji, kjer funkcionalnost manjka ali\n"
+"deluje le polovično.\n"
+"\n"
+"Če najdete hrošča, ga prosimo sporočite na bugzilla.ximian.com.\n"
+"Ta izdelek prihaja brez kakršnihkoli zagotovil in ni primeren za\n"
+"osebe, ki doživljajo nasilne napade jeze.\n"
+"\n"
+"Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
+"pričakujemo vaše prispevke!\n"
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"Hvala,\n"
+"skupina Evolucije\n"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Ne sprašuj me več"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne morem dostopati do lupine Ximian Evolucije."
 
-#: shell/main.c:232
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne morem inicializirati lupine Ximian Evolucije: %s"
 
-#: shell/main.c:302
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Izključi začetni zaslon"
 
-#: shell/main.c:303
+#: shell/main.c:438
 msgid "Start in offline mode"
 msgstr "Začni v ne-mrežnem načinu"
 
-#: shell/main.c:304
+#: shell/main.c:439
 msgid "Start in online mode"
 msgstr "Začni v mrežnem načinu"
 
-#: shell/main.c:305
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošlji razhroščevalna sporočila vseh komponent v datoteko."
 
-#: shell/main.c:323
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -24449,7 +25666,7 @@ msgstr ""
 "%s: --online in --ofline ne moreta biti uporabljena skupaj.\n"
 "  Uporabite %s --help za več podatkov.\n"
 
-#: shell/main.c:353
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
@@ -24476,7 +25693,7 @@ msgstr "Ime datoteke ni navedeno."
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopiraj stik(e) v drugo mapo..."
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
@@ -24492,7 +25709,7 @@ msgstr "Ustvari nov stik"
 msgid "Create new contact list"
 msgstr "Ustvari nov seznam stikov"
 
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:12
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Izreži izbrano"
 
@@ -24500,243 +25717,173 @@ msgstr "Izreži izbrano"
 msgid "Delete selected contacts"
 msgstr "Zbriši izbrane stike"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "Dump"
-msgstr "Shrani"
-
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:13
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Prestavi stik(e) v drugo mapo..."
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:14
 msgid "Move to Folder..."
 msgstr "Prestavi v mapo..."
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:23
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Prilepi odložišče"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Predogled stikov, ki bodo natisnjeni"
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "Natisni izbrane stike"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Shrani izbrane kontakte kot vVizitke"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Izberi vse stike"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Pošlji poročilo izbranim stikom."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Stiku pošlji sporočilo"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Pošlji izbrane stike drugi osebi."
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Ustavi"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Ustavi nalaganje"
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:30
 msgid "View the current contact"
 msgstr "Poglej trenutni stik"
 
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:17 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Dejanja"
 
 #: ui/evolution-addressbook.xml.h:33
-msgid "_Addressbook Sources..."
-msgstr "Viri _adresarja..."
-
-#: ui/evolution-addressbook.xml.h:35
 msgid "_Contact List"
 msgstr "Seznam _stikov"
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Posreduj stik..."
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:38
 msgid "_Move to Folder..."
 msgstr "Prestavi v _mapo..."
 
-#: ui/evolution-addressbook.xml.h:43 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:121
-#: ui/evolution-tasks.xml.h:24 ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "Na_tisni..."
-
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "_Shrani kot vVizitko"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_Išči po kontaktih"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "_Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:47
+#: ui/evolution-addressbook.xml.h:45
 msgid "_Send Message to Contact..."
 msgstr "Pošlji _sporočilo stiku..."
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Nastavi pogled koledarja"
-
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Ustvari nov celodnevni _dogodek"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "Ustvari novo _nalogo"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Ustvari _nov sestanek"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a _New Meeting"
-msgstr "Ustvari _nov sestanek"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
-msgstr "Ustvari nov sestanek"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new meeting request"
-msgstr "Ustvari nov zahtevek za sestanek"
-
-#: ui/evolution-calendar.xml.h:10 ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "Ustvari nov posel"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create an event for the whole day"
-msgstr "Ustvari sestanek, ki zavzame cel dan"
-
-#: ui/evolution-calendar.xml.h:13
 msgid "Day"
 msgstr "Dan"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Zbriši ta sestanek"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Pojdi na"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Pojdi nazaj"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Pojdi naprej"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Pojdi na _datum"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Pojdi na določen datum"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Pojdi na danes"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Mesec"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Predogled koledarja, ki bo natisnjen"
 
-#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "Predogled _tiskanja"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Natisni ta koledar"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Objavi podatek o zasedenosti za ta koledar"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Kaži en dan"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Kaži en mesec"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Kaži en teden"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Pokaži delavni teden"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Teden"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "_Sestanek..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Nastavitve pošte..."
-
-#: ui/evolution-calendar.xml.h:40
-msgid "_Meeting..."
-msgstr "_Sestanek..."
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Publish Free/Busy Information"
-msgstr "_Objavi podatek o zasedenosti"
-
-#: ui/evolution-calendar.xml.h:44
-msgid "_Task..."
-msgstr "_Naloga..."
-
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -24753,8 +25900,8 @@ msgstr "Zapri ta predmet"
 msgid "Delete this item"
 msgstr "Zbriši ta predmet"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Glavna orodna vrstica"
 
@@ -24766,15 +25913,15 @@ msgstr "Predogled natisnjenega predmeta"
 msgid "Print this item"
 msgstr "Natisni ta predmet"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Natisni..."
-
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Shrani"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Shrani kot..."
+
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-signature-editor.xml.h:6
@@ -24794,7 +25941,7 @@ msgstr "Shrani ta predmet na disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Datoteka"
 
@@ -24859,19 +26006,19 @@ msgstr "Posreduj naprej kot i_Koledar"
 msgid "Forward this item via email"
 msgstr "Posreduj naprej preko e-pošte"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Dobi osvežene podatke o sestanku"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "Osveži sestanek"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "_Načrtuj sestanek"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Načrtuj sestanek za ta predmet"
 
@@ -24888,74 +26035,54 @@ msgid "Compose _New Message"
 msgstr "Sestavi _novo sporočilo"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Ustvari ali uredi pravila za filtriranje nove pošte"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Ustvari ali uredi določitve navideznih map"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Sprazni _smeti"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Pozabi _gesla"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Pozabi pomnjena gesla tako, da boste zanje znova vprašani"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Odpri okno za sestavljanje novega poštnega sporočila"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trajno odstrani vsa zbrisana sporočila iz vseh map"
 
-#: ui/evolution-mail-global.xml.h:12
-msgid "Send / Receive"
-msgstr "Oddaja / sprejem"
-
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send queued mail and retrieve new mail"
-msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
-
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Kaži okno predogleda sporočila"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Naroči se ali prekliči naročnino na mape z oddaljenih strežnikov"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "Urejevalnik _virtualnih map..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Settings..."
-msgstr "_Nastavitve pošte..."
-
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "Pano _predogleda"
 
-#: ui/evolution-mail-global.xml.h:22
-msgid "_Send / Receive"
-msgstr "_Oddaja / sprejem"
-
-#: ui/evolution-mail-global.xml.h:23
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "_Naroči se na mape..."
 
@@ -25048,11 +26175,11 @@ msgstr "Začasno skrij vsa izbrana sporočila"
 msgid "Threaded Message list"
 msgstr "Niten seznam sporočil"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:22
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_Uniči"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Mapa"
 
@@ -25105,423 +26232,350 @@ msgid "Create _Virtual Folder From Message"
 msgstr "Iz sporočila ustvari na_videzno mapo"
 
 #: ui/evolution-mail-message.xml.h:11
-msgid "Create _Virtual Folder From Search..."
-msgstr "Iz iskanja ustvari na_videzno mapo..."
-
-#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages from this sender"
 msgstr "Ustvari pravilo za filtriranje sporočil tega pošiljatelja"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Ustvari pravilo za filtriranje sporočil tem prejemnikom"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Ustvari pravilo za filtriranje spročil temu dopisnemu seznamu"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Ustvari pravilo za filtriranje sporočil s tem predmetom"
 
-#: ui/evolution-mail-message.xml.h:16
-msgid "Create a virtual folder based on this search"
-msgstr "Ustvari navidezno mapo za to iskanje"
-
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Ustvari navidezno mapo za te prejemnike"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Ustvari navidezno mapo za ta dopisni seznam"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Ustvari navidezno mapo za tega pošiljatelja"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Ustvari navidezno mapo za ta predmet"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Zmanjšaj velikost besedila"
 
-#: ui/evolution-mail-message.xml.h:23
-msgid "Design an advanced search to run on the messages in this folder"
-msgstr "Oblikuj napredno iskanje, ki naj poteče na sporočilih te mape"
-
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Kaži naslednje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Kaži naslednje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Kaži naslednje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Kaži naslednjo neprebrano nit"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Kaži prejšnje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Kaži prejšnje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Kaži prejšnje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:31
-msgid "Edit Saved Searches"
-msgstr "Uredi shranjena iskanja"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Erase the current search"
-msgstr "Zbriši trenutno iskanje"
-
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:28
 msgid "F_orward"
 msgstr "P_osreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:34
-msgid "Family Mail"
-msgstr "Družinska pošta"
-
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filter glede na p_oštni seznam..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filter glede na pošilja_telja"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filter glede na preje_mnike..."
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filter glede na za_devo..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:33
 msgid "Flag selected message(s) for follow-up"
 msgstr "Označi izbrana sporočila za navezavo"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:34
 msgid "Follow _Up..."
 msgstr "Nadal_jevanje..."
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr "Prisili, da bodo slike v HTML pošti naložene"
 
-#: ui/evolution-mail-message.xml.h:42
-msgid "Forward"
-msgstr "Posreduj naprej"
-
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Posreduj naprej izbrano sporočilo v telesu novega sporočila"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Posreduj izbrano sporočilo citirano kot odgovor"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Nekomu posreduj izbrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Nekomu posreduj izbrano sporočilo kot prilogo"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Povečaj velikost besedila"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Naloži _slike"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Označi kot po_membno"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as U_nread"
 msgstr "Označi kot _neprebrano"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Označi kot _nepomembno"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected message(s) as having been read"
 msgstr "Označi izbrana sporočila kot prebrana"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as important"
 msgstr "Označi izbrana sporočila kot pomembna"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Označi izbrana sporočila kot neprebrana"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Označi izbrana sporočila kot nepomembna"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Označi izbrana sporočila za brisanje"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move selected message(s) to another folder"
 msgstr "Prestavi izbrana sporočila v drugo mapo"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Naslednje"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next _Important Message"
 msgstr "Naslednje po_membno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next _Thread"
 msgstr "Naslednja _nit"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next _Unread Message"
 msgstr "Naslednje _neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Odpri izbrano sporočilo v novem oknu"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Odpri izbrano sporočilo v skladatelju za vnovično pošiljanje"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Izvorna _velikost"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:61
 msgid "P_revious Unread Message"
 msgstr "P_rejšnje neprebrano sporočilo"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:62
 msgid "Pr_evious Important Message"
 msgstr "Pr_ejšnje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:63
 msgid "Preview the message to be printed"
 msgstr "Predogled sporočila, ki bo natisnjeno"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous"
 msgstr "Prejšnje"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Natisni to sporočilo"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:68
 msgid "Re_direct"
 msgstr "_Preusmeri"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:69
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Izbrano sporočilo nekomu posreduj"
 
-#: ui/evolution-mail-message.xml.h:76
-msgid "Reply"
-msgstr "Odgovori"
-
-#: ui/evolution-mail-message.xml.h:77
-msgid "Reply to All"
-msgstr "Odgovori vsem"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr "Ponastavi besedilo na njegovo izvorno velikost"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "_Išči v sporočilu..."
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "_Manjša"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "Shrani sporočilo kot datoteko z besedilom"
 
-#: ui/evolution-mail-message.xml.h:84
-msgid "Save this search"
-msgstr "Shrani to iskanje"
-
-#: ui/evolution-mail-message.xml.h:85
-msgid "Saved Searches"
-msgstr "Shranjena iskanja"
-
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:78
 msgid "Search for text in the body of the displayed message"
 msgstr "Išči besedilo v telesu prikazanega sporočila"
 
-#: ui/evolution-mail-message.xml.h:87
-msgid "Search through the messages in this folder"
-msgstr "Išči skozi sporočila v tej mapi"
-
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "Kaži _izvorno kodo pošte"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "Kaži celotne _glave"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "Kaži sporočila v običajnem slogu"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "Kaži sporočila s celotnimi glavami"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "Kaži neposredno izvorno kodo sporočila"
 
-#: ui/evolution-mail-message.xml.h:94
-msgid "Sue's Phone"
-msgstr "Suein telefon"
-
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "_Velikost besedila"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Odbriši izbrana sporočila"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "vMapa glede na poštni se_znam..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "vMapa glede na _pošiljatelja..."
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "vMapa glede na pre_jemnike..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "vMapa glede na p_redmet"
 
-#: ui/evolution-mail-message.xml.h:102
-msgid "_Advanced Search..."
-msgstr "N_apredno iskanje..."
-
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Attached"
 msgstr "_Priloženo"
 
-#: ui/evolution-mail-message.xml.h:104
-msgid "_Clear Search"
-msgstr "_Počisti iskanje"
-
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "_Kopiraj v mapo"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "Iz sporočila _ustvari filter"
 
-#: ui/evolution-mail-message.xml.h:108
-msgid "_Edit Saved Searches..."
-msgstr "_Uredi shranjena iskanja..."
-
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Find Now"
-msgstr "_Išči sedaj"
-
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "Sporočilo _posreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Go To"
 msgstr "Po_jdi na"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Inline"
 msgstr "Kot _del sporočila"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Večje"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "Prikaz _sporočila"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Prestavi v mapo"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Next Message"
 msgstr "_Naslednje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Običajen prikaz"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_Odpri sporočilo"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Previous Message"
 msgstr "_Prejšnje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ui/evolution-mail-message.xml.h:125
-msgid "_Save Search..."
-msgstr "_Shrani iskanje..."
-
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Orodja"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Undelete"
 msgstr "O_dbriši"
 
@@ -25532,12 +26586,12 @@ msgstr "Zapri to okno"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_Zapri"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "Po_gled"
 
@@ -25581,6 +26635,10 @@ msgstr "Vstavi datoteko v sporočilo kot besedilo"
 msgid "Insert text file..."
 msgstr "Vstavi datoteko z besedilom..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Odpri"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Odpri datoteko"
@@ -25720,11 +26778,7 @@ msgstr "_Odpri..."
 msgid "_Reply-To Field"
 msgstr "Polje o_dgovori-na:"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Varnost"
-
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Pomoč"
 
@@ -25780,46 +26834,38 @@ msgstr "Dobi osvežene podatke o nalogi"
 msgid "Re_fresh Task"
 msgstr "Osveži opravilo"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Nastavi pogled nalog"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopiraj izbrano opravilo"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Izreži izbrano opravilo"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete completed tasks"
 msgstr "Zbriši izbrana opravila"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Zbriši izbrana opravila"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 msgid "Mar_k as Complete"
 msgstr "_Označi kot opravljeno"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Prilepi opravilo z odložišča"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:11
 msgid "Previews the list of tasks to be printed"
 msgstr "Predogled nalog, ki bodo natisnjene"
 
-#: ui/evolution-tasks.xml.h:16
+#: ui/evolution-tasks.xml.h:13
 msgid "Print the list of tasks"
 msgstr "Natisni seznam nalog"
 
-#: ui/evolution-tasks.xml.h:17
-msgid "Tasks Settings..."
-msgstr "Nastavitve nalog..."
-
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
 msgstr "O Ximian Evoluciji..."
@@ -25877,121 +26923,135 @@ msgid "Move this folder to another place"
 msgstr "Prestavi to mapo na drugo mesto"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Ustvari _novo mapo..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Odpri v novem oknu"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Odpri to mapo v drugem oknu"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
+msgid "Send / Receive"
+msgstr "Oddaja / sprejem"
+
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
+
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Kaži podatke o Ximian Evoluciji"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "_Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošlji poročilo o hrošču z uporabo progama Bug buddy"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Preklopi"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bližnjicami"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Preklopi delo z mrežo"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Poglej izbrane mape"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "_Pogosto zastavljena vprašanja"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_O Ximian Evoluciji..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Kopiraj..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_Vrstica map"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Uvozi..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Prestavi..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nova"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Nova mapa"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "_Nastavitve pilota..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:53
+msgid "_Send / Receive"
+msgstr "_Oddaja / sprejem"
+
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Bližnjica"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "_Vrstica z bližnjicami"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Spremeni nastavitve povzetka"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Natisni povzetek"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Znova naloži"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Znova naloži ta pogled"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "Nastaviteve _povzetka..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Vizitke"
@@ -26060,20 +27120,20 @@ msgstr ""
 "pasu.\n"
 " Uporabite desni miškin gumb za pomanjšavo."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Trenutni pogled"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 msgid "Custom View"
 msgstr "Pogled po meri"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr "Shrani pogled po meri"
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Določi poglede"
 
@@ -26165,20 +27225,20 @@ msgstr "Ukrajinski"
 msgid "Visual"
 msgstr "Vidno"
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Neznan nabor znakov: %s"
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Vpišite nabor znakov, ki naj se uporablja"
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Drugo..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Nabor znakov"
 
@@ -26186,34 +27246,35 @@ msgstr "Nabor znakov"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Urejevalnik iskanja"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Dodaj med shranjena iskanja"
-
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Počisti"
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
+msgid "_Save Search..."
+msgstr "_Shrani iskanje..."
 
-#: widgets/misc/e-filter-bar.h:96 widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Uredi..."
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+msgid "_Edit Saved Searches..."
+msgstr "_Uredi shranjena iskanja..."
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Kaži vse"
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Napredno..."
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Podatki"
 
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "Napaka"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Vprašanje"
@@ -26227,11 +27288,20 @@ msgstr "Sporočilo"
 msgid "Don't show this message again."
 msgstr "Tega sporočila ne kaži več."
 
-#: widgets/misc/e-search-bar.c:342
-msgid "Sear_ch"
-msgstr "_Iskanje"
+#: widgets/misc/e-search-bar.c:512
+msgid "_Find Now"
+msgstr "_Išči sedaj"
+
+#: widgets/misc/e-search-bar.c:513
+#, fuzzy
+msgid "_Clear"
+msgstr "Počisti"
+
+#: widgets/misc/e-search-bar.c:875
+msgid "Clear"
+msgstr "Počisti"
 
-#: widgets/misc/e-search-bar.c:468
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Išči sedaj"
 
@@ -26257,12 +27327,659 @@ msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
+#~ msgid "Edit Addressbook"
+#~ msgstr "Uredi adresar"
+
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "_Avtentificiraj se pri srežniku z uporabo:"
+
+#~ msgid "Account Name"
+#~ msgstr "Ime računa"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Dodaj adresar"
+
+#~ msgid "Advanced"
+#~ msgstr "Napredno"
+
+#~ msgid "Base"
+#~ msgstr "Osnovno"
+
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Izberite to, če strežnik zahteva od vas avtentifikacijo."
+
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with "
+#~ "the server"
+#~ msgstr ""
+#~ "Evolucija bo uporabila to Razločno ime (DN), za vašo avtentifikacijo pri "
+#~ "strežniku"
+
+#~ msgid "Server Name"
+#~ msgstr "Ime strežnika"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "Podatki spodaj so potrebni za dodajanje adresarja.  "
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "Te podatki za večino strežnikov ldap niso potrebni"
+
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "Te podatke potrebuje vaš strežnik ldap za določitev katera vozlišča naj "
+#~ "se uporabljajo za iskanja. Za več podatkov se obrnite na svojega "
+#~ "administratorja."
+
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
+#~ msgstr ""
+#~ "To je izhodiščno vozlišče vseh vaših iskanj na strežniku ldap. Za več "
+#~ "podatkov se obrnite na svojega administratorja."
+
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "To je ime strežnika, kjer se nahaja vaš adresar"
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "To so vrata, ki jih uporablja vaš strežnik ldap."
+
+#~ msgid "_Port:"
+#~ msgstr "_Vrata:"
+
+#~ msgid "C_ontaining:"
+#~ msgstr "_Vsebujejo:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Kaži stike, ki ustrezajo naslednjim kriterijem:"
+
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolucijina komponenta za povzetke."
+
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Tovarna komponent za povzetke koledarja."
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Ustvari nove sestanke s privzetim _opomnilnikom"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "Prvi dan ted_na:"
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Zače_tek dneva:"
+
+#~ msgid "_End of day:"
+#~ msgstr "_Konec dneva:"
+
+#~ msgid "_Other"
+#~ msgstr "_Drugo"
+
+#~ msgid "before the start of the appointment"
+#~ msgstr "pred pričetkom sestanka"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "_Drug organizator"
+
+#~ msgid "_Delete this Task"
+#~ msgstr "_Zbriši to opravilo"
+
+#~ msgid "Unable to find any of your identities in the attendees list!\n"
+#~ msgstr "Ne morem najti nobene od vaših identitet v seznamu udeležencev!\n"
+
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Čisto podpisovanje v tem šifrirniku ni podprto"
+
+#~ msgid "Invalid type in body-contains, expecting string"
+#~ msgstr "Neveljaven tip v body-contains, pričakovan niz"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Prosim vpišite svoje %s geslo za %s"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Prosim vpišite svoje %s geslo"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Ne morem podpisati sporočila: osnovnega besedila ni"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Ne morem podpisati sporočila: geslo ni podano"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Ne morem podpisati tega sporočila: nisem mogel ustvariti cevi do GPG/PGP: "
+#~ "%s"
+
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Ne morem podpisati tega sporočila: ni osnovnega besedila"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr ""
+#~ "Ne morem preveriti tega sporočila: ni osnovnega besedila za preverbo"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Nisem mogel preveriti tega sporočila: nisem mogel ustvariti cevi do GPG/"
+#~ "PGP: %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Ne morem zašifirati tega sporočila: ni besedila za zašifriranje"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Ne morem zašifirati tega sporočia: geslo ni podano"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Ne morem zašifirati tega sporočila: nisem mogel ustvariti cevi do GPG/"
+#~ "PGP: %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr ""
+#~ "Ne morem dešifrirati tega sporočila: ni zašifriranega besedila za "
+#~ "dekodiranje."
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Ne morem dešifrirati tega sporočila: geslo ni podano"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Ne morem dešifrirati tega sporočila: nisem mogel ustvariti cevi do GPG/"
+#~ "PGP: %s"
+
+#~ msgid "Error hashing password."
+#~ msgstr "Napaka ob razprševanju gesla."
+
+#~ msgid "Invalid password."
+#~ msgstr "Neveljavno geslo.7"
+
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "Nisem mogel podpisati: certifikat za \"%s\" ni bil najden."
+
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "Nisem mogel čistopodpisati: certifikat za \"%s\" ni bil najden."
+
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ msgstr "Nisem mogel šifrirati: nisem uspel ustvariti podatkovne ovojnice."
+
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "Nisem mogel šifrirati: nisem uspel ustvariti konteksta šifriranja"
+
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "Nisem mogel šifrirati podatkov: neveljaven ključ uporabnika \"%s\"."
+
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "Nisem mogel šifirirati: enkodiranje ni uspelo."
+
+#~ msgid "%s server %s"
+#~ msgstr "strežnik %s %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(neznan gostitelj)"
+
+#~ msgid "No such message: %s"
+#~ msgstr "Ni takšnega sporočila: %s"
+
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Ne morete kopirati sporočil iz te mape smeti."
+
+#~ msgid "Directory tree of mbox files"
+#~ msgstr "Imeniško drevo datotek mbox"
+
+#~ msgid ""
+#~ "For accessing mail storedin an external tree of mbox files.\n"
+#~ "This will allow you to directly access pine and elm folders.\n"
+#~ "NOTE: This provider is still experimental so ensure you backup any mail "
+#~ "folders first."
+#~ msgstr ""
+#~ "Za dostopanje do pošte shranjene v zunanjem drevesu datotek mbox.\n"
+#~ "To vam bo omogočilo, da neposredno dostopate do map pine in elm.\n"
+#~ "OPOZORILO: Ta nudilnik je še vedno preizkusen, zato pred uporabo naredite "
+#~ "varnostno kopijo mape."
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Ne morem pripeti sporočila k datoteki vrste 'spool': %s: %s"
+
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Nisem mogel shraniti: %s: %s"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Prosim vpišite geslo NNTP za %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Strežnik je zavrnil uporabniško ime"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Nisem uspel poslati uporabniškega imena strežniku"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Strežnik je zavrnil uporabniško ime/geslo"
+
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "Notranja napaka: uid ima neveljavno obliko: %s"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Nisem mogel dobiti seznama skupin s strežnika."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Nisem mogel naložiti datoteke s seznamom skupin za %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
+
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "V sporočilu nisem našel naslova 'From' (pošiljatelja)."
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni naveden."
+
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "Evolucijina komponenta za povzetke."
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Ne morem inicializirati Evolucijine komponente za povzetke."
+
+#~ msgid "Select a service"
+#~ msgstr "Izberi storitev"
+
+#~ 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 ""
+#~ "Za ozadje izvlečka lahko izberete drugačno HTML stran.\n"
+#~ "\n"
+#~ "Pustite pravno za privzete nastavitve"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Odpri %s s privzetim GNOMEovim programom"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Odpri %s s privzetim GNOMEovim brskalnikom"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Pošlji e-pošto %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Poženi %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Zapri %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Premakni %s na levo"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Premakni %s na desno"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Premakni %s v prešnjo vrstico"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Premakni %s v naslednjo vrstico"
+
+#~ msgid "Configure %s"
+#~ msgstr "Nastavi /%s"
+
+#~ msgid "page"
+#~ msgstr "stran"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nisem mogel odpreti HTML datoteke:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Napaka ob branju podatkov:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Datoteka nima mesta za storitve.\n"
+
+#~ 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 ""
+#~ "Komponenta Povzetek ni mogla inicializirati Bonoba.\n"
+#~ "Če se je pokazalo opozorilo o RootPOA, to verjetno pomeni,\n"
+#~ "da ste prevedli Bonobo z GOAD-om namesto z OAF-om."
+
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "Tovarna za povzetke RDF."
+
+#~ msgid "RDF Summary"
+#~ msgstr "Povzetek RDF"
+
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Tovarna za preizkusno komponento bonobo."
+
+#~ msgid "Factory for the test component."
+#~ msgstr "Tovarna za preizkusno komponento."
+
+#~ msgid "Test bonobo service"
+#~ msgstr "Preizkusi storitev bonobo"
+
+#~ msgid "Test service"
+#~ msgstr "Preizkusi storitev"
+
+#~ msgid "Update automatically"
+#~ msgstr "Samodejno posodobi"
+
+#~ msgid "Update now"
+#~ msgstr "Posodobi zdaj"
+
+#~ msgid "Update every "
+#~ msgstr "Posodobi vsakih"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Vnesite URI mape"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Mapa v kateri se hrani pošta (notranja)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Nisem se mogel povezati s hrambo: %s"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Ustvari vMapo iz iskanja"
+
+#~ msgid "Indexing:"
+#~ msgstr "Ustvarjanje kazala:"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "Vrsta poštnega predala"
+
+#~ msgid "Random"
+#~ msgstr "Naključno"
+
+#~ msgid ""
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
+#~ msgstr ""
+#~ "Nisem mogel dobiti vhodnega predala za novo hrambo pošte:\n"
+#~ "%s\n"
+#~ "Bližnjica ne bo ustvarjena."
+
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: Dohdona pošta"
+
+#~ msgid "Cannot execute signature script"
+#~ msgstr "Nisem mogel izvesti skripte podpisa"
+
+#~ msgid "                        "
+#~ msgstr "                        "
+
+#~ msgid "&lt;&lt; S_imple"
+#~ msgstr "&lt;&lt; _Enostavno"
+
+#~ msgid "/home/rodo/cvs/evolution/mail/"
+#~ msgstr "/home/rodo/cvs/evolution/mail/"
+
+#~ msgid "Account"
+#~ msgstr "Račun"
+
+#~ msgid "Accounts"
+#~ msgstr "Računi"
+
+#~ msgid "Ad_vanced &gt;&gt;"
+#~ msgstr "Napredno &gt;&gt;"
+
+#~ msgid "Always _encrypt to myself when sending encrypted mail"
+#~ msgstr "Kadar pošiljam ši_frirano pošto, vedno šifriraj sebi"
+
+#~ msgid "Composer"
+#~ msgstr "Skladatelj"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Privzet način posredovanja naprej je: "
+
+#~ msgid "Delete selected signature"
+#~ msgstr "Zbriši izbran podpis"
+
+#~ msgid "Display"
+#~ msgstr "Prikaz"
+
+#~ msgid "E_mail address:"
+#~ msgstr "_E-poštni naslov:"
+
+#~ msgid "Ed_it..."
+#~ msgstr "_Uredi..."
+
+#~ msgid "Edi_t..."
+#~ msgstr "Ur_edi..."
+
+#~ msgid "Edit signature content in editor"
+#~ msgstr "Uredi vsebino podpisa v urejevalniku"
+
+#~ msgid "File containing signature"
+#~ msgstr "Datoteka, ki vsebuje podpis"
+
+#~ msgid "Hide advanced settings"
+#~ msgstr "Skrij napredne nastavitve"
+
+#~ msgid "If selected signature will be included in random signature list"
+#~ msgstr "Če bo izbran podpis vključen v seznamu naključnih podpisov"
+
+#~ msgid "Include in _random signatures list"
+#~ msgstr "Vključi v seznamu na_ključnih podpisov"
+
+#~ msgid "List of signatures"
+#~ msgstr "Seznam podpisov"
+
+#~ msgid "N_ew..."
+#~ msgstr "N_ova..."
+
+#~ msgid "Name of selected signature"
+#~ msgstr "Ime izbranega podpisa"
+
+#~ msgid "Ne_w..."
+#~ msgstr "No_va..."
+
+#~ msgid "News"
+#~ msgstr "Novice"
+
+#~ msgid "Same as text"
+#~ msgstr "Enako kot besedilo"
+
+#~ msgid "Script which is run before signature loading from specified filename"
+#~ msgstr "Skripta, ki se požene pred nalaganjem podpisa iz navedene datoteke"
+
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Izberi datoteko za dnevnik filtra..."
+
+#~ msgid "Show advanced settings"
+#~ msgstr "Kaži napredne nastavitve"
+
+#~ msgid "Sources"
+#~ msgstr "Viri"
+
+#~ msgid "Text _Signature:"
+#~ msgstr "Besedilo _podpisa:"
+
+#~ msgid "_Edit..."
+#~ msgstr "_Uredi..."
+
+#~ msgid "_Filename"
+#~ msgstr "_Ime datoteke:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "Podpis _HTML:"
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "Zapisuj dejanja filtra v:"
+
+#~ msgid "_Name"
+#~ msgstr "_Ime"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Organizacija:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Zapomni si to geslo"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "Privzeto pošiljaj pošto v _HTML obliki."
+
+#~ msgid "_Server type: "
+#~ msgstr "Vrsta _strežnika: "
+
+#~ msgid "placeholder"
+#~ msgstr "držalec mesta"
+
+#~ msgid "seconds."
+#~ msgstr "sekund."
+
+#~ msgid "use _HTML for this signature"
+#~ msgstr "za ta podpis uporabi _HTML"
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Nisem mogel ustvariti konteksta šifiranja PGP."
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Nisem mogel ustvariti konteksta dešifriranja PGP."
+
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "Evolucija ne pozna te vrste podpisa sporočila"
+
+#~ msgid "Moving"
+#~ msgstr "Prestavljam"
+
+#~ msgid "Copying"
+#~ msgstr "Kopiram"
+
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "V cev je bilo zapisano nepopolno sporočilo!"
+
+#~ msgid "Mail Summary"
+#~ msgstr "Povzetek pošte"
+
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "Ne morem inicializirati Evolucijine komponente za povzetek."
+
+#~ msgid "Summary Settings"
+#~ msgstr "Nastavitev povzetka"
+
+#~ msgid "Factory for the Evolution notes component."
+#~ msgstr "Tovarna komponent Evolucije zaznamkov."
+
+#~ msgid "Factory for the Notes control"
+#~ msgstr "Tovarna za kontrolo zaznamkov"
+
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Ste prepričani, da želite zbrisati mapo \"%s\"?"
+
+#~ msgid "Dump"
+#~ msgstr "Shrani"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Nastavi pogled koledarja"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Ustvari nov celodnevni _dogodek"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Ustvari novo _nalogo"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Ustvari _nov sestanek"
+
+#~ msgid "Create a _New Meeting"
+#~ msgstr "Ustvari _nov sestanek"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Ustvari nov sestanek"
+
+#~ msgid "Create a new meeting request"
+#~ msgstr "Ustvari nov zahtevek za sestanek"
+
+#~ msgid "Create a new task"
+#~ msgstr "Ustvari nov posel"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Ustvari sestanek, ki zavzame cel dan"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Sestanek..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Nastavitve pošte..."
+
+#~ msgid "_Meeting..."
+#~ msgstr "_Sestanek..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Naloga..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
+
+#~ msgid "_Mail Settings..."
+#~ msgstr "_Nastavitve pošte..."
+
+#~ msgid "Create a virtual folder based on this search"
+#~ msgstr "Ustvari navidezno mapo za to iskanje"
+
+#~ msgid "Design an advanced search to run on the messages in this folder"
+#~ msgstr "Oblikuj napredno iskanje, ki naj poteče na sporočilih te mape"
+
+#~ msgid "Edit Saved Searches"
+#~ msgstr "Uredi shranjena iskanja"
+
+#~ msgid "Erase the current search"
+#~ msgstr "Zbriši trenutno iskanje"
+
+#~ msgid "Family Mail"
+#~ msgstr "Družinska pošta"
+
+#~ msgid "Save this search"
+#~ msgstr "Shrani to iskanje"
+
+#~ msgid "Search through the messages in this folder"
+#~ msgstr "Išči skozi sporočila v tej mapi"
+
+#~ msgid "Sue's Phone"
+#~ msgstr "Suein telefon"
+
+#~ msgid "_Advanced Search..."
+#~ msgstr "N_apredno iskanje..."
+
+#~ msgid "_Clear Search"
+#~ msgstr "_Počisti iskanje"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Nastavi pogled nalog"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Nastavitve nalog..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Spremeni nastavitve povzetka"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "Nastaviteve _povzetka..."
+
+#~ msgid "Add to Saved Searches"
+#~ msgstr "Dodaj med shranjena iskanja"
+
+#~ msgid "Edit..."
+#~ msgstr "Uredi..."
+
+#~ msgid "Show All"
+#~ msgstr "Kaži vse"
+
+#~ msgid "Sear_ch"
+#~ msgstr "_Iskanje"
+
 #~ msgid "Connecting to LDAP server..."
 #~ msgstr "Vzpostavljam povezavo s strežnikom LDAP..."
 
-#~ msgid "Unable to connect to LDAP server."
-#~ msgstr "Nisem se mogel povezati s strežnikom LDAP."
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Čakam na povezavo s strežnikom LDAP..."
 
@@ -26284,27 +28001,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Filter on Mailing List"
 #~ msgstr "Filter glede na dopisni seznam"
 
-#~ msgid "Could not save signature file."
-#~ msgstr "Nisem mogel shraniti datoteke s podpisom."
-
-#~ msgid ""
-#~ "This signature has been changed, but hasn't been saved.\n"
-#~ "\n"
-#~ "Do you wish to save your changes?"
-#~ msgstr ""
-#~ "Podpis je bil spremenjen, a ni bil shranjen.\n"
-#~ "\n"
-#~ "Želite shraniti spremembe?"
-
-#~ msgid "HTML signature file:"
-#~ msgstr "Datoteka s podpisom HTML:"
-
 #~ msgid "Signature file:"
 #~ msgstr "Datoteka s podpisom:"
 
-#~ msgid "Evolution "
-#~ msgstr "Evolucija "
-
 #~ msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
 #~ msgstr "Avtorske pravice pridržane 1999, 2000, 2001, 20002 Ximian, Inc."
 
@@ -26554,9 +28253,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "New Contact _List"
 #~ msgstr "Nov seznam _stikov"
 
-#~ msgid "New _Task"
-#~ msgstr "Nova _naloga"
-
 #~ msgid "Could not check POP server for new messages: %s"
 #~ msgstr "Nisem mogel preveriti strežnika POP za nova sporočila: %s."
 
@@ -26585,9 +28281,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "(Unknown)"
 #~ msgstr "(Neznana)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Nepričakovan odgovor strežnika POP: %s"
-
 #~ msgid "RCPT TO response error: %s: mail not sent"
 #~ msgstr "Napaka v ogovoru na RCPT TO: %s: pošta ni bila poslana"
 
@@ -26619,18 +28312,12 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Regions"
 #~ msgstr "Območja"
 
-#~ msgid " _Remove"
-#~ msgstr " _Odstrani"
-
 #~ msgid "Al_l stations:"
 #~ msgstr "Vse _postaje:"
 
 #~ msgid "All _folders:"
 #~ msgstr "Vse _mape:"
 
-#~ msgid "All news _feeds:"
-#~ msgstr "Vsi viri _novic:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "_Kaži mape:"
 
@@ -26646,9 +28333,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "New Message"
 #~ msgstr "Novo sporočilo"
 
-#~ msgid "Forward As"
-#~ msgstr "Posreduj naprej kot"
-
 #~ msgid "Forward _Attached"
 #~ msgstr "Posreduj _pripeto"
 
@@ -26658,9 +28342,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Forward _Quoted"
 #~ msgstr "Posreduj kot _citirano"
 
-#~ msgid "Email Address:"
-#~ msgstr "E-poštni naslov:"
-
 #~ msgid "British Virgin Islands"
 #~ msgstr "Britanski deviški otoki"
 
@@ -26670,9 +28351,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Republika Moldavija"
 
-#~ msgid "Pierto Rico"
-#~ msgstr "Portoriko"
-
 #~ msgid "_Message Recipients:"
 #~ msgstr "Prejemniki _sporočila:"
 
@@ -26762,9 +28440,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "Prosim vpišite naslov svoje e-pošte in geslo za %s"
 
-#~ msgid "LDAP Authentication"
-#~ msgstr "Avtentifikacija LDAP"
-
 #~ msgid "Password:"
 #~ msgstr "Geslo:"
 
@@ -26774,9 +28449,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "USA"
 #~ msgstr "ZDA"
 
-#~ msgid "123"
-#~ msgstr "123"
-
 #~ msgid "a"
 #~ msgstr "a"
 
@@ -26816,9 +28488,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "m"
 #~ msgstr "m"
 
-#~ msgid "n"
-#~ msgstr "n"
-
 #~ msgid "o"
 #~ msgstr "o"
 
@@ -26917,9 +28586,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "after start of appointment"
 #~ msgstr "po pričetku sestanka"
 
-#~ msgid "before end of appointment"
-#~ msgstr "pred koncem sestanka"
-
 #~ msgid "_12 hour (am/pm)"
 #~ msgstr "_12 urna (dop./pop.)"
 
@@ -27005,9 +28671,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%d/%m/%Y"
 
-#~ msgid "Add"
-#~ msgstr "Dodaj"
-
 #~ msgid "Edit"
 #~ msgstr "Uredi"
 
@@ -27076,9 +28739,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabniških "
 #~ "datotek pod"
 
-#~ msgid "Delete folder '%s'"
-#~ msgstr "Zbriši mapo '%s'"
-
 #~ msgid ""
 #~ "Evolution is a suite of groupware applications\n"
 #~ "for mail, calendaring, and contact management\n"
@@ -27101,41 +28761,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Opa!  Pogled `%s' je nepričakovano umru.  :-(\n"
 #~ "To verjetno pomeni, da se je komponenta %s sesula."
 
-#~ 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. \n"
-#~ "\n"
-#~ "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
-#~ "This product comes with no warranty and is not intended for\n"
-#~ "individuals prone to violent fits of anger.\n"
-#~ "\n"
-#~ "We hope that you enjoy the results of our hard work, and we\n"
-#~ "eagerly await your contributions!\n"
-#~ msgstr ""
-#~ "Pozdrav.  Hvala, ker ste si vzeli čas za prenos te predogledne izdaje\n"
-#~ "programja za delovne skupine Evolucija.\n"
-#~ "\n"
-#~ "Evolucija še ni končana. Še vedno so kraji, kjer funkcionalnost manjka "
-#~ "ali\n"
-#~ "deluje le polovično.\n"
-#~ "\n"
-#~ "Če najdete hrošča, ga prosimo sporočite na bugzilla.ximian.com.\n"
-#~ "Ta izdelek prihaja brez kakršnihkoli zagotovil in ni primeren za\n"
-#~ "osebe, ki doživljajo nasilne napade jeze.\n"
-#~ "\n"
-#~ "Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
-#~ "pričakujemo vaše prispevke!\n"
-
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Evolution Team\n"
-#~ msgstr ""
-#~ "Hvala,\n"
-#~ "skupina Evolucije\n"
-
 #~ msgid "New contact"
 #~ msgstr "Nov stik"
 
@@ -27292,9 +28917,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Beep when alarm windows appear."
 #~ msgstr "Pozvoni, ko se pokažejo okna alarmov."
 
-#~ msgid "Calendar Preferences"
-#~ msgstr "Nastavitve koledarja"
-
 #~ msgid "Colors for Tasks"
 #~ msgstr "Barve za opravila"
 
@@ -27551,9 +29173,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Items Not Yet Due:"
 #~ msgstr "Predmeti z rokom v prihodnosti:"
 
-#~ msgid "Overdue Items:"
-#~ msgstr "Naloge s prekoračenim rokom:"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Čas do preteka"
 
@@ -27703,9 +29322,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Activate this shortcut"
 #~ msgstr "Aktiviraj to bližnjico"
 
-#~ msgid "Find a contact"
-#~ msgstr "Poišči stik"
-
 #~ msgid "View All"
 #~ msgstr "Glej vse"
 
@@ -27868,9 +29484,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Apply any new filters to the mail in this box"
 #~ msgstr "Uveljavi vse nove filtre pošti tega predala"
 
-#~ msgid "Configure Folder..."
-#~ msgstr "Nastavi mapo..."
-
 #~ msgid "Copy message to a new folder"
 #~ msgstr "Prestavi sporočilo v novo mapo"
 
@@ -27965,9 +29578,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Compose"
 #~ msgstr "_Sestavi"
 
-#~ msgid "PLAIN"
-#~ msgstr "ČISTO"
-
 #~ msgid ""
 #~ "This option will connect to the server using a the PLAIN SASL mechanism "
 #~ "if the server supports it."
@@ -28025,9 +29635,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Keep mail on server"
 #~ msgstr "Ohrani pošto na strežniku"
 
-#~ msgid "Mail Account"
-#~ msgstr "Poštni račun"
-
 #~ msgid "Plain Text"
 #~ msgstr "Nešifrirano"
 
@@ -28090,9 +29697,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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"
 
@@ -28128,9 +29732,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ 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"
 
@@ -28146,9 +29747,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Evolution ToDo Conduit"
 #~ msgstr "Evolucijin veznik opravil"
 
-#~ msgid "Configuration utility for the evolution todo conduit.\n"
-#~ msgstr "Nastavitveno orodje za Evolucijin veznik opravil.\n"
-
 #~ msgid "label21"
 #~ msgstr "označba21"
 
@@ -28172,9 +29770,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "matches regex"
 #~ msgstr "ustreza regularnemu izrazu"
 
-#~ msgid "Add VFolder Rule"
-#~ msgstr "Dodaj pravilo vMape"
-
 #~ msgid "Edit VFolder Rule"
 #~ msgstr "Uredi pravilo vMape"
 
@@ -28205,9 +29800,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Enter the subject of the mail"
 #~ msgstr "Vnesite zadevo spročila"
 
-#~ msgid "Account Properties"
-#~ msgstr "Lastnosti računa"
-
 #~ msgid "Include in \"Get Mail\" operations."
 #~ msgstr "Vključuj v operacije \"Dobi pošto\"."
 
@@ -28513,9 +30105,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Find..."
 #~ msgstr "_Poišči..."
 
-#~ msgid "_Object"
-#~ msgstr "_Predmet"
-
 #~ msgid "_Redo"
 #~ msgstr "Obnovi"
 
@@ -28592,9 +30181,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "External Directories"
 #~ msgstr "Zunanji imeniki"
 
-#~ msgid "Port Number:"
-#~ msgstr "Številka vrat:"
-
 #~ msgid "Headings:"
 #~ msgstr "Zaglavja:"
 
@@ -28659,15 +30245,9 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "today"
 #~ msgstr "danes"
 
-#~ msgid "this"
-#~ msgstr "ta"
-
 #~ msgid "next"
 #~ msgstr "naslednji"
 
-#~ msgid "first"
-#~ msgstr "prvi"
-
 #~ msgid "fifth"
 #~ msgstr "peti"
 
@@ -28723,9 +30303,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "bodo prikazane v dnevnem in tedenskem pogledu.\n"
 #~ "Časi izven tega razpona ne bodo samodejno prikazani"
 
-#~ msgid "Day end:"
-#~ msgstr "Konec dneva:"
-
 #~ msgid "Show on TODO List:"
 #~ msgstr "Pokaži v seznamu opravil:"
 
@@ -28741,15 +30318,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "To Do List Properties"
 #~ msgstr "Lastnosti seznama opravil"
 
-#~ msgid "To Do List"
-#~ msgstr "Seznam opravil"
-
-#~ msgid "Preferences"
-#~ msgstr "Nastavitve"
-
-#~ msgid "Beep on display alarms"
-#~ msgstr "Piskaj ob zaslonskih alarmih"
-
 #~ msgid "Audio alarms timeout after"
 #~ msgstr "Zvočni alarmi pretečejo po"
 
@@ -28797,9 +30365,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "Po želji lahko vnesete tudi ime vaše organizacije in ime datoteke iz "
 #~ "katere naj se prebere vaš podpis."
 
-#~ msgid "Signature File"
-#~ msgstr "Datoteka s podpisom"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Vrsta izvora pošte:"
 
@@ -28838,9 +30403,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Edit Identity"
 #~ msgstr "Uredi identiteto"
 
-#~ msgid "Edit News Server"
-#~ msgstr "Uredi novičarski strežnik"
-
 #~ msgid "The connection was successful!"
 #~ msgstr "Povezava je bila uspešna!"
 
@@ -28867,9 +30429,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "News Sources"
 #~ msgstr "Viri novic"
 
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr "Nisem mogel ustvariti cevi do %s: %s"
-
 #~ msgid "Could not execute %s: %s\n"
 #~ msgstr "Nisem mogel izvršiti %s: %s\n"
 
@@ -28925,9 +30484,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Exception while reporting result to shell component listener."
 #~ msgstr "Izjema med sporočanjem rezultatov lupini"
 
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Uskladi \"%s\""
-
 #~ msgid "Displaying message UID \"%s\""
 #~ msgstr "Prikazujem sporočilo z UID \"%s\""
 
@@ -28955,9 +30511,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Rebuilding message view"
 #~ msgstr "Obnavljam pogled sporočil"
 
-#~ msgid "N_ew Directory Server"
-#~ msgstr "N_ov strežnik imenikov"
-
 #~ msgid "_New appointment..."
 #~ msgstr "_Nov sestanek..."
 
@@ -28991,9 +30544,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "FIXME: New _Journal Entry for Contact"
 #~ msgstr "FIXME: Nov vpis v _dnevnik za stik"
 
-#~ msgid "FIXME: _Flag for Follow Up..."
-#~ msgstr "FIXME: _Zastavica za nadaljevanje..."
-
 #~ msgid "FIXME: _Display Map of Address"
 #~ msgstr "FIXME: _Pokaži zemljevid naslova"
 
@@ -29012,9 +30562,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "FIXME: Next"
 #~ msgstr "FIXME: Naslednji"
 
-#~ msgid "Gnome Calendar"
-#~ msgstr "Gnome Koledar"
-
 #~ msgid "The GNOME personal calendar and schedule manager."
 #~ msgstr "Gnome osebni koledar in urnik."
 
@@ -29200,9 +30747,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Bcc: >>"
 #~ msgstr "Bcc: >>"
 
-#~ msgid "label9"
-#~ msgstr "oznaka9"
-
 #~ msgid "label7"
 #~ msgstr "oznaka7"
 
@@ -29243,9 +30787,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "label2"
 #~ msgstr "label2"
 
-#~ msgid "Add >>"
-#~ msgstr "Dodaj >>"
-
 #~ msgid "<< Remove"
 #~ msgstr "<< odstrani"
 
diff --git a/po/sv.po b/po/sv.po
index 1a37cac738..4033c29e83 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,12 +6,12 @@
 # Martin Norbäck <d95mback@dtek.chalmers.se>, 2001.
 # Johan Dahlin <zilch.am@home.se>, 2001.
 #
-# $Id: sv.po,v 1.151 2002/05/08 13:37:12 jpr Exp $
+# $Id: sv.po,v 1.152 2002/06/27 19:55:17 jpr Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-04-01 01:16+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -40,7 +40,7 @@ msgstr "Importerar VCard-filer till Evolution."
 msgid "File As"
 msgstr "Arkivera som"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Namn"
@@ -51,7 +51,7 @@ msgid "Email"
 msgstr "E-post"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Primär"
 
@@ -61,7 +61,7 @@ msgstr "Prim"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Assistent"
@@ -69,8 +69,8 @@ msgstr "Assistent"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Företag"
 
@@ -80,12 +80,12 @@ msgid "Bus"
 msgstr "För"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Tillbakaringning"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Företag"
 
@@ -96,8 +96,8 @@ msgstr "För"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Hem"
 
@@ -112,18 +112,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Företagsfax"
@@ -133,13 +133,13 @@ msgid "Bus Fax"
 msgstr "För.fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax hem"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Företag 2"
 
@@ -148,43 +148,43 @@ msgid "Bus 2"
 msgstr "För 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Hem 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Annat"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Annan fax"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Personsökare"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
@@ -196,14 +196,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "E-post 3"
@@ -341,7 +341,7 @@ msgstr "VCard för %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -349,7 +349,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Söker..."
 
@@ -362,31 +362,31 @@ msgstr "Läser in..."
 msgid "Error in search expression."
 msgstr "Fel i sökuttryck."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Lägger till kort till LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Tar bort kort från LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Modifierar kort från LDAP-servern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Startar om sökningen."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Mottar LDAP-sökresultat..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 msgid "Error performing search"
 msgstr "Fel vid sökning"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 msgid "Could not parse query string"
 msgstr "Kunde inte tolka frågesträng"
 
@@ -433,110 +433,144 @@ msgstr "En Bonobo-testkontroll som visar en adressbok."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #, fuzzy
-msgid "Addressbook Settings"
-msgstr "Adressbokskällor"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#, fuzzy
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr "Konfigurationsverktyg för Evolution-adressboken."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr "Konfigurationsverktyg för Evolution-adressboken."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Kontroll som visar ett Evolution-adressboksvisitkort."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr "Katalogservrar"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Visare för Evolution-adressboksvisitkort"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Evolutionkomponent för att hantera kontakter."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Fabrik för kontrollen för adressboksvisitkort"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Fabrik för adressbokens adressvisare"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Fabrik för adressbokens adress-popup"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr "Fabrik för konfigurationskontrollen för Evolution-adressboken."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik för adressbokstestkontrollen"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-#, fuzzy
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-"Denna sida kan användas för att konfigurera åtkomst till katalogservrar "
-"genom användning av LDAP-protokollet"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 #, fuzzy
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 "Denna sida kan användas för att konfigurera åtkomst till katalogservrar "
 "genom användning av LDAP-protokollet"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Mapp som innehåller kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "LDAP-server som innehåller kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Ny kontaktlista"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "Kontakt_lista"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Ny kontaktlista"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Kan inte ansluta till LDAP-servern."
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "Contact _List"
-msgstr "Kontakt_lista"
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Kunde inte autentisera till IMAP-servern.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+#, fuzzy
+msgid "Could not perform query on Root DSE"
+msgstr "Kunde inte tolka frågesträng"
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP-serversvaret innehöll inte %s-information"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Fel vid läsning av filterinformation:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP-serversvaret innehöll inte %s-information"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL stöds inte i detta bygge av Evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunde inte initiera gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Andra kontakter"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Kan inte öppna adressboken"
@@ -571,48 +605,57 @@ msgstr ""
 "Vi kunde inte öppna denna adressbok. Kontrollera att sökvägen\n"
 "existerar och att du har rätt att komma åt den."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ange lösenord för %s (användare %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 msgid "Name begins with"
 msgstr "Namn börjar med"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 msgid "Email is"
 msgstr "E-post är"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori är"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Avancerat..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Alla kategorier"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "URI:n som mappbläddraren kommer att visa"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(ingen)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Primär e-post"
 
@@ -658,54 +701,6 @@ msgstr "Använd inte frågor"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Använd frågor (farligt!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Kan inte ansluta till LDAP-servern."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Kunde inte autentisera till IMAP-servern.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-#, fuzzy
-msgid "Could not perform query on Root DSE"
-msgstr "Kunde inte tolka frågesträng"
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Spårningsinformation för ogiltig ogenomskinlig:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP-serversvaret innehöll inte %s-information"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL stöds inte i detta bygge av Evolution)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Färdigdatum"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
@@ -713,53 +708,53 @@ msgstr " _Kontrollera vilka typer som stöds "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
 #, fuzzy
-msgid "<< Fewer Options"
-msgstr "Alternativ"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "Ta bort"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
-#, fuzzy
 msgid "1234"
 msgstr "123"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Ta bort"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Alternativ"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -768,8 +763,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Adressbokskällor"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Albany"
@@ -832,15 +827,15 @@ msgstr "Evolution-alarm"
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
-"Evolution kommer att använda denna e-postadress för att autentisera dig "
-"till servern"
+"Evolution kommer att använda denna e-postadress för att autentisera dig till "
+"servern"
 
 #: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
-"Evolution kommer att använda denna e-postadress för att autentisera dig "
-"till servern"
+"Evolution kommer att använda denna e-postadress för att autentisera dig till "
+"servern"
 
 #: addressbook/gui/component/ldap-config.glade.h:32
 #, fuzzy
@@ -867,8 +862,8 @@ msgstr "Konfiguration"
 msgid "Mappings"
 msgstr "Marginaler"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_var"
@@ -1053,19 +1048,19 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
-"Detta är det största antalet kort att hämta. Att ställa in detta tal "
-"för högt kommer att slöa ned adressboken."
+"Detta är det största antalet kort att hämta. Att ställa in detta tal för "
+"högt kommer att slöa ned adressboken."
 
 #: addressbook/gui/component/ldap-config.glade.h:90
 msgid ""
@@ -1073,9 +1068,9 @@ msgid ""
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
-"Detta är den metod som evolution kommer att använda för att autentisera "
-"dig. Observera att ställa in detta till \"E-postadress\" kräver anonym "
-"åtkomst till din ldap-server."
+"Detta är den metod som evolution kommer att använda för att autentisera dig. "
+"Observera att ställa in detta till \"E-postadress\" kräver anonym åtkomst "
+"till din ldap-server."
 
 #: addressbook/gui/component/ldap-config.glade.h:91
 #, fuzzy
@@ -1084,13 +1079,13 @@ msgid ""
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
-"Detta namn kommer att användas för att identifiera ditt konto. Det "
-"används endast för visning."
+"Detta namn kommer att användas för att identifiera ditt konto. Det används "
+"endast för visning."
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1123,7 +1118,7 @@ msgid "Using email address"
 msgstr "E-postadress"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1131,7 +1126,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Lägg till"
 
@@ -1180,7 +1175,7 @@ msgid "_Download limit:"
 msgstr "_Hämtningsgräns"
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1298,10 +1293,12 @@ msgstr "Evolutions adressboks namnvalsgränssnitt."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Fabrik för adressbokens namnvalsgränssnitt"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -1346,11 +1343,9 @@ msgid ""
 msgstr ""
 "Evolution kan inte få tag i det lokala adressbokslagret.\n"
 "Detta kan ha orsakats av att komponenten evolution-addressbook kraschar.\n"
-"För att hjälpa oss att bättre förstå och lösa detta problem en gång "
-"för\n"
+"För att hjälpa oss att bättre förstå och lösa detta problem en gång för\n"
 "alla kan du skicka ett brev till Jon Trowbridge <trow@ximian.com> med en\n"
-"detaljerad beskrivning av de omständigheter under vilket felet "
-"framträdde.\n"
+"detaljerad beskrivning av de omständigheter under vilket felet framträdde.\n"
 "Tack på förhand."
 
 #: addressbook/gui/component/select-names/e-select-names.c:724
@@ -1433,7 +1428,7 @@ msgstr "Samarbete"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Kontaktredigerare"
 
@@ -1442,7 +1437,7 @@ msgid "D_epartment:"
 msgstr "A_vdelning:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1502,11 +1497,12 @@ msgstr "Vill ha _HTML-post"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -1535,7 +1531,7 @@ msgid "_Web page address:"
 msgstr "_Webbsideadress:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "USA"
 
@@ -2040,12 +2036,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Lettland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libanon"
 
@@ -2054,7 +2049,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
@@ -2063,12 +2058,12 @@ msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litauen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
@@ -2101,7 +2096,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2126,7 +2121,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Mexiko"
 
@@ -2151,7 +2146,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Marocko"
 
@@ -2176,7 +2171,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Nederländerna"
 
@@ -2189,12 +2184,12 @@ msgid "New Caledonia"
 msgstr "Nya Kaledonien"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Nya Zeeland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
@@ -2211,7 +2206,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolköarna"
 
@@ -2220,17 +2215,17 @@ msgid "Northern Mariana Islands"
 msgstr "Norra Marianeröarna"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norge"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2243,7 +2238,7 @@ msgid "Palestinian Territory"
 msgstr "Palestina"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2252,12 +2247,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Nya Guinea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2270,22 +2265,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portugal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Qatar"
 
@@ -2294,7 +2289,7 @@ msgid "Reunion"
 msgstr "Réunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rumänien"
 
@@ -2331,7 +2326,7 @@ msgid "Sao Tome And Principe"
 msgstr "São Tomé och Principe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Saudiarabien"
 
@@ -2348,17 +2343,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapore"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovakien"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slovenien"
 
@@ -2371,7 +2366,7 @@ msgid "Somalia"
 msgstr "Somalia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Sydafrika"
 
@@ -2380,7 +2375,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "Sydgeorgien och södra Sandwichöarna"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Spanien"
 
@@ -2401,7 +2396,7 @@ msgid "Sudan"
 msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -2414,17 +2409,17 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Sverige"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Schweiz"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Taiwan"
 
@@ -2461,7 +2456,7 @@ msgid "Tunisia"
 msgstr "Tunisien"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Turkiet"
 
@@ -2482,7 +2477,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukraina"
 
@@ -2491,7 +2486,7 @@ msgid "United Arab Emirates"
 msgstr "Förenade Arabemiraten"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
@@ -2500,7 +2495,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "USA:s mindre avlägsna öar"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2513,12 +2508,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2539,12 +2534,12 @@ msgid "Western Sahara"
 msgstr "Västsahara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Jemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Jugoslavien"
 
@@ -2557,26 +2552,34 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Är du säker på att du vill\n"
+"ta bort denna kontakt?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Ta bort kontakten?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Kategoriredigeraren är inte tillgänglig."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Denna kontakt tillhör dessa kategorier:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Spara kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunde inte hitta widget för fältet: \"%s\""
@@ -2603,11 +2606,11 @@ msgstr "E-post"
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2742,11 +2745,11 @@ msgid "contact-list-editor"
 msgstr "kontaktlisteredigerare"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigerare"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Spara lista som VCard"
 
@@ -2823,21 +2826,21 @@ msgid "Error getting book view"
 msgstr "Fel vid hämtande av bokvy"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Fel vid ändring av kort"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Lyckades"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Okänt fel"
 
@@ -2846,7 +2849,7 @@ msgid "Repository offline"
 msgstr "Lagret frånkopplat"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Åtkomst nekas"
 
@@ -2864,53 +2867,68 @@ msgstr "Protokollet stöds inte"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Avbruten"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Autentisering misslyckades."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autentisering krävs"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Annat fel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Vill du spara ändringar?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Fel vid tillägg av lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Fel vid tillägg av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Fel vid ändring av lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Fel vid borttagning av lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Fel vid borttagning av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 msgid "Display Cards?"
 msgstr "Visa kort?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards"
 msgstr "Visa kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2920,19 +2938,19 @@ msgstr ""
 "Du har begärt att %d kort ska vara kort. Detta kommer att orsaka att %d nya "
 "fönster visas på din skärm. Vill du verkligen visa alla dessa kort?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 msgid "Move card to"
 msgstr "Flytta kort till"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Copy card to"
 msgstr "Kopiera kort till"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 msgid "Move cards to"
 msgstr "Flytta kort till"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 msgid "Copy cards to"
 msgstr "Kopiera kort till"
 
@@ -2996,100 +3014,106 @@ msgstr "Annan telefon"
 msgid "Other Address"
 msgstr "Annan adress"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Adressbok"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Spara som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Ny kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Ny kontaktlista"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Gå till mapp..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Importera..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Sök efter kontakter"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Adressbokskällor..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilotinställningar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Vidarebefordra kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Skicka meddelande till kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Skriv ut kuvert"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Copy to folder..."
 msgstr "Kopiera till mapp..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Move to folder..."
 msgstr "Flytta till mapp..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiera"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Klistra in"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Ta bort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3099,7 +3123,7 @@ msgstr "_Aktuell vy"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,x,y,z,å,ä,ö"
 
@@ -3107,7 +3131,7 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,x,y,z,å,ä,ö"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,x,y,z,å,ä,ö"
 
@@ -3255,7 +3279,7 @@ msgstr "Marginaler"
 msgid "Number of columns:"
 msgstr "Antal kolumner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Alternativ"
 
@@ -3265,7 +3289,7 @@ msgid "Orientation"
 msgstr "Orientering"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Sida"
 
@@ -3339,29 +3363,33 @@ msgstr "Bredd:"
 msgid "_Font..."
 msgstr "_Typsnitt..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Namnlöst möte"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Hög"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Låg"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Odefinierad"
 
@@ -3401,42 +3429,34 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Konfigurationsverktyg för Evolution-kalendern."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Evolutions kalendersammanfattningskomponent."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolutionkalenderns visare för iTip/iMip"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Evolutionkomponent för hantering av kalendern."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Fabrik för kalendersammanfattningskomponenten."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the Evolution Tasks control"
 msgstr "Fabrik för Evolutions uppgiftskomponent."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Fabrik för kalenderns iTip-vykontroll"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Fabrik för test-kalenderkontrollen"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Fabrik för att centralisera kalenderkomponentens redigerardialoger"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
 msgstr "Fabrik för att skapa en komponentredigerarfabrik"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3448,10 +3468,23 @@ msgstr "Alarmaviseringstjänst"
 msgid "Factory for the alarm notification service"
 msgstr "Fabrik för alarmavsieringstjänsten"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "Startar:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "Slutar:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "ogiltig tid"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution "
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3491,7 +3524,7 @@ msgstr ""
 "visa en normal dialogruta istället."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varning"
@@ -3517,15 +3550,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Fråga mig inte om detta program igen."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Kunde inte initiera GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "Kunde inte skapa fabriken för alarmnotifieringstjänsten"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunde inte skapa fabriken för alarmaviseringstjänsten"
 
@@ -3541,7 +3574,7 @@ msgstr "Beskrivningen innehåller"
 msgid "Comment contains"
 msgstr "Kommentaren innehåller"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Omatchade"
 
@@ -3581,14 +3614,16 @@ msgstr ""
 "Kunde inte skapa kalendervyn. Kontrollera din ORBit- och OAF-installation."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Publikt"
 
@@ -3609,27 +3644,32 @@ msgid "W"
 msgstr "V"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Upptagen"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Inte startad"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Pågår"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Färdigt"
 
@@ -3644,11 +3684,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3663,12 +3704,14 @@ msgstr "Återkommande"
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Nej"
 
@@ -3688,56 +3731,58 @@ msgstr "Veckovy"
 msgid "Month View"
 msgstr "Månadsvy"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Mapp som innehåller möten och evenemang"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Mapp som innehåller att-göra-objekt"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "New meeting"
 msgstr "Nytt möte"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "_Meeting"
 msgstr "_Möte"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "New task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 msgid "New All Day Appointment"
 msgstr "Nytt heldagsmöte"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 msgid "All _Day Appointment"
 msgstr "Hel_dagsmöte"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "New appointment"
 msgstr "Nytt möte"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "_Appointment"
 msgstr "_Möte"
 
@@ -3948,7 +3993,7 @@ msgstr "Påminnelser"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
@@ -3977,7 +4022,7 @@ msgstr "slut på möte"
 msgid "hour(s)"
 msgstr "timme/timmar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "minut(er)"
 
@@ -4005,79 +4050,82 @@ msgstr "30 minuter"
 msgid "60 minutes"
 msgstr "60 minuter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Kalender- och uppgiftsinställningar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Färg för uppgifter som skulle ha gjorts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Färg för uppgifter som ska utföras idag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "Day _ends:"
+msgstr "Dagsslut:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "dag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "timme"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "måndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "_sön"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "lördag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Visa v_eckonummer i datumbläddraren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "_Dagen startar:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "_sön"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "söndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "U_ppgifter som ska ha utförts idag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "to_r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "t_is"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4106,82 +4154,97 @@ msgid "Tuesday"
 msgstr "tisdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Arbetsvecka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12-timmars (FM/EM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24-timmars"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Fråga efter bekräftelse vid borttagning av objekt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "T_ryck ihop helger i månadsvyn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Dagsslut:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Visning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "Da_gen slutar:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "_fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "Allm_änt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_Dölj färdiga uppgifter efter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_mån"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Uppgi_fter som skulle ha utförts:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "_lör"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Visa _sluttiderna på möten i vecko- och månadsvyerna"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "_Tidsdivisioner:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "t_is"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
-msgstr "innan starten på mötet"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
+msgstr "före slut på möte"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
@@ -4238,8 +4301,7 @@ msgstr "Denna dagbokspost har ändrats."
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
-"%s  Du har gjort ändringar. Glöm dessa ändringar och uppdatera "
-"redigeraren?"
+"%s  Du har gjort ändringar. Glöm dessa ändringar och uppdatera redigeraren?"
 
 #: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
@@ -4266,40 +4328,61 @@ msgstr " (Ska utföras "
 msgid "Due "
 msgstr "Ska utföras "
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
 msgstr "Kunde inte uppdatera objekt!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Kunde inte uppdatera objekt!"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Kunde inte få tag i aktuell version!"
 
@@ -4357,27 +4440,27 @@ msgstr "Delegera till:"
 msgid "Enter Delegate"
 msgstr "Ange delegerad person"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Möte"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Upprepning"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Schemaläggning"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Möte"
 
@@ -4424,7 +4507,7 @@ msgid "Pu_blic"
 msgstr "Pu_blikt"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Visa tid som"
 
@@ -4446,19 +4529,19 @@ msgstr "Slutti_d:"
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "En organisatör krävs."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Det måste finnas åtminstone en närvarande person."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Personen är redan närvarande på mötet!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Delegera till..."
 
@@ -4469,49 +4552,55 @@ msgstr "Deltagare"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Vanligt namn"
+msgid "Click here to add an attendee"
+msgstr "Klicka här för att lägga till en närvarande person"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delegerad från"
+msgid "Common Name"
+msgstr "Vanligt namn"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegerad till"
+msgid "Delegated From"
+msgstr "Delegerad från"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Språk"
+msgid "Delegated To"
+msgstr "Delegerad till"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Medlem"
+msgid "Language"
+msgstr "Språk"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "OSA"
+msgid "Member"
+msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "OSA"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Roll"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -4526,14 +4615,10 @@ msgid "_Change Organizer"
 msgstr "_Ändra organisatör"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "Bjud _in andra..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "_Annan organisatör"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4582,8 +4667,7 @@ msgstr ":e"
 
 #: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Detta möte har upprepningsregler som inte kan redigeras med Evolution."
+msgstr "Detta möte har upprepningsregler som inte kan redigeras med Evolution."
 
 #: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
@@ -4720,7 +4804,7 @@ msgid "Progress"
 msgstr "Förlopp"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4732,19 +4816,19 @@ msgstr "_Prioritet:"
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Tilldelning"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Beskrivning:"
 
@@ -4756,22 +4840,77 @@ msgstr "Sta_rtdatum:"
 msgid "_Due Date:"
 msgstr "Förfallo_datum:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "0%"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "10%"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "20%"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "30%"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "40%"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "50%"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "60%"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "70%"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "80%"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "90%"
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr "100%"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Tar bort markerade objekt"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Öppna"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 msgid "_Save as..."
 msgstr "_Spara som..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4779,20 +4918,20 @@ msgstr "_Spara som..."
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4800,32 +4939,33 @@ msgstr "_Kopiera"
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 msgid "_Assign Task"
 msgstr "_Tilldela uppgift"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 msgid "_Forward as iCalendar"
 msgstr "_Vidarebefordra som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_Markera som färdig"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markera markerade uppgifter som färdiga"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Uppdaterar objekt"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicka för att lägga till en uppgift"
 
@@ -4833,47 +4973,48 @@ msgstr "Klicka för att lägga till en uppgift"
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Färdigt"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Färdigdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Förfallodatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Slutdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Geografisk position"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Startdatum"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Sammanfattning"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Sortera efter uppgift"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4921,11 +5062,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "fm"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "em"
 
@@ -4964,7 +5107,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Publicera ledig-/upptageninformation"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 msgid "_Configure..."
 msgstr "_Konfigurera..."
 
@@ -4974,7 +5117,7 @@ msgid "_Configure Pilot..."
 msgstr "_Konfigurera..."
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "_Spara som..."
 
@@ -4999,73 +5142,389 @@ msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot-verktygen verkar inte vara installerade på detta system."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Fel vid körning av %s."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "Mötet börjar: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "Uppgiften börjar: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+msgid "Free/Busy info begins: <b>"
+msgstr "Ledig-/upptageninformation börjar: <b>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Börjar: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "Mötet slutar: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+msgid "Free/Busy info ends: <b>"
+msgstr "Ledig-/upptageninformation slutar: <b>"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "Slutar: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "Uppgiften färdig: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr "Uppgiften ska vara utförd: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "iCalendar-information"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "iCalendar-fel"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "En okänd person"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Granska följande information, och välj sedan en åtgärd från menyn nedan."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Ingen</i>"
+
+#: calendar/gui/e-itip-control.c:903
+msgid "Status:"
+msgstr "Status:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Godtaget"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+msgid "Tentatively Accepted"
+msgstr "Preliminärt godtaget"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Avböjt"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Okänd"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "Kalenderfilen kunde inte uppdateras!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "Välj en åtgärd:"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Uppdatera"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "OK"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "Acceptera"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr "Acceptera preliminärt"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "Neka"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "Skicka ledig-/upptageninformation"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "Uppdatera svarandestatus"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "Skicka senaste information"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b> har publicerat mötesinformation."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Mötesinformation"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> begär din närvaro vid ett möte."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "Mötesförslag"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> vill lägga till i ett befintligt möte."
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "Mötesuppdatering"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> vill få den senaste mötesinformationen."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "Begäran av mötesuppdatering"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> har svarat på en mötesbegäran."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "Mötessvar"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> har avbokat ett möte."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "Mötesavbokning"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> har skickat ett obegripligt meddelande."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Felaktigt mötesmeddelande"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> har publicerat mötesinformation."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Uppgiftsinformation"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> begär att du utför en uppgift."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Uppgiftsförslag"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> vill lägga till i en befintlig uppgift."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Uppgiftsuppdatering"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> vill få den senaste uppgiftsinformationen."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Begäran om uppgiftsuppdatering"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> har svarat på en uppgiftstilldelning."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Uppgiftssvar"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> har avbokat en uppgift."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Uppgiftsavbokning"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Felaktigt uppgiftsmeddelande"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> har publicerat ledig-/upptageninformation."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Ledig-/upptageninformation"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> begär din ledig-/upptageninformation."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Ledig-/Upptagenbegäran"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> har svarat på en ledig-/upptagenbegäran."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Ledig-/Upptagensvar"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Felaktigt ledig-/upptagenmeddelande"
+
+#: calendar/gui/e-itip-control.c:1354
+msgid "The message does not appear to be properly formed"
+msgstr "Meddelandet verkar inte vara korrekt utformat"
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "Meddelandet innehåller typer av begäran som inte stöds."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "Bilagan innehåller inte ett giltigt kalendermeddelande"
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "Bilagan har inga visningsbara kalenderobjekt"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+# Detta är inte diskussionsgrupper utan nyheter
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#, fuzzy
+msgid "There was an error on the CORBA system\n"
+msgstr "Ett fel uppstod när nyhetskällan hämtades"
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Objektet kunde inte skickas!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Uppdateringen färdig\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Kalenderfilen kunde inte uppdateras!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Närvarandestatusen kan inte uppdateras eftersom objektet inte längre finns"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Närvarandestatus kunde inte uppdateras på grund av ogiltig status!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "Närvarandestatus kunde inte uppdateras!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Närvarandestatus är uppdaterad\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "Närvarandestatus kunde inte uppdateras!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Borttagning färdig"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Objektet skickat!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "Objektet kunde inte skickas!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Välj mapp"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Välj mapp"
@@ -5107,93 +5566,92 @@ msgstr "slutdatum"
 msgid "date-start"
 msgstr "startdatum"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Ordförandepersoner"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Nödvändiga deltagare"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Valfria deltagare"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Icke-deltagare"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Person"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Grupp"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Resurs"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Rum"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Mötesordförande"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Nödvändig deltagare"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Valfri deltagare"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Icke-deltagare"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Behöver åtgärd"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Godtaget"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Avböjt"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Preliminärt"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Delegerat"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "Pågår"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
@@ -5205,63 +5663,63 @@ msgstr "%a %Y-%m-%d"
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Inte inne"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Ingen information"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Alternativ"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Visa _endast arbetstimmar"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Visa ut_zoomade"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Uppdatera ledig/upptagen"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Autovälj"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Alla människor och resurser"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Alla _människor och en resurs"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Folk som k_rävs"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Folk som krävs _och en resurs"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Mötets _starttid:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Mötets slu_ttid:"
 
@@ -5280,17 +5738,22 @@ msgstr "Kunde inte läsa in uppgifterna i \"%s\""
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som krävs för att läsa in \"%s\" stöds inte"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Kunde inte öppna mappen i \"%s\""
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Färdigdatum"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Tar bort markerade objekt"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 msgid "Expunging"
 msgstr "Utplånar"
 
@@ -5302,17 +5765,17 @@ msgstr "Nytt _möte..."
 msgid "_Delete this Appointment"
 msgstr "_Ta bort detta möte"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunde inte öppna mappen i \"%s\""
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som krävs för att öppna \"%s\" stöds inte"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Öppnar kalender i %s"
@@ -5373,19 +5836,51 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Åtminstone en närvarande person krävs"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "En organisatör måste vara angiven."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr "Evenemangsinformation"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "Uppgiftsinformation"
+
+#: calendar/gui/itip-utils.c:358
+msgid "Journal information"
+msgstr "Journalinformation"
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr "Ledig-/upptageninformation"
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr "Kalenderinformation"
+
+#: calendar/gui/itip-utils.c:398
+msgid "Updated"
+msgstr "Uppdaterat"
+
+#: calendar/gui/itip-utils.c:406
+msgid "Refresh"
+msgstr "Uppdatera"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr "Motförslag"
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Du måste vara närvarande på detta evenemang."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "Kunde inte skapa komponentredigerarfabriken"
 
@@ -5574,12 +6069,45 @@ msgstr "Markerad månad (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Markerat år (%Y)"
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "Uppgift"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Status: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "_Prioritet:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Procent klar: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Kategorier: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Kontakter: "
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5616,8 +6144,8 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa uppgifter?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Fråga mig inte igen."
 
@@ -5651,8 +6179,8 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"Kunde inte öppna \"%s\"; inga objekt från kalendermappen kommer att "
-"flyttas till uppgiftsmappen."
+"Kunde inte öppna \"%s\"; inga objekt från kalendermappen kommer att flyttas "
+"till uppgiftsmappen."
 
 #: calendar/gui/tasks-migrate.c:133
 #, c-format
@@ -5679,6 +6207,10 @@ msgstr "Importerar iCalendar-filer till Evolution"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importerar vCalendar-filer till Evolution"
 
+#: calendar/importers/icalendar-importer.c:424
+msgid "Reminder!!"
+msgstr "Påminnelse!!"
+
 #: calendar/importers/icalendar-importer.c:638
 msgid "Calendar Events"
 msgstr "Kalenderhändelser"
@@ -5770,11 +6302,11 @@ msgstr "contains? förväntar sig att argument 2 är en sträng"
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
-"contains? förväntar sig att argument 1 är ett av \"any\", \"summary\", "
-"eller \"description\""
+"contains? förväntar sig att argument 1 är ett av \"any\", \"summary\", eller "
+"\"description\""
 
 #: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
@@ -5785,8 +6317,8 @@ msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
-"has-categories? förväntar sig att alla argument är strängar eller att "
-"ett och endast ett argument är booleskt falsk (#f)"
+"has-categories? förväntar sig att alla argument är strängar eller att ett "
+"och endast ett argument är booleskt falsk (#f)"
 
 #: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
@@ -6702,638 +7234,654 @@ msgid "Asia/Macao"
 msgstr "Asien/Macao"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Asien/Macao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Asien/Magadan"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Asien/Magadan"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Asien/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Asien/Muscat"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Asien/Nicosia"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Asien/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Asien/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Asien/Kabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Asien/Phnom_Penh"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Asien/Pontianak"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Asien/Pyongyang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Asien/Qatar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Asien/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Asien/Rangoon"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Asien/Riyadh"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Asien/Saigon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Asien/Sachalin"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Asien/Samarkand"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Asien/Söul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Asien/Shanghai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Asien/Singapore"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Asien/Taipei"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Asien/Tasjkent"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Asien/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Asien/Tehran"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Asien/Thimphu"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Asien/Tokyo"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Asien/Ujung_Pandang"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Asien/Ulaanbaatar"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Asien/Ürumqi"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Asien/Vientiane"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Asien/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Asien/Jakutsk"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Asien/Jekaterinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Asien/Jerevan"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlanten/Azorerna"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlanten/Bermuda"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlanten/Kanarieöarna"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlanten/Cape_Verde"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlanten/Färöarna"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlanten/Jan_Mayen"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlanten/Madeira"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlanten/Reykjavik"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlanten/South_Georgia"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlanten/St_Helena"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlanten/Stanley"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Australien/Adelaide"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Australien/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Australien/Broken_Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Australien/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Australien/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Australien/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Australien/Lord_Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Australien/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Australien/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Australien/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Europa/Amsterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Europa/Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Europa/Aten"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Europa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Europa/Belgrad"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Europa/Berlin"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Europa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Europa/Bryssel"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Europa/Bukarest"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Europa/Budapest"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Europa/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Europa/Köpenhamn"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Europa/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Europa/Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Europa/Helsingfors"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Europa/Istanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Europa/Kaliningrad"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Europa/Kiev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Europa/Lissabon"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Europa/Ljubljana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Europa/London"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Europa/Luxemburg"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Europa/Madrid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Europa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Europa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Europa/Monaco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Europa/Moskva"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Europa/Nicosia"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Europa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Europa/Paris"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Europa/Prag"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Europa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Europa/Rom"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Europa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Europa/San_Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Europa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Europa/Simferopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Europa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Europa/Sofia"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Europa/Stockholm"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Europa/Tallinn"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "Europa/Tirana"
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Europa/Uzjhorod"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "Europa/Vaduz"
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Europa/Vatikanstaten"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Europa/Wien"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "Europa/Vilnius"
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Europa/Warszawa"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Europa/Zagreb"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Europa/Zaporozhye"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Europa/Zürich"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr "Indiska_Oceanen/Antananarivo"
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "Indiska_Oceanen/Chagos"
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "Indiska_Oceanen/Julön"
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "Indiska_Oceanen/Cocos"
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indiska_Oceanen/Komorerna"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Indiska_Oceanen/Kerguelen"
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indiska_Oceanen/Mahe"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indiska_Oceanen/Maldiverna"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indiska_Oceanen/Mauritius"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indiska_Oceanen/Mayotte"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indiska_Oceanen/Réunion"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Stilla_Havet/Apia"
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Stilla_Havet/Auckland"
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Stilla_Havet/Chatham"
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Stilla_Havet/Påskön"
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Stilla_Havet/Efate"
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Stilla_Havet/Enderbury"
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Stilla_Havet/Fakaofo"
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Stilla_Havet/Fiji"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Stilla_Havet/Funafuti"
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Stilla_Havet/Galápagos"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Stilla_Havet/Gambier"
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Stilla_Havet/Guadalcanal"
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Stilla_Havet/Guam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Stilla_Havet/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Stilla_Havet/Johnston"
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Stilla_Havet/Kiritimati"
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Stilla_Havet/Kosrae"
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Stilla_Havet/Kwajalein"
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Stilla_Havet/Majuro"
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Stilla_Havet/Marquesas"
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Stilla_Havet/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Stilla_Havet/Nauru"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Stilla_Havet/Niue"
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Stilla_Havet/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Stilla_Havet/Noumea"
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Stilla_Havet/Pago_Pago"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Stilla_Havet/Palau"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Stilla_Havet/Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Stilla_Havet/Ponape"
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Stilla_Havet/Port_Moresby"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Stilla_Havet/Rarotonga"
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Stilla_Havet/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Stilla_Havet/Tahiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Stilla_Havet/Tarawa"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Stilla_Havet/Tongatapu"
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Stilla_Havet/Truk"
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Stilla_Havet/Wake"
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Stilla_Havet/Wallis"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Stilla_Havet/Yap"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Signering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Klartextsignering stöds inte av detta chiffer"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifiering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering stöds inte av detta chiffer"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering stöds inte av detta chiffer"
 
@@ -7341,12 +7889,12 @@ msgstr "Dekryptering stöds inte av detta chiffer"
 msgid "Unable to create cache path"
 msgstr "Kan inte skapa cachesökväg"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kunde inte ta bort cacheposten: %s: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7357,7 +7905,7 @@ msgstr ""
 "Ytterligare åtgärder på denna server kommer inte att spelas tillbaka\n"
 "då du återansluter till nätverket."
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7368,11 +7916,16 @@ msgstr ""
 "%s\n"
 "Ändringar i denna mapp kommer inte att återsynkroniseras."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Återsynkroniserar med servern"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Lagrar mappen \"%s\""
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Du måste vara ansluten för att kunna genomföra denna åtgärd"
 
@@ -7380,56 +7933,67 @@ msgstr "Du måste vara ansluten för att kunna genomföra denna åtgärd"
 msgid "Syncing folders"
 msgstr "Synkroniserar mappar"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fel vid tolkning av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fel vid körning av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Kan inte öppna spool-mappen"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Kan inte bearbeta spool-mappen"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Hämtar meddelande %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Kan inte öppna meddelande"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Misslyckades med meddelande %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Synkroniserar mapp"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Hämtar meddelande %d av %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Misslyckades vid meddelande %d av %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 msgid "Failed to retrieve message"
 msgstr "Misslyckades med att hämta meddelande"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Kunde inte skapa rör till %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Misslyckades med att cacha meddelande %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fel vid körning av filtersökning: %s: %s"
@@ -7461,25 +8025,102 @@ msgstr "(matcha-alla) kräver ett ensamt booleskt resultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Utför fråga på okänt huvud: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Åtgärden stöds inte: lägg till meddelande: för %s"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Åtgärden stöds inte: sökning med uttryck: för %s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Åtgärden stöds inte: sökning med uid: för %s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Flyttar meddelanden"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Kopierar meddelanden till %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Avbruten."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Oväntat svar från POP-servern: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Inget filnamn är angivet."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Kan inte kryptera detta meddelande: inga mottagare är angivna"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Misslyckades med att cacha meddelande %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Misslyckades med att cacha meddelande %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Misslyckades med att avkoda meddelandet."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Kan inte verifiera detta meddelande: kunde inte skapa temporär fil: %s"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7509,8 +8150,7 @@ msgstr "Kunde inte skapa låsfil för %s: %s"
 #: camel/camel-lock.c:150
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Gjorde time-out när låsfil skulle fås för %s. Försök igen senare."
+msgstr "Gjorde time-out när låsfil skulle fås för %s. Försök igen senare."
 
 #: camel/camel-lock.c:204
 #, c-format
@@ -7576,86 +8216,24 @@ msgstr "Fel vid skrivande av temporär brevlådefil: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Fel vid kopierande av temporär brevfil: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Ange din %s-lösenordsfras för %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Ange din %s-lösenordsfras"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Kan inte signera detta meddelande: ingen klartext att signera"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "Kan inte signera detta meddelande: inget lösenord angavs"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Kan inte signera detta meddelande: kunde inte skapa rör till GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "Kan inte signera detta meddelande: ingen klartext att klartextsignera"
 
-#: camel/camel-pgp-context.c:987
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Kan inte veridiera detta meddelande: ingen klartext att verifiera"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Kan inte verifiera detta meddelande: kunde inte skapa rör till GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr ""
-"Kan inte verifiera detta meddelande: kunde inte skapa temporär fil: %s"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Kan inte kryptera detta meddelande: ingen klartext att kryptera"
-
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Kan inte kryptera detta meddelande: inget lösenord angavs"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Kan inte kryptera detta meddelande: kunde inte skapa rör till GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Kan inte kryptera detta meddelande: inga mottagare är angivna"
-
-#: camel/camel-pgp-context.c:1372
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Kan inte dekryptera detta meddelande: ingen klartext att dekryptera"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Kan inte dekryptera detta meddelande: inget lösenord angavs"
-
-#: camel/camel-pgp-context.c:1387
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr ""
-"Kan inte dekryptera detta meddelande: kunde inte skapa rör till GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+#, fuzzy
+msgid "Failed to decrypt MIME part: parse error"
+msgstr "Misslyckades med att dekryptera: Okänd"
 
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Detta är en digitalt signerad meddelandedel"
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Annat fel"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7671,43 +8249,6 @@ msgstr "Kunde inte läsa in %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunde inte läsa in %s: Ingen initieringskod i modulen."
 
-#: camel/camel-remote-store.c:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s-server %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s-tjänst för %s på %s"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Anslutning avbruten"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Kunde inte ansluta till %s (port %d): %s"
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(okänd värd)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Åtgärden avbruten"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Servern kopplade ifrån oväntat: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonym"
@@ -7757,8 +8298,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Detta alternativ kommer att ansluta till servern med ett säkert "
-"CRAM-MD5-lösenord, om servern stöder det."
+"Detta alternativ kommer att ansluta till servern med ett säkert CRAM-MD5-"
+"lösenord, om servern stöder det."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -7769,8 +8310,8 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"Detta alternativ kommer att ansluta till servern med ett "
-"DIGEST-MD5-lösenord, om servern stöder det."
+"Detta alternativ kommer att ansluta till servern med ett DIGEST-MD5-"
+"lösenord, om servern stöder det."
 
 #: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
@@ -7803,8 +8344,8 @@ msgstr "Kerberos 4"
 #: camel/camel-sasl-kerberos4.c:42
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
-"Detta alternativ kommer att ansluta till servern med Kerberos "
-"4-autentisering."
+"Detta alternativ kommer att ansluta till servern med Kerberos 4-"
+"autentisering."
 
 #: camel/camel-sasl-kerberos4.c:161
 #, c-format
@@ -7816,7 +8357,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar från servern."
 
@@ -7827,8 +8368,7 @@ msgstr "Inloggning"
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr ""
-"Detta alternativ ansluter till servern genom att använda ett enkelt "
-"lösenord."
+"Detta alternativ ansluter till servern genom att använda ett enkelt lösenord."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -7846,11 +8386,9 @@ msgstr ""
 "Detta alternativ kommer att ansluta till med NTLM / säker "
 "lösenordsautentisering (SPA)."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Lösenord"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr "VANLIG"
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7879,52 +8417,52 @@ msgstr "POP innan SMTP-auktorisering med en källa som inte är POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Misslyckades med kompilering av reguljärt uttryck: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL:en \"%s\" behöver ett användarnamn"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL:en \"%s\" behöver ett värdnamn"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL:en \"%s\" behöver en sökväg"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Slår upp: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Namnuppslagning misslyckades: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Uppslagning av värdnamn misslyckades: %s: värden kunde inte hittas"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Uppslagning av värdnamn misslyckades: %s: okänd orsak"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Slår upp: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Uppslagning av värdnamn misslyckades: %s: värden kunde inte hittas"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Uppslagning av värdnamn misslyckades: %s: okänd orsak"
@@ -7989,11 +8527,11 @@ msgstr "Misslyckades med att avkoda meddelandet."
 msgid "Failed to verify certificates."
 msgstr "Misslyckades med att verifiera certifikat."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan inte få tag i mapp: Ogiltig åtgärd på detta lager"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan inte skapa mapp: Ogiltig åtgärd på detta lager"
 
@@ -8023,7 +8561,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8036,16 +8574,16 @@ msgstr ""
 "Fingeravtryck:     %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr "BRA"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr "DÅLIG"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8065,15 +8603,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Kunde inte tolka URL:en \"%s\""
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Det finns inget sådant meddelande %s i %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Det finns inget sådant meddelande: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Kontrollera nya meddelanden i alla mappar"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8095,68 +8633,77 @@ msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Du kan inte kopiera meddelanden från denna papperskorgsmapp."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Åtgärden avbruten"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Servern kopplade ifrån oväntat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Oväntat svar från IMAP-servern: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommandot misslyckades: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Serversvaret tog slut för tidigt."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP-serversvaret innehöll inte %s-information"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Oväntat OK-svar från IMAP-servern: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kunde inte skapa katalogen %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunde inte läsa in sammanfattning för %s"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen förstördes och återskapades på servern."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Letar efter ändrade meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Detta meddelande är inte tillgängligt för tillfället"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Hämtar meddelandeinformation för nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Letar efter nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
@@ -8209,33 +8756,82 @@ msgstr "IMAP"
 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:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Lösenord"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Detta alternativ ansluter till IMAP-servern med ett lösenord i klartext."
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP-server %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s-tjänst för %s på %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Anslutning avbruten"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Kunde inte ansluta till %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Kunde inte ansluta till POP-servern,\n"
+"Fel vid skickande av filnamn: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+msgid "SSL/TLS extension not supported."
+msgstr "SSL/TLS-tillägg stöds inte."
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+msgid "SSL negotiations failed"
+msgstr "SSL-förhandlingar misslyckades"
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-servern %s stöder inte den begärda autentiseringstypen %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Inget stöd för autentiseringstypen %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sAnge IMAP-lösenordet för %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Du angav inte något lösenord."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8246,68 +8842,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Föräldermappen får inte innehålla undermappar"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Kan inte öppna brevlåda: %s %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Brevlådekataloger i MH-format"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "För lagrande av lokal e-post i MH-liknande brevlådekataloger."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Lokal leverans"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "För hämtande av lokal e-post i mbox-standardformaterade brevlådor."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Tillämpa filtren på nya meddelanden i INBOX"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Brevlådekataloger i maildir-format"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "För lagrande av lokal e-post i maildir-kataloger."
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Unix mbox-standardbrevlåda"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "För läsande och lagrande av lokal e-post i mbox-standardspoolfiler."
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Unix mbox-standardbrevlåda"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "För läsande och lagrande av lokal e-post i mbox-standardspoolfiler."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagringsroten %s är inte en absolut sökväg"
@@ -8333,7 +8948,7 @@ msgstr "Lokala lager har ingen inkorg"
 msgid "Local mail file %s"
 msgstr "Lokal brevlådefil %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunde inte byta namn på mappen %s till %s: %s"
@@ -8353,33 +8968,31 @@ msgstr "Kunde inte ta bort mappsammanfattningsfilen \"%s\": %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunde inte ta bort mappindexfilen \"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Kunde inte spara sammanfattningen: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunde inte lägga till meddelandet i sammanfattningen: okänd orsak"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Tillägg av meddelande i brevlådekatalog avbröts"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan inte lägga till meddelande i mapp för brevlådekatalog: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8388,20 +9001,19 @@ msgstr ""
 "Kan inte hämta meddelande: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Det finns inget sådant meddelande"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Ogiltigt meddelandeinnehåll"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8412,13 +9024,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen \"%s\" finns inte."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8434,7 +9046,7 @@ msgstr "\"%s\" är inte en brevlådekatalog."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunde inte ta bort mappen \"%s\": %s"
@@ -8443,8 +9055,8 @@ msgstr "Kunde inte ta bort mappen \"%s\": %s"
 msgid "not a maildir directory"
 msgstr "är inte en brevlådekatalog"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunde inte genomsöka mappen \"%s\": %s"
@@ -8463,45 +9075,37 @@ msgstr "Kontrollerar mappkonsekvens"
 msgid "Checking for new messages"
 msgstr "Kontrollerar nya meddelanden"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Lagrar mapp"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan inte skapa mapplås på %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan inte öppna brevlåda: %s %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "E-posttillägg avbrutet"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan inte lägga till meddelande till mbox-fil: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8510,13 +9114,11 @@ msgstr ""
 "Kan inte hämta meddelande: %s från mappen %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen verkar vara obotligt skadad."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Meddelandebyggande misslyckades: Trasig brevlåda?"
 
@@ -8559,149 +9161,149 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen \"%s\" är inte tom. Den togs inte bort."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunde inte öppna mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Ödesdigert e-posttolkningsfel nära position %ld i mappen %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan inte kontrollera mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunde inte öppna fil: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan inte öppna temporär brevlåda: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Summeringen stämmer inte överens, även efter en synk"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Fel vid skrivning av temporär brevlåda: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Fel vid skrivning till temporär brevlåda: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunde inte stänga källmappen %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunde inte stänga temporära mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunde inte byta namn på mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Summeringen stämmer inte överens, även efter en synk"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Okänt fel: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Kunde inte byta namn på mapp: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Fel vid skrivning av temporär brevlåda: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Fel vid skrivning till temporär brevlåda: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "MH-meddelandetillägg avbrutet"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan inte lägga till meddelande i mh-mapp: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" är inte en katalog."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan inte öppna sökvägen till MH-katalogen: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Kan inte lägga till meddelande till spool-filen %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Spool-mappar kan inte bytas namn på"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Spool-filen \"%s\" finns inte eller är ingen vanlig fil"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "Lagringsroten %s är ingen vanlig katalog"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen \"%s/%s\" finns inte."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr "Lagret stöder inte en INKORG"
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool-brevlådefil %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Spool-mappar kan inte bytas namn på"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mappar kan inte bytas namn på"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-mappar kan inte tas bort"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Kunde inte synkronisera temporära mappen %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kunde inte synkronisera spool-mappen %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8710,25 +9312,6 @@ msgstr ""
 "Kunde inte synkronisera spool-mappen %s: %s\n"
 "Mappen kan vara skadad, kopia sparad i \"%s\""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "Kunde inte arkivera: %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "Lagret \"%s\" finns inte eller är ingen katalog"
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr "Lagret stöder inte en INKORG"
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, c-format
-msgid "Mail tree %s"
-msgstr "E-postträd %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET-diskussionsgrupper"
@@ -8736,15 +9319,25 @@ msgstr "USENET-diskussionsgrupper"
 #: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
-"Det här är en leverantör för läsning och postning till "
-"USENET-diskussionsgrupper."
+"Det här är en leverantör för läsning och postning till USENET-"
+"diskussionsgrupper."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Kunde inte skapa katalogen %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-diskussionsgrupper via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8844,7 +9437,7 @@ msgstr "Lämna meddelanden på servern"
 msgid "Delete after %s day(s)"
 msgstr "Ta bort efter %s dag(ar)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8858,8 +9451,8 @@ msgid ""
 "is the only option supported by many POP servers."
 msgstr ""
 "Detta alternativ kommer att ansluta till POP-servern med ett "
-"klartextlösenord. Det här är det enda alternativet som stöds hos många "
-"POP-servrar."
+"klartextlösenord. Det här är det enda alternativet som stöds hos många POP-"
+"servrar."
 
 #: camel/providers/pop3/camel-pop3-provider.c:81
 msgid ""
@@ -8871,28 +9464,20 @@ msgstr ""
 "krypterat lösenord via APOP-protokollet. Det här kanske inte fungerar för "
 "alla användare även med servrar som sägs stöda detta."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Misslyckades med att ansluta till POP-servern %s i säkert läge: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-msgid "SSL/TLS extension not supported."
-msgstr "SSL/TLS-tillägg stöds inte."
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-msgid "SSL negotiations failed"
-msgstr "SSL-förhandlingar misslyckades"
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Kunde inte ansluta till POP-servern på %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8900,27 +9485,27 @@ msgstr ""
 "Kan inte ansluta till POP-servern.\n"
 "Inget stöd för begärd autentiseringsmekanism."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "SASL \"%s\"-inloggning misslyckades: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr "SASL-protokollfel"
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr "I/O-fel: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sAnge ett POP3-lösenord för %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8929,13 +9514,13 @@ msgstr ""
 "Kan inte ansluta till POP-server.\n"
 "Fel vid skickande av lösenord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8944,8 +9529,8 @@ msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
-"För leverans av e-post genom att skicka det till programmet \"sendmail\" "
-"på det lokala systemet."
+"För leverans av e-post genom att skicka det till programmet \"sendmail\" på "
+"det lokala systemet."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:108
 msgid "Could not parse recipient list"
@@ -8996,8 +9581,8 @@ msgstr "SMTP"
 #: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
-"För leverans av e-post genom anslutning till ett fjärr-epostnav som "
-"använder SMTP.\n"
+"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:174
 msgid "Syntax error, command unrecognized"
@@ -9099,45 +9684,45 @@ msgstr "Tillfälligt autentiseringsmisslyckande"
 msgid "Authentication required"
 msgstr "Autentisering krävs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, 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:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Kunde inte ansluta till POP-servern,\n"
 "Fel vid skickande av filnamn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Meddelandet verkar inte vara korrekt utformat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "RSET-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-servern %s stöder inte den begärda autentiseringstypen %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sAnge SMTP-lösenordet för %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9148,89 +9733,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-epostleverans via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 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:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan inte skicka meddelande: inga mottagare är angivna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan inte skicka meddelande: en eller flera ogiltiga mottagare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "SMTP-hälsning"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, 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:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Fel i HELO-svar: %s: inte ödesdigert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Fel vid skapande av SASL-autentiseringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH-begäran misslyckades."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Felaktigt autentiseringssvar från servern.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, 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:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Fel i MAIL FROM-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, 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:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA-begäran gjorde time-out: %s: brevet skickades inte"
@@ -9238,39 +9823,39 @@ msgstr "DATA-begäran gjorde time-out: %s: brevet skickades inte"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, fuzzy
 msgid "DATA response error"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA-skickande gjorde time-out: meddelandeslut: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Felaktigt autentiseringssvar från servern."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 #, fuzzy
 msgid "RSET response error"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, 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:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Fel i RSET-svar: %s"
@@ -9344,52 +9929,52 @@ msgstr "MIME-typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Föreslå automatisk visning av bilaga"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Klicka här för att ta fram adressboken"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Från:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Svara till:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Till:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ange adresserna som ska få en kopia av meddelandet"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Blindkopia:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9402,7 +9987,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Kunde inte skapa ett PGP-signatursammanhang."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9411,34 +10001,34 @@ msgstr ""
 "Fel vid läsning av filen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Varning!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Filen finns, skriv över?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inläsning av filen: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fel vid åtkomst av filen: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Kunde inte hämta meddelande från redigeraren"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9447,7 +10037,7 @@ msgstr ""
 "Kan inte spola filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9456,7 +10046,7 @@ msgstr ""
 "Kan inte trunkera filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9465,7 +10055,7 @@ msgstr ""
 "Fel vid automatiskt sparande av meddelande: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9473,7 +10063,7 @@ msgstr ""
 "Ximian Evolution har hittat osparade filer från en tidigare session.\n"
 "Vill du försöka återställa dem?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9483,23 +10073,43 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Varning: Ändrat meddelande"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Infoga fil"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Spara signatur"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (standard)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9507,7 +10117,7 @@ msgstr ""
 "Kan inte skapa redigerarfönstret:\n"
 "Kan inte aktivera adressväljarkontrollen."
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9515,6 +10125,12 @@ msgstr ""
 "Kunde inte skapa redigerarfönstret:\n"
 "Kan inte aktivera HTML-redigerarkomponenten."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9575,7 +10191,7 @@ msgstr "Ämnet innehåller"
 msgid "Subject does not contain"
 msgstr "Ämnet innehåller inte"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9719,7 +10335,7 @@ msgstr "timme"
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "sekunder"
 
@@ -9794,7 +10410,7 @@ msgstr " sedan"
 msgid "ago"
 msgstr " sedan"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
@@ -9806,6 +10422,21 @@ msgstr "<klicka här för att välja ett datum>"
 msgid "Filter Rules"
 msgstr "Filterregler"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Ange filnamn:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Spool-filen \"%s\" finns inte eller är ingen vanlig fil"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Välj en åtgärd:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9824,7 +10455,7 @@ msgstr ""
 "Gå tillbaka och ange en giltig mapp som e-post kan levereras till."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Välj mapp"
 
@@ -9837,7 +10468,11 @@ msgstr ""
 "Fel i reguljära uttrycket \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
@@ -9867,7 +10502,7 @@ msgstr "om alla villkor uppfylls"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "om något villkor uppfylls"
 
 #: filter/filter-rule.c:780
@@ -9946,193 +10581,203 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Företag"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "innehåller"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Kopiera till mapp"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Ankomstdatum"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Avsändningsdatum"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "innehåller inte"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "slutar inte med"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "finns inte"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "låter inte som"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "börjar inte med"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "finns inte"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Utkast"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "slutar med"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr "Kör skalkommando"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "finns"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "finns"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Uttryck"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "viktigt"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "är"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 msgid "is after"
 msgstr "är efter"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 msgid "is before"
 msgstr "är innan"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "Flaggad"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "är större än"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "är mindre än"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "är inte"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Flaggad"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Sändlista"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "meddelandetext"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "meddelandehuvud"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Flytta till mapp"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Spela ljud:"
 
 # [Status] [är] [Läst]
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Läst"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Reguljärt uttryck matchar"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "besvarad"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Poäng"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Avsändare"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Ställ in status"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Storlek (kB)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "låter som"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Källkonto"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Specifikt huvud"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "börjar med"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Ämne"
 
@@ -10187,7 +10832,8 @@ msgid "Scanning %s"
 msgstr "Genomsöker %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "E-post"
 
@@ -10203,10 +10849,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Adressbok"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10256,7 +10898,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerar din gamla Netscape-data"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Papperskorg"
 
@@ -10397,269 +11041,277 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Mapp som innehåller e-post"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Virtuell papperskorg"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Virtuell papperskorgsmapp"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Denna mapp kan inte innehålla meddelanden."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Egenskaper..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Ändra egenskaperna för denna mapp"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
-"En del av dina e-postinställningar verkar felaktiga, kontrollera att allt "
-"är som det ska vara."
+"En del av dina e-postinställningar verkar felaktiga, kontrollera att allt är "
+"som det ska vara."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Du har inte angivit någon e-posttransportmetod"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Varning: Ändrat meddelande"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_E-postmeddelande"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan inte initiera Evolutions e-postkonfigurationskomponent."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan inte initiera Evolutions mappinformationskomponent."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ansluter till server..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lager hos skal"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper för \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunde inte skapa temporär katalog: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d nya"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d dolda"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr "%d synliga"
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d markerade"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d oskickade"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d skickade"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Skapa _virtuell mapp från meddelande"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp på _ämne"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på _avsändare"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på _mottagare"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "Virtuell mapp på sänd_lista"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Filtrera på _ämne"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Filtrera på _avsändare"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Filtrera på _mottagare"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Färdigt"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Ställ flagga"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_Markera som läst"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markera som ovikti_gt"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Ångra borttagning"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Flytta till mapp..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "Laurel"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lägg till avsändaren i adressboken"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Tillämpa filter"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Skapa rege_l från meddelande"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Virtuell mapp på sändlista"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrera på sändlista (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Virtuell mapp på sändlista (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Standard"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Hämtar mappinformation"
 
@@ -10714,7 +11366,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Du har inte fyllt i all nödvändig information."
 
@@ -10724,83 +11376,111 @@ msgid "Evolution News Editor"
 msgstr "Evolutions diskussionsgruppsredigerare"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontoredigerare"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Värd:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "Användar_namn:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "_Sökväg:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Radio"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan inte skapa två konton med samma namn."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Är du säker på att du vill ta bort detta konto?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Ta inte bort"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Verkligen ta bort kontot?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Stäng av"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Slå på"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Är du säker på att du vill ta bort detta diskussionsgruppskonto?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Påslagen"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Kontonamn:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, c-format
+msgid "Mail to %s"
+msgstr "E-post till %s"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Ämnet är %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "E-post från %s"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "Sändlistan %s"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, fuzzy, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+"Följande virtuella mappar:\n"
+"%sAnvände den borttagna mappen:\n"
+"    \"%s\"\n"
+"och har uppdaterats."
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10812,7 +11492,7 @@ msgstr ""
 "ta emot eller skriva nya brev.\n"
 "Vill du konfigurera den nu?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10820,7 +11500,7 @@ msgstr ""
 "Du måste konfigurera en identititet\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10829,7 +11509,7 @@ msgstr ""
 "innan du kan skriva brev."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10837,11 +11517,11 @@ msgstr ""
 "Du skickar ett HTML-formaterat brev, men följande mottagare vill inte ha "
 "HTML-formaterad e-post:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Skicka ändå?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10849,7 +11529,7 @@ msgstr ""
 "Detta meddelande har inget ämne.\n"
 "Vill du verkligen skicka?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10857,29 +11537,29 @@ msgstr ""
 "Eftersom kontaktlistan som du skickar är konfigurerad att dölja listans "
 "adresser kommer detta meddelande endast att innehålla blindkopiemottagare."
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Detta meddelande innehåller endast blindkopiemottagare."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"Det finns en möjlighet att e-postservern avslöjar mottagarna genom att "
-"lägga till ett Apparently-To-huvud.\n"
+"Det finns en möjlighet att e-postservern avslöjar mottagarna genom att lägga "
+"till ett Apparently-To-huvud.\n"
 "Skicka ändå?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Du måste ange mottagare för att kunna skicka detta meddelande."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Du måste konfigurera ett konto innan du kan skicka brevet."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10887,28 +11567,28 @@ msgstr ""
 "Kan inte öppna utkastmappen för detta konto.\n"
 "Vill du använda standardmappen för utkast?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "en okänd avsändare"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a %Y-%m-%d klockan %H.%M skrev %%s:"
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Är du säker på att du vill redigera alla %d meddelanden?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10916,7 +11596,7 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Utkast."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10924,39 +11604,39 @@ msgstr ""
 "Du kan bara skicka om meddelanden\n"
 "som du sparat i mappen Skickat."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Är du säker på att du vill skicka om alla %d meddelanden?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Inget meddelande markerat"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Visa nästa olästa meddelande"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10969,7 +11649,7 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa meddelanden?"
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10978,33 +11658,69 @@ msgstr ""
 "Fel vid läsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Hämtar meddelande %d av %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
 "Är du säker på att du vill öppna alla %d meddelanden i separata fönster?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "_Säkerhet"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Namnlös kontakt:"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "n"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Spara signatur"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Spara signatur"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11049,205 +11765,187 @@ msgid ""
 "space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"Du är nästan färdig med din e-postkonfiguration. Identiteten, den "
-"inkommande e-postservern och\n"
-"transportmetoden för utgående e-post som du angav kommer att "
-"sammanställas för att\n"
+"Du är nästan färdig med din e-postkonfiguration. Identiteten, den inkommande "
+"e-postservern och\n"
+"transportmetoden för utgående e-post som du angav kommer att sammanställas "
+"för att\n"
 "skapa ett Evolution-epostkonto. Ange ett namn för detta konto nedan.\n"
 "Detta namn kommer endast att användas för visning."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoassistent"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Cork"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Att-göra-lista"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "efter"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"Kunde inte få tag i inkorg för e-postlager:\n"
-"%s\n"
-"Ingen genväg kommer att skapas."
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Konto"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Kontrollerar tjänst"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Ansluter till server..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Namnlös kontakt:"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "Redigera"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Ny"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _Kontrollera vilka typer som stöds "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL stöds inte i detta bygge av Evolution)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL stöds inte i detta bygge av Evolution)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "Kryptera a_lltid till mig själv när krypterad post skickas"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Konto %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Kontohantering"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Avancerade LDAP-alternativ"
+msgid "Add Sc_ript"
+msgstr "_Säkerhet"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "Arkansas"
+msgid "Add new signature..."
+msgstr "Spara signatur"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Kryptera a_lltid till mig själv när krypterad post skickas"
 
 #: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
-
-#: mail/mail-config.glade.h:15
-#, fuzzy
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "_Signera alltid utgående meddelanden när detta konto används"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Skicka alltid blindkopia till:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 #, fuzzy
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Skicka alltid kopia till:"
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "Arica"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Bifoga en fil till meddelandet"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilaga"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autentisering"
 
 # Låter konstigt
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "Kontrollera _automatiskt ny e-post"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Teckenkodning"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "Komorerna"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Kontrollerar ny e-post"
 
 #: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Färg för uppgifter som ska utföras idag"
+
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr "Redigerar meddelanden"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11262,57 +11960,47 @@ msgstr ""
 "\n"
 "Klicka på \"Slutför\" för att spara dina inställningar."
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "Bari"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Standardteckenkodning: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Hämtar post"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Digitala ID..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Kan inte öppna meddelande"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Klar"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Utkastmapp:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "Sl_å på"
 
-#: mail/mail-config.glade.h:48
-#, fuzzy
-msgid "E_nable advanced options"
-msgstr "Slå på radarkartor"
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11333,39 +12021,34 @@ msgstr "_E-postadress:"
 msgid "Empty _trash folders on exit"
 msgstr "_Töm papperskorgsmappar vid avslut"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Kör kommando..."
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "slutar med"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Kontoegenskaper"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Hämta digitalt ID..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Markera _citat med"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Hurlburt"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11419,69 +12102,65 @@ msgstr "Mikronesien"
 msgid "NNTP Server:"
 msgstr "NNTP-server:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Notifiering om ny post"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "Redigera diskussionsgruppsserver"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Valfri information"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sation:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP-_nyckelid:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Välj en färg"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Fråga då meddelanden skickas med endast _blindkopiemottagare angivna"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Skriv ut markerade kontakter"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail-epostkatalog "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Kan inte öppna meddelande"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Citerad"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Ko_m ihåg detta lösenord"
@@ -11516,101 +12195,109 @@ msgstr "Säkerhet"
 
 #: mail/mail-config.glade.h:104
 #, fuzzy
-msgid "Same as text"
-msgstr "Somerset"
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Säker MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Välj PGP-program"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "Signaturfil:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Ta bort allt utom signatur"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Skickande av e-post"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Mapp för skickade _meddelanden:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Skickade meddelanden och utkast"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vern kräver autentisering"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Genvägar"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "Spara signatur"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Spara signatur"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Källkod"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Källinformation"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Ange filnamn:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Standard Unix-brevlåda"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -11619,17 +12306,12 @@ msgstr ""
 "Skriv in namnet som du vill använda för att referera till dessa servrar, "
 "till exempel: \"Jobb\" eller \"Hemma\"."
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "_HTML-signatur:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11639,150 +12321,143 @@ msgstr ""
 "\n"
 "Klicka på \"Nästa\" för att börja. "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Öst"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_Signaturfil:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "Läs alltid in _bilder från nätet"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Signera _alltid utgående meddelanden när detta konto används"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Autentiseringstyp: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentiseringstyp: "
 
 # Låter konstigt
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "Kontrollera _automatiskt ny e-post"
 
-#: mail/mail-config.glade.h:145
+# Låter konstigt
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "Kontrollera _automatiskt ny e-post"
+
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Pip då ny post anländer"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Bekräfta vid tömning av mapp"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "_HTML-signatur:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Standardvärden"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Notifiera inte mig när ny post anländer"
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Filnamn:"
+msgid "_Enable"
+msgstr "Slå på"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Standardstil för vidarebefordran är: "
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Full name:"
 msgstr "Fullständigt namn:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "I HTML-brev"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "_HTML-signatur:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Språk"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "Läs _in bilder om avsändaren finns i adressboken"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Gör detta till mitt standard_konto"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Markera meddelanden som lästa efter"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Läs aldrig in bilder från nätet"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "Sökväg till _PGP-programmet:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Spela ljudfil då ny post anländer"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
-"Fråga då HTML-meddelanden skickas till kontakter som inte vill ha dem"
+msgstr "Fråga då HTML-meddelanden skickas till kontakter som inte vill ha dem"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Fråga då meddelanden skickas med ett _tomt ämne"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Radio"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11824,69 +12499,52 @@ msgstr "_Signaturfil:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "_HTML-signatur:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Använd s_äker anslutning (SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_var"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " färg"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "beskrivning"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Kunde inte skapa ett PGP-signatursammanhang."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "Kunde inte skapa ett PGP-verifieringssammanhang."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "Kunde inte skapa ett PGP-krypteringssammanhang."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "Kunde inte skapa ett PGP-dekrypteringssammanhang."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Kunde inte skapa ett S/MIME-signatursammanhang."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Kunde inte skapa ett S/MIME-sammanhang endast för certifikat."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "Kunde inte skapa ett S/MIME-krypteringssammanhang."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "Kunde inte skapa ett S/MIME-kuvertsammanhang."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunde inte skapa ett S/MIME-avkodningssammanhang."
 
@@ -11929,98 +12587,133 @@ msgstr "Externt visningsprogram"
 msgid "Loading message content"
 msgstr "Läser in meddelandeinnehåll"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Objekt som skulle ha utförts:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Öppna länk i webbläsare"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Kopiera länkplats"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Spara länk som (FIXME)"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Felaktig adress"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Från"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Till"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Kopia"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Blindkopia"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "E-post"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Spara meddelande som..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Detta meddelande är digitalt signerat. Klicka på låsikonen för mer "
+"information."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Kunde inte skapa ett PGP-verifieringssammanhang."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Detta meddelande är digitalt signerat och har befunnits äkta."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr "Detta meddelande är digitalt signerat men äktheten kan inte bevisas."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pekare till lokal fil (%s) giltig på platsen \"%s\""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pekare till fjärrdata (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Lokala mappar"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerar mapp"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12029,27 +12722,27 @@ msgstr ""
 "Kan inte spara metainformation; du kommer antagligen att\n"
 "upptäcka att du inte kan öppna denna mapp längre: %s: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan inte spara metainformation för mapp på %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan inte ta bort metainformation för mapp %s: %s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Byter format på mappen \"%s\" till \"%s\""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s kan inte konfigureras om eftersom den inte är en lokal mapp"
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12057,11 +12750,11 @@ msgstr ""
 "Om du inte längre kan öppna denna brevlåda måste\n"
 "du kanske reparera den manuellt."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan inte ändra formatet på en ickelokal mapp."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigurera om /%s"
@@ -12119,81 +12812,73 @@ msgstr "Meddelande %d av %d misslyckades"
 msgid "Complete."
 msgstr "Färdig."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Flyttar"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Kopierar"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagret %s"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Hämtar %d meddelande(n)"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Sparar %d meddelande(n)"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12202,7 +12887,7 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12211,11 +12896,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12224,27 +12909,27 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Kör skalkommando: %s"
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Sök"
 
@@ -12315,10 +13000,6 @@ msgstr "Uppdaterar..."
 msgid "Waiting..."
 msgstr "Väntar..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Avbruten."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Användaren avbröt åtgärden."
@@ -12332,16 +13013,16 @@ msgstr "Ange lösenord för %s"
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "Kunde inte spara signaturfilen."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Spara signatur"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12351,10 +13032,33 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+#, fuzzy
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+"Skriv in namnet som du vill använda för att referera till dessa servrar, "
+"till exempel: \"Jobb\" eller \"Hemma\"."
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Namn:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "Signaturfil:"
+msgid "Signature hint"
+msgstr "Signaturfil"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "HTML-signaturfil:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12369,17 +13073,17 @@ msgstr "Vidarebefordrat meddelande"
 msgid "Forwarded Message"
 msgstr "Vidarebefordrat meddelande"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ställer in virtuell mapp: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Uppdaterar virtuella mappar för uri: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12392,89 +13096,94 @@ msgstr ""
 "    \"%s\"\n"
 "och har uppdaterats."
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "Virtuella mappar"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "Virtuella mappar"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Redigera virtuell mapp"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Försöker redigera en virtuell mapp \"%s\" som inte finns."
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Ny virtuell mapp"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Inget ämne)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Meddelande"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Oläst"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Läst"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Besvarad"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Lägre"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Högre"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Högsta"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Idag %H.%M"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %H.%M"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
@@ -12497,10 +13206,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Originalkontakt:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Mottaget"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Storlek"
 
@@ -17212,5227 +17926,5224 @@ msgstr "Latina"
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds och Bradford"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libyen"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liège"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lissabon"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "London"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "London/City"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "London/Gatwick"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "London/Heathrow"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "London/Stansted"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoué"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Lousiana"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "Lübeck-Blankensee"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr "Lviv"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapá"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Medina"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Mecka"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Malad City"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malmö/Sturup"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Matsumoto-flygplatsen"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsuyama-flygplatsen"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu-flygplatsen"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Mellanöstern"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Miyakejima-flygplatsen"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Miyazaki-flygplatsen"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu-flygplatsen"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Mönchengladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Méditerrannée"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Moskva Domodedovo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moskva Sheremetyevo"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "München"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Münster/Osnabrück"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki-flygplatsen"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoya-flygplatsen"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Naha-flygplatsen"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu-flygplatsen"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama-flygplatsen"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "Naples"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Neapel"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "New Tokyo International Airport"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Airport"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Côte d'Azur"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata Airport"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrköping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "Nürnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro-flygplatsen"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr "Odessa"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita-flygplatsen"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okayama-flygplatsen"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki-flygplatsen"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Osaka International Airport"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Oshima-flygplatsen"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardemoen"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "Folkrepubliken Kina"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung Nord"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung Syd"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre-flygplatsen"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Samto"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Prag"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Québec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Québec City"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr "Rivne"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Rom/Ciampino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Rom/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Rom/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Ryssland"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbrücken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjøen/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San José"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San José De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San José del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San José-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Sankt Petersburg"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Sanrarem"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "São Jose Dos Campo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "São Luiz"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "São Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Sendai-flygplatsen"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Söul E Ab"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Söul/Kimp'O International Airport"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Söul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Îles"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "Sønderborg"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sørkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sørstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Härnösand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvær/Helle"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr "Sympheropol"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu-flygplatsen"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talinn"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tammerfors"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Tanegashima-flygplatsen"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Teheran-Mehrabad"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokyo International Airport"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokyo New International Airport"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori-flygplatsen"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosières"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama-flygplatsen"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Tromsø/Langnes"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Værnes"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Tsushima-flygplatsen"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Åbo"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Umeå"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "Förenade Arabemiraten "
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Ürumqi"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr "Uzhgorod"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadsö"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Værlöse"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancover"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Västerås"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Växjö"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venedig"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Carmeil"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virigina Beach"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech-flygplatsen"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Yoronezh"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser-flygplatsen"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai-flygplatsen"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Avsändare"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Pam Bech"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "West Wirginia"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow-flygplatsen"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf point"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia-observatoriet"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Jakutsk"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Yamagata-flygplatsen"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube-flygplatsen"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao-flygplatsen"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Jekaterinburg"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zákinthos"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama flygfält"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Zürich"
 
@@ -22460,17 +23171,12 @@ msgstr "%l.%M %d %B"
 msgid "No description"
 msgstr "Ingen beskrivning"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "E-postsammanfattning"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "Virtuella mappar"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
@@ -22479,59 +23185,48 @@ msgstr "Lokala mappar"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "ESGG:ESMS:ESSA:ESNU"
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dagens ord från dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Dagens citat"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "Lägg till en nyhetskälla"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Ange URL:en till den nyhetskälla som du vill lägga till"
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Namn:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Fel vid hämtning av RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Nyhetskälla"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
-#, fuzzy
-msgid "Add ->"
-msgstr "Lägg till ->"
+#: my-evolution/e-summary-shown.c:545
+msgid "Add"
+msgstr "Lägg till"
 
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "Ta bort"
-
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Visa"
@@ -22574,10 +23269,42 @@ msgstr "Skriv ut sammanfattning"
 msgid "Printing of Summary failed"
 msgstr "Utskrift av sammanfattning misslyckades"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Sammanfattningskomponenten kunde inte initiera Bonobo.\n"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " °F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " °C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "knop"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "km/h"
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr "inHg"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "engelska mil"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometer"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Klar himmel"
@@ -23728,95 +24455,101 @@ msgstr "Lägg till n_yhetskälla"
 msgid "C_elsius"
 msgstr "_Celsius"
 
+# Detta är inte diskussionsgrupper utan nyheter
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "_Alla nyhetskällor:"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "Hur många dagar ska kalendern visa samtidigt?"
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "_Maximalt antal objekt som visas:"
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Inställningar för nyhetskällor"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "En _månad"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "En _vecka"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "_Uppdateringstid (sekunder):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "_Uppdateringstid (sekunder):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "Visa _fullständig sökväg för mappar"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Visa _alla uppgifter"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Visa _dagens uppgifter"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Visa temperaturer i:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Uppgifter "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Väderinställningar"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "_Fem dagar"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "_E-post"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "_Nyhetskällor"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_En dag"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "_Schema"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Väder"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 #, fuzzy
-msgid "Configuration control for Evolution default folders."
+msgid "Configuration control for Evolution folder settings."
 msgstr "Konfigurationsverktyg för evolutions att-göra-kanal.\n"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Specialmappar"
+msgid "Folder Settings"
+msgstr "E-postinställningar"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
@@ -23824,7 +24557,7 @@ msgstr "Evolutionskalet."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
 #, fuzzy
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 "Denna sida kan användas för att konfigurera åtkomst till katalogservrar "
 "genom användning av LDAP-protokollet"
@@ -23837,6 +24570,37 @@ msgstr "Visa detaljer"
 msgid "Cancel Operation"
 msgstr "Avbryt åtgärd"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Kan inte för över mapp:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Lägg till regel för virtuell mapp"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Utkast"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Inkorg"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Utkorg"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Skickat"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution-installation"
@@ -23952,6 +24716,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Presenteras av"
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Färdigdatum"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Specialmappar"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Specialmappar"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Specialmappar"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Färdigdatum"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -23981,20 +24770,20 @@ msgstr "Kan inte flytta en mapp till en av dess undermappar."
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Ange en mapp att kopiera mappen \"%s\" till:"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Kopieringsmapp"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Ange en mapp att flytta mappen \"%s\" till:"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Flyttningsmapp"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24003,18 +24792,17 @@ msgstr ""
 "Kan inte ta bort mapp:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Ta bort \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Är du säker på att du vill ta bort mappen \"%s\"?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr "Ta bort mappen \"%s\""
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24023,16 +24811,16 @@ msgstr ""
 "Kan inte byta namn på mapp:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Byt namn på mappen \"%s\" till:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24051,7 +24839,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Skapa ny mapp"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -24059,7 +24847,7 @@ msgstr ""
 "Den markerade typen av mapp är inte giltig för\n"
 "den begärda åtgärden."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Ny..."
 
@@ -24082,8 +24870,8 @@ msgstr ""
 "Välj den fil som du vill importera till Evolution, och välj vilken typ av "
 "fil det är i listan.\n"
 "\n"
-"Du kan välja \"Automatisk\" om du inte vet, så kommer Evolution att "
-"försöka reda ut det."
+"Du kan välja \"Automatisk\" om du inte vet, så kommer Evolution att försöka "
+"reda ut det."
 
 #: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
 msgid "Please select the information that you would like to import:"
@@ -24111,21 +24899,26 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Välj mapp"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s finns inte"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Evolution-fel"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Du kan endast importera till lokala mappar"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24134,11 +24927,11 @@ msgstr ""
 "Det finns ingen importör som kan hantera\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24147,17 +24940,17 @@ msgstr ""
 "Importerar %s.\n"
 "Startar %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Fel vid start av %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Fel vid inläsning av %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24166,31 +24959,31 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Filtyp:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Importera data och inställningar från äldre program"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Importera en ensam fil"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24198,31 +24991,76 @@ msgstr ""
 "Var god vänta...\n"
 "Letar efter befintliga konfigurationer"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Startar intelligenta importörer"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Från %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Välj en destinationsmapp för importen av denna data"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importera"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Kopplar från anslutningar..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr "Synkroniserar \"%s\""
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Synkroniserar mapp"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "Synkroniserar \"%s\""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Inställningar för Mitt Evolution"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Öppnar mappen %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Öppnar mappen %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Öppna i %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Kan inte skapa den angivna katalogen:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -24236,8 +25074,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kunde inte starta gränssnittet för Evolution-epostguiden\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Ny"
@@ -24258,43 +25096,43 @@ msgstr "Mappnamnet kan inte innehålla snedstreck."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" och \"..\" är reserverade mappnamn."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy hittades inte i din $PATH."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kunde inte köras."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Om Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Gå till mapp..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Markera den mapp som du vill öppna"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Skapa en ny genväg"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Välj den mapp som du vill att genvägen ska peka till:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
@@ -24315,8 +25153,8 @@ msgstr "(Ingen)"
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
-"Ximian Evolution är just nu ansluten. Klicka på denna knapp för att "
-"koppla från."
+"Ximian Evolution är just nu ansluten. Klicka på denna knapp för att koppla "
+"från."
 
 #: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
@@ -24329,7 +25167,7 @@ msgstr ""
 "Ximian Evolution är just nu frånkopplad. Klicka på denna knapp för att "
 "ansluta."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24341,12 +25179,12 @@ msgstr ""
 "Felet från aktiveringssystemet är:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan inte lägga upp lokal plats för sparande -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24357,23 +25195,19 @@ msgstr ""
 "oväntat avslutats. Du måste avsluta Evolution och starta om det\n"
 "för att komma åt den datan igen."
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Allmänt fel"
 
@@ -24398,95 +25232,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Ta inte bort"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Byt namn på genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Byt namn på den markerade genvägsgruppen till:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Små ikoner"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Visa genvägarna som små ikoner"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "S_tora ikoner"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Visa genvägarna som stora ikoner"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Ny grupp..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Skapa en ny genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "_Ta bort denna grupp..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Ta bort denna genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "_Byt namn på denna grupp..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Byt namn på denna genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "_Dölj genvägsraden"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "_Visa genvägsraden"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Byt namn på genväg"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Byt namn på den markerade genvägen till:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Öppna mappen som är länkad till denna genväg"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "_Öppna i nytt fönster"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Öppna mappen som är länkad till denna genväg i ett nytt fönster"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Byt namn"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Byt namn på denna genväg"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "_Ta bort"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Ta bort denna genväg från genvägsraden"
 
@@ -24498,10 +25332,6 @@ msgstr "Fel vid sparande av genvägar."
 msgid "Shortcuts"
 msgstr "Genvägar"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Inkorg"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -24565,10 +25395,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% färdigt)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<klicka här för att välja en mapp>"
 
@@ -24609,67 +25440,67 @@ msgstr ""
 "Felet från aktiveringssystemet är:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "CORBA-fel"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Avbruten"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Ogiltigt argument"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Har redan en ägare"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Ingen ägare"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Hittades inte"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Typen stöds inte"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Schemat stöds inte"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Åtgärden stöds inte"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Existerar"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "Ogiltig URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Har undermappar"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Inget utrymme kvar"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "Gamla ägaren har dött"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 msgid "Test type"
 msgstr "Testtyp"
 
@@ -24746,8 +25577,7 @@ msgstr ""
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Klicka på \"Importera\" för att börja importera filen till Evolution. "
+msgstr "Klicka på \"Importera\" för att börja importera filen till Evolution. "
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -24799,49 +25629,96 @@ msgstr "Fråga mig inte igen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importera data från följande filer:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avslutar nu..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, fuzzy, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"Hej. Tack för att du tog dig tiden att hämta denna förhandsversion\n"
+"av grupprogramsviten Ximian Evolution.\n"
+"\n"
+"Ximian Evolution är inte färdigt än. Det börjar närma sig, men det\n"
+"finns platser där funktioner antingen saknas eller endast fungerar\n"
+"delvis.\n"
+"\n"
+"Om du hittar fel i programmet ber vi att du rapporterar dem till\n"
+"oss på bugzilla.ximian.com.\n"
+"Denna produkt kommer utan garanti och är inte lämpad för\n"
+"våldsbenägna personer.\n"
+"\n"
+"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:245
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"Tack\n"
+"Ximian Evolution-teamet\n"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Fråga mig inte igen"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan inte komma åt Ximian Evolution-skalet."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan inte initiera Ximian Evolution-skalet: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Använd inte startbild"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Startar import"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Startar intelligenta importörer"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Skicka felsökningsinformation från alla komponenter till en fil."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
@@ -24952,11 +25829,11 @@ msgstr "Visa den aktuella kontakten"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Åtgärder"
 
@@ -25078,8 +25955,8 @@ msgstr "Stäng detta objekt"
 msgid "Delete this item"
 msgstr "Ta bort detta objekt"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Huvudverktygsrad"
 
@@ -25119,7 +25996,7 @@ msgstr "Spara detta objekt till disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Arkiv"
 
@@ -25184,19 +26061,19 @@ msgstr "Vidarebefordra som i_Calendar"
 msgid "Forward this item via email"
 msgstr "Vidarebefordra detta objekt via e-post"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Få tag i den senaste mötesinformationen"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "U_ppdatera möte"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "Boka _möte"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Boka ett möte för detta objekt"
 
@@ -25204,10 +26081,6 @@ msgstr "Boka ett möte för detta objekt"
 msgid "Customise My Evolution"
 msgstr "Anpassa Mitt Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Avbryt"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktuell e-poståtgärd"
@@ -25328,8 +26201,7 @@ msgstr "Markera trå_d"
 #: ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
-"Markera alla och endast de meddelanden som inte är markerade för "
-"tillfället"
+"Markera alla och endast de meddelanden som inte är markerade för tillfället"
 
 #: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
@@ -25363,7 +26235,7 @@ msgstr "Trådad meddelandelista"
 msgid "_Expunge"
 msgstr "T_öm"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Mapp"
 
@@ -25612,8 +26484,7 @@ msgstr "Öppna det markerade meddelandet i ett nytt fönster"
 
 #: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
-msgstr ""
-"Öppna det markerade meddelandet i redigeraren för återsändning av det"
+msgstr "Öppna det markerade meddelandet i redigeraren för återsändning av det"
 
 #: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
@@ -25781,7 +26652,7 @@ msgstr "Föregående meddelande"
 msgid "_Quoted"
 msgstr "Citerad"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "V_erktyg"
 
@@ -25796,12 +26667,12 @@ msgstr "Stäng detta fönster"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "S_täng"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Visa"
 
@@ -25988,7 +26859,7 @@ msgstr "_Öppna..."
 msgid "_Reply-To Field"
 msgstr "_Svara till-fältet"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Hjälp"
 
@@ -26135,111 +27006,120 @@ msgid "Move this folder to another place"
 msgstr "Flytta denna mapp till ett annat ställe"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Skapa _ny mapp..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Öppna i nytt fönster"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Öppna denna mapp i ett annat fönster"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Skicka / Ta emot"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Skicka kölagd e-post och hämta ny e-post"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Visa information om Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Skicka felrapport"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Skicka en felrapport med Bug-Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Växla"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Växla om mappraden ska visas"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Växla om genvägsraden ska visas"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Växla om vi arbetar frånkopplade."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Visa den markerade mappen"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Frågor och _svar om Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_Mapprad"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "_Gå till mapp..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Importera..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Flytta..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nytt"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Ny mapp"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "_Pilotinställningar..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "_Byt namn..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Skicka / Ta emot"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Genväg"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "_Genvägsrad"
 
@@ -26320,26 +27200,26 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"Använd vänster musknapp för att zooma in på ett intressant område på "
-"kartan och välja en tidszon.\n"
+"Använd vänster musknapp för att zooma in på ett intressant område på kartan "
+"och välja en tidszon.\n"
 " Använd höger musknapp för att zooma ut."
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Aktuell vy"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "Anpassad sökning"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 #, fuzzy
 msgid "Save Custom View"
 msgstr "Nyckelkund"
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Definiera vyer"
 
@@ -26460,16 +27340,21 @@ msgstr "Sökredigerare"
 msgid "Save Search"
 msgstr "Spara sökning"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Spara sökning"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Lägg till i sparade sökningar"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Avancerat..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Information"
@@ -26491,21 +27376,21 @@ msgstr "Meddelande"
 msgid "Don't show this message again."
 msgstr "Visa inte detta meddelande igen."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Sök nu"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Töm"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Töm"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Sök nu"
 
@@ -26531,379 +27416,307 @@ msgstr "init_corba(): kunde inte initiera GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
-#~ msgid "Edit Addressbook"
-#~ msgstr "Redigera adressbok"
-
-#~ msgid "A_uthenticate with server using:"
-#~ msgstr "A_utentisera med server genom att använda:"
-
-#~ msgid "Account Name"
-#~ msgstr "Kontonamn"
-
-#~ msgid "Add Addressbook"
-#~ msgstr "Lägg till adressbok"
-
-#~ msgid "Advanced"
-#~ msgstr "Avancerat"
-
-#~ msgid "Base"
-#~ msgstr "Bas"
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Adressbokskällor"
 
-#~ msgid "Check this if the server requires you to authenticate."
-#~ msgstr "Kontrollera detta om servern kräver autentisering."
+#~ msgid "Configuration control for the Evolution Addressbook."
+#~ msgstr "Konfigurationsverktyg för Evolution-adressboken."
 
-#~ msgid ""
-#~ "Evolution will use this Distinquished Name (DN) to authenticate you with the "
-#~ "server"
+#, fuzzy
+#~ msgid "This page can be used to configure Addressbook Settings"
 #~ msgstr ""
-#~ "Evolution kommer att använda detta \"Distinquished name (DN)\" för att "
-#~ "autentisera dig till servern"
-
-#~ msgid "Server Name"
-#~ msgstr "Servernamn"
+#~ "Denna sida kan användas för att konfigurera åtkomst till katalogservrar "
+#~ "genom användning av LDAP-protokollet"
 
-#~ msgid "The information below is required in order to add an addressbook.  "
+#, fuzzy
+#~ msgid "Could not query for schema information"
 #~ msgstr ""
-#~ "Informationen nedan krävs för att en adressbok ska kunna läggas till.  "
+#~ "Spårningsinformation för ogiltig ogenomskinlig:\n"
+#~ "%s"
 
-#~ msgid "This information is not required for most ldap servers. "
-#~ msgstr "Denna information krävs inte för de flesta ldap-servrar. "
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolutions kalendersammanfattningskomponent."
 
-#~ msgid ""
-#~ "This information is used by your ldap server to specify which nodes are used "
-#~ "in a search. Contact your server administrator for more information."
-#~ msgstr ""
-#~ "Denna information används av din ldap-server för att ange vilka noder som "
-#~ "används i en sökning. Kontakta din serveradministratör för mer "
-#~ "information."
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Fabrik för kalendersammanfattningskomponenten."
 
-#~ msgid ""
-#~ "This is the base node for all your searches on the ldap server. Contact your "
-#~ "server administrator for more information."
-#~ msgstr ""
-#~ "Detta är basnoden för alla dina sökningar på ldap-servern. Kontakta din "
-#~ "serveradministratör för mer information."
+#~ msgid "Sta_rt of day:"
+#~ msgstr "_Dagen startar:"
 
-#~ msgid "This is the name of the server where your addressbook is located."
-#~ msgstr "Detta är namnet på servern där din adressbok finns."
+#~ msgid "_End of day:"
+#~ msgstr "Da_gen slutar:"
 
-#~ msgid "This is the port that your ldap server uses."
-#~ msgstr "Detta är porten som din ldap-server använder."
+#~ msgid "before the start of the appointment"
+#~ msgstr "innan starten på mötet"
 
-#~ msgid "_Account name:"
-#~ msgstr "_Kontonamn:"
+#~ msgid "_Other Organizer"
+#~ msgstr "_Annan organisatör"
 
-#~ msgid "_Port:"
-#~ msgstr "_Port:"
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Klartextsignering stöds inte av detta chiffer"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Andra kontakter"
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Ange din %s-lösenordsfras för %s"
 
-#~ msgid "(none)"
-#~ msgstr "(ingen)"
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Ange din %s-lösenordsfras"
 
-#~ msgid "C_ontaining:"
-#~ msgstr "_Innehåller:"
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Kan inte signera detta meddelande: ingen klartext att signera"
 
-#~ msgid "Show contacts matching the following criteria:"
-#~ msgstr "Visa kontakter som matchar följande villkor:"
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Kan inte signera detta meddelande: inget lösenord angavs"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 #~ msgstr ""
-#~ "Är du säker på att du vill\n"
-#~ "ta bort denna kontakt?"
+#~ "Kan inte signera detta meddelande: kunde inte skapa rör till GPG/PGP: %s"
 
-#~ msgid "Starting:"
-#~ msgstr "Startar:"
-
-#~ msgid "Ending:"
-#~ msgstr "Slutar:"
-
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "_Skapa nya möten med en standardpåminnelse"
-
-#~ msgid "First day of wee_k:"
-#~ msgstr "F_örsta dagen i veckan:"
-
-#~ msgid "_Other"
-#~ msgstr "_Annat"
-
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Klicka här för att lägga till en närvarande person"
-
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr ""
+#~ "Kan inte signera detta meddelande: ingen klartext att klartextsignera"
 
-#~ msgid "60%"
-#~ msgstr "60%"
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Kan inte veridiera detta meddelande: ingen klartext att verifiera"
 
-#~ msgid "70%"
-#~ msgstr "70%"
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Kan inte verifiera detta meddelande: kunde inte skapa rör till GPG/PGP: %s"
 
-#~ msgid "80%"
-#~ msgstr "80%"
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Kan inte kryptera detta meddelande: ingen klartext att kryptera"
 
-#~ msgid "90%"
-#~ msgstr "90%"
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Kan inte kryptera detta meddelande: inget lösenord angavs"
 
-#~ msgid "100%"
-#~ msgstr "100%"
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Kan inte kryptera detta meddelande: kunde inte skapa rör till GPG/PGP: %s"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "Mötet börjar: <b>"
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "Kan inte dekryptera detta meddelande: ingen klartext att dekryptera"
 
-#~ msgid "Task begins: <b>"
-#~ msgstr "Uppgiften börjar: <b>"
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Kan inte dekryptera detta meddelande: inget lösenord angavs"
 
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "Ledig-/upptageninformation börjar: <b>"
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Kan inte dekryptera detta meddelande: kunde inte skapa rör till GPG/PGP: %"
+#~ "s"
 
-#~ msgid "Begins: <b>"
-#~ msgstr "Börjar: <b>"
+#~ msgid "%s server %s"
+#~ msgstr "%s-server %s"
 
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Mötet slutar: <b>"
+#~ msgid "(unknown host)"
+#~ msgstr "(okänd värd)"
 
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Ledig-/upptageninformation slutar: <b>"
+#~ msgid "No such message: %s"
+#~ msgstr "Det finns inget sådant meddelande: %s"
 
-#~ msgid "Ends: <b>"
-#~ msgstr "Slutar: <b>"
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Du kan inte kopiera meddelanden från denna papperskorgsmapp."
 
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Uppgiften färdig: <b>"
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Kan inte lägga till meddelande till spool-filen %s: %s"
 
-#~ msgid "Task Due: <b>"
-#~ msgstr "Uppgiften ska vara utförd: <b>"
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Kunde inte arkivera: %s: %s"
 
-#~ msgid "iCalendar Information"
-#~ msgstr "iCalendar-information"
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "Lagret \"%s\" finns inte eller är ingen katalog"
 
-#~ msgid "iCalendar Error"
-#~ msgstr "iCalendar-fel"
+#~ msgid "Mail tree %s"
+#~ msgstr "E-postträd %s"
 
-#~ msgid "An unknown person"
-#~ msgstr "En okänd person"
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Radio"
 
 #~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
 #~ msgstr ""
-#~ "<br> Granska följande information, och välj sedan en åtgärd från menyn "
-#~ "nedan."
-
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Ingen</i>"
+#~ "Kunde inte få tag i inkorg för e-postlager:\n"
+#~ "%s\n"
+#~ "Ingen genväg kommer att skapas."
 
-#~ msgid "Status:"
-#~ msgstr "Status:"
-
-#~ msgid "Tentatively Accepted"
-#~ msgstr "Preliminärt godtaget"
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "Redigera"
 
-#~ msgid "Choose an action:"
-#~ msgstr "Välj en åtgärd:"
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Ny"
 
-#~ msgid "Update"
-#~ msgstr "Uppdatera"
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Avancerade LDAP-alternativ"
 
-#~ msgid "Accept"
-#~ msgstr "Acceptera"
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "Arkansas"
 
-#~ msgid "Tentatively accept"
-#~ msgstr "Acceptera preliminärt"
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "Arica"
 
-#~ msgid "Decline"
-#~ msgstr "Neka"
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "Bari"
 
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Skicka ledig-/upptageninformation"
+#, fuzzy
+#~ msgid "E_nable advanced options"
+#~ msgstr "Slå på radarkartor"
 
-#~ msgid "Update respondent status"
-#~ msgstr "Uppdatera svarandestatus"
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Hurlburt"
 
-#~ msgid "Send Latest Information"
-#~ msgstr "Skicka senaste information"
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "Somerset"
 
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b> har publicerat mötesinformation."
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "Signaturfil:"
 
-#~ msgid "Meeting Information"
-#~ msgstr "Mötesinformation"
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Ta bort allt utom signatur"
 
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> begär din närvaro vid ett möte."
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "_HTML-signatur:"
 
-#~ msgid "Meeting Proposal"
-#~ msgstr "Mötesförslag"
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Filnamn:"
 
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> vill lägga till i ett befintligt möte."
+#~ msgid "_HTML Signature:"
+#~ msgstr "_HTML-signatur:"
 
-#~ msgid "Meeting Update"
-#~ msgstr "Mötesuppdatering"
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Språk"
 
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> vill få den senaste mötesinformationen."
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Radio"
 
-#~ msgid "Meeting Update Request"
-#~ msgstr "Begäran av mötesuppdatering"
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Kunde inte skapa ett PGP-krypteringssammanhang."
 
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> har svarat på en mötesbegäran."
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Kunde inte skapa ett PGP-dekrypteringssammanhang."
 
-#~ msgid "Meeting Reply"
-#~ msgstr "Mötessvar"
+#~ msgid "Moving"
+#~ msgstr "Flyttar"
 
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> har avbokat ett möte."
+#~ msgid "Copying"
+#~ msgstr "Kopierar"
 
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Mötesavbokning"
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Signaturfil:"
 
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> har skickat ett obegripligt meddelande."
+#~ msgid "Riga"
+#~ msgstr "Riga"
 
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Felaktigt mötesmeddelande"
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "Lägg till ->"
 
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> har publicerat mötesinformation."
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "Ta bort"
 
-#~ msgid "Task Information"
-#~ msgstr "Uppgiftsinformation"
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Är du säker på att du vill ta bort mappen \"%s\"?"
 
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> begär att du utför en uppgift."
+#~ msgid "Edit Addressbook"
+#~ msgstr "Redigera adressbok"
 
-#~ msgid "Task Proposal"
-#~ msgstr "Uppgiftsförslag"
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "A_utentisera med server genom att använda:"
 
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> vill lägga till i en befintlig uppgift."
+#~ msgid "Account Name"
+#~ msgstr "Kontonamn"
 
-#~ msgid "Task Update"
-#~ msgstr "Uppgiftsuppdatering"
+#~ msgid "Add Addressbook"
+#~ msgstr "Lägg till adressbok"
 
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> vill få den senaste uppgiftsinformationen."
+#~ msgid "Advanced"
+#~ msgstr "Avancerat"
 
-#~ msgid "Task Update Request"
-#~ msgstr "Begäran om uppgiftsuppdatering"
+#~ msgid "Base"
+#~ msgstr "Bas"
 
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> har svarat på en uppgiftstilldelning."
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Kontrollera detta om servern kräver autentisering."
 
-#~ msgid "Task Reply"
-#~ msgstr "Uppgiftssvar"
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with "
+#~ "the server"
+#~ msgstr ""
+#~ "Evolution kommer att använda detta \"Distinquished name (DN)\" för att "
+#~ "autentisera dig till servern"
 
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> har avbokat en uppgift."
+#~ msgid "Server Name"
+#~ msgstr "Servernamn"
 
-#~ msgid "Task Cancellation"
-#~ msgstr "Uppgiftsavbokning"
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr ""
+#~ "Informationen nedan krävs för att en adressbok ska kunna läggas till.  "
 
-#~ msgid "Bad Task Message"
-#~ msgstr "Felaktigt uppgiftsmeddelande"
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "Denna information krävs inte för de flesta ldap-servrar. "
 
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> har publicerat ledig-/upptageninformation."
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "Denna information används av din ldap-server för att ange vilka noder som "
+#~ "används i en sökning. Kontakta din serveradministratör för mer "
+#~ "information."
 
-#~ msgid "Free/Busy Information"
-#~ msgstr "Ledig-/upptageninformation"
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
+#~ msgstr ""
+#~ "Detta är basnoden för alla dina sökningar på ldap-servern. Kontakta din "
+#~ "serveradministratör för mer information."
 
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> begär din ledig-/upptageninformation."
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Detta är namnet på servern där din adressbok finns."
 
-#~ msgid "Free/Busy Request"
-#~ msgstr "Ledig-/Upptagenbegäran"
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Detta är porten som din ldap-server använder."
 
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> har svarat på en ledig-/upptagenbegäran."
+#~ msgid "_Account name:"
+#~ msgstr "_Kontonamn:"
 
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Ledig-/Upptagensvar"
+#~ msgid "_Port:"
+#~ msgstr "_Port:"
 
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Felaktigt ledig-/upptagenmeddelande"
+#~ msgid "C_ontaining:"
+#~ msgstr "_Innehåller:"
 
-#~ msgid "The message does not appear to be properly formed"
-#~ msgstr "Meddelandet verkar inte vara korrekt utformat"
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Visa kontakter som matchar följande villkor:"
 
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Meddelandet innehåller typer av begäran som inte stöds."
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "_Skapa nya möten med en standardpåminnelse"
 
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "Bilagan innehåller inte ett giltigt kalendermeddelande"
+#~ msgid "First day of wee_k:"
+#~ msgstr "F_örsta dagen i veckan:"
 
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "Bilagan har inga visningsbara kalenderobjekt"
+#~ msgid "_Other"
+#~ msgstr "_Annat"
 
 #~ msgid "Unable to find any of your identities in the attendees list!\n"
 #~ msgstr "Kan inte hitta någon av dina identiteter i närvarandelistan!\n"
 
-#~ msgid "Event information"
-#~ msgstr "Evenemangsinformation"
-
-#~ msgid "Task information"
-#~ msgstr "Uppgiftsinformation"
-
-#~ msgid "Journal information"
-#~ msgstr "Journalinformation"
-
-#~ msgid "Free/Busy information"
-#~ msgstr "Ledig-/upptageninformation"
-
-#~ msgid "Calendar information"
-#~ msgstr "Kalenderinformation"
-
-#~ msgid "Updated"
-#~ msgstr "Uppdaterat"
-
-#~ msgid "Refresh"
-#~ msgstr "Uppdatera"
-
-#~ msgid "Counter-proposal"
-#~ msgstr "Motförslag"
-
-#~ msgid "Task"
-#~ msgstr "Uppgift"
-
-#~ msgid "Status: %s"
-#~ msgstr "Status: %s"
-
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Procent klar: %i"
-
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
-
-#~ msgid "Categories: %s"
-#~ msgstr "Kategorier: %s"
-
-#~ msgid "Contacts: "
-#~ msgstr "Kontakter: "
-
-#~ msgid "Reminder!!"
-#~ msgstr "Påminnelse!!"
-
 #~ msgid "Error hashing password."
 #~ msgstr "Fel vid hashning av lösenord."
 
@@ -26929,9 +27742,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Could not encrypt: encoding failed."
 #~ msgstr "Kunde inte kryptera: kodning misslyckades."
 
-#~ msgid "Failed to decrypt: Unknown"
-#~ msgstr "Misslyckades med att dekryptera: Okänd"
-
 #~ msgid "Please enter the NNTP password for %s@%s"
 #~ msgstr "Ange NNTP-lösenordet för %s@%s"
 
@@ -27067,30 +27877,12 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Enter folder URI"
 #~ msgstr "Ange mappens URI"
 
-#~ msgid "Default"
-#~ msgstr "Standard"
-
-#~ msgid "Mail to %s"
-#~ msgstr "E-post till %s"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Ämnet är %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "E-post från %s"
-
-#~ msgid "%s mailing list"
-#~ msgstr "Sändlistan %s"
-
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Inkorg"
 
 #~ msgid " color"
 #~ msgstr " färg"
 
-#~ msgid "Account"
-#~ msgstr "Konto"
-
 #~ msgid "Accounts"
 #~ msgstr "Konton"
 
@@ -27098,17 +27890,9 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Ad_vanced &gt;&gt;"
 #~ msgstr "Avancerat"
 
-#, fuzzy
-#~ msgid "Add new signature"
-#~ msgstr "Spara signatur"
-
 #~ msgid "Always _encrypt to myself when sending encrypted mail"
 #~ msgstr "Kr_yptera alltid till mig själv när krypterad post skickas"
 
-#, fuzzy
-#~ msgid "Command"
-#~ msgstr "Företag"
-
 #~ msgid "Composer"
 #~ msgstr "Redigerare"
 
@@ -27128,9 +27912,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Display"
 #~ msgstr "Visa"
 
-#~ msgid "Drafts"
-#~ msgstr "Utkast"
-
 #, fuzzy
 #~ msgid "E_mail address:"
 #~ msgstr "_E-postadress:"
@@ -27166,9 +27947,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "List of signatures"
 #~ msgstr "Spara signatur"
 
-#~ msgid "Mail Settings"
-#~ msgstr "E-postinställningar"
-
 #, fuzzy
 #~ msgid "N_ew..."
 #~ msgstr "Ny..."
@@ -27193,9 +27971,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Select PGP binary"
 #~ msgstr "Välj PGP-program"
 
-#~ msgid "Sent"
-#~ msgstr "Skickat"
-
 #, fuzzy
 #~ msgid "Shortcut"
 #~ msgstr "_Genväg"
@@ -27238,10 +28013,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Remember this password"
 #~ msgstr "_Kom ihåg detta lösenord"
 
-#, fuzzy
-#~ msgid "_Script"
-#~ msgstr "_Säkerhet"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "_Skicka brev i HTML-format som standard."
 
@@ -27263,73 +28034,21 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "use _HTML for this signature"
 #~ msgstr "_HTML-signatur:"
 
-#, fuzzy
-#~ msgid "View messages..."
-#~ msgstr "Spara meddelande som..."
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "Detta meddelande är digitalt signerat. Klicka på låsikonen för mer "
-#~ "information."
-
 #~ msgid "Evolution does not recognize this type of signed message."
 #~ msgstr "Evolution känner inte igen denna typ av signerat meddelande."
 
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Detta meddelande är digitalt signerat och har befunnits äkta."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Detta meddelande är digitalt signerat men äktheten kan inte bevisas."
-
 #~ msgid "Incomplete message written on pipe!"
 #~ msgstr "Inkomplett meddelande skrevs på rör!"
 
 #~ msgid "Mail Summary"
 #~ msgstr "E-postsammanfattning"
 
-#~ msgid " F"
-#~ msgstr " °F"
-
-#~ msgid " C"
-#~ msgstr " °C"
-
-#~ msgid "knots"
-#~ msgstr "knop"
-
-#~ msgid "kph"
-#~ msgstr "km/h"
-
-#~ msgid "inHg"
-#~ msgstr "inHg"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "engelska mil"
-
-#~ msgid "kilometers"
-#~ msgstr "kilometer"
-
 #~ msgid "Factory for the Evolution notes component."
 #~ msgstr "Fabrik för Evolutions anteckningskomponent."
 
 #~ msgid "Factory for the Notes control"
 #~ msgstr "Fabrik för anteckningskontrollen"
 
-#~ msgid "Outbox"
-#~ msgstr "Utkorg"
-
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan inte för över mapp:\n"
-#~ "%s"
-
 #, fuzzy
 #~ msgid "Dump"
 #~ msgstr "Kasta XML"
@@ -27634,7 +28353,8 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Kunde inte hämta meddelande från POP-servern %s: %s"
 
 #~ msgid ""
-#~ "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
 #~ msgstr ""
 #~ "Det här kommer att ansluta till POP-servern och använda Kerberos 4 för "
 #~ "att autentisera med den."
@@ -27648,9 +28368,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "(Unknown)"
 #~ msgstr "(Okänd)"
 
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "Oväntat svar från POP-servern: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Kunde inte hitta \"Från\"-adress i meddelandet"
 
@@ -27705,9 +28422,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "Detta meddelande innehåller ogiltiga mottagare:"
 
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML-signaturfil:"
-
 #~ msgid "_Email Address:"
 #~ msgstr "_E-postadress:"
 
@@ -27732,10 +28446,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "All _folders:"
 #~ msgstr "_Alla mappar:"
 
-# Detta är inte diskussionsgrupper utan nyheter
-#~ msgid "All news _feeds:"
-#~ msgstr "_Alla nyhetskällor:"
-
 #~ msgid "_Display folders:"
 #~ msgstr "_Visa mappar:"
 
@@ -27745,9 +28455,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Displayed feeds:"
 #~ msgstr "_Visade källor:"
 
-#~ msgid "Evolution "
-#~ msgstr "Evolution "
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
@@ -27821,8 +28528,8 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "S_ök"
 
 #~ msgid ""
-#~ "Evolution will use this Distinguished Name (DN) to authenticate you with the "
-#~ "server"
+#~ "Evolution will use this Distinguished Name (DN) to authenticate you with "
+#~ "the server"
 #~ msgstr ""
 #~ "Evolution kommer att använda detta \"Distinquished name (DN)\" för att "
 #~ "autentisera dig till servern"
@@ -27996,42 +28703,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Folder cannot contain the directory separator."
 #~ msgstr "Mappen kan inte innehålla katalogavskiljaren."
 
-#~ msgid ""
-#~ "Hi.  Thanks for taking the time to download this preview release\n"
-#~ "of the Ximian Evolution groupware suite.\n"
-#~ "\n"
-#~ "Ximian Evolution is not yet complete. It's getting close, but there are\n"
-#~ "places where features are either missing or only half working. \n"
-#~ "\n"
-#~ "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
-#~ "This product comes with no warranty and is not intended for\n"
-#~ "individuals prone to violent fits of anger.\n"
-#~ "\n"
-#~ "We hope that you enjoy the results of our hard work, and we\n"
-#~ "eagerly await your contributions!\n"
-#~ msgstr ""
-#~ "Hej. Tack för att du tog dig tiden att hämta denna förhandsversion\n"
-#~ "av grupprogramsviten Ximian Evolution.\n"
-#~ "\n"
-#~ "Ximian Evolution är inte färdigt än. Det börjar närma sig, men det\n"
-#~ "finns platser där funktioner antingen saknas eller endast fungerar\n"
-#~ "delvis.\n"
-#~ "\n"
-#~ "Om du hittar fel i programmet ber vi att du rapporterar dem till\n"
-#~ "oss på bugzilla.ximian.com.\n"
-#~ "Denna produkt kommer utan garanti och är inte lämpad för\n"
-#~ "våldsbenägna personer.\n"
-#~ "\n"
-#~ "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"
-
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Ximian Evolution Team\n"
-#~ msgstr ""
-#~ "Tack\n"
-#~ "Ximian Evolution-teamet\n"
-
 #~ msgid "F_ormat"
 #~ msgstr "F_ormat"
 
@@ -28154,9 +28825,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "after start of appointment"
 #~ msgstr "efter start på möte"
 
-#~ msgid "before end of appointment"
-#~ msgstr "före slut på möte"
-
 #~ msgid "Evolution Shortcuts"
 #~ msgstr "Evolutiongenvägar"
 
@@ -28172,9 +28840,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Remember PGP Passphrase until exit"
 #~ msgstr "_Kom ihåg GPG-lösenordsfrasen fram till avslut"
 
-#~ msgid "Delete folder '%s'"
-#~ msgstr "Ta bort mappen \"%s\""
-
 #~ msgid "Rename"
 #~ msgstr "Byt namn"
 
@@ -28182,8 +28847,7 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "_Importera fil..."
 
 #~ msgid "Unable to get local storage.  This should never happen."
-#~ msgstr ""
-#~ "Kan inte få tag i lokalt lagringsutrymme. Detta borde aldrig hända."
+#~ msgstr "Kan inte få tag i lokalt lagringsutrymme. Detta borde aldrig hända."
 
 #~ msgid "%d"
 #~ msgstr "%d"
@@ -28229,8 +28893,8 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Alla deltagare"
 
 #~ msgid ""
-#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-#~ "know."
+#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like "
+#~ "to know."
 #~ msgstr ""
 #~ "Det är %s. Unix-tiden är %ld just nu. Vi ville bara låta dig veta det."
 
@@ -28279,9 +28943,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Elm mail"
 #~ msgstr "Elm-epost"
 
-#~ msgid "Synchronizing '%s'"
-#~ msgstr "Synkroniserar \"%s\""
-
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Vidarebefordrat meddelande:\n"
 
@@ -28324,9 +28985,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "m"
 #~ msgstr "m"
 
-#~ msgid "n"
-#~ msgstr "n"
-
 #~ msgid "o"
 #~ msgstr "o"
 
@@ -28382,12 +29040,13 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Brevfiler i UNIX-mbox-spoolformat"
 
 #~ 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."
+#~ "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 ""
 #~ "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."
+#~ "att hämta e-post från vissa webb-epostleverantörer och slutna e-"
+#~ "postsystem."
 
 #~ msgid "Synchronizing folder"
 #~ msgstr "Synkroniserar mapp"
@@ -28443,9 +29102,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "This is a reply to a task request."
 #~ msgstr "Detta är ett svar på en uppgiftsbegäran."
 
-#~ msgid "Add"
-#~ msgstr "Lägg till"
-
 #~ msgid "Evolution Account Manager"
 #~ msgstr "Evolutions kontohanterare"
 
@@ -28455,9 +29111,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Updating message list"
 #~ msgstr "Uppdaterar meddelandelistan"
 
-#~ msgid "My Evolution Settings"
-#~ msgstr "Inställningar för Mitt Evolution"
-
 #~ msgid "%A, %d %B %Y"
 #~ msgstr "%A %d %B %Y"
 
@@ -28636,11 +29289,11 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Skapa sökvägen om den inte finns."
 
 #~ msgid ""
-#~ "Select the kind of addressbook you have, and enter the relevant information "
-#~ "about it."
+#~ "Select the kind of addressbook you have, and enter the relevant "
+#~ "information about it."
 #~ msgstr ""
-#~ "Markera den typ av adressbok du har och ange den relevanta informationen om "
-#~ "den."
+#~ "Markera den typ av adressbok du har och ange den relevanta informationen "
+#~ "om den."
 
 #~ msgid "FIXME Name help text here"
 #~ msgstr "FIXME Namnhjälptext här"
@@ -28735,11 +29388,11 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Vidarebefordrat meddelande (inget ämne)"
 
 #~ msgid ""
-#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-#~ "%s<br><b>Subject:</b> %s<br>"
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
+#~ "s<br><b>Subject:</b> %s<br>"
 #~ msgstr ""
-#~ "-----Vidarebefordrat meddelande-----<br><b>Fr&aring;n:</b> "
-#~ "%s<br><b>Till:</b> %s<br><b>&Auml;mne:</b> %s<br>"
+#~ "-----Vidarebefordrat meddelande-----<br><b>Fr&aring;n:</b> %s<br><b>Till:"
+#~ "</b> %s<br><b>&Auml;mne:</b> %s<br>"
 
 #~ msgid "Wipe trackers"
 #~ msgstr "Rensa spårare"
@@ -28966,9 +29619,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Items Not Yet Due:"
 #~ msgstr "Objekt som inte ska utföras än:"
 
-#~ msgid "Overdue Items:"
-#~ msgstr "Objekt som skulle ha utförts:"
-
 #~ msgid "Time Until Due"
 #~ msgstr "Tid till förfallodatum"
 
@@ -29277,7 +29927,8 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
 #~ msgid "Forward this message in-line with your mail, so you can edit it"
 #~ msgstr ""
-#~ "Vidarebefordra detta meddelande inuti ditt brev, så att du kan redigera det"
+#~ "Vidarebefordra detta meddelande inuti ditt brev, så att du kan redigera "
+#~ "det"
 
 #~ msgid "Invert Selection"
 #~ msgstr "Omvänd markering"
@@ -29372,15 +30023,12 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Compose"
 #~ msgstr "Skriv _nytt"
 
-#~ msgid "PLAIN"
-#~ msgstr "VANLIG"
-
 #~ msgid ""
-#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
-#~ "the server supports it."
+#~ "This option will connect to the server using a the PLAIN SASL mechanism "
+#~ "if the server supports it."
 #~ msgstr ""
-#~ "Detta alternativ kommer att ansluta till servern med en VANLIG SASL-mekanism "
-#~ "om servern stöder det."
+#~ "Detta alternativ kommer att ansluta till servern med en VANLIG SASL-"
+#~ "mekanism om servern stöder det."
 
 #~ msgid "No such host %s."
 #~ msgstr "Det finns ingen värd med namnet %s."
@@ -29399,24 +30047,23 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
 #~ 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 över en "
-#~ "SSL-anslutning."
+#~ "För läsande och lagrande av e-post på IMAP-servrar över en SSL-anslutning."
 
 #~ msgid "Secure POP"
 #~ msgstr "Säker POP"
 
 #~ 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 "
+#~ "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 över en SSL-anslutning. POP-protokollet "
-#~ "kan även användas för att hämta e-post från vissa "
-#~ "webb-epostleverantörer och slutna e-postsystem."
+#~ "kan även användas för att hämta e-post från vissa webb-epostleverantörer "
+#~ "och slutna e-postsystem."
 
 #~ msgid ""
-#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-#~ "connection.\n"
+#~ "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 över en SSL-anslutning.\n"
@@ -29489,8 +30136,8 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ "authentication. This should be fine for connecting to most SMTP servers."
 #~ 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."
+#~ "autentisering. Detta bör fungera för anslutning till de flesta SMTP-"
+#~ "servrar."
 
 #~ msgid "[ %s ]"
 #~ msgstr "[ %s ]"
@@ -29510,9 +30157,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Edit Filter Rule"
 #~ msgstr "Redigera filterregel"
 
-#~ msgid "Add VFolder Rule"
-#~ msgstr "Lägg till regel för virtuell mapp"
-
 #~ msgid "Edit VFolder Rule"
 #~ msgstr "Redigera regel för virtuell mapp"
 
@@ -29642,7 +30286,8 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
 #~ msgid "Note: When converting between mailbox formats, a failure\n"
 #~ msgstr ""
-#~ "Observera: Vid konvertering mellan brevlådeformat kommer ett misslyckande\n"
+#~ "Observera: Vid konvertering mellan brevlådeformat kommer ett "
+#~ "misslyckande\n"
 
 #~ msgid "Connect to server"
 #~ msgstr "Anslut till server"
@@ -29878,39 +30523,36 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Svara till:"
 
 #~ 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."
+#~ "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 ""
 #~ "Ange ditt namn och din e-postadress för utgående post. Du kan också, om "
 #~ "du vill, ange namnet på din organisation och en fil att läsa din signatur "
 #~ "från."
 
-#~ msgid "Signature File"
-#~ msgstr "Signaturfil"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Typ av e-postkälla:"
 
 #~ msgid ""
-#~ "Select the kind of mail server you have, and enter the relevant information "
-#~ "about it.\n"
+#~ "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."
+#~ "If the server requires authentication, you can click the \"Detect "
+#~ "supported types...\" button after entering the other information."
 #~ msgstr ""
 #~ "Välj den typ av e-postserver som du har och ange den relevanta "
 #~ "informationen om den.\n"
 #~ "\n"
-#~ "Om servern kräver autentisering kan du klicka på knappen \"Detektera vilka "
-#~ "typer som stöds...\" när du har angett den andra informationen."
+#~ "Om servern kräver autentisering kan du klicka på knappen \"Detektera "
+#~ "vilka typer som stöds...\" när du har angett den andra informationen."
 
 #~ msgid ""
-#~ "Select the kind of news server you have, and enter the relevant information "
-#~ "about it.\n"
+#~ "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."
+#~ "If the server requires authentication, you can click the \"Detect "
+#~ "supported types...\" button after entering the other information."
 #~ msgstr ""
 #~ "Välj den typ av diskussionsgruppsserver som du har och ange den relevanta "
 #~ "informationen om den.\n"
@@ -30015,7 +30657,8 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Vidarebefordra meddelande \"%s\""
 
 #~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded message."
+#~ "Failed to generate mime part from message while generating forwarded "
+#~ "message."
 #~ msgstr ""
 #~ "Misslyckades med att generera mime-del från meddelande när ett "
 #~ "vidarebefordrat meddelande skulle genereras."
@@ -30137,9 +30780,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "MH folders may not be nested."
 #~ msgstr "MH-mappar får inte nästlas."
 
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr "Kunde inte skapa rör till %s: %s"
-
 #~ msgid "Could not execute %s: %s\n"
 #~ msgstr "Kunde inte köra %s: %s\n"
 
@@ -30212,9 +30852,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ "Tider utanför detta intervall kommer inte att\n"
 #~ "visas som standard."
 
-#~ msgid "Day end:"
-#~ msgstr "Dagsslut:"
-
 #~ msgid "Show on TODO List:"
 #~ msgstr "Visa på ATT GÖRA-listan:"
 
diff --git a/po/tr.po b/po/tr.po
index 8c76573252..6f42e36ecb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-02-21 00:42+0200\n"
 "Last-Translator: Görkem Çetin <gorkem@gelecek.com.tr>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -35,7 +35,7 @@ msgstr "VCard dosyalarını Evolution'a aktarır."
 msgid "File As"
 msgstr "Farklı Dosyala"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "İsim"
@@ -46,7 +46,7 @@ msgid "Email"
 msgstr "E-posta"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "İlk"
 
@@ -56,7 +56,7 @@ msgstr "İlk"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Yardımcı"
@@ -64,8 +64,8 @@ msgstr "Yardımcı"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Meslek"
 
@@ -75,12 +75,12 @@ msgid "Bus"
 msgstr "Meşg"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "Geri Arama"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Şirket"
 
@@ -91,8 +91,8 @@ msgstr "Şirk"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Ev"
 
@@ -107,18 +107,18 @@ msgstr "Kur"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Cep"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Araba"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "İşyeri Faksı"
@@ -128,13 +128,13 @@ msgid "Bus Fax"
 msgstr "İşy Faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Ev Faksı"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "2. Meslek"
 
@@ -143,43 +143,43 @@ msgid "Bus 2"
 msgstr "Meşgul 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "2. ev"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Diğer"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Başka Fakslar"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Çağrı Cihazı"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Radyo"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Teleks"
@@ -191,14 +191,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "2. E-posta Adresi"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "3. E-posta Adresi"
@@ -336,7 +336,7 @@ msgstr "%s için VCard"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -344,7 +344,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Bonobo'yu başlatamadım"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Aranıyor..."
 
@@ -357,32 +357,32 @@ msgstr "Yükleniyor..."
 msgid "Error in search expression."
 msgstr "Arama ifadesinde hata."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "LDAP sunucuya kart ekleniyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "LDAP sunucudaki kart siliniyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP sunucudaki kart düzenleniyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Arama yeniden başlatılıyor."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "LDAP arama sonuçları alınıyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 #, fuzzy
 msgid "Error performing search"
 msgstr "Kartı silerken bir hata oluştu"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "URL açılamadı: %s"
@@ -429,103 +429,139 @@ 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:4
-#, fuzzy
-msgid "Addressbook Settings"
-msgstr "Adres Defteri Kaynakları"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 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:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution Adres Defteri mini kart görüntüleyici"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Bağlantıları düzenleyen Evolution bileşeni."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Adres defteri mini kart mimarisi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Adres defteri isim gösterim arayüzü mimarisi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "Adres defteri menüsü mimarisi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "Örnek adres defteri kontrol mimarisi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Bağlantılar"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Bağlantı bilgisini içeren dizin"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP Sunucusu"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "Bağlantı bilgisini içeren LDAP sunucusu"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Yeni Bağlantı Listesi"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "B_ağlantı Listesi"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Yeni Bağlantı"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "_Bağlantı"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Yeni Bağlantı Listesi"
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "LDAP sunucuyla bağlantı başarısız oldu"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "Contact _List"
-msgstr "B_ağlantı Listesi"
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"IMAP sunucuyla kimlik denetimi başarısız oldu\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP sunucu cevabı %s bilgisini içermiyor"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Filtre bilgisini yüklerken hata oluştu:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP sunucu cevabı %s bilgisini içermiyor"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(Evolution'un bu sürümünde SSL desteklenmiyor)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Gnome-vfs başlatılamıyor"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+msgid "Other Contacts"
+msgstr "Diğer Bağlantılar"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Adres defterini açamadım"
@@ -559,50 +595,59 @@ msgstr ""
 "Bu adres defteri açılamadı. Yeterli izin haklarına sahip olup\n"
 "olmadığınızı ve dosyanın yerini kontrol edin."
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s için parolayı girin (kullanıcı: %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 #, fuzzy
 msgid "Name begins with"
 msgstr "biter"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 #, fuzzy
 msgid "Email is"
 msgstr "2. E-posta Adresi"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Herhangi bir alanın içeriği"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Gelişmiş..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Herhangi bir Kategori"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "Dizin tarayıcısının göstereceği URI"
 
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+msgid "(none)"
+msgstr "(hiçbiri)"
+
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Birincil E-posta Adresi"
 
@@ -648,106 +693,59 @@ msgstr "Aramaları Kapat"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aramaları Etkinleştir (Tehlikeli!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "LDAP sunucuyla bağlantı başarısız oldu"
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"IMAP sunucuyla kimlik denetimi başarısız oldu\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr ""
-"Hatalı opak izleme bilgisi:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP sunucu cevabı %s bilgisini içermiyor"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(Evolution'un bu sürümünde SSL desteklenmiyor)"
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Tamamlanma Tarihi"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "_Desteklenen türleri denetle "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Seçenekler"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
-msgid "<- _Remove"
-msgstr "_Sil"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "_Sil"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Seçenekler"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -756,8 +754,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Adres Defteri Kaynakları"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
 msgstr "Uyarılar"
@@ -850,8 +848,8 @@ msgstr "Yapılandırma"
 msgid "Mappings"
 msgstr "Marjin"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Never"
 msgstr "_her"
@@ -1034,14 +1032,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1058,14 +1056,12 @@ msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
-msgstr ""
-"Bu isim hesabınızı gösterir. Sadece görüntüleme sırasında işe "
-"yarar."
+msgstr "Bu isim hesabınızı gösterir. Sadece görüntüleme sırasında işe yarar."
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1097,7 +1093,7 @@ msgid "Using email address"
 msgstr "E-posta adresi"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1105,7 +1101,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "_Ekle"
 
@@ -1153,7 +1149,7 @@ msgid "_Download limit:"
 msgstr "İ_ndirme Sınırı"
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1271,10 +1267,12 @@ 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"
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Sil"
 
@@ -1395,7 +1393,7 @@ msgstr ""
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "İletişim Düzenleyici"
 
@@ -1404,7 +1402,7 @@ msgid "D_epartment:"
 msgstr "_Bölüm:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Ayrıntılar"
 
@@ -1462,11 +1460,12 @@ msgstr "_HTML e-postalarını kabul ediyor"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Sil"
 
@@ -1495,7 +1494,7 @@ msgid "_Web page address:"
 msgstr "W_eb sayfası adresi:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "Amerika"
 
@@ -2000,12 +1999,11 @@ msgid "Laos"
 msgstr "Laos"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Latvia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Lübnan"
 
@@ -2014,7 +2012,7 @@ msgid "Lesotho"
 msgstr "Lesotho"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberya"
 
@@ -2023,12 +2021,12 @@ msgid "Liechtenstein"
 msgstr "Lihtenştayn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litvanya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Lüksemburg"
 
@@ -2061,7 +2059,7 @@ msgid "Mali"
 msgstr "Mali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
@@ -2086,7 +2084,7 @@ msgid "Mayotte"
 msgstr "Mayotte"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Meksika"
 
@@ -2111,7 +2109,7 @@ msgid "Montserrat"
 msgstr "Montserrat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Morocco"
 
@@ -2136,7 +2134,7 @@ msgid "Nepal"
 msgstr "Nepal"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Hollanda"
 
@@ -2149,12 +2147,12 @@ msgid "New Caledonia"
 msgstr "Yeni Kaledonya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Yeni Zelanda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
@@ -2171,7 +2169,7 @@ msgid "Niue"
 msgstr "Niue"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Norfolk Adaları"
 
@@ -2180,17 +2178,17 @@ msgid "Northern Mariana Islands"
 msgstr "Northern Mariana Adaları"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Norveç"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Oman"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
@@ -2203,7 +2201,7 @@ msgid "Palestinian Territory"
 msgstr "Filistan Bölgesi"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
@@ -2212,12 +2210,12 @@ msgid "Papua New Guinea"
 msgstr "Papua Yeni Gine"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paraguay"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Peru"
 
@@ -2230,22 +2228,22 @@ msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Polonya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Portekiz"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Porto Riko"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Katar"
 
@@ -2254,7 +2252,7 @@ msgid "Reunion"
 msgstr "Reunion"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Romanya"
 
@@ -2291,7 +2289,7 @@ msgid "Sao Tome And Principe"
 msgstr "Sao Tome And Principe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Suudi Arabistan"
 
@@ -2308,17 +2306,17 @@ msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Singapur"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Slovakya"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Slovenya"
 
@@ -2331,7 +2329,7 @@ msgid "Somalia"
 msgstr "Somali"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Güney Afrika"
 
@@ -2340,7 +2338,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr "South Georgia And The South Sandwich Adaları"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "İspanya"
 
@@ -2361,7 +2359,7 @@ msgid "Sudan"
 msgstr "Sudan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Surinam"
 
@@ -2374,17 +2372,17 @@ msgid "Swaziland"
 msgstr "Swaziland"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "İsveç"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "İsviçre"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Tayvan"
 
@@ -2421,7 +2419,7 @@ msgid "Tunisia"
 msgstr "Tunus"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Türkiye"
 
@@ -2442,7 +2440,7 @@ msgid "Uganda"
 msgstr "Uganda"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ukrayna"
 
@@ -2451,7 +2449,7 @@ msgid "United Arab Emirates"
 msgstr "Birleşik Arap Emirlikleri"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Birleşik Krallık"
 
@@ -2460,7 +2458,7 @@ msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Uruguay"
 
@@ -2473,12 +2471,12 @@ msgid "Vanuatu"
 msgstr "Vanuatu"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Venezuela"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Vietnam"
 
@@ -2499,12 +2497,12 @@ msgid "Western Sahara"
 msgstr "Western Sahara"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Yemen"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Yugoslavya"
 
@@ -2517,26 +2515,34 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Gerçekten bu bağlantıyı\n"
+"silmek istiyor musunuz?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Bağlantıyı Sil?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Kategori düzenleyici bulunamadı."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "Bu bağlantı adı aşağıdaki sınıflandırmalara girer:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Bağlantıyı VCard olarak kaydet"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Bir alan için parçacık bulunamadı: `%s'"
@@ -2563,11 +2569,11 @@ msgstr "E-posta"
 msgid "card.vcf"
 msgstr "kart.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2702,11 +2708,11 @@ msgid "contact-list-editor"
 msgstr "bağlantı-listesi-editörü"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Bağlantı Listesi Düzenleyici"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Listeyi VCard Olarak Kaydet"
 
@@ -2784,21 +2790,21 @@ msgid "Error getting book view"
 msgstr "%s başlatırken hata oluştu"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Kartlar düzenlenirken bir hata oluştu"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Başarıldı"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
@@ -2807,7 +2813,7 @@ msgid "Repository offline"
 msgstr "Depo çevrimdışı"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "İzin yok"
 
@@ -2825,53 +2831,68 @@ msgstr "Protokol desteklenmiyor"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "İptal Edildi"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Kimlik denetimi başarısız."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Kimlik denetimi isteniyor"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Diğer hata"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Liste eklenirken hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Kart eklenirken hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Liste düzenlenirken hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Listeyi silerken bir hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Kartı silerken bir hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 msgid "Display Cards?"
 msgstr "Kartlar Gösterilsin mi?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards"
 msgstr "Kart Gösterimi"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2879,22 +2900,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 #, fuzzy
 msgid "Copy card to"
 msgstr "Kart yok"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 #, fuzzy
 msgid "Move cards to"
 msgstr "Kart yok"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Kart yok"
@@ -2959,102 +2980,108 @@ msgstr "Diğer Telefonlar"
 msgid "Other Address"
 msgstr "Diğer Adres"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Adres Defteri"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "VCard olarak kaydet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "New Contact..."
 msgstr "Yeni Bağlantı"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Yeni Bağlantı Listesi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Dizine _Git..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "Import..."
 msgstr "_Al..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "Bağ_lantıları Ara"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Adres Defteri Kaynakları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot Ayarları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Bağlantıyı Gönder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Bağlantıya İleti Gönder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Yazdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Zarfı Yazdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "D_izine Kopyala..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Move to folder..."
 msgstr "_Dizine Taşı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopyala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Sil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3064,16 +3091,15 @@ msgstr "Ş_imdiki Görünüm"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ""
-",123,a,b,c,ç,d,e,f,g,h,ı,i,j,k,l,m,n,o,ö,p,q,r,s,ş,t,u,ü,v,w,x,y,z"
+msgstr ",123,a,b,c,ç,d,e,f,g,h,ı,i,j,k,l,m,n,o,ö,p,q,r,s,ş,t,u,ü,v,w,x,y,z"
 
 #. Translators: put here a list of characters that correspond to buttons
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,ç,d,e,f,g,h,ı,i,j,k,l,m,n,o,ö,p,q,r,s,ş,t,u,ü,v,w,x,y,z"
 
@@ -3225,7 +3251,7 @@ msgstr "Marjin"
 msgid "Number of columns:"
 msgstr "Sütun sayısı:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Seçenekler"
 
@@ -3235,7 +3261,7 @@ msgid "Orientation"
 msgstr "Konum"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Sayfa"
 
@@ -3309,29 +3335,33 @@ msgstr "Genişlik:"
 msgid "_Font..."
 msgstr "_Yazıtipi..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Başlıksız toplantı"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Yüksek"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Düşük"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Tanımsız"
 
@@ -3373,45 +3403,37 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Evolution e-posta programı mimarisi."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution takvim özet bileşeni."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution takvimi iTip/iMip görüntüleyici"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "Takvimi düzenleyen Evolution bileşeni."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Calendar Summary component."
-msgstr "Takvim özet bileşen mimarisi."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
 msgstr "Evolution e-posta bileşen mimarisi."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr "Takvim iTip görüntü kontrolü mimarisi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr "Örnek Takvim kontrolü mimarisi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Evolution takvimi bileşen mimarisi."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Evolution takvimi bileşen mimarisi."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3423,10 +3445,23 @@ msgstr "Alarm bilgilendirme servisi"
 msgid "Factory for the alarm notification service"
 msgstr "Alarm bilgilendirme servisi mimarisi"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+msgid "Starting:"
+msgstr "Başlangıç:"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+msgid "Ending:"
+msgstr "Bitiş:"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "geçersiz saat"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3463,7 +3498,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Uyarı"
@@ -3483,15 +3518,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Bu program hakkında tekrar soru sorma."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "GNOME başlatılamıyor"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "Alarm bilgilendirme servisi oluşturamadım"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm bilgilendirme servis mimarisi oluşturamadım"
 
@@ -3507,7 +3542,7 @@ msgstr "Açıklama içeriği"
 msgid "Comment contains"
 msgstr "Yorum içeriği"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "Eşleme yok"
 
@@ -3543,18 +3578,19 @@ msgstr "%d %B"
 #: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Takvim görünümü yaratılamadı. ORBit ve OAF kurulumunu gözden geçirin."
+msgstr "Takvim görünümü yaratılamadı. ORBit ve OAF kurulumunu gözden geçirin."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Özel"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Genel"
 
@@ -3575,27 +3611,32 @@ msgid "W"
 msgstr "B"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Boş"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Meşgul"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Başlamadı"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "İşlemde"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Tamamlandı"
 
@@ -3610,11 +3651,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3629,12 +3671,14 @@ msgstr "Tekrarlama"
 msgid "Assigned"
 msgstr "Görevlendirildi"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Evet"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Hayır"
 
@@ -3654,58 +3698,60 @@ msgstr "Hafta Görünümü"
 msgid "Month View"
 msgstr "Ay Görünümü"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Takvim"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Randevuları tutan dizin"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Görevler"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Yapılacaklar listesini tutan dizin"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "New meeting"
 msgstr "_Yeni toplantı"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "_Meeting"
 msgstr "_Toplantı"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "New task"
 msgstr "Yeni görev"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "_Görev"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Y_eni randevu"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Randevu"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "New appointment"
 msgstr "Y_eni randevu"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "_Appointment"
 msgstr "_Randevu"
 
@@ -3913,7 +3959,7 @@ msgstr "Hatırlatıcılar"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Özet:"
 
@@ -3943,7 +3989,7 @@ msgstr "randevu sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "dakika"
 
@@ -3971,88 +4017,87 @@ msgstr "30 dakika"
 msgid "60 minutes"
 msgstr "60 dakika"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
 msgid "Calendar and Tasks Settings"
 msgstr "E-posta Ayarları..."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Tamamlanamayan görevlerin rengi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Bugün tamamlanması gereken görevlerin rengi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "Days"
 msgstr "Gün"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Cuma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #, fuzzy
 msgid "Hours"
 msgstr "saat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
 msgid "Minutes"
 msgstr "dakika"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "Paz"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #, fuzzy
 msgid "Show week _numbers in date navigator"
 msgstr "Hafta numaralarını göster"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#, fuzzy
-msgid "Sta_rt of day:"
-msgstr "Günün başlangıcı:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#, fuzzy
-msgid "Su_n"
-msgstr "Paz"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Pazar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Bugünün işleri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "T_hu"
 msgstr "Per"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#, fuzzy
-msgid "T_ue"
-msgstr "Sal"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Task List"
@@ -4082,93 +4127,106 @@ msgid "Tuesday"
 msgstr "Salı"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Çarşamba"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Çalışma Haftası"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #, fuzzy
 msgid "_12 hour (AM/PM)"
 msgstr "12 saat (öö/ös)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #, fuzzy
 msgid "_24 hour"
 msgstr "24 saat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "_Compress weekends in month view"
 msgstr "Hafta sonlarını ay görüntülemesinde sıkıştır"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #, fuzzy
-msgid "_Display"
-msgstr "Gösterim"
+msgid "_Day begins:"
+msgstr "Görev başlangıcı: <b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #, fuzzy
-msgid "_End of day:"
-msgstr "Gün sonu:"
+msgid "_Display"
+msgstr "Gösterim"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_Fri"
 msgstr "Cum"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_General"
 msgstr "Genel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "_Silenen İletileri Gizle"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Mon"
 msgstr "Pzt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Zamanı geçen görevler"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #, fuzzy
 msgid "_Sat"
 msgstr "Cmt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Randevu bitiş tarihlerini hafta ve ay şeklinde göster"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Zaman bölmeleri:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "Sal"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
 msgid "_Wed"
 msgstr "Çar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 #, fuzzy
-msgid "before the start of the appointment"
+msgid "before every appointment"
 msgstr " randevunun başlangıcından önce"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4256,42 +4314,62 @@ msgstr ""
 msgid "Due "
 msgstr "Tarihe göre "
 
-#: calendar/gui/dialogs/comp-editor.c:322
+#: calendar/gui/dialogs/comp-editor.c:342
 #, fuzzy
-msgid "Could not update object!"
+msgid "Could not update invalid object"
 msgstr "Dosyalar düzgün bir şekilde güncellenemedi"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Dosyalar düzgün bir şekilde güncellenemedi"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "Toplantıyı düzenle"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "Randevular"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Görev - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Özet yok"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Farklı kaydet..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4350,27 +4428,27 @@ msgstr "Dağıt:"
 msgid "Enter Delegate"
 msgstr "Silinen"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Randevu"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Hatırlatıcı"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Tekrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Zaman Düzenleme"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Toplantı"
 
@@ -4417,7 +4495,7 @@ msgid "Pu_blic"
 msgstr "_Genel"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Zamanı Farklı Göster"
 
@@ -4439,19 +4517,19 @@ msgstr "B_itiş tarihi:"
 msgid "_Start time:"
 msgstr "B_aşlangıç tarihi:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "En az bir katılan olmalıdır."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Bu kişi toplantıya zaten katılıyor!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "_Dağıt..."
 
@@ -4462,52 +4540,58 @@ msgstr "Katılımcı"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Ortak İsim"
+msgid "Click here to add an attendee"
+msgstr "Katılımcı eklemek için tıklayın"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Ortak İsim"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
 msgid "Delegated From"
 msgstr "Silinen"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 #, fuzzy
 msgid "Delegated To"
 msgstr "Görevi Dağıt"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "Dil"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "Üye"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 #, fuzzy
 msgid "Role"
 msgstr "Görevler"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Durum"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tür"
@@ -4523,15 +4607,10 @@ msgid "_Change Organizer"
 msgstr "Kurum:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Başkalarını Davet Et..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#, fuzzy
-msgid "_Other Organizer"
-msgstr "Kurum:"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4693,8 +4772,7 @@ msgstr "Toplantı bilgisi oluşturuldu. Gönderilsin mi?"
 
 #: calendar/gui/dialogs/send-comp.c:59
 msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-"Toplantı bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
+msgstr "Toplantı bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
 
 #: calendar/gui/dialogs/send-comp.c:66
 msgid "The task assignment information has been created. Send it?"
@@ -4719,7 +4797,7 @@ msgid "Progress"
 msgstr "İşlem"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4731,20 +4809,20 @@ msgstr "Ö_ncelik:"
 msgid "_Status:"
 msgstr "_Durum:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 msgid "Basic"
 msgstr "Temel"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 #, fuzzy
 msgid "Assignment"
 msgstr "Görevlendirildi"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Açıklama:"
 
@@ -4756,24 +4834,79 @@ msgstr "_Başlangıç Tarihi:"
 msgid "_Due Date:"
 msgstr "_Tarihe Göre:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr "%0"
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr "%10"
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr "%20"
+
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
+msgid "30%"
+msgstr "%30"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr "%40"
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr "%50"
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr "%60"
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr "%70"
+
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
+msgid "80%"
+msgstr "%80"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr "%90"
+
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
+msgid "100%"
+msgstr "%100"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Seçili bağlantıları sil"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Aç"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 #, fuzzy
 msgid "_Save as..."
 msgstr "Farklı kaydet..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4781,20 +4914,20 @@ msgstr "Farklı kaydet..."
 msgid "_Print..."
 msgstr "_Yazdır..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Kes"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopyala"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4802,35 +4935,36 @@ msgstr "_Kopyala"
 msgid "_Paste"
 msgstr "_Yapıştır"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Görev Ata"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "i_Calendar Olarak Yönlendir"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "_Bitmiş Olarak İşaretle"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Görevleri Bitmiş Olarak İşaretle"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "_Seçilen Görevleri Sil"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "_Görev eklemek buraya tıklayın"
 
@@ -4838,47 +4972,48 @@ msgstr "_Görev eklemek buraya tıklayın"
 msgid "Alarms"
 msgstr "Uyarılar"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Tamamlandı"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Tamamlanma Tarihi"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Tarihe göre:"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Bitiş Tarihi"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Coğrafi Konum"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Öncelik"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Başlangıç Tarihi"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Özet"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Görev sıralama"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4926,11 +5061,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "öö"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "ös"
 
@@ -4970,7 +5107,7 @@ msgid "_Publish Free/Busy Information"
 msgstr "_Boş/Meşgul Bilgisini Yayınla"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_Configure..."
 msgstr "Yapılandır: %s"
@@ -4981,7 +5118,7 @@ msgid "_Configure Pilot..."
 msgstr "Yapılandır: %s"
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "_Farklı Kaydet..."
 
@@ -5008,74 +5145,393 @@ msgid "Delete _All Occurrences"
 msgstr "_Tüm Oluşumları Sil"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Bu sistemde GNOME Pilot araçları kurulu değil."
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "%s çalıştırırken bir hata oldu."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr "Toplantı başlangıcı: <b>"
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr "Görev başlangıcı: <b>"
+
+#: calendar/gui/e-itip-control.c:688
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "İstenen Bilgiler"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr "Başlangıç: <b>"
+
+#: calendar/gui/e-itip-control.c:704
+msgid "Meeting ends: <b>"
+msgstr "Toplantı bitişi: <b>"
+
+#: calendar/gui/e-itip-control.c:707
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "İstenen Bilgiler"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr "Bitiş: <b>"
+
+#: calendar/gui/e-itip-control.c:725
+msgid "Task Completed: <b>"
+msgstr "Tamamlanan Görev: <b>"
+
+#: calendar/gui/e-itip-control.c:735
+#, fuzzy
+msgid "Task Due: <b>"
+msgstr "Görev başlangıcı: <b>"
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+msgid "iCalendar Information"
+msgstr "iCalendar Bilgisi"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+msgid "iCalendar Error"
+msgstr "iCalendar Hatası"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+msgid "An unknown person"
+msgstr "Bilinmeyen kişi"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Lütfen bu bilgilerin doğruluğunu denetledikten sonra, aşağıdaki menüden "
+"bir işlem seçiniz."
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr "<i>Hiçbiri</i>"
+
+#: calendar/gui/e-itip-control.c:903
+msgid "Status:"
+msgstr "Durum:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Onaylandı"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "Girişimli"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Reddedildi"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
-msgstr "Takvim dosyası güncellenemedi!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+msgid "Choose an action:"
+msgstr "Bir eylem seçin:"
+
+#: calendar/gui/e-itip-control.c:972
+msgid "Update"
+msgstr "Güncelle"
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Tamam"
+
+#: calendar/gui/e-itip-control.c:1000
+msgid "Accept"
+msgstr "Onayla"
+
+#: calendar/gui/e-itip-control.c:1001
+#, fuzzy
+msgid "Tentatively accept"
+msgstr "Girişimli"
+
+#: calendar/gui/e-itip-control.c:1002
+msgid "Decline"
+msgstr "Reddet"
+
+#: calendar/gui/e-itip-control.c:1026
+msgid "Send Free/Busy Information"
+msgstr "Boş/Meşgul Bilgisi Gönder"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr "Cevaplayan Bilgisini Güncelle"
+
+#: calendar/gui/e-itip-control.c:1052
+msgid "Send Latest Information"
+msgstr "Güncel Bilgiyi Gönder"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "İptal"
+
+#: calendar/gui/e-itip-control.c:1117
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "<b>%s</b>, toplantı bilgisi gönderdi."
+
+#: calendar/gui/e-itip-control.c:1118
+msgid "Meeting Information"
+msgstr "Toplantı Bilgisi"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr "<b>%s</b> sizin toplantıda olmanızı istiyor."
+
+#: calendar/gui/e-itip-control.c:1123
+msgid "Meeting Proposal"
+msgstr "Toplantı Taslağı"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> mevcut bir toplantıya ekleme yapmak istiyor"
+
+#: calendar/gui/e-itip-control.c:1128
+msgid "Meeting Update"
+msgstr "Toplantı Güncellemesi"
+
+#: calendar/gui/e-itip-control.c:1132
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "<b>%s</b> son toplantı bilgisini almak istiyor."
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr "Toplantı Güncelleme Bilgisi İsteği"
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr "<b>%s</b> bir toplantı isteğine cevap verdi."
+
+#: calendar/gui/e-itip-control.c:1157
+msgid "Meeting Reply"
+msgstr "Toplantı Yanıtı"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr "<b>%s</b> bir toplantıyı iptal etti."
+
+#: calendar/gui/e-itip-control.c:1162
+msgid "Meeting Cancellation"
+msgstr "Toplantı İptali"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr "<b>%s</b> hatalı bir mesaj gönderdi."
+
+#: calendar/gui/e-itip-control.c:1167
+msgid "Bad Meeting Message"
+msgstr "Hatalı Toplantı Mesajı"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr "<b>%s</b> görev bilgisi yayınladı."
+
+#: calendar/gui/e-itip-control.c:1190
+msgid "Task Information"
+msgstr "Görev Bilgisi"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr "<b>%s</b> bir görevi tamamlamanızı istiyor."
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr "Görev Taslağı"
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> mevcut bir göreve eklenti yapmak istiyor."
+
+#: calendar/gui/e-itip-control.c:1200
+msgid "Task Update"
+msgstr "Görev Güncellemesi"
+
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "<b>%s</b> en güncel görev bilgisini almak istiyor."
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
+msgstr "Güncel Görev Bilgisi İsteği"
+
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "<b>%s</b> bir görev tanımına cevap verdi."
+
+#: calendar/gui/e-itip-control.c:1230
+msgid "Task Reply"
+msgstr "Görev Yanıtı"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr "<b>%s</b> bir görevi iptal etti."
+
+#: calendar/gui/e-itip-control.c:1235
+msgid "Task Cancellation"
+msgstr "Görev İptali"
+
+#: calendar/gui/e-itip-control.c:1240
+msgid "Bad Task Message"
+msgstr "Hatalı Görev Mesajı"
+
+#: calendar/gui/e-itip-control.c:1259
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "<b>%s</b> boş/meşgul bilgisi gönderdi."
+
+#: calendar/gui/e-itip-control.c:1260
+msgid "Free/Busy Information"
+msgstr "Boş/Meşgul Bilgisi"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr "<b>%s</b> sizden boş/meşgul bilgisini almak istiyor."
+
+#: calendar/gui/e-itip-control.c:1265
+msgid "Free/Busy Request"
+msgstr "Boş/Meşgul İsteği"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "<b>%s</b> bir boş/meşgul isteğine cevap verdi."
+
+#: calendar/gui/e-itip-control.c:1270
+msgid "Free/Busy Reply"
+msgstr "Boş/Meşgul Cevabı"
+
+#: calendar/gui/e-itip-control.c:1275
+msgid "Bad Free/Busy Message"
+msgstr "Hatalı Boş/Meşgul Mesajı"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Dizin onarılamayacak şekilde bozulmuş."
+
+#: calendar/gui/e-itip-control.c:1373
+msgid "The message contains only unsupported requests."
+msgstr "Bu iletide desteklenmeyen bilgiler var."
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr "Bu eklenti geçerli bir takvim mesajını içermiyor."
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr "Bu eklentide görüntülenebilir takvim öğeleri bulunmuyor"
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Öğe gönderilemedi!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Güncelleme tamamlandı\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Takvim dosyası güncellenemedi!\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Bu öğe yerinde bulunamadığı için katılımcı bilgileri güncellenemedi"
+msgstr "Bu öğe yerinde bulunamadığı için katılımcı bilgileri güncellenemedi"
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Katılımcı bilgileri geçersiz bir durum nedeniyle güncellenemedi!\n"
+msgstr "Katılımcı bilgileri geçersiz bir durum nedeniyle güncellenemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1638
-msgid "Attendee status could not be updated!\n"
-msgstr "Katılımcı bilgileri güncellenemedi!\n"
-
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Katılımcı bilgileri güncellendi\n"
 
 #: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "Katılımcı bilgileri güncellenemedi!\n"
+
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Bitiş Tamamlandı"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Öğe gönderildi!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "Öğe gönderilemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Dizini Seçin"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Dizini Seçin"
@@ -5117,95 +5573,94 @@ msgstr "bitiş-tarihi"
 msgid "date-start"
 msgstr "başlangıç-tarihi"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Toplantıyı Yönetenler"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Gerekli Katılımcılar"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Seçimlik Katılımcılar"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Katılmayanlar"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Bireysel"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Grup"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Kaynak"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Oda"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 #, fuzzy
 msgid "Chair"
 msgstr "Araba"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Gerekli Katılımcı"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Seçimlik Katılımcı"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Katılmayan"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "İşlem Gerektiriyor"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Onaylandı"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Reddedildi"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Girişimli"
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 #, fuzzy
 msgid "Delegated"
 msgstr "Silinen"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "İşlemde"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%d %B %A, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%d %b %Y %a"
@@ -5217,63 +5672,63 @@ msgstr "%d %b %Y %a"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Ofiste Değil"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Bilgi Yok"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Seçenekler"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "_Sadece Çalışma Saatlerini Göster"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "_Uzaklaştırılmış Göster"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Boş/Meşgul Olanları Güncelle"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Otomatikman seç"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Tüm Kişiler ve Kaynaklar"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Tüm _Kişiler ve Bir Kaynak"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "_Gerekli Kişiler"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Gerekli Kişiler ve _Bir Kaynak"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Toplantı b_aşlama saati :"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Toplantı _bitiş saati:"
 
@@ -5292,17 +5747,22 @@ msgstr "%s içindeki görevler yüklenemedi."
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' yüklemek için gereken yöntem desteklenmiyor"
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "`%s' dizini açılamadı."
+
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Tamamlanma Tarihi"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Seçili bağlantıları sil"
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 msgid "Expunging"
 msgstr "Siliniyor"
 
@@ -5314,17 +5774,17 @@ msgstr "Yeni _Randevu..."
 msgid "_Delete this Appointment"
 msgstr "_Bu Randevuyu Sil"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' dizini açılamadı."
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' açmak için gereken yöntem desteklenmiyor"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s tarihinde takvim açılıyor"
@@ -5385,19 +5845,54 @@ msgstr "Ekim"
 msgid "September"
 msgstr "Eylül"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "En az bir katılımcı olmak zorunda"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Bir düzenleyen kişi olmak zorunda."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+msgid "Event information"
+msgstr "Olay bilgisi"
+
+#: calendar/gui/itip-utils.c:356
+msgid "Task information"
+msgstr "Görev bilgisi"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "Seçimlik Bilgiler"
+
+#: calendar/gui/itip-utils.c:360
+msgid "Free/Busy information"
+msgstr "Boş/Meşgul bilgisi"
+
+#: calendar/gui/itip-utils.c:362
+msgid "Calendar information"
+msgstr "Takvim bilgisi"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Güncelle"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Listeyi Tazele"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Bu olayda bir katılımcı olarak görünmeniz gerekiyor."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "Bileşen düzenleyici mimarisi oluşturulamadı."
 
@@ -5586,12 +6081,45 @@ msgstr "Seçili ay (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Seçili yıl (%Y)"
 
+#: calendar/gui/print.c:2249
+msgid "Task"
+msgstr "Görev"
+
+#: calendar/gui/print.c:2306
+#, c-format
+msgid "Status: %s"
+msgstr "Durum: %s"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "Ö_ncelik:"
+
+#: calendar/gui/print.c:2338
+#, c-format
+msgid "Percent Complete: %i"
+msgstr "Biten Yüzde: %i"
+
+#: calendar/gui/print.c:2350
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: calendar/gui/print.c:2364
+#, c-format
+msgid "Categories: %s"
+msgstr "Kategoriler: %s"
+
+#: calendar/gui/print.c:2375
+msgid "Contacts: "
+msgstr "Bağlantılar: "
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Takvimi Yazdır"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5609,8 +6137,7 @@ msgstr "Yazdırma Ayarları"
 #, fuzzy
 msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Takvim görünümü yaratılamadı. ORBit ve OAF kurulumunu gözden geçirin."
+msgstr "Takvim görünümü yaratılamadı. ORBit ve OAF kurulumunu gözden geçirin."
 
 #: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
@@ -5624,8 +6151,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Tekrar sorma."
 
@@ -5639,8 +6166,7 @@ msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
 msgstr ""
-"Evolution takvim dizininde bulunan tüm görevleri görevler dizinine "
-"aktardı."
+"Evolution takvim dizininde bulunan tüm görevleri görevler dizinine aktardı."
 
 #: calendar/gui/tasks-migrate.c:108
 msgid ""
@@ -5650,8 +6176,8 @@ msgid ""
 "again in the future."
 msgstr ""
 "Evolution takvim dizininde bulunan görevleri yeni görevler dizinine "
-"göndermeyi denedi, ancak bazı görevler taşınamadı. Bu işlemi daha "
-"sonra tekrar deneyiniz."
+"göndermeyi denedi, ancak bazı görevler taşınamadı. Bu işlemi daha sonra "
+"tekrar deneyiniz."
 
 #: calendar/gui/tasks-migrate.c:120
 #, c-format
@@ -5686,6 +6212,11 @@ msgstr "iCalendar dosyalarını Evolution'a aktarır"
 msgid "Imports vCalendar files into Evolution"
 msgstr "iCalendar dosyalarını Evolution'a aktarır"
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Hatırlatıcı"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5783,8 +6314,8 @@ msgstr "contains? ikinci argümanı dizgi şeklinde istiyor"
 #: calendar/pcs/query.c:693
 #, fuzzy
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr "contains? birinci argümanı dizgi şeklinde istiyor"
 
 #: calendar/pcs/query.c:735
@@ -6717,638 +7248,654 @@ msgid "Asia/Macao"
 msgstr "Asya/Macao"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Asya/Macao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Asya/Magadan"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Asya/Magadan"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Asya/Manila"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "Asya/Muscat"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "Asya/Nicosia"
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Asya/Novosibirsk"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Asya/Omsk"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Asya/Kabul"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "Asya/Phnom_Penh"
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "Asya/Pontianak"
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "Asya/Pyongyang"
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Asya/Qatar"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Asya/Gaza"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "Asya/Rangoon"
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "Asya/Riyadh"
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Asya/Saigon"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Asya/Sakhalin"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Asya/Samarkand"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Asya/Seoul"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Asya/Shanghai"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Asya/Singapore"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Asya/Taipei"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Asya/Tashkent"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Asya/Tbilisi"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "Asya/Tehran"
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "Asya/Thimphu"
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Asya/Tokyo"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr "Asya/Ujung_Pandang"
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "Asya/Ulaanbaatar"
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "Asya/Urumqi"
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "Asya/Vientiane"
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "Asya/Vladivostok"
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Asya/Yakutsk"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Asya/Yekaterinburg"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Asya/Yerevan"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azores"
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermuda"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Canary"
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Cape_Verde"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faeroe"
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Mayen"
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madeira"
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Reykjavik"
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/South_Georgia"
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/St_Helena"
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "Atlantik/Stanley"
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Avustralya/Adelaide"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "Avustralya/Brisbane"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr "Avustralya/Broken_Hill"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Avustralya/Darwin"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "Avustralya/Hobart"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "Avustralya/Lindeman"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr "Avustralya/Lord_Howe"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Avustralya/Melbourne"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "Avustralya/Perth"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Avustralya/Sydney"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Avrupa/Amsterdam"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Avrupa/Andorra"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Avrupa/Athens"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Avrupa/Belfast"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Avrupa/Belgrade"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Avrupa/Berlin"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Avrupa/Bratislava"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Avrupa/Brussels"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Avrupa/Bucharest"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Avrupa/Budapest"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr "Avrupa/Chisinau"
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "Avrupa/Copenhagen"
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Avrupa/Dublin"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Avrupa/Gibraltar"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Avrupa/Helsinki"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Avrupa/İstanbul"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Avrupa/Kaliningrad"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Avrupa/Kiev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Avrupa/Lisbon"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Avrupa/Ljubljana"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Avrupa/London"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Avrupa/Luxembourg"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Avrupa/Madrid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "Avrupa/Malta"
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Avrupa/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Avrupa/Monaco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Avrupa/Moscow"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "Avrupa/Nicosia"
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Avrupa/Oslo"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Avrupa/Paris"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Avrupa/Prague"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Avrupa/Riga"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Avrupa/Rome"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Avrupa/Samara"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Avrupa/San_Marino"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Avrupa/Sarajevo"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Avrupa/Simferopol"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "Avrupa/Skopje"
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr ""
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr ""
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr ""
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr ""
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr ""
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "Indian/Comoro"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr "Indian/Kerguelen"
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr "Indian/Mahe"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "Indian/Maldives"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "Indian/Mauritius"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "Indian/Mayotte"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "Indian/Reunion"
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "Pacific/Apia"
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "Pacific/Auckland"
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "Pacific/Chatham"
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "Pacific/Easter"
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "Pacific/Efate"
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr "Pacific/Enderbury"
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr "Pacific/Fakaofo"
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "Pacific/Fiji"
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "Pacific/Funafuti"
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "Pacific/Galapagos"
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr "Pacific/Gambier"
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "Pacific/Guadalcanal"
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "Pacific/Guam"
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "Pacific/Honolulu"
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "Pacific/Johnston"
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr "Pacific/Kiritimati"
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr "Pacific/Kosrae"
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "Pacific/Kwajalein"
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr "Pacific/Majuro"
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "Pacific/Marquesas"
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "Pacific/Midway"
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "Pacific/Nauru"
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "Pacific/Niue"
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "Pacific/Norfolk"
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "Pacific/Noumea"
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "Pacific/Pago_Pago"
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "Pacific/Palau"
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "Pacific/Pitcairn"
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr "Pacific/Ponape"
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "Pacific/Port_Moresby"
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "Pacific/Rarotonga"
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "Pacific/Saipan"
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "Pacific/Tahiti"
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "Pacific/Tarawa"
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr "Pacific/Tongatapu"
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "Pacific/Truk"
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "Pacific/Wake"
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "Pacific/Wallis"
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "Bu şifreleme ile imza desteklenmiyor"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "Bu şifreleme ile açık imza desteklenmiyor"
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "Bu şifreleme ile onaylama desteklenmiyor"
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "Bu şifre ile şifreleme desteklenmiyor"
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "Bu şifreleme ile geriye dönük şifreleme desteklenmiyor"
 
@@ -7356,12 +7903,12 @@ msgstr "Bu şifreleme ile geriye dönük şifreleme desteklenmiyor"
 msgid "Unable to create cache path"
 msgstr "Önbellek yolu oluşturulamıyor"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Önbellek girdisi silinemedi: %s: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7369,7 +7916,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7380,11 +7927,16 @@ msgstr ""
 "%s\n"
 "Bu dizine yapılacak değişiklikler senkronize edilmeyecektir."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Sunucu ile eşzamanlama yapılıyor"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Yeni dizin yaratılıyor"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Bu işlemi bitirmek için İnternet bağlantısı sağlamalısınız"
 
@@ -7392,56 +7944,67 @@ msgstr "Bu işlemi bitirmek için İnternet bağlantısı sağlamalısınız"
 msgid "Syncing folders"
 msgstr "Dizinler eşzamanlı hale getiriliyor"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "%s filtresini ayrıştırırken hata oldu: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "%s filtresini çalıştırırken hata oldu: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "Spool dizini açılamadı"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "Spool dizini işlenemedi"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) iletisi alınıyor"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "İleti açılamadı"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d iletisinde hata"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Dizin eşzamanlı hale getiriliyor"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d ileti alınıyor"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d/%d iletisinde hata"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 msgid "Failed to retrieve message"
 msgstr "Mesajın alınmasında hata"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "%s iletisi önbelleğe yazılamadı: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "%s iletisi önbelleğe yazılamadı: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "%s filtre taramasını çalıştırırken hata oldu: %s"
@@ -7473,25 +8036,101 @@ msgstr "(hepsini-eşle) boolean sonuç içermelidir"
 msgid "Performing query on unknown header: %s"
 msgstr "Bilinmeyen başlık üzerinde arama yapılıyor: %s"
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Desteklenmeyen işlem: mesaja ekle: %s için"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Desteklenmeyen işlem: ifade ile ara: %s için"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Desteklenmeyen işlem: uid ile ara: %s için"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Mesajlar taşınıyor"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "İletiler %s'e kopyalanıyor"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "İptal edildi."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Dosya adı belirtilmedi."
+
+#: camel/camel-gpg-context.c:827
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr ""
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "%s iletisi önbelleğe yazılamadı: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "%s iletisi önbelleğe yazılamadı: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Mesajın açılmasında hata."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Bu mesaj denetlenemedi: %s geçici dosyası yaratılamadı"
+
 #: camel/camel-lock-client.c:111
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7522,8 +8161,8 @@ msgstr "%s için kilitleme dosyası oluşturulamadı: %s"
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
-"%s dosyasının kilidinin açılmasını beklerken zaman aşımı. Daha "
-"sonra yeniden deneyiniz."
+"%s dosyasının kilidinin açılmasını beklerken zaman aşımı. Daha sonra yeniden "
+"deneyiniz."
 
 #: camel/camel-lock.c:204
 #, c-format
@@ -7589,84 +8228,24 @@ msgstr "Geçici mektup dosyasına yazarken hata: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Geçici mektup dosyasına yazarken hata: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "%s parolasını %s için parolayı girin"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "%s parolasını girin"
-
-#: camel/camel-pgp-context.c:621
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Bu mesaj şifrelenemedi"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-msgid "Cannot sign this message: no password provided"
-msgstr "Bu mesaj şifrelenemedi: Parola verilmedi"
-
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, fuzzy, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "GPG/PGP ile bağlantı kurulamadı: %s"
-
-#: camel/camel-pgp-context.c:795
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
-
-#: camel/camel-pgp-context.c:987
-#, fuzzy
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
-
-#: camel/camel-pgp-context.c:993
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Bu mesaj denetlenemedi: GPG/PGP ile bağlantı kurulamadı: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "Bu mesaj denetlenemedi: %s geçici dosyası yaratılamadı"
-
-#: camel/camel-pgp-context.c:1177
-msgid "Cannot encrypt this message: no plaintext to encrypt"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1187
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Bu mesaj şifrelenemedi: Parola verilmedi"
-
-#: camel/camel-pgp-context.c:1194
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Bu mesaj şifrelenemedi: GPG/PGP ile bağlantı kurulamadı: %s"
-
-#: camel/camel-pgp-context.c:1203
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1372
+#: camel/camel-multipart-encrypted.c:325
 #, fuzzy
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
+msgid "Failed to decrypt MIME part: parse error"
+msgstr "Şifre açılamadı: Bilinmeyen hata"
 
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1387
-#, fuzzy, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "GPG/PGP ile bağlantı kurulamadı: %s"
-
-#: camel/camel-pgp-mime.c:354
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr ""
 
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Diğer hata"
+
 #: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
@@ -7682,43 +8261,6 @@ msgstr "%s yüklenemedi: %s"
 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:199
-#, c-format
-msgid "%s server %s"
-msgstr "%s sunucu %s"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s için %s üzerindeki %s servisi"
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "Bağlantı iptal edildi"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "%s adresine bağlantı kurulamadı (%d): %s"
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(bilinmeyen makine)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "İşlem iptal edildi"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, fuzzy, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Anonim"
@@ -7766,8 +8308,7 @@ msgstr "CRAM-MD5"
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr ""
-"Bu seçenek sunucuya güvenli CRAM-MD5 sistemi ile bağlantı kuracaktır. "
+msgstr "Bu seçenek sunucuya güvenli CRAM-MD5 sistemi ile bağlantı kuracaktır. "
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -7822,7 +8363,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Sunucudan hatalı kimlik sınama yanıtı."
 
@@ -7832,8 +8373,7 @@ msgstr "Giriş"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr ""
-"Bu seçenek sunucuya basit bir parola kullanarak bağlantı kuracaktır."
+msgstr "Bu seçenek sunucuya basit bir parola kullanarak bağlantı kuracaktır."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -7850,11 +8390,9 @@ msgid ""
 "Password Authentication."
 msgstr "Bu seçenek sunucuya Kerberos 4 kimlik denetimi ile bağlanacaktır."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Parola"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7863,8 +8401,7 @@ msgstr "SMTP öncesi POP"
 #: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
-"Bu özellik, SMTP bağlantısı yaratmadan önce bir POP bağlantısı "
-"kuracaktır"
+"Bu özellik, SMTP bağlantısı yaratmadan önce bir POP bağlantısı kuracaktır"
 
 #: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
@@ -7883,52 +8420,52 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Düzgün deyim derleme işlemi başarısız: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URL'inde kullanıcı bilgisi bulunmuyor"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URL'inde makine adı bilgisi bulunmuyor"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URL'inde dizin bilgisi bulunmuyor"
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Çözümleniyor: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "İsim çözümlemesinde hata: %s"
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Makine adı çözümlemesinde hata: %s: Makine bulunamadı"
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Makine adı çözümlemesinde hata: %s: bilinmeyen hata"
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Çözümleniyor: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Makine adı çözümlemesinde hata: %s: Makine bulunamadı"
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Makine adı çözümlemesinde hata: %s: bilinmeyen hata"
@@ -7992,11 +8529,11 @@ msgstr "Mesajın açılmasında hata."
 msgid "Failed to verify certificates."
 msgstr "Sertifika denetlenemedi."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Dizin alınamadı: Gerçersiz"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Dizin oluşturulamadı: Geçersiz işlem"
 
@@ -8026,7 +8563,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8039,16 +8576,16 @@ msgstr ""
 "Parmak izi:       %s\n"
 "İmza:              %s"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr "İYİ"
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr "KÖTÜ"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8067,15 +8604,15 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL açılamadı: %s"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Bu isimle bir ileti yok: %s (%s)"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Bu isimle bir ileti yok: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Yeni iletileri tüm dizinlerde denetle"
 
 #: camel/camel-vee-store.c:262
 #, c-format
@@ -8097,68 +8634,77 @@ msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "%s dizininin adı değiştirilemedi: Bu isimde bir dizin yok"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Bu çöp dizininden iletileri kopyalayamazsınız."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "İşlem iptal edildi"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, fuzzy, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti"
+
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP komutu başarısız oldu: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Sunucu cevabı çok erken bitti."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP sunucu cevabı %s bilgisini içermiyor"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP sunucudan beklenmeyen cevap: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s dizini yaratılamadı: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s için özet bilgisi yüklenemedi"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Sunucudaki dizin silindi ve yeniden oluşturuldu."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Değiştirilen iletiler taranıyor"
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Bu ileti kullanılabilir değil"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Yeni iletilerdeki özet bilgiler alınıyor"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Yeni iletiler taranıyor"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cevabında ileti gövdesi bulunamadı"
 
@@ -8211,34 +8757,85 @@ msgstr "IMAP"
 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-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Parola"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 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."
+"Bu seçenek IMAP sunucusuna açık metin parola kullanarak bağlantı kurulmasını "
+"sağlar."
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP sunucu %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s için %s üzerindeki %s servisi"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Bağlantı iptal edildi"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "%s adresine bağlantı kurulamadı (%d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"POP sunucusuyla bağlantı kurulamadı.\n"
+"Parola iletiminde hata: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "İşlem desteklenmiyor"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Kimlik denetimi başarısız."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, 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:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s kimlik sınama yöntemi desteklenmiyor"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, 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:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Bir parola girmediniz."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8249,69 +8846,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Bu isimde bir dizin yok: `%s'"
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ana dizin üzerinde alt dizin açılamaz"
 
-#: camel/providers/local/camel-local-provider.c:48
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "%s posta kutusu açılamadı: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "MH biçimli e-posta dizinleri"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "MH benzeri e-posta dizinleri içinde yerel postalar tutmak için."
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Yerel aktarım"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "GELEN kutusu içindeki yeni iletilere filtre uygula"
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Maildir biçimli ileti dizinleri"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Standart UNIX posta kutusu kuyruğu"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:101
 #, fuzzy
-msgid "For reading and storing local mail in standard mbox spool files."
-msgstr "İletileri Unix spool dizinleri halinde saklamak için"
-
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr "Posta kutusu dosyalarının dizin yapısı"
+msgid "Standard Unix mbox spool or directory"
+msgstr "Standart UNIX posta kutusu kuyruğu"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
-msgstr ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr "İletileri Unix spool dizinleri halinde saklamak için"
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s saklama dizininde hata"
@@ -8337,7 +8952,7 @@ msgstr "Yerel disklerde gelen dizini bulunmasın"
 msgid "Local mail file %s"
 msgstr "Yerel mektup dosyası %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "%s dizininin adı %s olarak değiştirilemedi: %s"
@@ -8357,33 +8972,31 @@ msgstr "`%s' dizin özet dosyası silinemedi: %s"
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' dizin indeks dosyası silinemedi: %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Özet kaydedilemedi: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "İleti özete eklenemedi: bilinmeyen neden"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "%s dizinine ileti eklenemedi: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8392,20 +9005,19 @@ msgstr ""
 "İleti alınamadı: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "İleti bulunmuyor"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Geçersiz ileti içeriği"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8416,13 +9028,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "%s dizini bulunamadı."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8438,7 +9050,7 @@ msgstr "`%s' bir maildir dizini."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' dizini silinemedi: %s"
@@ -8447,8 +9059,8 @@ msgstr "`%s' dizini silinemedi: %s"
 msgid "not a maildir directory"
 msgstr "maildir dizini değil"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "'%s dizini taranamadı: %s"
@@ -8469,46 +9081,38 @@ msgstr "Yeni iletiler denetleniyor"
 msgid "Checking for new messages"
 msgstr "Yeni iletiler taranıyor"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
 msgstr "Dizin eşzamanlı hale getiriliyor"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s üzerinde dizin kilitlemesi yaratılamadı: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "%s posta kutusu açılamadı: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "İleti aktarımı iptal edildi"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "İleti mbox dosyasına eklenemedi (%s): %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8517,13 +9121,11 @@ msgstr ""
 "%s iletisi %s dizininden alınamadı\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dizin onarılamayacak şekilde bozulmuş."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İletiler düzenlenemiyor: İleti kutusu bozulmuş olabilir."
 
@@ -8566,190 +9168,180 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' dizini boş değil. Silinmedi."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Dizin açılamadı: `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "%ld yakınında e-posta ayrıştırma hatası (dizin: %s)"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "%s dizini alınamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "%s dosyası açılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Geçici posta kutusu açılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Özet ve dizin uyuşmazlığı"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Geçici posta kutusuna yazma hatası: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Geçici dosya kutusuna yazma işlemi başarısız: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kaynak dizin %s açılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "geçici dizin kapatılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Dizinin adı değiştirilemedi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Özet ve dizin uyuşmazlığı"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Bilinmeyen hata: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Dizinin adı değiştirilemedi: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Geçici posta kutusuna yazma hatası: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Geçici dosya kutusuna yazma işlemi başarısız: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "Bağlantıya ileti gönder"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Mesaj mh dizinine eklenemedi: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' bir dizin değil."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH dizin yolu açılamadı: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, fuzzy, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "İleti mbox dosyasına eklenemedi (%s): %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:115
+#: camel/providers/local/camel-spool-store.c:128
 #, fuzzy, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "`%s' normal bir dosya değildir."
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "%s saklama dizini geçersiz"
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "%s dizini bulunamadı."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "Yerel mektup dosyası %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Yerel mektup dosyası %s"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Geçici e-posta dosyası %s açılamadı: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "'%s dizini taranamadı: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, fuzzy, c-format
-msgid "Could not file: %s: %s"
-msgstr "%s yüklenemedi: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "`%s' normal bir dosya değildir."
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "%s'e Postala"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET haber grubu"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
+msgstr "USENET haber gruplarından ileti okuma ve gönderme için sağlayıcı."
+
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "%s dizini yaratılamadı: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
-"USENET haber gruplarından ileti okuma ve gönderme için sağlayıcı."
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s üzerinden USENET"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8851,7 +9443,7 @@ msgstr "İletileri sunucuda bırak"
 msgid "Delete after %s day(s)"
 msgstr "%s günden sonra sil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -8865,8 +9457,8 @@ 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çenek POP sunucuya açık metin parola kullanarak bağlantı kurar. "
-"Pek çok POP sunucusu tarafından desteklenir."
+"Bu seçenek POP sunucuya açık metin parola kullanarak bağlantı kurar. Pek çok "
+"POP sunucusu tarafından desteklenir."
 
 #: camel/providers/pop3/camel-pop3-provider.c:81
 msgid ""
@@ -8874,35 +9466,24 @@ msgid ""
 "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."
+"Bu seçenek POP sunucuya şifreli APOP protokolünü kullanarak bağlantı kurar."
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "POP sunucusuyla bağlantı kurulamadı.\n"
 "Parola iletiminde hata: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-#, fuzzy
-msgid "SSL/TLS extension not supported."
-msgstr "İşlem desteklenmiyor"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Kimlik denetimi başarısız."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "%s üzerindeki POP sunucuya bağlantı kurulamadı"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8910,27 +9491,27 @@ msgstr ""
 "POP sunucusuyla bağlantı kurulamadı.\n"
 "Belirtilen kimlik sınama protokolü desteklenmiyor."
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "SASL `%s' girişi başarısız: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr "SASL Protokol hatası"
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr "G/Ç hatası: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sLütfen %s@%s için POP3 parolasını girin"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8939,13 +9520,13 @@ msgstr ""
 "POP sunucusuyla bağlantı kurulamadı.\n"
 "Parola iletiminde hata: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Bu isimde bir dizin yok: `%s'"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8953,8 +9534,7 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr ""
-"Yerel sistemdeki sendmail programının e-postaları göndermesi için."
+msgstr "Yerel sistemdeki sendmail programının e-postaları göndermesi için."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:108
 msgid "Could not parse recipient list"
@@ -9004,9 +9584,7 @@ msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
 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"
+msgstr "SMTP üzerinden bir sunucuya bağlanıp e-postalarınızı göndermek için.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
@@ -9108,45 +9686,45 @@ msgstr "Geçici kimlik denetim hatası"
 msgid "Authentication required"
 msgstr "Kimlik denetimi isteniyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Giriş hatası: %s: önemsiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "POP sunucusuyla bağlantı kurulamadı.\n"
 "Parola iletiminde hata: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Bu iletinin biçimi düzgün değil."
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH isteği zaman aşımına uğradı: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "DATA cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "%s SMTP sunucusu %s kimlik sınama yöntemini desteklemiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, 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:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9157,88 +9735,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP sunucu %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s üzerinden STMP ileti gönderimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "İleti gönderilemiyor: gönderen adresi geçersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "İleti gönderiliyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "İleti gönderilemedi: bir ya da daha fazla geçersiz alıcı var"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "SMTP Karşılaması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, 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:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELO cevap hatası: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP Kimlik Denetimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "SASL kimlik denetim nesnesi yaratılamadı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, 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:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH isteği başarısız."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Sunucudan hatalı kimlik sınama yanıtı.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, 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:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, 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:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, 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"
@@ -9246,35 +9824,35 @@ msgstr "DATA isteği zaman aşımına uğradı: %s: ileti gönderilmedi"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr "DATA cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, 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:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr "DATA kesimi cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, 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:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr "RSET cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, 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:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr "QUIT cevap hatası"
 
@@ -9347,52 +9925,52 @@ msgstr "MIME türü:"
 msgid "Suggest automatic display of attachment"
 msgstr "Eklentinin otomatik gösterimini öner"
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Adres defteri için buraya tıklayın"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Gönderen:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Cevapla:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Konu:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Alıcı:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "İletinin gönderildiği kişiler"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Bilgi:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 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:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Gizli:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9405,7 +9983,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Bir dosya ekle"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "PGP imza dosyası oluşturulamadı."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9414,35 +9997,35 @@ msgstr ""
 "%s dosyasını yüklerken hata oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Uyarı!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Dosya var. Üzerine yazılsın mı?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "%s dosyasını kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "`%s' dosyasını yüklerken hata oldu"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Dosyaya erişirken hata oldu: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "%s POP sunucusundan iletileri alamadım: %s"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9451,7 +10034,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9460,7 +10043,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9469,7 +10052,7 @@ msgstr ""
 "İletilerin kaydında hata: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -9478,7 +10061,7 @@ msgstr ""
 "Evolution, Pine e-posta dosyaları buldu.\n"
 "Bunların Evolution'a aktarılmasını istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9487,29 +10070,49 @@ msgstr ""
 "Bu ileti gönderilmedi.\n"
 "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Uyarı: İleti Değiştirildi"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Dosyayı aç"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Dosya _Ekle"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "İmzayı kaydet"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (öntanımlı)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Bir ileti yaz"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -9518,6 +10121,12 @@ msgstr ""
 "E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
 "e-posta bilgilerinizi girmediniz."
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 #: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
@@ -9578,7 +10187,7 @@ msgstr "Konu içerir"
 msgid "Subject does not contain"
 msgstr "Konu içermez"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9731,7 +10340,7 @@ msgstr "saat"
 msgid "minute"
 msgstr "dakika"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "saniye"
 
@@ -9807,7 +10416,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
@@ -9819,6 +10428,21 @@ msgstr "<bir tarih seçmek için tıklayınız>"
 msgid "Filter Rules"
 msgstr "Filtre Kuralları"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Stil adı:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "`%s' normal bir dosya değildir."
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Bir eylem seçin:"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9837,7 +10461,7 @@ msgstr ""
 "Lütfen geriye gidip geçerli bir dizin seçin."
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Dizini Seçin"
 
@@ -9850,7 +10474,11 @@ msgstr ""
 "`%s' düzgün deyiminde hata var:\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
@@ -9880,7 +10508,7 @@ msgstr "tüm kriterler sağlanırsa"
 
 #: filter/filter-rule.c:769
 #, fuzzy
-msgid "if any criterion are met"
+msgid "if any criteria are met"
 msgstr "herhangi bir kriter sağlanırsa"
 
 #: filter/filter-rule.c:780
@@ -9959,194 +10587,204 @@ msgid "Beep"
 msgstr "Boyut"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Şirket"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "içerir"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Dizine Kopyala"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Alınma tarihi"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Gönderilme tarihi"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Silinen"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "içermez"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "sonlanmaz"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "bulunmaz"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "benzemez"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "başlamaz"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Bulunmaz"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Taslak"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "biter"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr "Kabuk Programı Çalıştır"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "bulunur"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "bulunur"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Deyim"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Önemli"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr " "
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "daha önce"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "daha sonra"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 #, fuzzy
 msgid "is Flagged"
 msgstr "İşaretli"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "büyük"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "küçük"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "değil"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "İşaretli"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "Çağrı Cihazı"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "E-posta listesi"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "İleti Gövdesi"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "İleti Başlığı"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Dizine Taşı"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Ses çal:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Oku"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Alıcılar"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Düzgün Deyim Eşleşimi"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Cevaplanan"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puan"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Gönderen"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "Durum belirt"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Boyut (Kb)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "benzer"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "Kaynak Hesap"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "Özel başlık"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "başlayan"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "İşlemeyi Durdur"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Konu"
 
@@ -10204,7 +10842,8 @@ msgid "Scanning %s"
 msgstr "%s taranıyor"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "İleti"
 
@@ -10220,10 +10859,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Adres Defteri"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10273,7 +10908,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution, Netscape verilerini alıyor."
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Çöp"
 
@@ -10409,267 +11046,275 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "İletileri içeren dizin"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Sanal Çöp"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Sanal Çöp dizini"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Bu dizinde ileti bulunamaz."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Özellikler..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Bu dizinin özelliklerini değiştir"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr "Posta iletim yöntemi düzenlenmemiş"
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Uyarı: İleti Değiştirildi"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Yeni İleti"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "_İletiyi Gönder"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution'ın posta programı başlatılamadı."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolution'ın ileti yapılandırma bileşeni başlatılamadı."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution'ın ileti dizin bilgi bileşeni başlatılamadı."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 #, fuzzy
 msgid "Connecting..."
 msgstr "Sunucuya bağlantı kuruluyor..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Depo kabuğa kayıt ettirilemedi"
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" özellikleri"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Özellikler"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Geçici dizin yaratılamadı: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d yeni"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d gizli"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr "%d görünür"
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d seçili"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d gönderilmemiş"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d gönderilmiş"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "toplam %d"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "İletiden _Sanal Dizin Yarat"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "_Konuya Göre VFolder"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "_Gönderene Göre VFolder"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "_Alıcılara Göre VFolder"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "_E-posta Listesi Üzerinde VFolder"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "_Konuya Göre Filtrele"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "_Gönderene Göre Filtrele"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "_Alıcılara Göre Filtrele"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "_E-posta Listelerine Göre Filtrele"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "Yeni İleti Olarak _Düzenle..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_Yazdır"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "_Gönderene Cevapla"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "_Listeye Cevapla"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "_Tümüne Cevapla"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Yönlendir"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Tamamlandı"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Temizle"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_Okunmuş Olarak İşaretle"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Oku_nmamış Olarak İşaretle"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Ö_nemli Olarak İşaretle"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Ö_nemsiz Olarak İşaretle"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Silme"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Dizine Taşı..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "Çağrı Cihazı"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "_Göndereni Adres Defterine Ekle"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Filtreleri Uygula"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "İletiden Bir Kural Yarat"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "E-posta Listesi Üzerinde VFolder"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "E-posta Listesine Filtre (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "E-posta Listesi Üzerinde VFolder (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Öntanımlı"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Dizin Bilgisi Alınıyor"
 
@@ -10724,7 +11369,7 @@ msgstr "pkutusu"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Gerekli tüm bilgiler verilmedi."
 
@@ -10734,84 +11379,108 @@ msgid "Evolution News Editor"
 msgstr "Evolution Haber Grubu Düzenleyici"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesap Düzenleyici"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "_Makina:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 #, fuzzy
 msgid "User_name:"
 msgstr "_Kullanıcı adı:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Path:"
 msgstr "Yol:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Radyo"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "İki hesabı aynı isimlerle oluşturamazsınız."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Gerçekten bu hesabı silmek istiyor musunuz?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Silme"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Gerçekten hesap silinsin mi?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Kapat"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Etkinleştir"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Gerçekten bu haber grubu hesabını silmek istiyor musunuz?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Etkin"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Hesap adı:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Riko"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "%s'e Postala"
+
+#: mail/mail-autofilter.c:223
+#, c-format
+msgid "Subject is %s"
+msgstr "Konu: %s"
+
+#: mail/mail-autofilter.c:239
+#, c-format
+msgid "Mail from %s"
+msgstr "%s'ten E-posta"
+
+#: mail/mail-autofilter.c:295
+#, c-format
+msgid "%s mailing list"
+msgstr "%s posta listesi"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Filtre Kuralı Ekle"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10823,7 +11492,7 @@ msgstr ""
 "önce yapmanız gerekiyor.\n"
 "Şimdi yapılandırmak istiyor musunuz?"
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10831,7 +11500,7 @@ msgstr ""
 "İleti göndermeden önce kendinize\n"
 "ait bir kimlik oluşturmalısınız."
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10840,19 +11509,19 @@ msgstr ""
 "iletim ayarı yapmalısınız."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
-"HTML biçimli bir ileti gönderiyorsunuz. Ancak aşağıdaki alıcılar, "
-"HTML biçimli iletiler almak istemiyorlar:\n"
+"HTML biçimli bir ileti gönderiyorsunuz. Ancak aşağıdaki alıcılar, HTML "
+"biçimli iletiler almak istemiyorlar:\n"
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Yine de gönderilsin mi?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10860,35 +11529,35 @@ msgstr ""
 "Bu iletinin konusu yok.\n"
 "Yine de gönderilsin mi?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Bu ileti sadece gizli (Bcc) alıcıları içeriyor."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"E-posta sunucusu tüm alıcıları Apparently-to başlığı ekleyerek "
-"görünür hale getirebilir.\n"
+"E-posta sunucusu tüm alıcıları Apparently-to başlığı ekleyerek görünür hale "
+"getirebilir.\n"
 "Yine de göndereyim mi?"
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Bu e-postayı göndermek için alıcısını belirtmeniz gereklidir."
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Bu e-postayı göndermeden önce bir hesap ayarı yapmalısınız."
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10896,28 +11565,28 @@ msgstr ""
 "Bu hesap için taslak dizini açılamadı.\n"
 "Öntanımlı taslak dizinini kullanmak istiyor musunuz?"
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "bilinmeyen gönderici"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "İletileri buraya taşı"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "İleti(leri) buraya kopyala"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Gerçekten %d iletiyi düzenlemek istiyor musunuz?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10925,7 +11594,7 @@ msgstr ""
 "Sadece taslaklar dizinine kaydedilen\n"
 "iletileri düzenleyebilirsiniz."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10933,39 +11602,39 @@ msgstr ""
 "Sadece Gönderilen dizinine kaydedilen\n"
 "iletileri yeniden gönderebilirsiniz."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Gerçekten %d iletiyi yeniden göndermek istiyor musunuz?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Hiç İleti Seçilmedi"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Dosya üzerine yazılsın mı?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "İletiyi Farklı Kaydet..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "İletileri Farklı Kaydet..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Sonraki okunmamış iletiyi göster"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10973,7 +11642,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10982,41 +11651,77 @@ msgstr ""
 "Filtre bilgisini yüklerken hata oluştu:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Filtreler"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sayfa %d/%d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "İletiyi Yazdır"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "Zarf"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "İletiyi yazdırılmasında hata"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Gerçekten %d iletiyi farklı pencerelerde açmak istiyor musunuz?"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Açıklama yok"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "İsimsiz Bağlantı"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Gönderildi"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Sınıf ekle"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "İmzayı kaydet"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in,\n"
 "unless you wish to include this information in email you send."
 msgstr ""
-"Lütfen adınızı ve e-posta adresinizi aşağıdaki boşluğa yazın. "
-"Göndereceğiniz e-posta adresinizin içinde görünmesini istemiyorsanız "
-"seçimlik alanları doldurmanıza gerek yoktur. "
+"Lütfen adınızı ve e-posta adresinizi aşağıdaki boşluğa yazın. Göndereceğiniz "
+"e-posta adresinizin içinde görünmesini istemiyorsanız seçimlik alanları "
+"doldurmanıza gerek yoktur. "
 
 #: mail/mail-config-druid.c:148
 #, fuzzy
@@ -11025,9 +11730,9 @@ msgid ""
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"Lütfen gelen e-posta sunucusu için bilgi verin. Eğer hangi tür bir "
-"sunucu kullandığınızı bilmiyorsanız sistem yöneticinize, ya da "
-"İnternet servis sağlayıcınıza başvurun."
+"Lütfen gelen e-posta sunucusu için bilgi verin. Eğer hangi tür bir sunucu "
+"kullandığınızı bilmiyorsanız sistem yöneticinize, ya da İnternet servis "
+"sağlayıcınıza başvurun."
 
 #: mail/mail-config-druid.c:150
 msgid "Please select among the following options"
@@ -11040,9 +11745,9 @@ msgid ""
 "sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"Lütfen giden e-posta sunucusu için protokol bilgisini aşağıda belirtin. "
-"Eğer hangi protokolü kullandığınızı bilmiyorsanız sistem "
-"yöneticinize, ya da İnternet servis sağlayıcınıza başvurun."
+"Lütfen giden e-posta sunucusu için protokol bilgisini aşağıda belirtin. Eğer "
+"hangi protokolü kullandığınızı bilmiyorsanız sistem yöneticinize, ya da "
+"İnternet servis sağlayıcınıza başvurun."
 
 #: mail/mail-config-druid.c:154
 msgid ""
@@ -11058,193 +11763,178 @@ msgstr ""
 "gelen \n"
 "ve giden e-posta sunucunuz Evolution hesabınızı tanımlamak için yeterli "
 "olacaktır. \n"
-"Lütfen aşağıdaki boşluğa bu hesap için bir ad veriniz. Bu isim, "
-"sadece görüntüleme \n"
+"Lütfen aşağıdaki boşluğa bu hesap için bir ad veriniz. Bu isim, sadece "
+"görüntüleme \n"
 " amaçlı olarak kullanılacaktır."
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesap Sihirbazı"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Çalışıyor"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Pownal"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "sonra"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Hesap"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Servis Denetleniyor"
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Sunucuya bağlantı kuruluyor..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "İsimsiz Bağlantı"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " "
 msgstr ", "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "_Düzenle"
-
-#: mail/mail-config.glade.h:3
-#, fuzzy
-msgid " New "
-msgstr "Yeni"
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "_Desteklenen türleri denetle "
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Evolution'un bu sürümünde SSL desteklenmiyor)"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Evolution'un bu sürümünde SSL desteklenmiyor)"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Hesap %d"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Hesap Bilgisi"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Hesap Yöneticisi"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "İşlemi İ_ptal Et"
+msgid "Add Sc_ript"
+msgstr "Sınıf ekle"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "Afrika/Lagos"
+msgid "Add new signature..."
+msgstr "İmzayı kaydet"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-#, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
-
-#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "Ağustos"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "İletiyi bir dosya ekle"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Ek"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Kimlik Denetimi"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "Automatically _detect links"
 msgstr "_Yeni iletileri otomatik denetle:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Bilinmeyen karakter seti: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "C_olors"
 msgstr "_Kapat"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Yeni İletiler Denetleniyor"
 
 #: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Bugün tamamlanması gereken görevlerin rengi"
+
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr "İleti Düzenleniyor"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Yapılandırma"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11260,56 +11950,47 @@ msgstr ""
 "\n"
 "Ayarlarınızı kaydetmek için \"Bitir\" düğmesine tıklayın."
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "Temel"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "Ö_ntanımlı"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
 msgstr "Öntanımlı Ö_ncelik:"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Öntanımlı karakter kodlaması: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "E-posta Alınıyor"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "Sayısal Numaralar..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "İleti açılamadı"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Tamamlandı"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Drafts _folder:"
 msgstr "_Taslaklar dizini:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Etkinleştir"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Emacs"
@@ -11330,39 +12011,34 @@ msgstr "_E-posta Adresi:"
 msgid "Empty _trash folders on exit"
 msgstr "Çıkarken taslaklar dizinini sil"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Komut Çalıştır..."
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "biter"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Font Properties"
 msgstr "Özellikler"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Yönlendirilen iletiler"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "Sayısal Numarayı Al..."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Renklendir: "
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Tuvalu"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11417,68 +12093,64 @@ msgstr "Mikronezya"
 msgid "NNTP Server:"
 msgstr "NNTP Sunucusu: "
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Yeni İleti Uyarısı"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "News Servers"
 msgstr "Haber _Grupları"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Seçimlik Bilgiler"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Kurum:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Anahtar Numarası:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Bir renk seçin"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Seçili bağlantıları yazdır"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail dizini "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "İleti açılamadı"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Quoted"
 msgstr "_Kotelenmiş"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Bu parolayı hatırla"
@@ -11512,122 +12184,125 @@ msgid "S_ecurity"
 msgstr "Güvenlik"
 
 #: mail/mail-config.glade.h:104
-#, fuzzy
-msgid "Same as text"
-msgstr "Somerset"
-
-#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "Güvenli MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Select PGP program"
 msgstr "PGP programını seçin"
 
-#: mail/mail-config.glade.h:111
-#, fuzzy
-msgid "Select a signature file"
-msgstr "İmza dosyası:"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "İmza dışında tümünü sil"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "E-posta Gönderiliyor"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Gönderilen iletiler dizini:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Gönderilen ve Taslak İletileri"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Sunucu kimlik denetimi istiyor"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Sunucu Yapılandırması"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Sunucu Türü: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Kısayollar"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:118
 #, fuzzy
-msgid "Signature"
+msgid "Signature #1"
 msgstr "İmzayı kaydet"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "İmzayı kaydet"
+
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Source"
 msgstr "Kaynaklar"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Source Information"
 msgstr "Bilgi Yok"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stil adı:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX posta kutusu dosyası"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "_HTML imzası:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Değişken"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -11638,150 +12313,142 @@ msgstr ""
 "\n"
 "Devam etmek için \"İleri\" düğmesine tıklayın."
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "XEmacs"
 msgstr "Doğu"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "İmza dosyası:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Kimlik Denetim Türü: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 msgid "_Authentication type: "
 msgstr "_Kimlik denetim türü: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "_Yeni iletileri otomatik denetle:"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "_Yeni iletileri otomatik denetle:"
+
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Yeni ileti geldiği zaman ses çıkar"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "_Sertifika No:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "_HTML imzası:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Öntanımlılar"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Yeni ileti geldiğinde haber verme"
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Filename:"
-msgstr "Dosya adı:"
+msgid "_Enable"
+msgstr "Etkinleştir"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "İletiyi _Yönlendir"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 msgid "_Full name:"
 msgstr "_Tam isim:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML iletide"
 
-#: mail/mail-config.glade.h:160
-#, fuzzy
-msgid "_HTML Signature:"
-msgstr "_HTML imzası:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Language:"
-msgstr "Dil"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "Gönderici adres defterinde ise resimleri yükle"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "_Bunu öntanımlı hesabım yap"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "İletileri okunmuş olarak işaretle:"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Name:"
 msgstr "İsim:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP program yolu:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Yeni ileti geldiği zaman bir müzik dosyasını çal"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Bu konuyla iletileri filtrelemek için kural oluştur"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Bu konuyla iletileri filtrelemek için kural oluştur"
 
-#: mail/mail-config.glade.h:174
-#, fuzzy
-msgid "_Random"
-msgstr "Radyo"
-
 #: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Receiving Mail"
@@ -11822,69 +12489,52 @@ msgstr "İmza dosyası:"
 
 #: mail/mail-config.glade.h:183
 #, fuzzy
-msgid "_Text Signature:"
-msgstr "_HTML imzası:"
-
-#: mail/mail-config.glade.h:184
-#, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Güvenli bağlantı (SSL) kullan"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Değişken"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_her"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 #, fuzzy
 msgid "color"
 msgstr " renk"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "açıklama"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "PGP imza dosyası oluşturulamadı."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "PGP onaylama dosyası oluşturulamadı."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "PGP şifreleme dosyası oluşturulamadı."
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "PGP şifre açma dosyası oluşturulamadı."
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "S/MIME imzası oluşturulamadı."
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "S/MIME şifreli içerik (sadece serifikalı) oluşturulamıyor."
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "S/MIME şifreli içerik oluşturulamıyor."
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "S/MIME şifreli zarf içeriği oluşturulamıyor."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME kodlama içeriği oluşturulamıyor."
 
@@ -11927,98 +12577,134 @@ msgstr "Harici İzleyici"
 msgid "Loading message content"
 msgstr "İleti içeriği yükleniyor"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Zamanı geçen görevler"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Bağlantıyı Tarayıcıda Aç"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Adresi Kopyala"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Bağlantıyı Farklı Kaydet"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Resmi Farklı Kaydet..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s ek"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarih"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Hatalı Adres"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Gönderen"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Yanıtla:"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Alıcı"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Bilgi:"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Gizli"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "İleti"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "İletiyi Farklı Kaydet..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Bu ileti dijital olarak imzalanmıştır ve güvenlidir. Daha fazla bilgi için "
+"kilit simgesi üzerine tıklayın."
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "PGP onaylama dosyası oluşturulamadı."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Bu ileti dijital olarak imzalanmıştır ve güvenlidir."
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP adresine bağ (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, 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:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerel dosyaya bağ (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "FTP adresine bağ (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Bilinmeyen harici veriye bağ (\"%s\" türünde)"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "Bozuk harici gövde"
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Yerel Dizinler"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Dizin yeniden yapılandırılıyor"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -12027,29 +12713,29 @@ msgstr ""
 "Dizin meta bilgisi kaydedilemedi. Büyük ihtimalle bu dizini \n"
 "yeniden açamayacaksınız: %s"
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "%s üzerinde dizin kilitlemesi yaratılamadı: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "`%s' dizini silinemedi:\n"
 "%s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" biçiminden \"%s\" biçimine geçiliyor"
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12057,12 +12743,12 @@ msgstr ""
 "Eğer bu dizini tekrar açamazsınız, elle \n"
 "düzeltme yapmak zorunda kalacaksınız."
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Bu çöp dizininden iletileri kopyalayamazsınız."
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Yeniden Yapılandır: %s"
@@ -12122,81 +12808,73 @@ msgstr "%d/%d iletide hata"
 msgid "Complete."
 msgstr "Tamamlandı."
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "İletiler dizine kaydediliyor"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İletiler %s'e taşınıyor"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İletiler %s'e kopyalanıyor"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Taşınıyor"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Kopyalanıyor"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Yönlendirilen iletiler"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s dizini açılıyor"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "%s deposu açılıyor"
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Yeni dizin yaratılıyor"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s iletisi alınıyor"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "İletiler alınıyor"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "İletiler kaydediliyor"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12205,7 +12883,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12214,11 +12892,11 @@ msgstr ""
 "İletilerin kaydında hata: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Ek kaydediliyor"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12227,27 +12905,27 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s bağlantısı kesiliyor"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "%s bağlantısı kesiliyor"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Ara"
 
@@ -12321,10 +12999,6 @@ msgstr "Güncelleniyor..."
 msgid "Waiting..."
 msgstr "Bekleniyor..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "İptal edildi."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Kullanıcı işlemi iptal etti."
@@ -12338,16 +13012,16 @@ msgstr "%s İçin Parolayı Girin"
 msgid "Enter Password"
 msgstr "Parolayı Girin"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, fuzzy, c-format
 msgid "Could not save signature file: %s"
 msgstr "İmza dosyası kaydedilemedi."
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "İmzayı kaydet"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -12357,10 +13031,30 @@ msgstr ""
 "\n"
 "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "İsim:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "İmza dosyası:"
+msgid "Signature hint"
+msgstr "İmzayı kaydet"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "HTML imza dosyası:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12375,17 +13069,17 @@ msgstr "Yönlendirilen ileti"
 msgid "Forwarded Message"
 msgstr "Yönlendirilen İleti"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Yeni dizin yaratılıyor"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "%s dizini %s adresine kopyalanıyor"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12394,91 +13088,96 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+msgid "VFolders"
+msgstr "VDizin"
+
+#: mail/mail-vfolder.c:784
 #, fuzzy
 msgid "vFolders"
 msgstr "Dizinler"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "VFolder Düzenle"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Yeni VDizin"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Konusuz)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - İleti"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Görünmeyen"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Görünen"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Cevaplanan"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Çoklu Görülmeyen İleti"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Çoklu İletiler"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "En Düşük"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Düşük"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Yüksek"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "En Yüksek"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Dün %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "İleti listesi oluşturuluyor"
 
@@ -12501,10 +13200,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Asıl Bağlantı:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Alındı"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Boyut"
 
@@ -17583,5316 +18287,5313 @@ msgstr "Yağmurlu"
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "Çağrı Cihazı"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr ""
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "En Düşük"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 #, fuzzy
 msgid "Learmouth"
 msgstr "En Düşük"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "Mayıs"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "Marjin"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "Sil"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "yıl"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "En Düşük"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 #, fuzzy
 msgid "Lewistown"
 msgstr "En Düşük"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr ""
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Liberal"
 msgstr "Nisan"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Libya"
 msgstr "Nisan"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "Yüksek"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Lihue"
 msgstr "dakika"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "En Düşük"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limoges"
 msgstr "En Düşük"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "ay"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Lincoln"
 msgstr "gelen"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 #, fuzzy
 msgid "Lisboa"
 msgstr "Nisan"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "Sisli"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr ""
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "Kasırga"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "Kopyala"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 #, fuzzy
 msgid "London"
 msgstr "Kasırga"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr ""
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "saat"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 #, fuzzy
 msgid "Los Alamos"
 msgstr "Uyarılar"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr ""
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "En Düşük"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "giden"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "Düşük"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr ""
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "Mart"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "Mart"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macapa"
 msgstr "Mart"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "Pazartesi"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "Mayıs"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "Mayıs"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "Radyo"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "Kanada"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr ""
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "Mayıs"
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "Mayıs"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "İleti"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "İleti"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "İleti"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 #, fuzzy
 msgid "Managua"
 msgstr "Yönetici"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "İletiler"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "Mart"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manchester"
 msgstr "Eşleşenler:"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr ""
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "Mayıs"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "Sisli"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "Ana araç çubuğu"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "Pazartesi"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "İleti"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "İleti"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr ""
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "Mart"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "Marjin"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "Marjin"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "İleti"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr ""
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "İleti"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "Marjin"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 #, fuzzy
 msgid "Marquette"
 msgstr "Mayıs"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "Mart"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr ""
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "Tarih"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Oku_nmamış Olarak İşaretle"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Marjin"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "Marjin"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 #, fuzzy
 msgid "Maryland"
 msgstr "Finlandiya"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "Mart"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "Mayıs"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "Düzenle"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Matsuyama Airport"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr " "
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Memambetsu Airport"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Middle East"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "_Ortanca:"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "%s'e Postala"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "gelen"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr " "
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "değil"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Miyazaki Airport"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Mobile Regional Airport"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Mombetsu Airport"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "Orta şiddette kar yağışı"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr ""
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moscow Sheremetyevo"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Muğla/Dalaman"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "Munchen"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Nagasaki Airport"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Nagoya Airport"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Naha Airport"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu Airport"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "Cevapla"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "Haberler"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 #, fuzzy
 msgid "Napoli"
 msgstr "İleti"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "Lakap"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "New Tokyo International Airport"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "Haberler"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Niigata Airport"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "Şimdi"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "Kuzeydoğu"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "Şimdi"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "Kuzeybatı"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "Kuzey"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "Şimdi"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "Not"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Obihiro Airport"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr "Odesa"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Oita Airport"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Okayama Airport"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Oki Airport"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Osaka International Airport"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr ""
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr " "
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "Bir ses çal"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "Bir ses çal"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "Soru"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "Oku"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "Bölümler:"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "People's Republic of China"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr ""
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr ""
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr ""
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Apt"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr " Geri"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr " Özet"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr "Rivne"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Russia"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Safford-Municipal Airport"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Şanlıurfa"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitkaz"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr " Gönderen"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "Dur"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle "
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr "Sympheropol"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Takamatsu Airport"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Talinn"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Tanegashima Airport"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Tehran-Mehrabad"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Tokyo International Airport"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Tokyo New International Airport"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Tottori Airport"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Toyama Airport"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Tsushima Airport"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "United Arab Emirates "
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr "Uzhgorod"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Virginia Tech Airport"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser Airport"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Wakkanai Airport"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Yamagata Airport"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube Airport"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Yao Airport"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Zürih"
 
@@ -22922,17 +23623,12 @@ msgstr "%d %B %A"
 msgid "No description"
 msgstr "Açıklama yok"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "İleti özeti"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-msgid "VFolders"
-msgstr "VDizin"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Yerel Dizinler"
 
@@ -22941,57 +23637,47 @@ msgstr "Yerel Dizinler"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "İsim:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "RDF indirirken bir hata oluştu"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "Haber Grubu"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
+#: my-evolution/e-summary-shown.c:545
 #, fuzzy
-msgid "Add ->"
+msgid "Add"
 msgstr "_Ekle"
 
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-#, fuzzy
-msgid "<- Remove"
-msgstr "Sil"
-
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
@@ -23033,10 +23719,43 @@ msgstr "Yazdırma Özeti"
 msgid "Printing of Summary failed"
 msgstr "İletiyi yazdırılmasında hata"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Bonobo başlatılamadı.\n"
 
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr "knot"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr "km/h"
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Taşınıyor"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr "mmHg"
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "mil"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "kilometre"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Açık gökyüzü"
@@ -24217,101 +24936,107 @@ msgid "C_elsius"
 msgstr "D_erece"
 
 #: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Haber grubu _ekle"
+
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Haber Grubu Ayarları"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Bi_r ay"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "B_ir hafta"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 #, fuzzy
 msgid "S_how full path for folders"
 msgstr "_Kapsamlı Başlıkları Göster"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Tüm _görevleri göster"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "_Bugünün görevlerini göster"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Sıcaklığı göster:"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Görevler "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Hava durumu ayarları"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "_Fahrenheit"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "Beş gün"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "İ_leti"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "Haber _Grupları"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "_Bir gün"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "_Hava Durumu"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Evolution e-posta programı mimarisi."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Dizini Seçin"
+msgid "Folder Settings"
+msgstr "İleti Ayarları"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution kabuğu."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -24322,6 +25047,37 @@ msgstr "Ayrıntıları Göster"
 msgid "Cancel Operation"
 msgstr "İşlemi İ_ptal Et"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Cannot transfer folder:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Gönderilmiş Dizin Olarak"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Taslaklar"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Gelen"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Giden"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Gönderildi"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Evolution kurulumu"
@@ -24425,6 +25181,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Tamamlanma Tarihi"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Dizini Seçin"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Dizini Seçin"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Dizini Seçin"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Tamamlanma Tarihi"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -24455,20 +25236,20 @@ msgstr ""
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "\"%s\" dizinini kopyalamak için bir dizin adı verin:"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Dizini kopyala"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "\"%s\" dizinini taşımak için bir dizin adı verin:"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Dizini taşı"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24477,18 +25258,19 @@ msgstr ""
 "Dizin silinemedi:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr ""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Gerçekten '%s' dizinini silmek istiyor musunuz?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"Dizin silinemedi:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24497,16 +25279,16 @@ msgstr ""
 "Dizin yeniden adlandırılamadı:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" dizinini yeniden adlandır:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Dizini yeniden adlandır"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24525,7 +25307,7 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Yeni dizin yarat"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -24533,7 +25315,7 @@ msgstr ""
 "İstenen işlem için seçili dizin tipi \n"
 "geçerli değildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Yeni..."
 
@@ -24556,8 +25338,8 @@ msgstr ""
 "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."
+"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."
 
 #: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
 msgid "Please select the information that you would like to import:"
@@ -24585,21 +25367,26 @@ msgstr ""
 "%s alınıyor\n"
 "%d öğesi alınıyor."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Dizini Seçin"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "%s dosyası bulunamadı."
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Evolution Hatası"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24608,11 +25395,11 @@ msgstr ""
 "Bunu açabilecek hiç bir filtre bulunamadı:\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Alınıyor"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24621,17 +25408,17 @@ msgstr ""
 "%s alınıyor.\n"
 "%s başlatılıyor"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "%s başlatırken hata oluştu"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "%s yüklenirken hata oluştu"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24640,31 +25427,31 @@ msgstr ""
 "%s alınıyor\n"
 "1. öğe alınıyor."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Dosya adı:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Bir dosya seçin"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Dosya türü:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Tek dosya aktar"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24672,31 +25459,78 @@ msgstr ""
 "Lütfen bekleyiniz...\n"
 "Mevcut ayarlar aranıyor"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Dizini seçin"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Bu veriyi almak için hedef dizin seçin"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Aktar"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Bağlantılar kesiliyor..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"'%s' sırasında hata:\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Dizin eşzamanlı hale getiriliyor"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "%s dizini açılıyor"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "%s dizini açılıyor"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "%s içinde aç..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Belirlenen dizin yaratılamadı:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -24710,8 +25544,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolution Posta Asistanı arayüzü başlatılamadı\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Yeni"
@@ -24732,43 +25566,43 @@ msgstr "Dizin içinde bölü karakteri bulunamaz."
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH dizininde bulunamadı."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy çalıştırılamadı."
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Ximian Evolution Hakkında"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Dizine git..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Açmak istediğiniz dizini seçin"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Yeni bir kısayol yarat"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Kısayolu işaret etmek istediğiniz dizini seçin:"
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "Ç_evrimiçi Çalış"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "Çe_vrimdışı Çalış"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Çevrimdışı Çalış"
 
@@ -24789,8 +25623,8 @@ msgstr "(Hiçbiri)"
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
-"Ximian Evolution çevrimiçi çlışıyor. Bu düğmeye tıklayarak "
-"çevrimdışı çalışmasını sağlayın."
+"Ximian Evolution çevrimiçi çlışıyor. Bu düğmeye tıklayarak çevrimdışı "
+"çalışmasını sağlayın."
 
 #: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
@@ -24800,10 +25634,10 @@ msgstr "Ximian Evolution çevrimdışı çalışmak üzere hazırlanıyor."
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Ximian Evolution çevrimdışı çalışıyor. Bu düğmeye tıklayarak "
-"çevrimiçi çalışmasını sağlayın."
+"Ximian Evolution çevrimdışı çalışıyor. Bu düğmeye tıklayarak çevrimiçi "
+"çalışmasını sağlayın."
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24815,12 +25649,12 @@ msgstr ""
 "Etkinleştirme sisteminden gelen mesaj:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerel kayıt kurulamadı -- %s"
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24828,23 +25662,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "Tamam"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Geçersiz argümanlar"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "OAF'a kayıt yapılamadı"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Yapılandırma Veritabanı bulunamadı"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Genel hata"
 
@@ -24869,95 +25699,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Silme"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Kısayol Grubunu Yeniden İsimlendir"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Seçili kısayol grubunu yeniden isimlendir:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Küçük Simgeler"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Kısayolları küçük simgeler olarak göster"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "_Büyük Simgeler"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Kısayolları büyük simgeler olarak göster"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "Yeni _Grup..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Yeni bir kısayol grubu yarat"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "B_u Grubu Sil..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Bu kısayolu grubunu sil"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "_Bu Grubu Yeniden Adlandır..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Bu kısayol grubunu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "Kısayol Çubuğunu _Gizle"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Kısayol çubuğunu gizle"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Kısayolu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Seçili kısayolları yeniden isimlendir:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Bu kısayola bağlı dizini aç"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Y_eni Pencerede Aç"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Bu kısayola bağlı dizini yeni pencerede aç"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "_Yeniden adlandır"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Bu kısayolu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "_Sil"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu kısayolu kısayol çubuğundan sil"
 
@@ -24969,10 +25799,6 @@ msgstr "Kısayolları kaydederken hata oldu."
 msgid "Shortcuts"
 msgstr "Kısayollar"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Gelen"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -25036,10 +25862,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d tamamlandı)"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<bir dizin seçmek için tıklayın>"
 
@@ -25080,67 +25907,67 @@ msgstr ""
 "Etkinleştirme sisteminden gelen mesaj:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "CORBA hatası"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Kesintiye uğradı"
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Geçersiz argüman"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Sahibi yok"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Bulunamadı"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Desteklenmeyen tür"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Desteklenmeyen şema"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Desteklenmeyen işlem"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "İç hata"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Bulunur"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "Geçersiz URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Alt dizinler"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Hiç boş alan kalmadı"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr ""
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 msgid "Test type"
 msgstr "Deneme türü"
 
@@ -25151,8 +25978,8 @@ msgstr "Etkin bağlantılar"
 #: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Click OK to close these connections and go offline"
 msgstr ""
-"Bu bağlantıları kapatmak ve İnternet bağlantısını ayırmak için "
-"Tamam düğmesine tıklayın"
+"Bu bağlantıları kapatmak ve İnternet bağlantısını ayırmak için Tamam "
+"düğmesine tıklayın"
 
 #: shell/glade/e-active-connection-dialog.glade.h:3
 msgid "Host"
@@ -25268,49 +26095,81 @@ msgstr "Tekrar sorma"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution, aşağıdaki dosyalardan veri alabilir:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution'dan çıkılıyor..."
 
-#: shell/main.c:227
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Tekrar sorma"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution Kabuğuna erişilemedi."
 
-#: shell/main.c:236
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution Kabuğu başlatılamadı: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Açılış ekranıni gösterme"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Aktarma işlemi başlıyor"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Aktarma işlemi başlıyor"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Tüm hata ayıklama verilerini bir dosyaya yazdır."
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parçalar sistemi başlatılamadı."
 
@@ -25424,11 +26283,11 @@ msgstr "Şimdiki bağlantıyı görüntüle"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Eylemler"
 
@@ -25550,8 +26409,8 @@ msgstr "Bu öğeyi kapat"
 msgid "Delete this item"
 msgstr "Bu öğeyi sil"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Ana araç çubuğu"
 
@@ -25591,7 +26450,7 @@ msgstr "Bu öğeyi diske kaydet"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Dosya"
 
@@ -25656,19 +26515,19 @@ msgstr "i_Calendar Olarak Yönlendir"
 msgid "Forward this item via email"
 msgstr "Bu öğeyi ileti ile yönlendir"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Son toplantı bilgisini al"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "T_oplantıyı Tazele"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "Toplantı Zamanı Düzenle"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Bu öğe _için toplantı zamanı düzenle"
 
@@ -25676,10 +26535,6 @@ msgstr "Bu öğe _için toplantı zamanı düzenle"
 msgid "Customise My Evolution"
 msgstr "Evolution'ı Özelleştir"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "İptal"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Şimdiki e-posta işlemini iptal et"
@@ -25706,8 +26561,7 @@ msgstr "Parolaları _Unut"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
-"Bilinen parolaları unut (tüm parolaları yeniden girmeniz gerekecektir)"
+msgstr "Bilinen parolaları unut (tüm parolaları yeniden girmeniz gerekecektir)"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
@@ -25834,7 +26688,7 @@ msgstr "Konumlandırılan İleti listesi"
 msgid "_Expunge"
 msgstr "_Sil"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_Dizin"
 
@@ -26249,7 +27103,7 @@ msgstr "Önceki İleti"
 msgid "_Quoted"
 msgstr "_Kotelenmiş"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Araçlar"
 
@@ -26264,12 +27118,12 @@ msgstr "Bu pencereyi kapat"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "_Kapat"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Göster"
 
@@ -26456,7 +27310,7 @@ msgstr "_Aç..."
 msgid "_Reply-To Field"
 msgstr "_Yanıtla Alanı"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Yardım"
 
@@ -26603,111 +27457,120 @@ msgid "Move this folder to another place"
 msgstr "Bu dizini başka bir yere taşı"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Yeni Bir _Dizin Yarat..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Yeni Pencerede Aç"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Bu dizini yeni bir pencerede aç"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Al / Gönder"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Kuyruktaki iletileri gönder ve yeni iletileri al"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution hakkında bilgi ver"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Hata Raporu Gönder"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "_Hata Raporu Gönder"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy kullanarak bir hata raporu gönderin"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Aç/kapat"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Dizin çubuğunu göster/gizle"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Kısayol çubuğunu göster/gizle"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Çevrimiçi/çevrimdışı çalış."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Seçili dizini göster"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _SSS"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolution Hakkında..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Kopyala..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "_Dizin Çubuğu"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "Dizine _Git..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Al..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Taşı..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Yeni"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "_Yeni Dizin"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "_Pilot Ayarları..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "Y_eniden İsimlendir..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "_Gönder / Al"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Kısayol"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "_Kısayol Çubuğu"
 
@@ -26788,20 +27651,20 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "Ş_imdiki Görünüm"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 msgid "Custom View"
 msgstr "Özel Görünüm"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr "Özel Görünümü Kaydet"
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Görünümleri Tanımla"
 
@@ -26922,16 +27785,21 @@ msgstr "Arama Düzenleyici"
 msgid "Save Search"
 msgstr "Aramayı Kaydet"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Aramayı Kaydet"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Kayıtlı Aramalara Ekle"
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Gelişmiş..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Bilgi"
@@ -26953,21 +27821,21 @@ msgstr "İleti"
 msgid "Don't show this message again."
 msgstr "Bu mesajı bir daha gösterme."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Şimdi Bul"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Temizle"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 msgid "Clear"
 msgstr "Temizle"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Şimdi Bul"
 
@@ -26993,322 +27861,264 @@ msgstr "init_corba(): GNOME başlatılamadı"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo başlatılamadı"
 
-#~ msgid "Connecting to LDAP server..."
-#~ msgstr "LDAP sunucuya bağlantı kuruluyor..."
-
-#~ msgid "Waiting for connection to LDAP server..."
-#~ msgstr "LDAP sunucuya bağlantı kuruluyor..."
-
-#~ msgid "Edit Addressbook"
-#~ msgstr "Adres Defterini Düzenle"
-
-#~ msgid "A_uthenticate with server using:"
-#~ msgstr "Sunucu ile kimlik denetimi yaparken kullan:"
-
-#~ msgid "Account Name"
-#~ msgstr "Hesap Adı"
-
-#~ msgid "Add Addressbook"
-#~ msgstr "Adres Defterine Ekle"
-
-#~ msgid "Advanced"
-#~ msgstr "Gelişmiş"
-
-#~ msgid "Base"
-#~ msgstr "Temel"
-
-#~ msgid "Check this if the server requires you to authenticate."
-#~ msgstr "Sunucu kimlik denetimi istiyor"
-
-#~ msgid "Server Name"
-#~ msgstr "Sunucu Adı"
-
-#~ msgid "The information below is required in order to add an addressbook.  "
-#~ msgstr "Aşağıdaki bilgi, adres defterine eklemek için gereklidir.  "
-
-#~ msgid "This information is not required for most ldap servers. "
-#~ msgstr "Bu bilgi pek çok ldap sunucu için gerekli değildir. "
-
-#~ msgid "This is the name of the server where your addressbook is located."
-#~ msgstr "Burada adres defterinizin bulunduğu sunucunun adı yeralıyor."
-
-#~ msgid "This is the port that your ldap server uses."
-#~ msgstr "Bu sizin LDAP sunucunuzun kullandığı port numarasını veriyor."
-
-#~ msgid "Other Contacts"
-#~ msgstr "Diğer Bağlantılar"
-
-#~ msgid "Name contains"
-#~ msgstr "İsim içeriği"
-
-#~ msgid "(none)"
-#~ msgstr "(hiçbiri)"
-
-#~ msgid "C_ontaining:"
-#~ msgstr "İç_erir:"
+#, fuzzy
+#~ msgid "Addressbook Settings"
+#~ msgstr "Adres Defteri Kaynakları"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#, fuzzy
+#~ msgid "Could not query for schema information"
 #~ msgstr ""
-#~ "Gerçekten bu bağlantıyı\n"
-#~ "silmek istiyor musunuz?"
+#~ "Hatalı opak izleme bilgisi:\n"
+#~ "%s"
 
-#~ msgid "Starting:"
-#~ msgstr "Başlangıç:"
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolution takvim özet bileşeni."
 
-#~ msgid "Ending:"
-#~ msgstr "Bitiş:"
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Takvim özet bileşen mimarisi."
 
 #, fuzzy
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Yeni bir randevu yarat"
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Günün başlangıcı:"
 
 #, fuzzy
-#~ msgid "First day of wee_k:"
-#~ msgstr "Haftanın ilk günü:"
+#~ msgid "_End of day:"
+#~ msgstr "Gün sonu:"
 
 #, fuzzy
-#~ msgid "_Other"
-#~ msgstr "Diğer"
-
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Katılımcı eklemek için tıklayın"
-
-#~ msgid "0%"
-#~ msgstr "%0"
-
-#~ msgid "10%"
-#~ msgstr "%10"
-
-#~ msgid "20%"
-#~ msgstr "%20"
+#~ msgid "_Other Organizer"
+#~ msgstr "Kurum:"
 
-#~ msgid "30%"
-#~ msgstr "%30"
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "Bu şifreleme ile açık imza desteklenmiyor"
 
-#~ msgid "40%"
-#~ msgstr "%40"
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "%s parolasını %s için parolayı girin"
 
-#~ msgid "50%"
-#~ msgstr "%50"
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "%s parolasını girin"
 
-#~ msgid "60%"
-#~ msgstr "%60"
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Bu mesaj şifrelenemedi"
 
-#~ msgid "70%"
-#~ msgstr "%70"
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Bu mesaj şifrelenemedi: Parola verilmedi"
 
-#~ msgid "80%"
-#~ msgstr "%80"
+#, fuzzy
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "GPG/PGP ile bağlantı kurulamadı: %s"
 
-#~ msgid "90%"
-#~ msgstr "%90"
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
 
-#~ msgid "100%"
-#~ msgstr "%100"
+#, fuzzy
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
 
-#~ msgid "_Delete this Task"
-#~ msgstr "_Bu Görevi Sil"
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Bu mesaj denetlenemedi: GPG/PGP ile bağlantı kurulamadı: %s"
 
-#~ msgid "Meeting begins: <b>"
-#~ msgstr "Toplantı başlangıcı: <b>"
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Bu mesaj şifrelenemedi: Parola verilmedi"
 
-#~ msgid "Task begins: <b>"
-#~ msgstr "Görev başlangıcı: <b>"
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Bu mesaj şifrelenemedi: GPG/PGP ile bağlantı kurulamadı: %s"
 
 #, fuzzy
-#~ msgid "Free/Busy info begins: <b>"
-#~ msgstr "İstenen Bilgiler"
-
-#~ msgid "Begins: <b>"
-#~ msgstr "Başlangıç: <b>"
-
-#~ msgid "Meeting ends: <b>"
-#~ msgstr "Toplantı bitişi: <b>"
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
 
 #, fuzzy
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "İstenen Bilgiler"
-
-#~ msgid "Ends: <b>"
-#~ msgstr "Bitiş: <b>"
-
-#~ msgid "Task Completed: <b>"
-#~ msgstr "Tamamlanan Görev: <b>"
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "GPG/PGP ile bağlantı kurulamadı: %s"
 
-#~ msgid "iCalendar Information"
-#~ msgstr "iCalendar Bilgisi"
+#~ msgid "%s server %s"
+#~ msgstr "%s sunucu %s"
 
-#~ msgid "iCalendar Error"
-#~ msgstr "iCalendar Hatası"
+#~ msgid "(unknown host)"
+#~ msgstr "(bilinmeyen makine)"
 
-#~ msgid "An unknown person"
-#~ msgstr "Bilinmeyen kişi"
+#~ msgid "No such message: %s"
+#~ msgstr "Bu isimle bir ileti yok: %s"
 
-#~ msgid ""
-#~ "<br> Please review the following information, and then select an action from "
-#~ "the menu below."
-#~ msgstr ""
-#~ "<br> Lütfen bu bilgilerin doğruluğunu denetledikten sonra, aşağıdaki "
-#~ "menüden bir işlem seçiniz."
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Bu çöp dizininden iletileri kopyalayamazsınız."
 
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Hiçbiri</i>"
+#~ msgid "Directory tree of mbox files"
+#~ msgstr "Posta kutusu dosyalarının dizin yapısı"
 
-#~ msgid "Status:"
-#~ msgstr "Durum:"
-
-#~ msgid "Choose an action:"
-#~ msgstr "Bir eylem seçin:"
-
-#~ msgid "Update"
-#~ msgstr "Güncelle"
+#, fuzzy
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "İleti mbox dosyasına eklenemedi (%s): %s"
 
-#~ msgid "Accept"
-#~ msgstr "Onayla"
+#, fuzzy
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "%s yüklenemedi: %s"
 
-#~ msgid "Decline"
-#~ msgstr "Reddet"
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "`%s' normal bir dosya değildir."
 
-#~ msgid "Send Free/Busy Information"
-#~ msgstr "Boş/Meşgul Bilgisi Gönder"
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Radyo"
 
-#~ msgid "Update respondent status"
-#~ msgstr "Cevaplayan Bilgisini Güncelle"
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "_Düzenle"
 
-#~ msgid "Send Latest Information"
-#~ msgstr "Güncel Bilgiyi Gönder"
+#, fuzzy
+#~ msgid " New "
+#~ msgstr "Yeni"
 
-#~ msgid "<b>%s</b> has published meeting information."
-#~ msgstr "<b>%s</b>, toplantı bilgisi gönderdi."
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "İşlemi İ_ptal Et"
 
-#~ msgid "Meeting Information"
-#~ msgstr "Toplantı Bilgisi"
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "Afrika/Lagos"
 
-#~ msgid "<b>%s</b> requests your presence at a meeting."
-#~ msgstr "<b>%s</b> sizin toplantıda olmanızı istiyor."
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "Ağustos"
 
-#~ msgid "Meeting Proposal"
-#~ msgstr "Toplantı Taslağı"
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "Temel"
 
-#~ msgid "<b>%s</b> wishes to add to an existing meeting."
-#~ msgstr "<b>%s</b> mevcut bir toplantıya ekleme yapmak istiyor"
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Tuvalu"
 
-#~ msgid "Meeting Update"
-#~ msgstr "Toplantı Güncellemesi"
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "Somerset"
 
-#~ msgid "<b>%s</b> wishes to receive the latest meeting information."
-#~ msgstr "<b>%s</b> son toplantı bilgisini almak istiyor."
+#, fuzzy
+#~ msgid "Select a signature file"
+#~ msgstr "İmza dosyası:"
 
-#~ msgid "Meeting Update Request"
-#~ msgstr "Toplantı Güncelleme Bilgisi İsteği"
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "İmza dışında tümünü sil"
 
-#~ msgid "<b>%s</b> has replied to a meeting request."
-#~ msgstr "<b>%s</b> bir toplantı isteğine cevap verdi."
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "_HTML imzası:"
 
-#~ msgid "Meeting Reply"
-#~ msgstr "Toplantı Yanıtı"
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Dosya adı:"
 
-#~ msgid "<b>%s</b> has cancelled a meeting."
-#~ msgstr "<b>%s</b> bir toplantıyı iptal etti."
+#, fuzzy
+#~ msgid "_HTML Signature:"
+#~ msgstr "_HTML imzası:"
 
-#~ msgid "Meeting Cancellation"
-#~ msgstr "Toplantı İptali"
+#, fuzzy
+#~ msgid "_Language:"
+#~ msgstr "Dil"
 
-#~ msgid "<b>%s</b> has sent an unintelligible message."
-#~ msgstr "<b>%s</b> hatalı bir mesaj gönderdi."
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Radyo"
 
-#~ msgid "Bad Meeting Message"
-#~ msgstr "Hatalı Toplantı Mesajı"
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "PGP şifreleme dosyası oluşturulamadı."
 
-#~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> görev bilgisi yayınladı."
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "PGP şifre açma dosyası oluşturulamadı."
 
-#~ msgid "Task Information"
-#~ msgstr "Görev Bilgisi"
+#~ msgid "Moving"
+#~ msgstr "Taşınıyor"
 
-#~ msgid "<b>%s</b> requests you perform a task."
-#~ msgstr "<b>%s</b> bir görevi tamamlamanızı istiyor."
+#~ msgid "Copying"
+#~ msgstr "Kopyalanıyor"
 
-#~ msgid "Task Proposal"
-#~ msgstr "Görev Taslağı"
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "İmza dosyası:"
 
-#~ msgid "<b>%s</b> wishes to add to an existing task."
-#~ msgstr "<b>%s</b> mevcut bir göreve eklenti yapmak istiyor."
+#~ msgid "Riga"
+#~ msgstr "Riga"
 
-#~ msgid "Task Update"
-#~ msgstr "Görev Güncellemesi"
+#, fuzzy
+#~ msgid "Add ->"
+#~ msgstr "_Ekle"
 
-#~ msgid "<b>%s</b> wishes to receive the latest task information."
-#~ msgstr "<b>%s</b> en güncel görev bilgisini almak istiyor."
+#, fuzzy
+#~ msgid "<- Remove"
+#~ msgstr "Sil"
 
-#~ msgid "Task Update Request"
-#~ msgstr "Güncel Görev Bilgisi İsteği"
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Gerçekten '%s' dizinini silmek istiyor musunuz?"
 
-#~ msgid "<b>%s</b> has replied to a task assignment."
-#~ msgstr "<b>%s</b> bir görev tanımına cevap verdi."
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "LDAP sunucuya bağlantı kuruluyor..."
 
-#~ msgid "Task Reply"
-#~ msgstr "Görev Yanıtı"
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "LDAP sunucuya bağlantı kuruluyor..."
 
-#~ msgid "<b>%s</b> has cancelled a task."
-#~ msgstr "<b>%s</b> bir görevi iptal etti."
+#~ msgid "Edit Addressbook"
+#~ msgstr "Adres Defterini Düzenle"
 
-#~ msgid "Task Cancellation"
-#~ msgstr "Görev İptali"
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "Sunucu ile kimlik denetimi yaparken kullan:"
 
-#~ msgid "Bad Task Message"
-#~ msgstr "Hatalı Görev Mesajı"
+#~ msgid "Account Name"
+#~ msgstr "Hesap Adı"
 
-#~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> boş/meşgul bilgisi gönderdi."
+#~ msgid "Add Addressbook"
+#~ msgstr "Adres Defterine Ekle"
 
-#~ msgid "Free/Busy Information"
-#~ msgstr "Boş/Meşgul Bilgisi"
+#~ msgid "Advanced"
+#~ msgstr "Gelişmiş"
 
-#~ msgid "<b>%s</b> requests your free/busy information."
-#~ msgstr "<b>%s</b> sizden boş/meşgul bilgisini almak istiyor."
+#~ msgid "Base"
+#~ msgstr "Temel"
 
-#~ msgid "Free/Busy Request"
-#~ msgstr "Boş/Meşgul İsteği"
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "Sunucu kimlik denetimi istiyor"
 
-#~ msgid "<b>%s</b> has replied to a free/busy request."
-#~ msgstr "<b>%s</b> bir boş/meşgul isteğine cevap verdi."
+#~ msgid "Server Name"
+#~ msgstr "Sunucu Adı"
 
-#~ msgid "Free/Busy Reply"
-#~ msgstr "Boş/Meşgul Cevabı"
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "Aşağıdaki bilgi, adres defterine eklemek için gereklidir.  "
 
-#~ msgid "Bad Free/Busy Message"
-#~ msgstr "Hatalı Boş/Meşgul Mesajı"
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "Bu bilgi pek çok ldap sunucu için gerekli değildir. "
 
-#~ msgid "The message contains only unsupported requests."
-#~ msgstr "Bu iletide desteklenmeyen bilgiler var."
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Burada adres defterinizin bulunduğu sunucunun adı yeralıyor."
 
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "Bu eklenti geçerli bir takvim mesajını içermiyor."
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Bu sizin LDAP sunucunuzun kullandığı port numarasını veriyor."
 
-#~ msgid "The attachment has no viewable calendar items"
-#~ msgstr "Bu eklentide görüntülenebilir takvim öğeleri bulunmuyor"
+#~ msgid "Name contains"
+#~ msgstr "İsim içeriği"
 
-#~ msgid "Unable to find any of your identities in the attendees list!\n"
-#~ msgstr "Katılımcı bilgileri içinde size ait bir kimlik bulunamadı!\n"
+#~ msgid "C_ontaining:"
+#~ msgstr "İç_erir:"
 
-#~ msgid "Event information"
-#~ msgstr "Olay bilgisi"
+#, fuzzy
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Yeni bir randevu yarat"
 
-#~ msgid "Task information"
-#~ msgstr "Görev bilgisi"
+#, fuzzy
+#~ msgid "First day of wee_k:"
+#~ msgstr "Haftanın ilk günü:"
 
 #, fuzzy
-#~ msgid "Journal information"
-#~ msgstr "Seçimlik Bilgiler"
+#~ msgid "_Other"
+#~ msgstr "Diğer"
 
-#~ msgid "Free/Busy information"
-#~ msgstr "Boş/Meşgul bilgisi"
+#~ msgid "_Delete this Task"
+#~ msgstr "_Bu Görevi Sil"
 
-#~ msgid "Calendar information"
-#~ msgstr "Takvim bilgisi"
+#~ msgid "Unable to find any of your identities in the attendees list!\n"
+#~ msgstr "Katılımcı bilgileri içinde size ait bir kimlik bulunamadı!\n"
 
 #~ msgid "Free/Busy information (%s to %s)"
 #~ msgstr "Boş/Meşgul bilgisi (%s -> %s)"
@@ -27316,24 +28126,6 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgid "iCalendar information"
 #~ msgstr "iCalendar bilgisi"
 
-#~ msgid "Task"
-#~ msgstr "Görev"
-
-#~ msgid "Status: %s"
-#~ msgstr "Durum: %s"
-
-#~ msgid "Percent Complete: %i"
-#~ msgstr "Biten Yüzde: %i"
-
-#~ msgid "URL: %s"
-#~ msgstr "URL: %s"
-
-#~ msgid "Categories: %s"
-#~ msgstr "Kategoriler: %s"
-
-#~ msgid "Contacts: "
-#~ msgstr "Bağlantılar: "
-
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Gövde içeriğinde geçersiz tür. Dizgi bekleniyordu"
 
@@ -27366,9 +28158,6 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgid "Could not encrypt: encoding failed."
 #~ msgstr "PGP imza dosyası oluşturulamadı."
 
-#~ msgid "Failed to decrypt: Unknown"
-#~ msgstr "Şifre açılamadı: Bilinmeyen hata"
-
 #~ msgid "Please enter the NNTP password for %s@%s"
 #~ msgstr "%s@%s için NNTP parolasını giriniz"
 
@@ -27493,36 +28282,15 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgid "Filter on Mailing List"
 #~ msgstr "E-posta Listelerine Göre Filtreleme"
 
-#~ msgid "Default"
-#~ msgstr "Öntanımlı"
-
 #~ msgid "Indexing:"
 #~ msgstr "İndeksleniyor:"
 
 #~ msgid "Mailbox Format"
 #~ msgstr "Posta Kutusu Biçimi"
 
-#~ msgid " (default)"
-#~ msgstr " (öntanımlı)"
-
-#~ msgid "Mail Settings"
-#~ msgstr "İleti Ayarları"
-
-#~ msgid "Subject is %s"
-#~ msgstr "Konu: %s"
-
-#~ msgid "Mail from %s"
-#~ msgstr "%s'ten E-posta"
-
-#~ msgid "%s mailing list"
-#~ msgstr "%s posta listesi"
-
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Gelen"
 
-#~ msgid "Account"
-#~ msgstr "Hesap"
-
 #~ msgid "Composer"
 #~ msgstr "Düzenleyici"
 
@@ -27533,24 +28301,15 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgid "Display"
 #~ msgstr "Gösterim"
 
-#~ msgid "Drafts"
-#~ msgstr "Taslaklar"
-
 #~ msgid "Edit..."
 #~ msgstr "Düzenle..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "HTML imza dosyası:"
-
 #~ msgid "News"
 #~ msgstr "Haberler"
 
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Bir Filtre Günlük Dosyası Seçin..."
 
-#~ msgid "Sent"
-#~ msgstr "Gönderildi"
-
 #~ msgid "Sources"
 #~ msgstr "Kaynaklar"
 
@@ -27573,21 +28332,6 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgid "seconds."
 #~ msgstr "saniye."
 
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more information."
-#~ msgstr ""
-#~ "Bu ileti dijital olarak imzalanmıştır ve güvenlidir. Daha fazla bilgi "
-#~ "için kilit simgesi üzerine tıklayın."
-
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Bu ileti dijital olarak imzalanmıştır ve güvenlidir."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu "
-#~ "kanıtlanmamıştır."
-
 #, fuzzy
 #~ msgid "Incomplete message written on pipe!"
 #~ msgstr "Şifrelenmiş ileti gösterilemiyor"
@@ -27599,54 +28343,15 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgid "Cannot initialize Evolution's Summary component."
 #~ msgstr "Evolution'ın posta programı başlatılamadı."
 
-#~ msgid " F"
-#~ msgstr " F"
-
-#~ msgid " C"
-#~ msgstr " C"
-
-#~ msgid "knots"
-#~ msgstr "knot"
-
-#~ msgid "kph"
-#~ msgstr "km/h"
-
-#, fuzzy
-#~ msgid "inHg"
-#~ msgstr "Taşınıyor"
-
-#~ msgid "mmHg"
-#~ msgstr "mmHg"
-
-#~ msgid "miles"
-#~ msgstr "mil"
-
-#~ msgid "kilometers"
-#~ msgstr "kilometre"
-
 #~ msgid "Factory for the Evolution notes component."
 #~ msgstr "Evolution notes bileşen mimarisi"
 
 #~ msgid "Factory for the Notes control"
 #~ msgstr "Evolution Notes denetim mimarisi"
 
-#~ msgid "Outbox"
-#~ msgstr "Giden"
-
-#, fuzzy
-#~ msgid "Evolution "
-#~ msgstr "Evolution"
-
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Telif hakkı 1999, 2000, 2001 Ximian, Inc."
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(isimsiz)"
 
diff --git a/po/uk.po b/po/uk.po
index 98437faa30..b33b2dcda1 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2002-05-07 15:46-0400\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-02-22 17:09+0200\n"
 "Last-Translator: Yuriy Syrota <yuri@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -34,7 +34,7 @@ msgstr "Імпорт файлів VCard у Evolution."
 msgid "File As"
 msgstr "Файл як"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ім'я:"
@@ -45,7 +45,7 @@ msgid "Email"
 msgstr "Е-пошта"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "Первинний"
 
@@ -55,7 +55,7 @@ msgstr "Перв."
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
 #: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Помічник"
@@ -63,8 +63,8 @@ msgstr "Помічник"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Робоча"
 
@@ -74,12 +74,12 @@ msgid "Bus"
 msgstr "Роб."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Компанія"
 
@@ -90,8 +90,8 @@ msgstr "Комп."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Домашня"
 
@@ -106,18 +106,18 @@ msgstr "Орг."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Мобільний"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Авто"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
 #: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Робочий факс"
@@ -127,13 +127,13 @@ msgid "Bus Fax"
 msgstr "Роб. факс"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 #: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Домашній факс"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Робоча 2"
 
@@ -142,43 +142,43 @@ msgid "Bus 2"
 msgstr "Роб. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Домашня 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
 #: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Інша"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 #: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Інший факс"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
 #: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "Пейджер"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 #: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Радіо"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
 #: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Телекс"
@@ -190,14 +190,14 @@ msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "Е-пошта 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 #: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Е-пошта 3"
@@ -336,7 +336,7 @@ msgstr "vCard для %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:63
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -344,7 +344,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Не вдалось ініціалізувати Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2732
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Пошук..."
 
@@ -357,31 +357,31 @@ msgstr "Завантаження..."
 msgid "Error in search expression."
 msgstr "Помилка у регулярному виразі."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Додавання картки з сервером LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1226
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Видалення картки з сервера LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1462
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Зміна картки на сервері LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2586
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
 msgid "Restarting search."
 msgstr "Почати пошук знову."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2678
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Отримання результатів пошуку на LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2759
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
 msgid "Error performing search"
 msgstr "Помилка виконання пошуку"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2783
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
 msgid "Could not parse query string"
 msgstr "Неможливо проаналізувати рядок пошуку"
 
@@ -428,111 +428,141 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Addressbook Settings"
-msgstr "Налаштування адресної книги"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Configuration control for the Evolution Addressbook."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 #, fuzzy
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Канал адресної книги Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "Компонент Evolution для обробки контактів."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the Addressbook Minicard control"
-msgstr ""
-"Не вдалося ініціалізувати поштовий "
-"компонент Evolutuion."
+msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:15
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 #, fuzzy
 msgid "Factory for the sample Addressbook control"
-msgstr ""
-"Клацніть тут щоб викликати адресну книгу"
+msgstr "Клацніть тут щоб викликати адресну книгу"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:16
-msgid "This page can be used to configure Addressbook Settings"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Контакти"
 
-#: addressbook/gui/component/addressbook-component.c:72
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
-msgstr ""
-"Тека, що містить контактну інформацію"
+msgstr "Тека, що містить контактну інформацію"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:74
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
-msgstr ""
-"Сервер LDAP, що містить контактну "
-"інформацію"
+msgstr "Сервер LDAP, що містить контактну інформацію"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Новий контактний список"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "Контактний _список"
+
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "Новий контакт"
 
-#: addressbook/gui/component/addressbook-component.c:562
+#: addressbook/gui/component/addressbook-component.c:581
 #: ui/evolution-addressbook.xml.h:32
 msgid "_Contact"
 msgstr "Контакт"
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Contact List"
-msgstr "Новий контактний список"
+#: addressbook/gui/component/addressbook-config.c:197
+msgid "Failed to connect to LDAP server"
+msgstr "Неможливо з'єднатись з сервером LDAP."
 
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "Contact _List"
-msgstr "Контактний _список"
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Неможливо автентифікуватися на сервері IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1152
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "Відповідь сервера IMAP не містить інформації про %s"
+
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Помилка завантаження інформації про фільтр:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "Відповідь сервера IMAP не містить інформації про %s"
+
+#: addressbook/gui/component/addressbook-config.c:1638
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:135
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Не вдалось ініціалізувати gnome-vfs"
 
+#: addressbook/gui/component/addressbook-storage.c:168
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Контакти"
+
 #: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Не вдалося відкрити адресну книгу"
@@ -558,49 +588,58 @@ msgid ""
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:643
-#: addressbook/gui/component/addressbook.c:646
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Введіть пароль для %s (користувач %s)"
 
-#: addressbook/gui/component/addressbook.c:769
+#: addressbook/gui/component/addressbook.c:776
 msgid "Name begins with"
 msgstr "Ім'я починається з"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:777
 msgid "Email is"
 msgstr "Е-пошта"
 
-#: addressbook/gui/component/addressbook.c:771
+#: addressbook/gui/component/addressbook.c:778
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Категорія - "
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:772
+#: addressbook/gui/component/addressbook.c:779
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Будь-яке поле містить"
 
-#: addressbook/gui/component/addressbook.c:773 widgets/misc/e-filter-bar.h:99
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Додатково..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1001
+#: addressbook/gui/component/addressbook.c:1008
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Будь-яка категорія"
 
-#: addressbook/gui/component/addressbook.c:1083
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
-msgstr ""
-"URI теки, що буде відображено переглядачем"
+msgstr "URI теки, що буде відображено переглядачем"
+
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * card.
+#.
+#: addressbook/gui/component/e-address-popup.c:178
+#, fuzzy
+msgid "(none)"
+msgstr "(Немає)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Первинна е-пошта"
 
@@ -616,8 +655,7 @@ msgstr "Створити новий контакт \"%s\""
 #: addressbook/gui/component/e-address-popup.c:605
 #, c-format
 msgid "Add address to existing contact \"%s\""
-msgstr ""
-"Додати адресу до існуючого контакту \"%s\""
+msgstr "Додати адресу до існуючого контакту \"%s\""
 
 #: addressbook/gui/component/e-address-popup.c:891
 msgid "Querying Addressbook..."
@@ -647,104 +685,58 @@ msgstr "Заборонити запити"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Дозволити запити (небезпечно!)"
 
-#: addressbook/gui/component/addressbook-config.c:197
-msgid "Failed to connect to LDAP server"
-msgstr "Неможливо з'єднатись з сервером LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:215
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Неможливо автентифікуватися на сервері "
-"IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:235
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:641
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1143
-msgid "The server did not respond with a schema entry"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1163
-#, fuzzy
-msgid "Could not query for schema information"
-msgstr "Помилка завантаження файлу: %s"
-
-#: addressbook/gui/component/addressbook-config.c:1169
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr ""
-"Відповідь сервера IMAP не містить "
-"інформації про %s"
-
-#: addressbook/gui/component/addressbook-config.c:1613
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1689
-#, fuzzy
-msgid "Extra Completion folders"
-msgstr "Дата завершення"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #, fuzzy
 msgid "  S_how Supported Bases "
 msgstr "Визначити типи, що підтримуються..."
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Параметри"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-msgid "<- _Remove"
-msgstr "<- Видалити"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 #, fuzzy
 msgid "1:00"
 msgstr "100"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr ""
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+msgid "<- _Remove"
+msgstr "<- Видалити"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Параметри"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -753,8 +745,8 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Джерело адресної книги"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:54
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "Завжди"
 
@@ -844,8 +836,8 @@ msgstr "Конфігурація"
 msgid "Mappings"
 msgstr "Поля"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:56
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
 msgid "Never"
 msgstr "Ніколи"
 
@@ -1024,14 +1016,14 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\n"
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
 "too large will slow down your addressbook."
 msgstr ""
 
@@ -1051,8 +1043,8 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
@@ -1083,7 +1075,7 @@ msgid "Using email address"
 msgstr "Використовуючи електронну адресу"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:55 mail/mail-config.glade.h:136
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1091,7 +1083,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Add"
 msgstr "Додати"
 
@@ -1136,7 +1128,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:36
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -1253,10 +1245,12 @@ msgstr "Канал адресної книги Evolution"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
 #: addressbook/gui/component/select-names/e-select-names.c:980
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Видалити"
 
@@ -1375,7 +1369,7 @@ msgstr "Співпраця"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Редактор контактів"
 
@@ -1384,7 +1378,7 @@ msgid "D_epartment:"
 msgstr "Відділ:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Подробиці"
 
@@ -1441,11 +1435,12 @@ msgstr "Хоче отримувати листи в HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:706 calendar/gui/e-calendar-table.c:991
-#: calendar/gui/e-day-view.c:3612 filter/filter.glade.h:8
-#: mail/folder-browser.c:1635 mail/mail-config.glade.h:150
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:39
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "Стерти"
 
@@ -1474,7 +1469,7 @@ msgid "_Web page address:"
 msgstr "Адреса сторінки WWW:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "США"
 
@@ -1611,9 +1606,7 @@ msgstr "Бразилія"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "British Indian Ocean Territory"
-msgstr ""
-"Британська територія в Індійському "
-"океані"
+msgstr "Британська територія в Індійському океані"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Brunei Darussalam"
@@ -1981,12 +1974,11 @@ msgid "Laos"
 msgstr "Лаос"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "Латвія"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Лебанон"
 
@@ -1995,7 +1987,7 @@ msgid "Lesotho"
 msgstr "Лесото"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Ліберія"
 
@@ -2004,12 +1996,12 @@ msgid "Liechtenstein"
 msgstr "Ліхтенштейн"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Литва"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Люксембург"
 
@@ -2042,7 +2034,7 @@ msgid "Mali"
 msgstr "Малі"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Мальта"
 
@@ -2067,7 +2059,7 @@ msgid "Mayotte"
 msgstr "Майотт"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "Мексика"
 
@@ -2092,7 +2084,7 @@ msgid "Montserrat"
 msgstr "Монцеррат"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "Марокко"
 
@@ -2117,7 +2109,7 @@ msgid "Nepal"
 msgstr "Непал"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Голландія"
 
@@ -2130,12 +2122,12 @@ msgid "New Caledonia"
 msgstr "Нова Каледонія"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Нова Зеландія"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Нікарагуа"
 
@@ -2152,7 +2144,7 @@ msgid "Niue"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr ""
 
@@ -2161,17 +2153,17 @@ msgid "Northern Mariana Islands"
 msgstr "Північні Маріанські острови"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Норвегія"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Оман"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Пакистан"
 
@@ -2184,7 +2176,7 @@ msgid "Palestinian Territory"
 msgstr "Палестинська територія"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Панама"
 
@@ -2193,12 +2185,12 @@ msgid "Papua New Guinea"
 msgstr "Папуа Нова Гвінея"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Парагвай"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Перу"
 
@@ -2211,22 +2203,22 @@ msgid "Pitcairn"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Польща"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Португалія"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "Пуерто Ріко"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "Катар"
 
@@ -2235,7 +2227,7 @@ msgid "Reunion"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Румунія"
 
@@ -2272,7 +2264,7 @@ msgid "Sao Tome And Principe"
 msgstr "Сан Томе і Прінсіпі"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Саудівська Аравія"
 
@@ -2289,17 +2281,17 @@ msgid "Sierra Leone"
 msgstr "Сьєрра Леоне"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "Сінгапур"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "Словакія"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "Словенія"
 
@@ -2312,7 +2304,7 @@ msgid "Somalia"
 msgstr "Сомалі"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Південна Африка"
 
@@ -2321,7 +2313,7 @@ msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Іспанія"
 
@@ -2342,7 +2334,7 @@ msgid "Sudan"
 msgstr "Судан"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "Суринам"
 
@@ -2355,17 +2347,17 @@ msgid "Swaziland"
 msgstr "Свазіленд"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Швеція"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "Швейцарія"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Тайвань"
 
@@ -2402,7 +2394,7 @@ msgid "Tunisia"
 msgstr "Туніс"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Туреччина"
 
@@ -2423,7 +2415,7 @@ msgid "Uganda"
 msgstr "Уганда"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Україна"
 
@@ -2432,7 +2424,7 @@ msgid "United Arab Emirates"
 msgstr "Об'єднані Арабські Емірати"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Велика Британія"
 
@@ -2441,7 +2433,7 @@ msgid "United States Minor Outlying Islands"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "Уругвай"
 
@@ -2454,12 +2446,12 @@ msgid "Vanuatu"
 msgstr "Вануату"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "Венесуела"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "В'єтнам"
 
@@ -2481,12 +2473,12 @@ msgid "Western Sahara"
 msgstr "Північна Сахара"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "Ємен"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Югославія"
 
@@ -2499,31 +2491,36 @@ msgid "Zimbabwe"
 msgstr "Зімбабве"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Ви впевнені, що хочете стерти цей рахунок?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Стерти контакт?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "Редактор категорій недоступний."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
-msgstr ""
-"Цей контакт належить до таких категорій:"
+msgstr "Цей контакт належить до таких категорій:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "Зберегти як VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
-msgstr ""
-"Не вдалося знайти віджета для поля: \"%s\""
+msgstr "Не вдалося знайти віджета для поля: \"%s\""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
@@ -2547,11 +2544,11 @@ msgstr "Е-пошта"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "список"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2687,11 +2684,11 @@ msgid "contact-list-editor"
 msgstr "Редактор контактів"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Редактор контактних списків"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Зберегти список як VCard"
 
@@ -2717,10 +2714,8 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Ім'я чи електронна адреса цього контакту "
-"вже існує\n"
-"у цій теці.  Чи хочете ви додати його "
-"всеодно?"
+"Ім'я чи електронна адреса цього контакту вже існує\n"
+"у цій теці.  Чи хочете ви додати його всеодно?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 msgid "Change Anyway"
@@ -2739,10 +2734,8 @@ msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
-"Змінене ім'я чи електронна адреса цього "
-"контакту вже\n"
-"існує у цій теці.  Чи хочете ви додати його "
-"всеодно?"
+"Змінене ім'я чи електронна адреса цього контакту вже\n"
+"існує у цій теці.  Чи хочете ви додати його всеодно?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
 #: widgets/misc/e-filter-bar.c:231
@@ -2773,21 +2766,21 @@ msgid "Error getting book view"
 msgstr "Помилка запуску %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Помилка модифікації картки"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1043
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Успішно"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363
-#: camel/providers/pop3/camel-pop3-store.c:509 shell/e-shell.c:2143
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1080
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
@@ -2797,7 +2790,7 @@ msgid "Repository offline"
 msgstr "Перенесення"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1071
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr ""
 
@@ -2815,53 +2808,68 @@ msgstr "Протокол не підтримується"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:613
-#: camel/camel-service.c:653 camel/camel-service.c:721
-#: camel/camel-service.c:764
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Скасовано"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Збій автенфікації."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Вимагається автенфікація"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Інша помилка"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Ви хочете змінити зміни?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Помилка додавання списку"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Помилка додавання картки"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Помилка модифікування списку"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Помилка видалення списку"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Помилка видалення картки"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 msgid "Display Cards?"
 msgstr "Відобразити картки?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards"
 msgstr "Відобразити картки"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:209
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2869,19 +2877,19 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
+#: addressbook/gui/widgets/e-addressbook-util.c:347
 msgid "Move card to"
 msgstr "Перенести картку до"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:346
+#: addressbook/gui/widgets/e-addressbook-util.c:349
 msgid "Copy card to"
 msgstr "Копіювати картку до"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:352
 msgid "Move cards to"
 msgstr "Перенести картки до"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:351
+#: addressbook/gui/widgets/e-addressbook-util.c:354
 msgid "Copy cards to"
 msgstr "Копіювати картки до"
 
@@ -2945,93 +2953,99 @@ msgstr "Інший телефон"
 msgid "Other Address"
 msgstr "Інша адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:699
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1824
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Адресна книга"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
 #: ui/evolution-addressbook.xml.h:21
 msgid "Save as VCard"
 msgstr "Зберегти як VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "New Contact..."
 msgstr "Новий контакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "New Contact List..."
 msgstr "Новий контактний список..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Go to Folder..."
 msgstr "Перейти на теку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Import..."
 msgstr "Імпорт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Search for Contacts..."
 msgstr "Пошук контактів..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Addressbook Sources..."
 msgstr "Джерела адресних книг..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Pilot Settings..."
 msgstr "Установки пілота..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 #: ui/evolution-addressbook.xml.h:12
 msgid "Forward Contact"
 msgstr "Переслати контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "Send Message to Contact"
 msgstr "Відіслати повідомлення за контактом"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Друкувати"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Print Envelope"
 msgstr "Надрукувати конверт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Copy to folder..."
 msgstr "Скопіювати в теку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Move to folder..."
 msgstr "Перенести в теку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Вирізати"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Скопіювати"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 #: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Вставити"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:215 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Стерти"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 #: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
 #, fuzzy
 msgid "Current View"
@@ -3041,7 +3055,7 @@ msgstr "Поточний рік"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:940
+#: addressbook/gui/widgets/e-addressbook-view.c:942
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3049,7 +3063,7 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:945
+#: addressbook/gui/widgets/e-addressbook-view.c:947
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 
@@ -3189,7 +3203,7 @@ msgstr "Поля"
 msgid "Number of columns:"
 msgstr "Кількість стовпчиків:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Параметри"
 
@@ -3199,7 +3213,7 @@ msgid "Orientation"
 msgstr "Орієнтація"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Сторінка"
 
@@ -3273,45 +3287,45 @@ msgstr "Ширина:"
 msgid "_Font..."
 msgstr "Шрифт..."
 
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Неназвана зустріч"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:684
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Високий"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:683
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Звичайний"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
-#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:682
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Низький"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Невизначено"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1150
 #: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
-msgstr ""
-"Помилка під час комунікування з "
-"календарним сервером"
+msgstr "Помилка під час комунікування з календарним сервером"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1297
 #: calendar/conduits/calendar/calendar-conduit.c:1300
 msgid "Could not read pilot's Calendar application block"
-msgstr ""
-"Не вдалося зчитати програмний блок "
-"календаря з пілота"
+msgstr "Не вдалося зчитати програмний блок календаря з пілота"
 
 #: calendar/conduits/todo/todo-conduit.c:206
 msgid "Default Priority:"
@@ -3341,60 +3355,37 @@ msgstr "Фабрика для редактора Evolutuion."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 #, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr ""
-"Не вдалося ініціалізувати поштовий "
-"компонент Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Канал календаря Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
-msgstr ""
-"Компонент Evolution для керування календарем."
+msgstr "Компонент Evolution для керування календарем."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-"Не вдалося ініціалізувати поштовий "
-"компонент Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Evolution Tasks control"
-msgstr ""
-"Не вдалося ініціалізувати поштовий "
-"компонент Evolutuion."
+msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 #, fuzzy
 msgid "Factory for the calendar iTip view control"
-msgstr ""
-"Не вдалося ініціалізувати поштовий "
-"компонент Evolutuion."
+msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 #, fuzzy
 msgid "Factory for the sample Calendar control"
-msgstr ""
-"Не вдалося ініціалізувати поштовий "
-"компонент Evolutuion."
+msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to create a component editor factory"
-msgstr ""
-"Фабрика для створення фабрики "
-"компонентного редактора"
+msgstr "Фабрика для створення фабрики компонентного редактора"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "This page can be used to configure Calendar and Task preferences"
 msgstr ""
 
@@ -3406,10 +3397,25 @@ msgstr "Послуга сповіщення"
 msgid "Factory for the alarm notification service"
 msgstr "Фабрика для послуги сповіщення"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#, fuzzy
+msgid "Starting:"
+msgstr "Параметри"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#, fuzzy
+msgid "Ending:"
+msgstr "Півтони"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
 msgid "invalid time"
 msgstr "невірний час"
 
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#, fuzzy
+msgid "Evolution Alarm"
+msgstr "Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
 #, c-format
 msgid "Alarm on %s"
@@ -3445,7 +3451,7 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2608
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Попередження"
@@ -3465,20 +3471,17 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Більше не питати про цю програму."
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Не вдалось ініціалізувати GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
-msgstr ""
-"Не вдалося створити послугу сповіщення"
+msgstr "Не вдалося створити послугу сповіщення"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
-msgstr ""
-"Не вдалося створити фабрику послуги "
-"сповіщення"
+msgstr "Не вдалося створити фабрику послуги сповіщення"
 
 #: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
@@ -3492,7 +3495,7 @@ msgstr "Опис містить"
 msgid "Comment contains"
 msgstr "Коментар містить"
 
-#: calendar/gui/cal-search-bar.c:386
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr ""
 
@@ -3531,14 +3534,16 @@ msgid ""
 msgstr ""
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:424
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr ""
 
@@ -3559,27 +3564,32 @@ msgid "W"
 msgstr "Зх"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Вільний"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1065
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Зайнятий"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Не розпочато"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Виконується"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Завершено"
 
@@ -3589,17 +3599,17 @@ msgid ""
 "\n"
 "45.436845,125.862501"
 msgstr ""
-"Географічне положення потрібно вводити у "
-"такому форматі: \n"
+"Географічне положення потрібно вводити у такому форматі: \n"
 "\n"
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/folder-browser.c:1597
-#: mail/mail-account-gui.c:1212 mail/mail-account-gui.c:1213
-#: mail/mail-account-gui.c:1810 mail/mail-accounts.c:503
-#: mail/mail-config.glade.h:79 mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3614,12 +3624,14 @@ msgstr "Періодично"
 msgid "Assigned"
 msgstr "Прив'язано"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Так"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Ні"
 
@@ -3639,61 +3651,61 @@ msgstr "Відображення тижня"
 msgid "Month View"
 msgstr "Відображення місяця"
 
-#: calendar/gui/component-factory.c:67 importers/netscape-importer.c:1866
-#: my-evolution/my-evolution.glade.h:3 shell/e-shortcuts.c:1036
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Календар"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
-msgstr ""
-"Тека, що містить інформацію про зустрічі "
-"та події"
+msgstr "Тека, що містить інформацію про зустрічі та події"
 
-#: calendar/gui/component-factory.c:72 calendar/gui/tasks-control.c:502
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:645
 #: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-shortcuts.c:1039
-#: views/tasks/galview.xml.h:1
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Завдання"
 
-#: calendar/gui/component-factory.c:73
+#: calendar/gui/component-factory.c:75
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "Фільтр списку розсилки"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "New meeting"
 msgstr "Нове засідання"
 
-#: calendar/gui/component-factory.c:695
+#: calendar/gui/component-factory.c:704
 msgid "_Meeting"
 msgstr "За_сідання"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "New task"
 msgstr "Нове завдання"
 
-#: calendar/gui/component-factory.c:699
+#: calendar/gui/component-factory.c:708
 msgid "_Task"
 msgstr "Завдання"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Нова зустріч"
 
-#: calendar/gui/component-factory.c:703
+#: calendar/gui/component-factory.c:712
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Зустріч"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "New appointment"
 msgstr "Нова зустріч"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:716
 msgid "_Appointment"
 msgstr "_Зустріч"
 
@@ -3903,7 +3915,7 @@ msgstr "Нагадування"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Зведення:"
 
@@ -3934,7 +3946,7 @@ msgstr "кінець зустрічі"
 msgid "hour(s)"
 msgstr "година"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:189
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 #, fuzzy
 msgid "minute(s)"
 msgstr "хвилина"
@@ -3963,79 +3975,79 @@ msgstr "30 хвилин"
 msgid "60 minutes"
 msgstr "60 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+msgid "Alerts"
+msgstr "Попередження"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Установки Календаря та Завдань"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "Дні"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "П'ятниця"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Hours"
 msgstr "Години"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Хвилини"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Понеділок"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "S_un"
+msgstr "Ндл"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Субота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Sh_ow a default reminder"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
-msgstr ""
-"Показати номера тижнів у навігаторі дат"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Sta_rt of day:"
-msgstr "Початок дня:"
+msgstr "Показати номера тижнів у навігаторі дат"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Su_n"
-msgstr "Ндл"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "Неділя"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "T_asks due today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "Чтв"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "T_ue"
-msgstr "Втр"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Task List"
 msgstr "Список завдань"
@@ -4063,80 +4075,94 @@ msgid "Tuesday"
 msgstr "Вівторок"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Середа"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Робочий тиждень"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 годин (дп/пп)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 години"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "_Day begins:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #, fuzzy
 msgid "_Display"
 msgstr "День"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_End of day:"
-msgstr "Кінець дня:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "Птн"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "Загальне"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "_Сховати виконані завдання після"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "Пнд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Overdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "Сбт"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Показати час завершення зустрічей"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Time divisions:"
 msgstr "Розділювачі часу:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "Втр"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "Срд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "Перед початком зустрічі"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -4153,8 +4179,7 @@ msgstr "Ви впевнені, що хочете скасувати та сте�
 
 #: calendar/gui/dialogs/cancel-comp.c:67
 msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-"Ви впевнені, що хочете скасувати та стерти цей запис в журналі?"
+msgstr "Ви впевнені, що хочете скасувати та стерти цей запис в журналі?"
 
 #: calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
@@ -4220,80 +4245,90 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:322
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "Не вдалося поновити об'єкт!"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
 msgstr "Не вдалося поновити об'єкт!"
 
-#: calendar/gui/dialogs/comp-editor.c:693
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Виправити зустріч"
 
-#: calendar/gui/dialogs/comp-editor.c:698
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Зустріч - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Завдання - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:704
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Журнальний запис - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:718
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Немає зведення"
 
-#: calendar/gui/dialogs/comp-editor.c:1074
-#: calendar/gui/e-calendar-table.c:1055 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:958
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
 msgid "Save as..."
 msgstr "Зберегти як..."
 
-#: calendar/gui/dialogs/comp-editor.c:1226
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr ""
 
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-"Ви впевнені, що хочете стерти зустріч \"%s\"?"
+msgstr "Ви впевнені, що хочете стерти зустріч \"%s\"?"
 
 #: calendar/gui/dialogs/delete-comp.c:99
 msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-"Ви впевнені, що хочете стерти цю "
-"неназвану зустріч?"
+msgstr "Ви впевнені, що хочете стерти цю неназвану зустріч?"
 
 #: calendar/gui/dialogs/delete-comp.c:105
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-"Ви впевнені, що хочете стерти завдання "
-"\"%s\"?"
+msgstr "Ви впевнені, що хочете стерти завдання \"%s\"?"
 
 #: calendar/gui/dialogs/delete-comp.c:108
 msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-"Ви впевнені, що хочете стерти це "
-"неназване завдання?"
+msgstr "Ви впевнені, що хочете стерти це неназване завдання?"
 
 #: calendar/gui/dialogs/delete-comp.c:114
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-"Ви впевнені, що хочете стерти запис в "
-"журналі \"%s\"?"
+msgstr "Ви впевнені, що хочете стерти запис в журналі \"%s\"?"
 
 #: calendar/gui/dialogs/delete-comp.c:117
 msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-"Ви впевнені, що хочете стерти цей "
-"неназваний запис в журналі?"
+msgstr "Ви впевнені, що хочете стерти цей неназваний запис в журналі?"
 
 #: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
@@ -4324,27 +4359,27 @@ msgstr "Стерто"
 msgid "Enter Delegate"
 msgstr "Стерто"
 
-#: calendar/gui/dialogs/event-editor.c:185
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Зустріч"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Нагадування"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Повторення"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Планування"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Засідання"
 
@@ -4391,7 +4426,7 @@ msgid "Pu_blic"
 msgstr "Публічне"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Show Time As"
 msgstr "Показати"
@@ -4414,19 +4449,19 @@ msgstr "Час завершення:"
 msgid "_Start time:"
 msgstr "Дата початку:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Потрібно вказати організатора."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Потрібен хоча б один відвідувач."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "Доручити..."
 
@@ -4438,49 +4473,56 @@ msgstr "Відвідування"
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
 #, fuzzy
-msgid "Common Name"
-msgstr "Дата завершення"
+msgid "Click here to add an attendee"
+msgstr "* Клацніть тут щоб додати контакт *"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Доручив "
+#, fuzzy
+msgid "Common Name"
+msgstr "Дата завершення"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Доручено"
+msgid "Delegated From"
+msgstr "Доручив "
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Мова"
+msgid "Delegated To"
+msgstr "Доручено"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Член"
+msgid "Language"
+msgstr "Мова"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr ""
+msgid "Member"
+msgstr "Член"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Роль"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:52
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Стан"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Тип"
@@ -4495,14 +4537,10 @@ msgid "_Change Organizer"
 msgstr "Змінити організатора"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "Запросити інших..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "Інший організатор"
-
 #: calendar/gui/dialogs/recurrence-page.c:126
 #: calendar/gui/dialogs/recurrence-page.c:146
 #: calendar/gui/dialogs/recurrence-page.c:156
@@ -4567,7 +4605,6 @@ msgid "second"
 msgstr "другий"
 
 #: calendar/gui/dialogs/recurrence-page.c:1064
-#, fuzzy
 msgid "third"
 msgstr ""
 
@@ -4689,7 +4726,7 @@ msgid "Progress"
 msgstr "Поступ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:740
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -4701,20 +4738,20 @@ msgstr "Пріоритет:"
 msgid "_Status:"
 msgstr "Стан:"
 
-#: calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
 #, fuzzy
 msgid "Basic"
 msgstr "Вставити"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:324
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "Призначення"
 
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Опис:"
 
@@ -4727,22 +4764,77 @@ msgstr "Час початку:"
 msgid "_Due Date:"
 msgstr "Відділ:"
 
-#: calendar/gui/e-calendar-table.c:751 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:443
+#, fuzzy, c-format
+msgid "30%"
+msgstr "389"
+
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:448
+#, fuzzy, c-format
+msgid "80%"
+msgstr "389"
+
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:450
+#, fuzzy, c-format
+msgid "100%"
+msgstr "100"
+
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
 #: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Стерти вибрані об'єкти"
 
-#: calendar/gui/e-calendar-table.c:972 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1608
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "Відкрити"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:985
 msgid "_Save as..."
 msgstr "Зберегти як..."
 
-#: calendar/gui/e-calendar-table.c:974 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
 #: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
 #: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
@@ -4750,20 +4842,20 @@ msgstr "Зберегти як..."
 msgid "_Print..."
 msgstr "Друкувати..."
 
-#: calendar/gui/e-calendar-table.c:978 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
 #: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Вирізати"
 
-#: calendar/gui/e-calendar-table.c:979 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
 #: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "Скопіювати"
 
-#: calendar/gui/e-calendar-table.c:980 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
 #: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
 #: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
@@ -4771,32 +4863,33 @@ msgstr "Скопіювати"
 msgid "_Paste"
 msgstr "Вставити"
 
-#: calendar/gui/e-calendar-table.c:984
+#: calendar/gui/e-calendar-table.c:996
 msgid "_Assign Task"
 msgstr "Призначити завдання"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:997
 msgid "_Forward as iCalendar"
 msgstr "Переслати як i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:986
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "Позначити як виконане"
 
-#: calendar/gui/e-calendar-table.c:987
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Позначити вибрані завдання як виконані"
 
-#: calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "Стерти вибрані завдання"
 
-#: calendar/gui/e-calendar-table.c:1259 calendar/gui/e-day-view.c:7416
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
 #: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Поновлення об'єктів"
 
-#: calendar/gui/e-calendar-table.c:1342
+#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Клацніть щоб додати завдання"
 
@@ -4804,48 +4897,49 @@ msgstr "Клацніть щоб додати завдання"
 msgid "Alarms"
 msgstr "Сповіщення"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:946
-#: camel/camel-filter-driver.c:1054
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 #, fuzzy
 msgid "Complete"
 msgstr "% завершення:"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Дата завершення"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Дата кінця"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Географічне положення"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Пріоритет"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Дата початку"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:51 shell/e-shortcuts.c:1030
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Зведення"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Сортування завдання"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4893,11 +4987,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "дп"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "пп"
 
@@ -4934,11 +5030,10 @@ msgstr "Перейти на дату..."
 #: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
-msgstr ""
-"Опублікувати інформацію про зайнятість"
+msgstr "Опублікувати інформацію про зайнятість"
 
 #: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
 msgid "_Configure..."
 msgstr "Конфіґурувати..."
 
@@ -4947,7 +5042,7 @@ msgid "_Configure Pilot..."
 msgstr "Конфіґурувати Pilot..."
 
 #: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1610 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "Зберегти як..."
 
@@ -4976,74 +5071,418 @@ msgid "Delete _All Occurrences"
 msgstr "Джерела"
 
 #: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:609
+#: shell/e-shell-view-menu.c:638
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 #: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:646
 #, c-format
 msgid "Error executing %s."
 msgstr "Помилка виконання %s."
 
-#: calendar/gui/e-itip-control.c:1150 calendar/gui/e-itip-control.c:1223
-#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-itip-control.c:678
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:683
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:688
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Опублікувати інформацію про зайнятість"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "Begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:704
+#, fuzzy
+msgid "Meeting ends: <b>"
+msgstr "Час завершення зібрання:"
+
+#: calendar/gui/e-itip-control.c:707
+#, fuzzy
+msgid "Free/Busy info ends: <b>"
+msgstr "Опублікувати інформацію про зайнятість"
+
+#: calendar/gui/e-itip-control.c:711
+msgid "Ends: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:725
+#, fuzzy
+msgid "Task Completed: <b>"
+msgstr "(Завершено"
+
+#: calendar/gui/e-itip-control.c:735
+msgid "Task Due: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#, fuzzy
+msgid "iCalendar Information"
+msgstr "календарна інформація"
+
+#. Title
+#: calendar/gui/e-itip-control.c:787
+#, fuzzy
+msgid "iCalendar Error"
+msgstr "Календар"
+
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#, fuzzy
+msgid "An unknown person"
+msgstr "Невідома причина"
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:875
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:891
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "Стан:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Прийнято"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Відхилено"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:323
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
 #: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1564
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Вибір дії"
+
+#: calendar/gui/e-itip-control.c:972
+#, fuzzy
+msgid "Update"
+msgstr "Оновлення виконано\n"
+
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+msgid "OK"
+msgstr "Гаразд"
+
+#: calendar/gui/e-itip-control.c:1000
+#, fuzzy
+msgid "Accept"
+msgstr "Прийнято"
+
+#: calendar/gui/e-itip-control.c:1001
+msgid "Tentatively accept"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1002
+#, fuzzy
+msgid "Decline"
+msgstr "Відхилено"
+
+#: calendar/gui/e-itip-control.c:1026
+#, fuzzy
+msgid "Send Free/Busy Information"
+msgstr "Опублікувати інформацію про зайнятість"
+
+#: calendar/gui/e-itip-control.c:1039
+msgid "Update respondent status"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1052
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "календарна інформація"
+
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+msgid "Cancel"
+msgstr "Скасувати"
+
+#: calendar/gui/e-itip-control.c:1117
+#, fuzzy, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr "Отримати останню інформацію про засідання"
+
+#: calendar/gui/e-itip-control.c:1118
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Необов'язкова інформація"
+
+#: calendar/gui/e-itip-control.c:1122
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1123
+#, fuzzy
+msgid "Meeting Proposal"
+msgstr "Отримання пошти"
+
+#: calendar/gui/e-itip-control.c:1127
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1128
+#, fuzzy
+msgid "Meeting Update"
+msgstr "Час завершення зібрання:"
+
+#: calendar/gui/e-itip-control.c:1132
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr "Отримати останню інформацію про засідання"
+
+#: calendar/gui/e-itip-control.c:1133
+msgid "Meeting Update Request"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1156
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1157
+#, fuzzy
+msgid "Meeting Reply"
+msgstr "Засідання"
+
+#: calendar/gui/e-itip-control.c:1161
+#, c-format
+msgid "<b>%s</b> has cancelled a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1162
+#, fuzzy
+msgid "Meeting Cancellation"
+msgstr "Вибір дії"
+
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1167
+#, fuzzy
+msgid "Bad Meeting Message"
+msgstr "Знайти у повідомленні"
+
+#: calendar/gui/e-itip-control.c:1189
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1190
+#, fuzzy
+msgid "Task Information"
+msgstr "Інформація"
+
+#: calendar/gui/e-itip-control.c:1194
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1195
+msgid "Task Proposal"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1199
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1200
+#, fuzzy
+msgid "Task Update"
+msgstr "Сортування завдання"
+
+#: calendar/gui/e-itip-control.c:1204
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr "Отримати останню інформацію про засідання"
+
+#: calendar/gui/e-itip-control.c:1205
+msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1566
+#: calendar/gui/e-itip-control.c:1229
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1230
+#, fuzzy
+msgid "Task Reply"
+msgstr "Відповісти"
+
+#: calendar/gui/e-itip-control.c:1234
+#, c-format
+msgid "<b>%s</b> has cancelled a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1235
+#, fuzzy
+msgid "Task Cancellation"
+msgstr "Скасувати операцію"
+
+#: calendar/gui/e-itip-control.c:1240
+#, fuzzy
+msgid "Bad Task Message"
+msgstr "Календарне повідомлення"
+
+#: calendar/gui/e-itip-control.c:1259
+#, fuzzy, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr "Опублікувати інформацію про зайнятість"
+
+#: calendar/gui/e-itip-control.c:1260
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Опублікувати інформацію про зайнятість"
+
+#: calendar/gui/e-itip-control.c:1264
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1265
+#, fuzzy
+msgid "Free/Busy Request"
+msgstr "URL зайнятості:"
+
+#: calendar/gui/e-itip-control.c:1269
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1270
+#, fuzzy
+msgid "Free/Busy Reply"
+msgstr "URL зайнятості:"
+
+#: calendar/gui/e-itip-control.c:1275
+#, fuzzy
+msgid "Bad Free/Busy Message"
+msgstr "Попереднє повідомлення"
+
+#: calendar/gui/e-itip-control.c:1354
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Схоже тека непоправно зіпсована."
+
+#: calendar/gui/e-itip-control.c:1373
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1432
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Елемент не може бути відіслано!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Оновлення виконано\n"
 
-#: calendar/gui/e-itip-control.c:1592 calendar/gui/e-itip-control.c:1642
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1632
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1625
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1638
+#: calendar/gui/e-itip-control.c:1671
 #, fuzzy
-msgid "Attendee status could not be updated!\n"
+msgid "Attendee status updated\n"
 msgstr "Весь супровід"
 
-#: calendar/gui/e-itip-control.c:1640
+#: calendar/gui/e-itip-control.c:1674
 #, fuzzy
-msgid "Attendee status updated\n"
+msgid "Attendee status could not be updated!\n"
 msgstr "Весь супровід"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Видалення завершено"
 
-#: calendar/gui/e-itip-control.c:1704 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Елемент відіслано!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1758
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "Елемент не може бути відіслано!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Вибір теки"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1903
 msgid "Select Tasks Folder"
 msgstr "Вибір теки завдань"
 
@@ -5084,95 +5523,94 @@ msgstr "дата-завершення"
 msgid "date-start"
 msgstr "дата-початку"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-model.c:84
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Автомобільний телефон"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Потрібні учасники"
 
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Необов'язкові учасники"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Не учасники"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Індивідуальне"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Групове"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Ресурс"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Кімната"
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Місце"
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Потрібний учасник"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Необов'язковий учасник"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Не учасник"
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 #, fuzzy
 msgid "Needs Action"
 msgstr "Додати дію"
 
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-msgid "Accepted"
-msgstr "Прийнято"
-
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-msgid "Declined"
-msgstr "Відхилено"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Доручено"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "Відбувається"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
@@ -5184,63 +5622,63 @@ msgstr "%a %d.%m.%Y"
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "За межами офісу"
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Немає інформації"
 
-#: calendar/gui/e-meeting-time-sel.c:473
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "Параметри"
 
-#: calendar/gui/e-meeting-time-sel.c:490
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Показувати лише робочі години"
 
-#: calendar/gui/e-meeting-time-sel.c:503
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Показати зменшене"
 
-#: calendar/gui/e-meeting-time-sel.c:521
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "Поновити зайнятість"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "Автовибір"
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr "_>>"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "Всі люди і ресурси"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Всі люди і один ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Потрібні люди"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Потрібні люди і один ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:649
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Час початку зібрання:"
 
-#: calendar/gui/e-meeting-time-sel.c:668
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Час завершення зібрання:"
 
@@ -5257,20 +5695,23 @@ msgstr "Не вдалося завантажити завдання в \"%s\""
 #: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
-msgstr ""
-"Метод, необхідний для завантаження \"%s\", "
-"не підтримується"
+msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
+
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Не вдалося відкрити теку в \"%s\""
 
-#: calendar/gui/e-tasks.c:543
+#: calendar/gui/e-tasks.c:558
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Дата завершення"
 
-#: calendar/gui/e-tasks.c:566
+#: calendar/gui/e-tasks.c:581
 msgid "Deleting selected objects..."
 msgstr "Стерти вибрані об'екти..."
 
-#: calendar/gui/e-tasks.c:659
+#: calendar/gui/e-tasks.c:674
 #, fuzzy
 msgid "Expunging"
 msgstr "Викреслення теки"
@@ -5283,19 +5724,17 @@ msgstr "Нова зустріч..."
 msgid "_Delete this Appointment"
 msgstr "Стерти цю зустріч"
 
-#: calendar/gui/gnome-cal.c:1538
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Не вдалося відкрити теку в \"%s\""
 
-#: calendar/gui/gnome-cal.c:1549
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
-msgstr ""
-"Метод, необхідний для завантаження \"%s\", "
-"не підтримується"
+msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
 
-#: calendar/gui/gnome-cal.c:1916
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Відкривання календаря на %s"
@@ -5356,23 +5795,60 @@ msgstr "Жовтень"
 msgid "September"
 msgstr "Вересень"
 
-#: calendar/gui/itip-utils.c:220
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Потрібен хоча б один відвідувач"
 
-#: calendar/gui/itip-utils.c:251
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Потрібно вказати організатора."
 
-#: calendar/gui/itip-utils.c:617
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "календарна інформація"
+
+#: calendar/gui/itip-utils.c:356
+#, fuzzy
+msgid "Task information"
+msgstr "Інформація"
+
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "Необов'язкова інформація"
+
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "Опублікувати інформацію про зайнятість"
+
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "календарна інформація"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Оновлення виконано\n"
+
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Оновити список"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Ви маєте бути відвідувачем події."
 
-#: calendar/gui/main.c:92
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
-msgstr ""
-"Неможливо створити фабрику "
-"компонентного редактора"
+msgstr "Неможливо створити фабрику компонентного редактора"
 
 #: calendar/gui/print.c:456
 msgid "1st"
@@ -5559,12 +6035,47 @@ msgstr "Вибраний місяць (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Вибраний рік (%Y)"
 
+#: calendar/gui/print.c:2249
+#, fuzzy
+msgid "Task"
+msgstr "Завдання"
+
+#: calendar/gui/print.c:2306
+#, fuzzy, c-format
+msgid "Status: %s"
+msgstr "Стан:"
+
+#: calendar/gui/print.c:2324
+#, fuzzy, c-format
+msgid "Priority: %s"
+msgstr "Пріоритет:"
+
+#: calendar/gui/print.c:2338
+#, fuzzy, c-format
+msgid "Percent Complete: %i"
+msgstr "Дата виконання:"
+
+#: calendar/gui/print.c:2350
+#, fuzzy, c-format
+msgid "URL: %s"
+msgstr "URL:"
+
+#: calendar/gui/print.c:2364
+#, fuzzy, c-format
+msgid "Categories: %s"
+msgstr "Категорії"
+
+#: calendar/gui/print.c:2375
+#, fuzzy
+msgid "Contacts: "
+msgstr "Контакти"
+
 #: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "Надрукувати календар"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2894
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
 #: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
 #: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
@@ -5596,8 +6107,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2381
-#: mail/mail-callbacks.c:2622
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "Більше не питати."
 
@@ -5649,6 +6160,11 @@ msgstr "Імпорт файлів iCalendar у Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Імпорт файлів vCalendar у Evolution."
 
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Нагадування"
+
 #: calendar/importers/icalendar-importer.c:638
 #, fuzzy
 msgid "Calendar Events"
@@ -5740,8 +6256,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:693
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:735
@@ -6705,650 +7221,666 @@ msgid "Asia/Macao"
 msgstr "Азія/Макао"
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Азія/Макао"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr "Азія/Магадан"
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Азія/Магадан"
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "Азія/Маніла"
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 #, fuzzy
 msgid "Asia/Muscat"
 msgstr "Помічник"
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "Азія/Новосибірськ"
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "Азія/Омськ"
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Азія/Кабул"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "Азія.Катар"
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Азія/Газа"
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "Азія/Сайґон"
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "Азія/Сахалін"
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "Азія/Самарканд"
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "Азія/Сеул"
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "Азія/Шанхай"
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "Азія/Сінгапур"
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "Азія/Тайпей"
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "Азія/Ташкент"
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "Азія/Тбілісі"
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr ""
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "Азія/Токіо"
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr ""
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "Азія/Якутськ"
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr "Азія/Єкатеринбург"
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "Азія/Єреван"
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "Атлантика/Бермуди"
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "Атлантика/Капе Верде"
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "Австралія/Аделаїда"
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 #, fuzzy
 msgid "Australia/Brisbane"
 msgstr "Австралія"
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 #, fuzzy
 msgid "Australia/Broken_Hill"
 msgstr "Австралія"
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "Австралія/Дарвін"
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 #, fuzzy
 msgid "Australia/Hobart"
 msgstr "Австралія"
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 #, fuzzy
 msgid "Australia/Lindeman"
 msgstr "Австралія"
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 #, fuzzy
 msgid "Australia/Lord_Howe"
 msgstr "Австралія"
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "Австралія/Мельбурн"
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 #, fuzzy
 msgid "Australia/Perth"
 msgstr "Австралія"
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "Австралія/Сідней"
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "Європа/Амстердам"
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "Європа/Андорра"
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "Європа/Афіни"
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "Європа/Белфаст"
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Європа/Белград"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Європа/Берлін"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "Європа/Братіслава"
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Європа/Брюсель"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "Європа/Бухарест"
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "Європа/Будапешт"
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "Європа/Дублін"
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "Європа/Гібралтар"
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "Європа/Гельсинки"
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "Європа/Стамбул"
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "Європа/Калінінград"
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Європа/Київ"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr ""
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "Європа/Любляна"
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Європа/Лондон"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Європа/Люксембург"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr ""
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr ""
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Європа/Мінськ"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Європа/Монако"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Європа/Москва"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "Європа/Осло"
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Європа/Париж"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "Європа/Прага"
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "Європа/Ріга"
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "Європа/Рим"
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr "Європа/Самара"
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "Європа/Сан Маріно"
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "Європа/Сараєво"
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "Європа/Сімферополь"
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "Європа/Софія"
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "Європа/Стокгольм"
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "Європа/Талін"
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr "Європа/Ужгород"
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "Європа/Ватікан"
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "Європа/Відень"
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "Європа/Варшава"
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "Європа/Загреб"
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr "Європа/Запоріжжя"
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "Європа/Цюріх"
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 #, fuzzy
 msgid "Indian/Comoro"
 msgstr "Коморос"
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 #, fuzzy
 msgid "Indian/Mahe"
 msgstr "Індія"
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 #, fuzzy
 msgid "Indian/Maldives"
 msgstr "Мальдіви"
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 #, fuzzy
 msgid "Indian/Mauritius"
 msgstr "Маурітус"
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 #, fuzzy
 msgid "Indian/Mayotte"
 msgstr "Майотт"
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr ""
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr ""
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Операція не підтримується"
@@ -7360,12 +7892,12 @@ msgstr ""
 "Неможливо створити файл виводу: %s\n"
 " %s"
 
-#: camel/camel-data-cache.c:441
+#: camel/camel-data-cache.c:443
 #, fuzzy, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Не вдалося відкрити кеш-каталогу: %s"
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7373,7 +7905,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7381,11 +7913,16 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Збереження теки \"%s\""
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr ""
 
@@ -7393,64 +7930,72 @@ msgstr ""
 msgid "Syncing folders"
 msgstr "Синхронізація тек"
 
-#: camel/camel-filter-driver.c:811 camel/camel-filter-driver.c:1197
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Помилка аналізу фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:820 camel/camel-filter-driver.c:1203
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Помилка виконання фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:887
+#: camel/camel-filter-driver.c:884
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Не вдалося відкрити адресну книгу"
 
-#: camel/camel-filter-driver.c:896
+#: camel/camel-filter-driver.c:893
 #, fuzzy
 msgid "Unable to process spool folder"
-msgstr ""
-"Не вдалося зберегти список груп для %s: %s"
+msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: camel/camel-filter-driver.c:911
+#: camel/camel-filter-driver.c:908
+#, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Отримання повідомлення %d (%d%%)"
 
-#: camel/camel-filter-driver.c:915
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Неможливо відкрити повідомлення"
 
-#: camel/camel-filter-driver.c:916 camel/camel-filter-driver.c:928
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Збій на повідомленні %d"
 
-#: camel/camel-filter-driver.c:942 camel/camel-filter-driver.c:1049
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Синхронізація теки"
 
-#: camel/camel-filter-driver.c:1016
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Отримання повідомлення %d з %d"
 
-#: camel/camel-filter-driver.c:1031
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Збій на повідомленні %d з %d"
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 msgid "Failed to retrieve message"
 msgstr "Збій отримання повідомлення"
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Збій кешування повідомлення %s: %s"
+
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Збій кешування повідомлення %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
-msgstr ""
-"Помилка виконання фільтрованого пошуку: "
-"%s: %s"
+msgstr "Помилка виконання фільтрованого пошуку: %s: %s"
 
 #: camel/camel-folder-search.c:343
 #, c-format
@@ -7458,8 +8003,7 @@ msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
-"Неможливо проаналізувати пошуковий "
-"вираз: %s:\n"
+"Неможливо проаналізувати пошуковий вираз: %s:\n"
 "%s"
 
 #: camel/camel-folder-search.c:353
@@ -7480,31 +8024,103 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:469
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
-msgstr ""
-"Непідтримувана операція: додавання "
-"повідомлення: для %s"
+msgstr "Непідтримувана операція: додавання повідомлення: для %s"
 
-#: camel/camel-folder.c:1038
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-"Непідтримувана операція: пошук за "
-"виразом: для %s"
+msgstr "Непідтримувана операція: пошук за виразом: для %s"
 
-#: camel/camel-folder.c:1078
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
-"Непідтримувана операція: пошук за "
-"ідентифікаторами користувачів: для %s"
+"Непідтримувана операція: пошук за ідентифікаторами користувачів: для %s"
 
-#: camel/camel-folder.c:1260
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Перенесення повідомлень"
 
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Копіювання повідомлень у %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Відмінено."
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Неочікувана відповідь від сервера IMAP: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Не вказано назви файлу."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Збій кешування повідомлення %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Збій кешування повідомлення %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Збій розкодовування повідомлення."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Не вдалося створити тимчасовий файл: %s"
+
 #: camel/camel-lock-client.c:111
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -7529,9 +8145,7 @@ msgstr "Не вдалося заблокувати \"%s\""
 #: camel/camel-lock.c:91 camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
-msgstr ""
-"Не вдалося створити файл блокування для "
-"%s: %s"
+msgstr "Не вдалося створити файл блокування для %s: %s"
 
 #: camel/camel-lock.c:150
 #, c-format
@@ -7541,22 +8155,17 @@ msgstr ""
 #: camel/camel-lock.c:204
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-"Не вдалось зробити блокування за "
-"допомогою fcntl(2): %s"
+msgstr "Не вдалось зробити блокування за допомогою fcntl(2): %s"
 
 #: camel/camel-lock.c:266
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-"Не вдалось зробити блокування за "
-"допомогою flock(2): %s"
+msgstr "Не вдалось зробити блокування за допомогою flock(2): %s"
 
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
-msgstr ""
-"Неможливо перевірити поштовий файл %s: %s"
+msgstr "Неможливо перевірити поштовий файл %s: %s"
 
 #: camel/camel-movemail.c:121
 #, c-format
@@ -7566,16 +8175,12 @@ msgstr "Не вдалось відкрити файл пошти %s: %s"
 #: camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr ""
-"Не вдалось відкрити тимчасовий файл "
-"пошти %s: %s"
+msgstr "Не вдалось відкрити тимчасовий файл пошти %s: %s"
 
 #: camel/camel-movemail.c:158
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
-msgstr ""
-"Не вдалося зберегти пошту в тимчасовому "
-"файлі %s: %s"
+msgstr "Не вдалося зберегти пошту в тимчасовому файлі %s: %s"
 
 #: camel/camel-movemail.c:188
 #, c-format
@@ -7585,9 +8190,7 @@ msgstr "Не вдалося створити канал: %s"
 #: camel/camel-movemail.c:200
 #, c-format
 msgid "Could not fork: %s"
-msgstr ""
-"Не вдалося запустити спадкоємний процес: "
-"%s"
+msgstr "Не вдалося запустити спадкоємний процес: %s"
 
 #: camel/camel-movemail.c:238
 #, c-format
@@ -7606,114 +8209,29 @@ msgstr "Помилка зчитування файлу пошти: %s"
 #: camel/camel-movemail.c:273
 #, c-format
 msgid "Error writing mail temp file: %s"
-msgstr ""
-"Помилка запису пошти у тимчасовий файл: %s"
+msgstr "Помилка запису пошти у тимчасовий файл: %s"
 
 #: camel/camel-movemail.c:466 camel/camel-movemail.c:533
 #, c-format
 msgid "Error copying mail temp file: %s"
-msgstr ""
-"Помилка копіювання тимчасового "
-"поштового файлу: %s"
-
-#: camel/camel-pgp-context.c:193
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Введіть пароль NNTP для %s@%s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr ""
-
-#: camel/camel-pgp-context.c:621
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr ""
-"Неможливо відіслати повідомлення: не "
-"визначено отримувачів"
-
-#: camel/camel-pgp-context.c:628 camel/camel-pgp-context.c:802
-#, fuzzy
-msgid "Cannot sign this message: no password provided"
-msgstr ""
-"Неможливо відіслати повідомлення: адреса "
-"відправника не вірна."
+msgstr "Помилка копіювання тимчасового поштового файлу: %s"
 
-#: camel/camel-pgp-context.c:634 camel/camel-pgp-context.c:808
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Неможливо підписати це повідомлення: неможливо створити канал до GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:795
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr ""
-"Неможливо відіслати повідомлення: не "
-"визначено отримувачів"
-
-#: camel/camel-pgp-context.c:987
-#, fuzzy
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr ""
-"Неможливо відіслати повідомлення: не "
-"визначено отримувачів"
-
-#: camel/camel-pgp-context.c:993
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Неможливо створити канал до GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1004
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "Не вдалося створити тимчасовий файл: %s"
-
-#: camel/camel-pgp-context.c:1177
-#, fuzzy
-msgid "Cannot encrypt this message: no plaintext to encrypt"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
-"Неможливо відіслати повідомлення: не "
-"визначено отримувачів"
 
-#: camel/camel-pgp-context.c:1187
-#, fuzzy
-msgid "Cannot encrypt this message: no password provided"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
-"Неможливо відіслати повідомлення: адреса "
-"відправника не вірна."
 
-#: camel/camel-pgp-context.c:1194
-#, fuzzy, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Неможливо створити канал до GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1203
-#, fuzzy
-msgid "Cannot encrypt this message: no recipients specified"
+#: camel/camel-multipart-signed.c:624
+msgid "This is a digitally signed message part"
 msgstr ""
-"Неможливо відіслати повідомлення: не "
-"визначено отримувачів"
 
-#: camel/camel-pgp-context.c:1372
+#: camel/camel-multipart-signed.c:678
 #, fuzzy
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr ""
-"Неможливо відіслати повідомлення: не "
-"визначено отримувачів"
-
-#: camel/camel-pgp-context.c:1380
-msgid "Cannot decrypt this message: no password provided"
-msgstr ""
-
-#: camel/camel-pgp-context.c:1387
-#, fuzzy, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Неможливо створити канал до GPG/PGP: %s"
-
-#: camel/camel-pgp-mime.c:354
-msgid "This is a digitally signed message part"
-msgstr ""
+msgid "parse error"
+msgstr "Інша помилка"
 
 #: camel/camel-provider.c:131
 #, c-format
@@ -7728,46 +8246,7 @@ msgstr "Не вдалося завантажити %s: %s"
 #: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
-msgstr ""
-"Не вдалося завантажити %s: немає "
-"ініціалізації в модулі."
-
-#: camel/camel-remote-store.c:199
-#, fuzzy, c-format
-msgid "%s server %s"
-msgstr "Сервер:"
-
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
-msgid "Connection cancelled"
-msgstr "З'єднання скасовано"
-
-#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Не вдалося з'єднатись з %s (порт %d): %s"
-
-#: camel/camel-remote-store.c:258
-msgid "(unknown host)"
-msgstr "(невідомий хост)"
-
-#: camel/camel-remote-store.c:350 camel/camel-remote-store.c:412
-#: camel/camel-remote-store.c:473
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Операцію скасовано"
-
-#: camel/camel-remote-store.c:476
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Сервер неочікувано закрив з'єднання: %s"
+msgstr "Не вдалося завантажити %s: немає ініціалізації в модулі."
 
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
@@ -7862,11 +8341,10 @@ msgid ""
 msgstr "Не вдалося створити канал: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 #, fuzzy
 msgid "Bad authentication response from server."
-msgstr ""
-"Неочікувана відповідь від сервера IMAP: %s"
+msgstr "Неочікувана відповідь від сервера IMAP: %s"
 
 #: camel/camel-sasl-login.c:32
 #, fuzzy
@@ -7891,11 +8369,9 @@ msgid ""
 "Password Authentication."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:153
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
-msgid "Password"
-msgstr "Пароль"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7903,9 +8379,7 @@ msgstr "POP перед SMTP"
 
 #: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr ""
-"За допомогою цього параметру з'єднання POP "
-"відбуватиметься перед SMTP"
+msgstr "За допомогою цього параметру з'єднання POP відбуватиметься перед SMTP"
 
 #: camel/camel-sasl-popb4smtp.c:107
 #, fuzzy
@@ -7923,55 +8397,53 @@ msgstr ""
 #: camel/camel-search-private.c:113
 #, fuzzy, c-format
 msgid "Regular expression compilation failed: %s: %s"
-msgstr ""
-"Збій запису в тимчасову поштову скриньку: "
-"%s: %s"
+msgstr "Збій запису в тимчасову поштову скриньку: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:617
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Розв'язання: %s"
 
-#: camel/camel-service.c:648 camel/camel-service.c:759
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:673
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:675
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:725
+#: camel/camel-service.c:850
 #, fuzzy
 msgid "Resolving address"
 msgstr "Розв'язання: %s"
 
-#: camel/camel-service.c:787
+#: camel/camel-service.c:912
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:790
+#: camel/camel-service.c:915
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -8020,9 +8492,7 @@ msgstr "Сертифікату шифрування \"%s\" не існує."
 #: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
 #, fuzzy, c-format
 msgid "Failed to find certificate for \"%s\"."
-msgstr ""
-"Не вдалося відіслати ім'я користувача на "
-"сервер"
+msgstr "Не вдалося відіслати ім'я користувача на сервер"
 
 #: camel/camel-smime-context.c:556
 msgid "Failed to find a common bulk algorithm."
@@ -8036,12 +8506,12 @@ msgstr "Збій розкодовування повідомлення."
 msgid "Failed to verify certificates."
 msgstr "Збір перевірки сертифікатів."
 
-#: camel/camel-store.c:222
+#: camel/camel-store.c:241
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/camel-store.c:284
+#: camel/camel-store.c:303
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не вдалося отримати теку: %s: %s"
@@ -8070,7 +8540,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:491
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8079,16 +8549,16 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:497
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:500
+#: camel/camel-tcp-stream-ssl.c:504
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8108,120 +8578,109 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Неможливо проаналізувати URL \"%s\""
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Невірне повідомлення %s в %s"
 
-#: camel/camel-vee-folder.c:753
-#, c-format
-msgid "No such message: %s"
-msgstr "Немає такого повідомлення: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Ви не можете скопіювати повідомлення з цієї теки смітника."
 
 #: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
-msgstr ""
-"Неможливо стерти теку: %s: Невірна операція"
+msgstr "Неможливо стерти теку: %s: Невірна операція"
 
 #: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
-msgstr ""
-"Неможливо стерти теку: %s: Немає такої теки"
+msgstr "Неможливо стерти теку: %s: Немає такої теки"
 
 #: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
-msgstr ""
-"Неможливо перейменувати теку: %s: Невірна "
-"операція"
+msgstr "Неможливо перейменувати теку: %s: Невірна операція"
 
 #: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr ""
-"Неможливо перейменувати теку: %s: Немає "
-"такої теки"
+msgstr "Неможливо перейменувати теку: %s: Немає такої теки"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr ""
-"Ви не можете скопіювати повідомлення з "
-"цієї теки смітника."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Операцію скасовано"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Сервер неочікувано закрив з'єднання: %s"
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
-msgstr ""
-"Неочікувана відповідь від сервера IMAP: %s"
+msgstr "Неочікувана відповідь від сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
-msgstr ""
-"Відповідь сервера завершилась надто "
-"скоро."
+msgstr "Відповідь сервера завершилась надто скоро."
 
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr ""
-"Відповідь сервера IMAP не містить "
-"інформації про %s"
+msgstr "Відповідь сервера IMAP не містить інформації про %s"
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
-msgstr ""
-"Неочікувана відповідь OK від сервера IMAP: %s"
+msgstr "Неочікувана відповідь OK від сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Не вдалося створити каталог %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:218
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Не вдалося завантажити зведення для %s"
 
-#: camel/providers/imap/camel-imap-folder.c:284
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
-msgstr ""
-"Теку було знищено і повторно створено на "
-"сервері."
+msgstr "Теку було знищено і повторно створено на сервері."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:469
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Пошук змінених повідомлень."
 
-#: camel/providers/imap/camel-imap-folder.c:1638
-#: camel/providers/imap/camel-imap-folder.c:2114
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Цього повідомлення зараз не існує"
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1867
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
-msgstr ""
-"Отримання інформації про нові "
-"повідомлення"
+msgstr "Отримання інформації про нові повідомлення"
 
-#: camel/providers/imap/camel-imap-folder.c:1799
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Пошук нових повідомлень"
 
-#: camel/providers/imap/camel-imap-folder.c:2151
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
-msgstr ""
-"Не вдалося знайти тіла повідомлення у "
-"відповіді на FETCH."
+msgstr "Не вдалося знайти тіла повідомлення у відповіді на FETCH."
 
 #: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
@@ -8263,8 +8722,7 @@ msgstr "Простір назв"
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
-"Застосувати фільтри до нових повідомлень "
-"у теці \"Вхідні\" на цьому сервері"
+"Застосувати фільтри до нових повідомлень у теці \"Вхідні\" на цьому сервері"
 
 #: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
@@ -8272,124 +8730,178 @@ msgstr "IMAP"
 
 #: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
-msgstr ""
-"Для зчитування та збереження пошти на "
-"серверах IMAP."
+msgstr "Для зчитування та збереження пошти на серверах IMAP."
+
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Пароль"
 
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Сервер SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Сервер SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "З'єднання скасовано"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Не вдалося з'єднатись з %s (порт %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
-"Сервер IMAP %s не підтримує запитаного типу "
-"автенфікації %s"
+"Неможливо з'єднатись з сервером POP.\n"
+"Помилка відсилання пароля: %s"
 
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+msgid "SSL/TLS extension not supported."
+msgstr "SSL/TLS розширення не підтримується"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Збій автенфікації."
+
+#: camel/providers/imap/camel-imap-store.c:869
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr "Сервер IMAP %s не підтримує запитаного типу автенфікації %s"
+
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Немає підтримки автенфікації типу %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sБудь ласка, введіть пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:509
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Ви не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:597
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"Неможливо автентифікуватися на сервері "
-"IMAP.\n"
+"Неможливо автентифікуватися на сервері IMAP.\n"
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:901
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Невірна тека \"%s\""
 
-#: camel/providers/imap/camel-imap-store.c:1276
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
+msgstr "Батьківська тека не дозволяє розміщати підтеки"
+
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Неможливо відкрити поштову скриньку: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
-"Батьківська тека не дозволяє розміщати "
-"підтеки"
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Поштові каталоги формату MH"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
-msgstr ""
-"Для збереження локальної пошти у форматі "
-"поштових каталогів MH"
+msgstr "Для збереження локальної пошти у форматі поштових каталогів MH"
 
-#: camel/providers/local/camel-local-provider.c:64
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Локальне відвантаження"
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr ""
-"Для отримання локальної пошти з "
-"стандартного накопичувача у форматі mbox."
+"Для отримання локальної пошти з стандартного накопичувача у форматі mbox."
 
-#: camel/providers/local/camel-local-provider.c:76
+#: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
-msgstr ""
-"Застосувати фільтри до нових повідомлень "
-"у теці \"Вхідні\""
+msgstr "Застосувати фільтри до нових повідомлень у теці \"Вхідні\""
 
-#: camel/providers/local/camel-local-provider.c:82
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Поштові каталоги формату maildir"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
-msgstr ""
-"Для збереження локальної пошти у форматі "
-"поштових каталогів maildir."
-
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Standard Unix mbox spools"
-msgstr "Стандартні накопичувачі Unix mbox"
+msgstr "Для збереження локальної пошти у форматі поштових каталогів maildir."
 
-#: camel/providers/local/camel-local-provider.c:101
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
-"Для зчитування та збереження локальної "
-"пошти у стандартних накопичувальних "
-"файлах mbox."
 
-#: camel/providers/local/camel-local-provider.c:116
-msgid "Directory tree of mbox files"
-msgstr ""
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
+msgstr "Стандартні накопичувачі Unix mbox"
 
-#: camel/providers/local/camel-local-provider.c:117
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
 msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
+"Для зчитування та збереження локальної пошти у стандартних накопичувальних "
+"файлах mbox."
 
 #: camel/providers/local/camel-local-store.c:139
 #: camel/providers/local/camel-local-store.c:228
-#: camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-spoold-store.c:111
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
@@ -8415,12 +8927,10 @@ msgstr ""
 msgid "Local mail file %s"
 msgstr "Файл локальної пошти %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:863
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
-msgstr ""
-"Не вдалося перейменувати теку \"%s\" на \"%s\": "
-"%s"
+msgstr "Не вдалося перейменувати теку \"%s\" на \"%s\": %s"
 
 #: camel/providers/local/camel-local-store.c:358
 #, fuzzy, c-format
@@ -8430,49 +8940,38 @@ msgstr "Не вдалося перейменувати теку: %s"
 #: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
-msgstr ""
-"Не вдалося стерти файл зведення теки \"%s\": "
-"%s"
+msgstr "Не вдалося стерти файл зведення теки \"%s\": %s"
 
 #: camel/providers/local/camel-local-store.c:389
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
-msgstr ""
-"Не вдалося стерти індексний файл теки "
-"\"%s\": %s"
+msgstr "Не вдалося стерти індексний файл теки \"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:371
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Не вдалося зберегти зведення %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:427
-#: camel/providers/local/camel-spool-summary.c:1167
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
-msgstr ""
-"Неможливо додати повідомлення до "
-"зведення: причина невідома"
+msgstr "Неможливо додати повідомлення до зведення: причина невідома"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
-msgstr ""
-"Відмінено додавання повідомлення у maildir"
+msgstr "Відмінено додавання повідомлення у maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
-msgstr ""
-"Неможливо додати повідомлення у теку maildir: "
-"%s: %s"
+msgstr "Неможливо додати повідомлення у теку maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8481,20 +8980,19 @@ msgstr ""
 "Неможливо отримати повідомлення: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Невірне повідомлення"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Невірний вміст повідомлення"
 
 #: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8505,13 +9003,13 @@ msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Теки \"%s\" не існує."
 
 #: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8527,7 +9025,7 @@ msgstr "\"%s\" не є каталогом Maildir."
 
 #: camel/providers/local/camel-maildir-store.c:167
 #: camel/providers/local/camel-maildir-store.c:204
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Не вдалося стерти теку \"%s\": %s"
@@ -8536,8 +9034,8 @@ msgstr "Не вдалося стерти теку \"%s\": %s"
 msgid "not a maildir directory"
 msgstr "каталог не Maildir"
 
-#: camel/providers/local/camel-maildir-store.c:332
-#: camel/providers/local/camel-spoold-store.c:253
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Не вдалося просканувати теку \"%s\": %s"
@@ -8546,8 +9044,7 @@ msgstr "Не вдалося просканувати теку \"%s\": %s"
 #: camel/providers/local/camel-maildir-summary.c:531
 #, fuzzy, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr ""
-"Неможливо відкрити поштову скриньку: %s: %s\n"
+msgstr "Неможливо відкрити поштову скриньку: %s: %s\n"
 
 #: camel/providers/local/camel-maildir-summary.c:525
 #, fuzzy
@@ -8559,68 +9056,52 @@ msgstr "Тека не порожня"
 msgid "Checking for new messages"
 msgstr "Пошук нових повідомлень"
 
-#. 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-maildir-summary.c:718
-#: camel/providers/local/camel-mbox-summary.c:250
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:381
-#: camel/providers/local/camel-spool-summary.c:646
-#: camel/providers/local/camel-spool-summary.c:945
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Збереження теки"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
-msgstr ""
-"Неможливо відкрити поштову скриньку: %s: %s\n"
+msgstr "Неможливо відкрити поштову скриньку: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Додавання пошти відмінено"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
-msgstr ""
-"Неможливо додати повідомлення до файлу "
-"Mbox: %s: %s"
+msgstr "Неможливо додати повідомлення до файлу Mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
-"Неможливо отримати повідомлення \"%s\" з "
-"теки \"%s\"\n"
+"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Схоже тека непоправно зіпсована."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
-"Збій побудови повідомлення: зіпсовано "
-"поштову скриньку?"
+msgstr "Збій побудови повідомлення: зіпсовано поштову скриньку?"
 
 #: camel/providers/local/camel-mbox-store.c:95
 #, c-format
@@ -8661,194 +9142,155 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Тека \"%s\" не порожня. Не стерто."
 
-#: camel/providers/local/camel-mbox-summary.c:255
-#: camel/providers/local/camel-spool-summary.c:386
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Не вдалося відкрити теку %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:297
-#: camel/providers/local/camel-spool-summary.c:428
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-"Фатальна помилка поштового аналізатора "
-"на позиції %ld в теці %s"
+msgstr "Фатальна помилка поштового аналізатора на позиції %ld в теці %s"
 
-#: camel/providers/local/camel-mbox-summary.c:372
-#: camel/providers/local/camel-spool-summary.c:500
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Неможливо перевірити теку: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:651
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Не вдалося відкрити файл %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
-#: camel/providers/local/camel-spool-summary.c:675
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
-msgstr ""
-"Не вдалося відкрити тимчасову поштову "
-"скриньку: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
-#: camel/providers/local/camel-spool-summary.c:700
-#: camel/providers/local/camel-spool-summary.c:708
-#: camel/providers/local/camel-spool-summary.c:988
-#: camel/providers/local/camel-spool-summary.c:996
-msgid "Summary and folder mismatch, even after a sync"
-msgstr ""
-"Зведення і тека не співпадають, навіть "
-"після синхронізації"
-
-#: camel/providers/local/camel-mbox-summary.c:597
-#: camel/providers/local/camel-spool-summary.c:752
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr ""
-"Помилка запису в тимчасову пошту "
-"скриньку: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:614
-#: camel/providers/local/camel-spool-summary.c:774
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr ""
-"Збій запису в тимчасову поштову скриньку: "
-"%s: %s"
+msgstr "Не вдалося відкрити тимчасову поштову скриньку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
-#: camel/providers/local/camel-spool-summary.c:1046
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Не вдалося закрити вихідну теку %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Не вдалося закрити тимчасову теку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не вдалося перейменувати теку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
-#: camel/providers/local/camel-spool-summary.c:547
-#: camel/providers/local/camel-spool-summary.c:1120
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Зведення і тека не співпадають, навіть після синхронізації"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Невідома помилка: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Не вдалося перейменувати теку: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Помилка запису в тимчасову пошту скриньку: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Збій запису в тимчасову поштову скриньку: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Відмінено додавання повідомлення у MH"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
-msgstr ""
-"Неможливо додати повідомлення у теку MH: %s: "
-"%s"
+msgstr "Неможливо додати повідомлення у теку MH: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" не є каталогом."
 
-#: camel/providers/local/camel-mh-summary.c:220
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Неможливо відкрити каталог MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:515
+#: camel/providers/local/camel-spool-store.c:116
 #, fuzzy, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr ""
-"Неможливо додати повідомлення до файлу "
-"Mbox: %s: %s"
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Накопичувальні теки не можна перейменовувати"
 
-#: camel/providers/local/camel-spool-store.c:115
+#: camel/providers/local/camel-spool-store.c:128
 #, fuzzy, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
+msgid "Spool `%s' is not a regular file or directory"
 msgstr "\"%s\" не є звичайним файлом."
 
-#: camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spoold-store.c:148
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Теки \"%s/%s\" не існує."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Накопичувальній файл пошти %s"
 
-#: camel/providers/local/camel-spool-store.c:208
-#: camel/providers/local/camel-spoold-store.c:193
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Накопичувальні теки не можна перейменовувати"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
-msgstr ""
-"Накопичувальні теки не можна "
-"перейменовувати"
+msgstr "Накопичувальні теки не можна перейменовувати"
 
-#: camel/providers/local/camel-spool-store.c:216
-#: camel/providers/local/camel-spoold-store.c:201
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Накопичувальні теки не можна видаляти"
 
-#: camel/providers/local/camel-spool-summary.c:798
-#: camel/providers/local/camel-spool-summary.c:807
-#: camel/providers/local/camel-spool-summary.c:816
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
-msgstr ""
-"Не вдалось синхронізувати тимчасову теку "
-"%s: %s"
+msgstr "Не вдалось синхронізувати тимчасову теку %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:831
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
-msgstr ""
-"Не вдалося синхронізувати "
-"накопичувальну теку %s: %s"
+msgstr "Не вдалося синхронізувати накопичувальну теку %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:861
-#: camel/providers/local/camel-spool-summary.c:879
-#: camel/providers/local/camel-spool-summary.c:891
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:950
-#, fuzzy, c-format
-msgid "Could not file: %s: %s"
-msgstr "Не вдалося завантажити %s: %s"
-
-#: camel/providers/local/camel-spoold-store.c:117
-#, fuzzy, c-format
-msgid "Store `%s' does not exist or is not a directory"
-msgstr "\"%s\" не є звичайним файлом."
-
-#: camel/providers/local/camel-spoold-store.c:162
-msgid "Store does not support an INBOX"
-msgstr ""
-
-#: camel/providers/local/camel-spoold-store.c:173
-#, fuzzy, c-format
-msgid "Mail tree %s"
-msgstr "існує"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "Новини USENET"
@@ -8857,12 +9299,22 @@ msgstr "Новини USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Не вдалося створити каталог %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "Новини USENET через %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -8944,8 +9396,7 @@ msgstr "Отримання повідомлення POP %d"
 #: camel/providers/pop3/camel-pop3-folder.c:524
 #, c-format
 msgid "Cannot get message %s: %s"
-msgstr ""
-"Неможливо отримати повідомлення %s: %s"
+msgstr "Неможливо отримати повідомлення %s: %s"
 
 #: camel/providers/pop3/camel-pop3-folder.c:514
 msgid "Unknown reason"
@@ -8965,15 +9416,13 @@ msgstr "Залишати повідомлення на сервері"
 msgid "Delete after %s day(s)"
 msgstr "Стирати по завершенню %s днів"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
 #: camel/providers/pop3/camel-pop3-provider.c:54
 msgid "For connecting to and downloading mail from POP servers."
-msgstr ""
-"Для з'єднання та звантаження пошти з "
-"серверів POP."
+msgstr "Для з'єднання та звантаження пошти з серверів POP."
 
 #: camel/providers/pop3/camel-pop3-provider.c:71
 msgid ""
@@ -8988,58 +9437,48 @@ msgid ""
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:238
-#: camel/providers/pop3/camel-pop3-store.c:250
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Неможливо з'єднатись з сервером POP.\n"
 "Помилка відсилання пароля: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:210
-msgid "SSL/TLS extension not supported."
-msgstr "SSL/TLS розширення не підтримується"
-
-#: camel/providers/pop3/camel-pop3-store.c:251
-#, fuzzy
-msgid "SSL negotiations failed"
-msgstr "Збій автенфікації."
-
-#: camel/providers/pop3/camel-pop3-store.c:348
+#: camel/providers/pop3/camel-pop3-store.c:351
 #, c-format
 msgid "Could not connect to POP server on %s"
-msgstr ""
-"Не вдалося з'єднатись з сервером POP на %s"
+msgstr "Не вдалося з'єднатись з сервером POP на %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
-#: camel/providers/pop3/camel-pop3-store.c:492
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:405
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:431
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr "Помилка вводу-виводу: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sБудь ласка, введіть пароль POP для %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:504
-#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -9048,13 +9487,13 @@ msgstr ""
 "Неможливо з'єднатись з сервером POP.\n"
 "Помилка відсилання пароля: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:601
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Невірна тека \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9072,16 +9511,12 @@ msgstr "Неможливо проаналізувати URL \"%s\""
 #: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr ""
-"Не вдалося створити канал до sendmail: %s: "
-"пошту не відіслано"
+msgstr "Не вдалося створити канал до sendmail: %s: пошту не відіслано"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr ""
-"Не вдалося розгалудити sendmail: %s: пошту не "
-"відіслано"
+msgstr "Не вдалося розгалудити sendmail: %s: пошту не відіслано"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
@@ -9091,22 +9526,17 @@ msgstr "Не вдалося відіслати повідомлення: %s"
 #: camel/providers/sendmail/camel-sendmail-transport.c:178
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr ""
-"sendmail завершився сигналом %s: пошту не "
-"відіслано."
+msgstr "sendmail завершився сигналом %s: пошту не відіслано."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:185
 #, c-format
 msgid "Could not execute %s: mail not sent."
-msgstr ""
-"Не вдалося виконати %s: пошту не відіслано."
+msgstr "Не вдалося виконати %s: пошту не відіслано."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:190
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
-"sendmail завершився з станом %d: пошту не "
-"відіслано."
+msgstr "sendmail завершився з станом %d: пошту не відіслано."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:204
 msgid "sendmail"
@@ -9126,15 +9556,11 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
-msgstr ""
-"Синтаксична помилка, команду не "
-"розпізнано"
+msgstr "Синтаксична помилка, команду не розпізнано"
 
 #: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
-msgstr ""
-"Синтаксична помилка у параметрах чи "
-"аргументах"
+msgstr "Синтаксична помилка у параметрах чи аргументах"
 
 #: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
@@ -9162,14 +9588,11 @@ msgstr "Послуга закриває канал передачі"
 
 #: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
-msgstr ""
-"Послуга не доступна, закриття каналу "
-"передачі"
+msgstr "Послуга не доступна, закриття каналу передачі"
 
 #: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
-msgstr ""
-"Запитана поштова дія успішно виконалася"
+msgstr "Запитана поштова дія успішно виконалася"
 
 #: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
@@ -9217,8 +9640,7 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
-msgstr ""
-"Автенфікаційний механізм надто слабкий"
+msgstr "Автенфікаційний механізм надто слабкий"
 
 #: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
@@ -9232,46 +9654,44 @@ msgstr "Тимчасовий збій автенфікації"
 msgid "Authentication required"
 msgstr "Вимагається автенфікація"
 
-#: camel/providers/smtp/camel-smtp-transport.c:300
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:335
-#: camel/providers/smtp/camel-smtp-transport.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Неможливо з'єднатись з сервером POP.\n"
 "Помилка відсилання пароля: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:336
+#: camel/providers/smtp/camel-smtp-transport.c:338
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:350
+#: camel/providers/smtp/camel-smtp-transport.c:352
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
-msgstr ""
-"Перевищено час очікування відповіді на "
-"AUTH: %s"
+msgstr "Перевищено час очікування відповіді на AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: camel/providers/smtp/camel-smtp-transport.c:367
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Помилка відповіді на DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:458
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "Сервер IMAP %s не підтримує запитаного типу автенфікації %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:496
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Введіть пароль NNTP для %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9279,146 +9699,125 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:642
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "Сервер SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:644
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Достачання пошти SMTP через %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:662
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
-msgstr ""
-"Неможливо відіслати повідомлення: адреса "
-"відправника не вірна."
+msgstr "Неможливо відіслати повідомлення: адреса відправника не вірна."
 
-#: camel/providers/smtp/camel-smtp-transport.c:667 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Відсилання повідомлення"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
-msgstr ""
-"Неможливо відіслати повідомлення: не "
-"визначено отримувачів"
+msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:691
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
-msgstr ""
-"Неможливо відіслати повідомлення: не "
-"визначено отримувачів"
+msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
 
-#: camel/providers/smtp/camel-smtp-transport.c:838
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "Привітання SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:869
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-"Перевищено час очікування відповіді на "
-"HELO: %s: не фатально"
+msgstr "Перевищено час очікування відповіді на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Помилка відповіді на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "Автенфікація SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
-msgstr ""
-"Помилка створення автенфікаційного "
-"об'єкта SASL"
+msgstr "Помилка створення автенфікаційного об'єкта SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
-#: camel/providers/smtp/camel-smtp-transport.c:972
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
-msgstr ""
-"Перевищено час очікування відповіді на "
-"AUTH: %s"
+msgstr "Перевищено час очікування відповіді на AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:981
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "Збій запиту AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1042
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
-msgstr ""
-"Невірна автенфікаціна відповідь від "
-"сервера.\n"
+msgstr "Невірна автенфікаціна відповідь від сервера.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-"Затримка відповіді на MAIL FROM: %s: пошту не "
-"відіслано"
+msgstr "Затримка відповіді на MAIL FROM: %s: пошту не відіслано"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1081
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr "Помилка відповіді на MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
-"Затримка відповіді на RCPT TO: %s: пошту не "
-"відіслано"
+msgstr "Затримка відповіді на RCPT TO: %s: пошту не відіслано"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1157
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
-msgstr ""
-"Затримка відповіді на DATA: %s: пошту не "
-"відіслано"
+msgstr "Затримка відповіді на DATA: %s: пошту не відіслано"
 
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr "Помилка відповіді на DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
-#: camel/providers/smtp/camel-smtp-transport.c:1229
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1266
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "затримка відповіді на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1280
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr "Помилка відповіді на RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1303
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
-"затримка відповіді на QUIT: %s: нефатально"
+msgstr "затримка відповіді на QUIT: %s: нефатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1317
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr "Помилка відповіді на QUIT"
 
@@ -9453,9 +9852,7 @@ msgstr "долучення"
 
 #: composer/e-msg-composer-attachment-bar.c:506
 msgid "Remove selected items from the attachment list"
-msgstr ""
-"Видалити вибрані елементи з списку "
-"долучення"
+msgstr "Видалити вибрані елементи з списку долучення"
 
 #: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
@@ -9474,9 +9871,7 @@ msgstr "Неможливо долучити файл %s: %s"
 #: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
-msgstr ""
-"Неможливо долучити файл %s: не звичайний "
-"файл."
+msgstr "Неможливо долучити файл %s: не звичайний файл."
 
 #: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
@@ -9495,61 +9890,57 @@ msgstr "Тип MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:333
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
-msgstr ""
-"Клацніть тут щоб викликати адресну книгу"
+msgstr "Клацніть тут щоб викликати адресну книгу"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Від:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:369
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Відповідати на:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:380
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Введіть адресатів повідомлення"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:399
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr ""
-"Введіть адресатів, що отримають копію "
-"повідомлення"
+msgstr "Введіть адресатів, що отримають копію повідомлення"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:403
+#: composer/e-msg-composer-hdrs.c:410
 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-select-file.c:267
@@ -9557,7 +9948,12 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Долучити файл"
 
-#: composer/e-msg-composer.c:718
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Не вдалося створити вміст PGP-підпису."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9566,36 +9962,34 @@ msgstr ""
 "Помилка зчитування файлу: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Попередження!"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Файл існує, переписати?"
 
-#: composer/e-msg-composer.c:993
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Помилка доступу до файлу: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
-msgstr ""
-"Неможливо отримати повідомлення від "
-"редактора"
+msgstr "Неможливо отримати повідомлення від редактора"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9604,7 +9998,7 @@ msgstr ""
 "Неможливо спозиціонуватися у файлі: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9613,7 +10007,7 @@ msgstr ""
 "Неможливо обрізати файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9622,16 +10016,15 @@ msgstr ""
 "Помилка автозбереження файлу: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1176
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
-"Знайдено незбережені файли з "
-"попереднього сеансу роботи.\n"
+"Знайдено незбережені файли з попереднього сеансу роботи.\n"
 "Чи хочете ви спробувати відновити їх?"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9641,36 +10034,61 @@ msgstr ""
 "\n"
 "Чи хочете ви зберегти ваші зміни?"
 
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Увага: змінене повідомлення"
 
-#: composer/e-msg-composer.c:1364
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Відкрити файл"
 
-#: composer/e-msg-composer.c:1513
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Вставити файл"
 
-#: composer/e-msg-composer.c:2049 composer/e-msg-composer.c:2648
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Підпис"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr "Стерти"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Підготувати повідомлення"
 
-#: composer/e-msg-composer.c:2665
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2688 composer/e-msg-composer.c:2743
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 "Не вдалось створити вікно редактора:\n"
-"Неможливо активувати компонент "
-"HTML-редактора."
+"Неможливо активувати компонент HTML-редактора."
+
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
 
 #: composer/evolution-composer.c:376
 msgid ""
@@ -9680,9 +10098,7 @@ msgstr ""
 
 #: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
-msgstr ""
-"Не вдалося ініціалізувати редактора "
-"Evolutuion."
+msgstr "Не вдалося ініціалізувати редактора Evolutuion."
 
 #: data/evolution.desktop.in.h:1
 #, fuzzy
@@ -9733,7 +10149,7 @@ msgstr "Тема містить"
 msgid "Subject does not contain"
 msgstr "Тема не містить"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2247
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
 #: mail/mail-display.c:122
 msgid ""
 "A file by that name already exists.\n"
@@ -9881,7 +10297,7 @@ msgstr "година"
 msgid "minute"
 msgstr "хвилина"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:191
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "секунд"
 
@@ -9949,7 +10365,7 @@ msgstr " тому"
 msgid "ago"
 msgstr "тому"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1027
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9961,6 +10377,21 @@ msgstr "<клацніть тут для вибору дати>"
 msgid "Filter Rules"
 msgstr "Правила фільтрування"
 
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "Назва стилю:"
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "\"%s\" не є звичайним файлом."
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Відкрити файл"
+
 #. and now for the action area
 #: filter/filter-filter.c:488
 msgid "Then"
@@ -9977,7 +10408,7 @@ msgid ""
 msgstr ""
 
 #: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1633 mail/mail-account-gui.c:1647
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Вибір теки"
 
@@ -9990,7 +10421,11 @@ msgstr ""
 "Помилка у регулярному виразі \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:47
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Тест"
 
@@ -10019,7 +10454,8 @@ msgid "if all criteria are met"
 msgstr "якщо відповідає всім критеріям"
 
 #: filter/filter-rule.c:769
-msgid "if any criterion are met"
+#, fuzzy
+msgid "if any criteria are met"
 msgstr "якщо відповідає будь-якому критерію"
 
 #: filter/filter-rule.c:780
@@ -10099,197 +10535,207 @@ msgid "Beep"
 msgstr "Беліз"
 
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "Компанія"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "містить"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "Скопіювати у теку"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "Дата отримання"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "Дата відсилання"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "Стерто"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "не містить"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "не закінчується на"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "не існує"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "не схоже на"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "не починається з"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "не існують"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Чернетка"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "закінчується на"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Існують"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "існує"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "Вираз"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:26
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26 mail/mail-config.c:74
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Важливо"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr " "
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is after"
 msgstr "було перед"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is before"
 msgstr "було після"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:31
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "більше"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "менше"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "не"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "is not Flagged"
 msgstr "не"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "Більше"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "Список листування"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "Тіло повідомлення"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "Заголовок повідомлення"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "Перенести в теку"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Відтворити звук:"
 
-#: filter/libfilter-i18n.h:40 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Прочитано"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Адресати"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "Replied to"
 msgstr "Відповісти всім"
 
-#: filter/libfilter-i18n.h:44 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 #, fuzzy
 msgid "Score"
 msgstr "Мобільний"
 
-#: filter/libfilter-i18n.h:45 mail/mail-callbacks.c:1552
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "Відправник"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:48
 #, fuzzy
 msgid "Set Status"
 msgstr "Стан:"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "Розмір (Кб)"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "схоже на"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "Source Account"
 msgstr "Електронна адреса містить"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "починається на"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "Зупинити обробку"
 
-#: filter/libfilter-i18n.h:54 mail/mail-format.c:887
-#: mail/message-list.etspec.h:12
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Тема"
 
@@ -10345,7 +10791,8 @@ msgid "Scanning %s"
 msgstr "Сканування %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2121
-#: importers/pine-importer.c:637 mail/component-factory.c:101
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Пошта"
 
@@ -10361,10 +10808,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Адресна книга"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -10414,7 +10857,9 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution імпортує ваші старі дані Netscape"
 
-#: importers/netscape-importer.c:1865
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
 #, fuzzy
 msgid "Trash"
 msgstr "Лаос"
@@ -10476,9 +10921,7 @@ msgstr "Фабрика для редактора Evolutuion."
 #: mail/GNOME_Evolution_Mail.oaf.in.h:3
 #, fuzzy
 msgid "Configuration control for the Evolution Mail Accounts."
-msgstr ""
-"Не вдалося ініціалізувати поштовий "
-"компонент Evolutuion."
+msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:4
 #, fuzzy
@@ -10500,20 +10943,15 @@ msgstr "Редактор пошти Evolutuion."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
-msgstr ""
-"Компонент поштового виконавчого "
-"зведення Evolutuion."
+msgstr "Компонент поштового виконавчого зведення Evolutuion."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
-msgstr ""
-"Компонент відображення поштової теки "
-"Evolutuion."
+msgstr "Компонент відображення поштової теки Evolutuion."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
-msgstr ""
-"Компонент фабрики поштової теки Evolutuion."
+msgstr "Компонент фабрики поштової теки Evolutuion."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
@@ -10522,9 +10960,7 @@ msgstr "Фабрика для редактора Evolutuion."
 #: mail/GNOME_Evolution_Mail.oaf.in.h:12
 #, fuzzy
 msgid "Factory for the Mail Summary component."
-msgstr ""
-"Не вдалося ініціалізувати поштовий "
-"компонент Evolutuion."
+msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:13
 #, fuzzy
@@ -10560,271 +10996,272 @@ msgstr ""
 msgid "This page can be used to configure the Composer"
 msgstr ""
 
-#: mail/component-factory.c:101
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Тека, що містить пошту"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Віртуальний смітник"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Віртуальна тека смітника"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Ця тека не може містити повідомлення."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Властивості..."
 
-#: mail/component-factory.c:403
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Змінити властивості цієї теки"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:929
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:967
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Увага: змінене повідомлення"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Нове поштове повідомлення"
 
-#: mail/component-factory.c:967 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
 msgid "_Mail Message"
 msgstr "Відіслати повідомлення"
 
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
-msgstr ""
-"Не вдалося ініціалізувати поштовий "
-"компонент Evolutuion."
+msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
-msgstr ""
-"Не вдалося ініціалізувати поштовий "
-"компонент Evolutuion."
+msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
-msgstr ""
-"Не вдалося ініціалізувати поштовий "
-"компонент Evolutuion."
+msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
-#: mail/component-factory.c:1209 mail/component-factory.c:1240
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
 msgid "Connecting..."
 msgstr "З'єднання..."
 
-#: mail/component-factory.c:1250
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:342
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Властивості для \"%s\""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Властивості"
 
-#: mail/folder-browser.c:305 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
-msgstr ""
-"Неможливо створити тимчасовий каталог: %s"
+msgstr "Неможливо створити тимчасовий каталог: %s"
 
-#: mail/folder-browser.c:760
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d нових"
 
-#: mail/folder-browser.c:763 mail/folder-browser.c:771
-#: mail/folder-browser.c:774
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d приховано"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d вибрано"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d не відіслано"
 
-#: mail/folder-browser.c:779
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d відіслано"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d всього"
 
-#: mail/folder-browser.c:1088
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
-msgstr ""
-"Створити віртуальну теку з повідомлення"
+msgstr "Створити віртуальну теку з повідомлення"
 
-#: mail/folder-browser.c:1581
+#: mail/folder-browser.c:1649
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Віртуальна тека теми"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "Віртуальна тека відправника"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "Віртуальна тека отримувачів"
 
-#: mail/folder-browser.c:1584
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "Фільтр списку листування"
 
-#: mail/folder-browser.c:1588
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Фільтр теми"
 
-#: mail/folder-browser.c:1589
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Фільтр відправника"
 
-#: mail/folder-browser.c:1590
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Фільтр отримувачів"
 
-#: mail/folder-browser.c:1591 mail/folder-browser.c:1935
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Фільтр списку розсилки"
 
-#: mail/folder-browser.c:1609 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "Виправити як нове повідомлення..."
 
-#: mail/folder-browser.c:1611
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "Друкувати"
 
-#: mail/folder-browser.c:1615 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Відповісти відправнику"
 
-#: mail/folder-browser.c:1616 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Відповісти у список"
 
-#: mail/folder-browser.c:1617 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Відповісти всім"
 
-#: mail/folder-browser.c:1618
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "Переслати"
 
-#: mail/folder-browser.c:1622
+#: mail/folder-browser.c:1690
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Повне ім'я..."
 
-#: mail/folder-browser.c:1623
+#: mail/folder-browser.c:1691
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Завершено"
 
-#: mail/folder-browser.c:1624
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Безхмарно"
 
 #. separator here?
-#: mail/folder-browser.c:1628 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Позначити прочитаним"
 
-#: mail/folder-browser.c:1629
+#: mail/folder-browser.c:1697
 msgid "Mark as _Unread"
 msgstr "Позначити непрочитаним"
 
-#: mail/folder-browser.c:1630
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Позначити як важливе"
 
-#: mail/folder-browser.c:1631
+#: mail/folder-browser.c:1699
 msgid "_Mark as Unimportant"
 msgstr "Позначити як неважливе"
 
-#: mail/folder-browser.c:1636
+#: mail/folder-browser.c:1704
 msgid "U_ndelete"
 msgstr "Відновити"
 
-#: mail/folder-browser.c:1640
+#: mail/folder-browser.c:1708
 msgid "Mo_ve to Folder..."
 msgstr "Перенести в теку..."
 
-#: mail/folder-browser.c:1641 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "Скопіювати в теку..."
 
-#: mail/folder-browser.c:1645
-#, fuzzy
-msgid "Label"
-msgstr "Більше"
-
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1717
 msgid "Add Sender to Address_book"
 msgstr "Додати відправника в адресну книгу"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1721
 msgid "Appl_y Filters"
 msgstr "Застосувати фільтри"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1725
 msgid "Crea_te Rule From Message"
 msgstr "Створити правило з повідомлення"
 
-#: mail/folder-browser.c:1936
+#: mail/folder-browser.c:1990
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Віртуальна теку списку листування"
 
-#: mail/folder-browser.c:1938
+#: mail/folder-browser.c:1992
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Фільтр списку листування (%s)"
 
-#: mail/folder-browser.c:1939
+#: mail/folder-browser.c:1993
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Віртуальна тека списку листування (%s)"
 
-#: mail/folder-info.c:64
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Default"
+msgstr "Типово"
+
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Отримання інформації про теку"
 
@@ -10838,9 +11275,7 @@ msgstr "Імпортує файли mbox у Evolution"
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
 msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-"Фабрика для імпортування пошти Outlook Express 4 "
-"у Evolution"
+msgstr "Фабрика для імпортування пошти Outlook Express 4 у Evolution"
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
 msgid "Imports Outlook Express 4 files into Evolution"
@@ -10880,7 +11315,7 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
@@ -10890,86 +11325,105 @@ msgid "Evolution News Editor"
 msgstr "Редактор новин Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Редактор рахунків Evolution"
 
-#: mail/mail-account-gui.c:738 mail/mail-config.glade.h:161
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
 msgid "_Host:"
 msgstr "Комп'ютер:"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:131
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
 msgid "User_name:"
 msgstr "Назва користувача:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:170
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
 msgid "_Path:"
 msgstr "Шлях:"
 
-#: mail/mail-account-gui.c:1216 mail/mail-account-gui.c:1217
-#: mail/mail-account-gui.c:1454 mail/mail-account-gui.c:1459
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Random"
-msgstr "Радіо"
-
-#: mail/mail-account-gui.c:1286 mail/mail-account-gui.c:1301
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-
-#: mail/mail-account-gui.c:1985
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
-msgstr ""
-"Ви не можете створити два рахунки з "
-"однаковими назвами."
+msgstr "Ви не можете створити два рахунки з однаковими назвами."
 
-#: mail/mail-accounts.c:212
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
-msgstr ""
-"Ви впевнені, що хочете стерти цей рахунок?"
+msgstr "Ви впевнені, що хочете стерти цей рахунок?"
 
-#: mail/mail-accounts.c:216
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Не стирати"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Справді стерти рахунок?"
 
-#: mail/mail-accounts.c:353 mail/mail-accounts.c:387
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Вимкнути"
 
-#: mail/mail-accounts.c:355 mail/mail-accounts.c:389
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Увімкнути"
 
-#: mail/mail-accounts.c:632 mail/mail-accounts.c:636
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
-msgstr ""
-"Ви впевнені, що хочете стерти ці нові "
-"рахунки?"
+msgstr "Ви впевнені, що хочете стерти ці нові рахунки?"
 
-#: mail/mail-accounts.c:731 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: mail/mail-accounts.c:732 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Назва рахунку:"
 
-#: mail/mail-accounts.c:733 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Протокол"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:78
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "існує"
+
+#: mail/mail-autofilter.c:223
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "Тема"
+
+#: mail/mail-autofilter.c:239
+#, fuzzy, c-format
+msgid "Mail from %s"
+msgstr "існує"
+
+#: mail/mail-autofilter.c:295
+#, fuzzy, c-format
+msgid "%s mailing list"
+msgstr "Список листування"
+
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Додати правило фільтрування"
 
-#: mail/mail-callbacks.c:93
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10977,30 +11431,30 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:142
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:156
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:209
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Відіслати всеодно?"
 
-#: mail/mail-callbacks.c:251
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11008,64 +11462,60 @@ msgstr ""
 "Це повідомлення не має теми.\n"
 "Справді відіслати?"
 
-#: mail/mail-callbacks.c:295
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:301
 #, fuzzy
 msgid "This message contains only Bcc recipients."
-msgstr ""
-"Неможливо відіслати повідомлення: не "
-"визначено отримувачів"
+msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:408
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:497
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:623
+#: mail/mail-callbacks.c:644
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:977
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "невідомий відправник"
 
-#: mail/mail-callbacks.c:981
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1433 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Перенести повідомлення у"
 
-#: mail/mail-callbacks.c:1435 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Скопіювати повідомлення у"
 
-#: mail/mail-callbacks.c:2091
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
-msgstr ""
-"Ви впевнені, що хочете виправити всі %d "
-"повідомлень?"
+msgstr "Ви впевнені, що хочете виправити всі %d повідомлень?"
 
-#: mail/mail-callbacks.c:2116
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11073,7 +11523,7 @@ msgstr ""
 "Ви можете лише редагувати збережені\n"
 "повідомлення в теці \"Чернетки\"."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11081,41 +11531,39 @@ msgstr ""
 "Ви можете лише відіслати повторно\n"
 "повідомлення з теки \"Відіслані\"."
 
-#: mail/mail-callbacks.c:2169
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
-msgstr ""
-"Ви впевнені, що хочете відіслати повторно "
-"всі %d повідомлень?"
+msgstr "Ви впевнені, що хочете відіслати повторно всі %d повідомлень?"
 
-#: mail/mail-callbacks.c:2195
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Немає вибраних повідомлень"
 
-#: mail/mail-callbacks.c:2240 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
 msgid "Overwrite file?"
 msgstr "Переписати файл?"
 
-#: mail/mail-callbacks.c:2294
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Зберегти повідомлення як..."
 
-#: mail/mail-callbacks.c:2296
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Зберегти повідомлення як..."
 
-#: mail/mail-callbacks.c:2366
+#: mail/mail-callbacks.c:2415
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Показати попереднє повідомлення"
 
-#: mail/mail-callbacks.c:2373
+#: mail/mail-callbacks.c:2422
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2615
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11123,42 +11571,77 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2728
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
-"Помилка завантаження інформації про "
-"фільтр:\n"
+"Помилка завантаження інформації про фільтр:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2740
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Фільтри"
 
-#: mail/mail-callbacks.c:2783
+#: mail/mail-callbacks.c:2833
 #, c-format
 msgid "Page %d of %d"
 msgstr "Сторінка %d з %d"
 
-#: mail/mail-callbacks.c:2836
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "Надрукувати повідомлення"
 
-#: mail/mail-callbacks.c:2863
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2901
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Не вдалося надрукувати повідомлення"
 
-#: mail/mail-callbacks.c:3087 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ви впевнені, що хочете стерти зустріч"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Немає опису"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Неназваний контакт"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Відіслано"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Додати критерій"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Підпис"
+
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -11196,184 +11679,170 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:628
+#: mail/mail-config-druid.c:627
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Інсталяція Evolution"
 
 #. red
-#: mail/mail-config.c:75 mail/mail-config.glade.h:137
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Work"
 msgstr "Корк"
 
 #. orange
-#: mail/mail-config.c:76 mail/mail-config.glade.h:86
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Personal"
 msgstr "Загальне"
 
 #. forest green
-#: mail/mail-config.c:77 mail/mail-config.glade.h:127
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
 #, fuzzy
 msgid "To Do"
 msgstr "Тоґо"
 
 #. blue
-#: mail/mail-config.c:78 mail/mail-config.glade.h:66
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Later"
 msgstr "після"
 
-#: mail/mail-config.c:2458
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#: mail/mail-config.c:625
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Редактор рахунків Evolution"
 
-#: mail/mail-config.c:2719
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2797 mail/mail-config.c:2801
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "З'єднання з сервером..."
 
-#: mail/mail-config.c:2999
-#, fuzzy
-msgid "Unnamed"
-msgstr "Неназваний контакт"
-
-#: mail/mail-config.c:3177
-msgid "Cannot execute signature script"
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 msgid " "
 msgstr " "
 
 #: mail/mail-config.glade.h:2
-#, fuzzy
-msgid " Edit "
-msgstr "Редагування"
-
-#: mail/mail-config.glade.h:3
-msgid " New "
-msgstr " Новий "
-
-#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr "Визначити типи, що підтримуються..."
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:5
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Editor"
 msgstr "Редактор рахунків Evolution"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Інформація про рахунок"
 
-#: mail/mail-config.glade.h:10 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Керування рахунками"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Advanced Options"
-msgstr "Скасувати операцію"
+msgid "Add Sc_ript"
+msgstr "Додати критерій"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Afrikaans"
-msgstr "Арканзас"
+msgid "Add new signature..."
+msgstr "Зберегти підпис"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:14
-msgid "Alerts"
-msgstr "Попередження"
-
-#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-#, fuzzy
-msgid "Arabic"
-msgstr "Алґерія"
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid "Attach original message"
 msgstr "Долучити файл до повідомлення"
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Долучення"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Автенфікація"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "Automatically _detect links"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Невідомий набір символів: %s"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "Кольори"
 
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 #: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:29
+msgid "Color for _misspelled words:"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr "Підготувати повідомлення"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Конфігурація"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11383,53 +11852,44 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
-#, fuzzy
-msgid "Dari"
-msgstr "Бахрейн"
-
 #: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "Default Behavior"
 msgstr "Типова поведінка"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "Default character _encoding:"
 msgstr "Типове кодування символів: "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Отримання пошти"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Неможливо відкрити повідомлення"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Готово"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "Drafts _folder:"
 msgstr "Тека чернеток:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "Увімкнути"
 
-#: mail/mail-config.glade.h:48
-msgid "E_nable advanced options"
-msgstr ""
-
 #: mail/mail-config.glade.h:49
 msgid "Emacs"
 msgstr "Emacs"
@@ -11447,38 +11907,33 @@ msgstr "_Електронна адреса:"
 msgid "Empty _trash folders on exit"
 msgstr "Спорожнити теку смітника на виході"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "Виконати команду..."
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "закінчується на"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Font Properties"
 msgstr "Властивості шрифтів"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Переслані повідомлення"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Підсвітка процитованого"
 
-#: mail/mail-config.glade.h:59
-#, fuzzy
-msgid "Hulu"
-msgstr "Тувалу"
-
 #: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
@@ -11530,67 +11985,61 @@ msgstr "Microsoft"
 msgid "NNTP Server:"
 msgstr "Сервер NNTP:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "Повідомляти про нову пошту"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "News Servers"
 msgstr "Сервери новин"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Необов'язкова інформація"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Організація:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "Ідентифікатор ключа PGP/GPG:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Вибір кольору"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
-"Неможливо відіслати повідомлення: не "
-"визначено отримувачів"
+msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Надрукувати вибрані контакти"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Quote original message"
 msgstr "Неможливо відкрити повідомлення"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Процитовано"
 
-#: mail/mail-config.glade.h:95
-msgid "Randomized"
-msgstr ""
-
 #: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "Запам'ятати цей пароль"
@@ -11621,258 +12070,253 @@ msgstr "Безпека"
 
 #: mail/mail-config.glade.h:104
 #, fuzzy
-msgid "Same as text"
-msgstr "Показати"
-
-#: mail/mail-config.glade.h:105
-#, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Безпечний MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Select PGP program"
 msgstr "Вибрати програму PGP"
 
-#: mail/mail-config.glade.h:111
-msgid "Select a signature file"
-msgstr "Вибрати файл підпису"
-
-#: mail/mail-config.glade.h:112
-#, fuzzy
-msgid "Select a signature script"
-msgstr "Стерти все крім підпису"
-
-#: mail/mail-config.glade.h:113 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Відсилання пошти"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Відіслати повідомлення пізніше"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Відіслати повідомлення негайно"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Сервер вимагає автенфікації"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Конфігурація сервера"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "Тип сервера: "
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Ярлики"
 
-#: mail/mail-config.glade.h:121
-msgid "Signature"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Signature #1"
 msgstr "Підпис"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
+msgstr "Підпис"
+
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Джерело"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Вхідна інформація"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:122
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Назва стилю:"
 
-#: mail/mail-config.glade.h:125
-msgid "Spell Checking"
+#: mail/mail-config.glade.h:123
+#, fuzzy
+msgid "Spell Checking Language"
 msgstr "Перевірка орфографії"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Spell _Checking"
+msgstr "Перевірка орфографії"
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Стандартний Unix mbox"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
-#, fuzzy
-msgid "Use _HTML for this signature"
-msgstr "Підпис _HTML:"
-
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "Підписи"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "Тип автенфікації: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:146
 msgid "_Authentication type: "
 msgstr "Тип _автенфікації: "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+msgid "_Automatically insert smiley images"
+msgstr ""
+
+#: mail/mail-config.glade.h:149
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "Ідентифікатор сертифіката:"
 
-#: mail/mail-config.glade.h:147
-msgid "_Color for misspelled words: "
-msgstr ""
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Викреслення теки"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Підпис _HTML:"
+
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Defaults"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
-msgid "_Enable spell checking"
-msgstr ""
-
-#: mail/mail-config.glade.h:154
-msgid "_Filename:"
-msgstr "Назва файлу:"
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Enable"
+msgstr "Увімкнути"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:158
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Переслати повідомлення"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 msgid "_Full name:"
 msgstr "_Повне ім'я:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 msgid "_HTML Mail"
 msgstr "В HTML"
 
-#: mail/mail-config.glade.h:160
-msgid "_HTML Signature:"
-msgstr "Підпис _HTML:"
-
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
-msgid "_Language:"
-msgstr "Мова:"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
-msgstr ""
-"Завантажувати зображення, якщо "
-"відправник у адресній книзі"
+msgstr "Завантажувати зображення, якщо відправник у адресній книзі"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 msgid "_Make this my default account"
 msgstr "Зробити це моїм _початковим рахунком"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Зберегти повідомлення у вказаній теці"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "Ім'я:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "Шифрування PGP"
 
-#: mail/mail-config.glade.h:171
-msgid "_Play sound file when new mail arrives"
-msgstr ""
-
 #: mail/mail-config.glade.h:172
-#, fuzzy
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgid "_Play sound file when new mail arrives"
 msgstr ""
-"Неможливо відіслати повідомлення: не "
-"визначено отримувачів"
 
 #: mail/mail-config.glade.h:173
 #, fuzzy
-msgid "_Prompt when sending messages with an empty subject line"
-msgstr ""
-"Неможливо відіслати повідомлення: не "
-"визначено отримувачів"
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
 
 #: mail/mail-config.glade.h:174
 #, fuzzy
-msgid "_Random"
-msgstr "Радіо"
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
 
 #: mail/mail-config.glade.h:175
 msgid "_Receiving Mail"
@@ -11909,77 +12353,54 @@ msgid "_Signatures"
 msgstr "Підписи"
 
 #: mail/mail-config.glade.h:183
-#, fuzzy
-msgid "_Text Signature:"
-msgstr "Підпис _HTML:"
-
-#: mail/mail-config.glade.h:184
 msgid "_Use secure connection (SSL):"
-msgstr ""
-"Використовувати безпечне з'єднання (SSL)"
+msgstr "Використовувати безпечне з'єднання (SSL)"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:184
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "кожні"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:186
 msgid "color"
 msgstr " колір"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "опис"
 
-#: mail/mail-config.glade.h:190
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "Не вдалося створити вміст PGP-підпису."
-
-#: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr ""
-"Не вдалося створити вміст PGP-перевірки."
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
-"Не вдалося створити вміст PGP-шифрування."
 
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr ""
-"Не вдалося створити вміст PGP-дешифрування."
-
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
-msgstr ""
-"Не вдалось створити вікно конструктора."
+msgstr "Не вдалось створити вікно конструктора."
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
-msgstr ""
-"Не вдалось створити вікно конструктора."
+msgstr "Не вдалось створити вікно конструктора."
 
 #: mail/mail-display.c:279
 msgid "Save Attachment"
@@ -11988,8 +12409,7 @@ msgstr "Зберегти долучення"
 #: mail/mail-display.c:344
 #, c-format
 msgid "Could not create temporary file '%s': %s"
-msgstr ""
-"Неможливо створити тимчасовий файл '%s': %s"
+msgstr "Неможливо створити тимчасовий файл '%s': %s"
 
 #: mail/mail-display.c:390
 msgid "Save to Disk..."
@@ -12021,145 +12441,174 @@ msgstr "Зовнішня програма перегляду"
 msgid "Loading message content"
 msgstr "Завантаження вмісту повідомлення"
 
-#: mail/mail-display.c:1832
+#: mail/mail-display.c:1553
+msgid "Overdue:"
+msgstr ""
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Відкрити посилання у браузері"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1834
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "Контакт"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:1836
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Завдання"
 
-#: mail/mail-display.c:1837
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Зберегти зображення як..."
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "долучення %s"
 
-#: mail/mail-format.c:647
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:730 mail/message-list.etspec.h:2
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: mail/mail-format.c:822
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Невірна адреса"
 
-#: mail/mail-format.c:865 mail/message-list.etspec.h:7
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Від"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Відповідати на"
 
-#: mail/mail-format.c:874 mail/message-list.etspec.h:13
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "До"
 
-#: mail/mail-format.c:879
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:884
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:915
+#: mail/mail-format.c:945
 #, fuzzy
 msgid "Mailer"
 msgstr "Пошта"
 
-#: mail/mail-format.c:2106
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Зберегти повідомлення як..."
+
+#: mail/mail-format.c:1832
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Не вдалося створити вміст PGP-перевірки."
+
+#: mail/mail-format.c:1868
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1876
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Вказівник на сайт FTP (%s)"
 
-#: mail/mail-format.c:2120
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Вказівник на локальний файл (%s)"
 
-#: mail/mail-format.c:2154
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Вказівник на віддалені дані (%s)"
 
-#: mail/mail-format.c:2162
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-"Вказівник на невідомі зовнішні дані (типу "
-"\"%s\")"
+msgstr "Вказівник на невідомі зовнішні дані (типу \"%s\")"
 
-#: mail/mail-format.c:2167
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:625
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Віртуальні теки"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Переконфіґурування теки"
 
-#: mail/mail-local.c:706
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:762
+#: mail/mail-local.c:807
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:859
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Не вдалось стерти теку \"%s\":\n"
 "%s"
 
-#: mail/mail-local.c:1279
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1294
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1316
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1405
+#: mail/mail-local.c:1450
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
-"Неможливо отримати повідомлення \"%s\" з "
-"теки \"%s\"\n"
+"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
 "  %s"
 
-#: mail/mail-local.c:1414
+#: mail/mail-local.c:1459
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Конфіґурувати теку"
@@ -12196,9 +12645,7 @@ msgstr "Отримання пошти"
 
 #: mail/mail-ops.c:538 mail/mail-ops.c:567
 msgid "However, the message was successfully sent."
-msgstr ""
-"Всеодно, повідомлення було успішно "
-"відіслано."
+msgstr "Всеодно, повідомлення було успішно відіслано."
 
 #: mail/mail-ops.c:603
 #, c-format
@@ -12220,81 +12667,73 @@ msgstr "Збій на повідомленні %d з %d"
 msgid "Complete."
 msgstr "% завершення:"
 
-#: mail/mail-ops.c:837
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Збереження повідомлення у теці"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перенесення повідомлень у %s"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копіювання повідомлень у %s"
 
-#: mail/mail-ops.c:944
-msgid "Moving"
-msgstr "Перенесення"
-
-#: mail/mail-ops.c:947
-msgid "Copying"
-msgstr "Копіювання"
-
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканування тек в \"%s\""
 
-#: mail/mail-ops.c:1240
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Переслані повідомлення"
 
-#: mail/mail-ops.c:1283
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Відкривання теки %s"
 
-#: mail/mail-ops.c:1355
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1424
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Видалення теки %s"
 
-#: mail/mail-ops.c:1518
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Збереження теки \"%s\""
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Оновлення теки"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Викреслення теки"
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Отримання повідомлення %s"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Отримання %d повідомлень"
 
-#: mail/mail-ops.c:1807
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Збереження %d повідомлень"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12303,7 +12742,7 @@ msgstr ""
 "Неможливо створити файл виводу: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12312,11 +12751,11 @@ msgstr ""
 "Помилка збереження повідомлень у %s:\n"
 "%s"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Збереження долучення"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12325,27 +12764,27 @@ msgstr ""
 "Неможливо створити файл виводу %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Закриття з'єднання з %s"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Перевстановлення з'єднання з %s"
 
-#: mail/mail-ops.c:2237
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr ""
 
-#: mail/mail-search-dialogue.c:113 ui/evolution.xml.h:51
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "Пошук"
 
@@ -12417,10 +12856,6 @@ msgstr "Оновлення..."
 msgid "Waiting..."
 msgstr "Очікування..."
 
-#: mail/mail-send-recv.c:534
-msgid "Cancelled."
-msgstr "Відмінено."
-
 #: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Користувач скасував операцію."
@@ -12434,26 +12869,46 @@ msgstr "Введіть пароль для %s"
 msgid "Enter Password"
 msgstr "Ввід пароля"
 
-#: mail/mail-signature-editor.c:79
+#: mail/mail-signature-editor.c:81
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Не вдалося зберегти файл підпису: %s"
 
-#: mail/mail-signature-editor.c:172
+#: mail/mail-signature-editor.c:174
 msgid "Save signature"
 msgstr "Зберегти підпис"
 
-#: mail/mail-signature-editor.c:178
+#: mail/mail-signature-editor.c:180
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-signature-editor.c:357
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Ім'я:"
+
+#: mail/mail-signature-editor.c:397
 #, fuzzy
-msgid "Signature name:"
-msgstr "Файл підпису:"
+msgid "Signature hint"
+msgstr "Підпис"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "Файл підпису HTML:"
 
 #: mail/mail-tools.c:257
 #, c-format
@@ -12468,17 +12923,17 @@ msgstr "Переслане повідомлення"
 msgid "Forwarded Message"
 msgstr "Переслане повідомлення"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Відкривання теки %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Сканування тек в \"%s\""
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12487,91 +12942,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
+#, fuzzy
+msgid "VFolders"
+msgstr "Теки"
+
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "Віртуальні теки"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Виправлення віртуальної теки"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "Нова віртуальна тека"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Без теми)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "повідомлення - %s"
 
-#: mail/message-list.c:672
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Не прочитано"
 
-#: mail/message-list.c:673
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Прочитано"
 
-#: mail/message-list.c:674
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Дано відповідь"
 
-#: mail/message-list.c:675
+#: mail/message-list.c:723
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Не вдалося відіслати повідомлення: %s"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:724
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Надрукувати повідомлення"
 
-#: mail/message-list.c:680
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Найнижче"
 
-#: mail/message-list.c:681
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Нижче"
 
-#: mail/message-list.c:685
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Вище"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Найвище"
 
-#: mail/message-list.c:991
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Сьогодні %I:%M %p"
 
-#: mail/message-list.c:1007
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Вчора %l:%M %p"
 
-#: mail/message-list.c:1019
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1029
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2396
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Створення списку повідомлень"
 
@@ -12593,10 +13054,15 @@ msgid "Follow Up Flag"
 msgstr ""
 
 #: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Оригінальний контакт:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Отримано"
 
-#: mail/message-list.etspec.h:10
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Розмір"
 
@@ -12724,16 +13190,12 @@ msgstr "Редактор пошти Evolutuion."
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
 #, fuzzy
 msgid "Factory for Evolution Summary's configuration control."
-msgstr ""
-"Не вдалося ініціалізувати поштовий "
-"компонент Evolutuion."
+msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
 #, fuzzy
 msgid "Factory for the Evolution Summary component."
-msgstr ""
-"Компонент поштового виконавчого "
-"зведення Evolutuion."
+msgstr "Компонент поштового виконавчого зведення Evolutuion."
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
 #, fuzzy
@@ -17712,5629 +18174,5626 @@ msgstr "Латвія"
 msgid "Latrobe"
 msgstr ""
 
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 #, fuzzy
 msgid "Laurel"
 msgstr "Більше"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 #, fuzzy
 msgid "La Verne"
 msgstr "Капе Верде"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr ""
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr ""
 "\n"
 "Розташування: "
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 #, fuzzy
 msgid "Learmouth"
 msgstr "Лесото"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 #, fuzzy
 msgid "Leesburg"
 msgstr "Люксембурґ"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr ""
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "Кер."
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "Мартініка"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 #, fuzzy
 msgid "Lemmon"
 msgstr "Лебанон"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "Видалити"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "Заголовок"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 #, fuzzy
 msgid "Lewisburg"
 msgstr "Люксембурґ"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "Лесото"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 #, fuzzy
 msgid "Lewistown"
 msgstr "Лесото"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 #, fuzzy
 msgid "Lexington"
 msgstr "Лебанон"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Liberal"
 msgstr "Ліберія"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 #, fuzzy
 msgid "Libya"
 msgstr "Ліберія"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "Ніґер"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr ""
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr ""
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr ""
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "Лаос"
 
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 #, fuzzy
 msgid "Limoges"
 msgstr "Найнижче"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "місяць"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 #, fuzzy
 msgid "Lincoln"
 msgstr "вхідні"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr ""
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 #, fuzzy
 msgid "Lisboa"
 msgstr "Ліберія"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "список"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 #, fuzzy
 msgid "Litchfield"
 msgstr "Слабкий град"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Ліверпуль"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr ""
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr ""
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 #, fuzzy
 msgid "Logan"
 msgstr "Тонґа"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr ""
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "Комп."
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "Лондон"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "Лондон/Місто"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr ""
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "Гондурас"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 #, fuzzy
 msgid "Los Alamos"
 msgstr "Сповіщення"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Лос Анжелес"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 #, fuzzy
 msgid "Lousiana"
 msgstr "Ботсвана"
 
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "Лебанон"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 #, fuzzy
 msgid "Luton"
 msgstr "вихідні"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "Люксембурґ"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 msgid "Lviv"
 msgstr "Львів"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr ""
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr ""
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Маастріхт"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "Масау"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macapa"
 msgstr "Масау"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "Македонія"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 #, fuzzy
 msgid "Macon"
 msgstr "Кер."
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "Македонія"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 #, fuzzy
 msgid "Madison"
 msgstr "Радіо"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr ""
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr ""
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr ""
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Магадан"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Магдалена"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 #, fuzzy
 msgid "Maine"
 msgstr "Кер."
 
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr ""
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr ""
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "Кер."
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "Малаві"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Малага"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "Мальта"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Манагуа"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 #, fuzzy
 msgid "Manassas"
 msgstr "Малазія"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 #, fuzzy
 msgid "Manaus"
 msgstr "Масау"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 #, fuzzy
 msgid "Manchester"
 msgstr "Шлях:"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Манхеттен"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 #, fuzzy
 msgid "Manisa"
 msgstr "Кер."
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "існує"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 #, fuzzy
 msgid "Manitoba"
 msgstr "Головна панель інструментів"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr ""
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 #, fuzzy
 msgid "Mankato"
 msgstr "Монако"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 #, fuzzy
 msgid "Mansfield"
 msgstr "Пошта"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "Мальта"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 #, fuzzy
 msgid "Maraba"
 msgstr "Мавританія"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr ""
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 #, fuzzy
 msgid "Marathon"
 msgstr "Березень"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 #, fuzzy
 msgid "Margarita"
 msgstr "Мавританія"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 #, fuzzy
 msgid "Marianna"
 msgstr "Мавританія"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "Малі"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Марібор"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 #, fuzzy
 msgid "Marietta"
 msgstr "Мавританія"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 #, fuzzy
 msgid "Marion"
 msgstr "Поля"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr ""
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 #, fuzzy
 msgid "Marquette"
 msgstr "Мартініка"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr ""
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr ""
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 #, fuzzy
 msgid "Marshall"
 msgstr "Маршалові острови"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 #, fuzzy
 msgid "Marshalltown"
 msgstr "Маршалові острови"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "Мартініка"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "Позначити непрочитаним"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "Мартініка"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "Мартініка"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Меріленд"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr ""
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "Малазія"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr ""
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr ""
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "Македонія"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 #, fuzzy
 msgid "Matamoros"
 msgstr "Коморос"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Мацумото (аеропорт)"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Мацуяма (аеропорт)"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mattoon"
 msgstr "Кер."
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "Керівник"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "Майотт"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "Казахстан"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 #, fuzzy
 msgid "Mazu"
 msgstr "Масау"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr ""
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "Малі"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "Березень"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 #, fuzzy
 msgid "McClellan"
 msgstr "Ісландія"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "Комп."
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "Масау"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "перед"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 #, fuzzy
 msgid "Mehamn"
 msgstr "Кер."
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Мельбурн"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "Мальта"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr ""
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Мемфіс"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "Македонія"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "П'ятниця"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 #, fuzzy
 msgid "Merril Field"
 msgstr "Поле \"Від\""
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr ""
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 #, fuzzy
 msgid "Mexicali"
 msgstr "Мексика"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 #, fuzzy
 msgid "Miami"
 msgstr "Малі"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr ""
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr ""
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr ""
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 #, fuzzy
 msgid "Middle East"
 msgstr "По-батькові:"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 #, fuzzy
 msgid "Middleton Island"
 msgstr "Соломонові острови"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "По-батькові:"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 #, fuzzy
 msgid "Midland"
 msgstr "Фінляндія"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr ""
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr ""
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 #, fuzzy
 msgid "Miles City"
 msgstr "Тип файлу:"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 #, fuzzy
 msgid "Milford"
 msgstr "для"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 #, fuzzy
 msgid "Milton"
 msgstr "Пнд"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr ""
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr ""
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minatitlan"
 msgstr "Мавританія"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "вхідні"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Мінеаполіс"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Мінеаполіс [2]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Мінеаполіс [3]"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Міннесота"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 #, fuzzy
 msgid "Minot"
 msgstr "не"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Місісіпі"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missoula"
 msgstr "існує"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Міссурі"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 #, fuzzy
 msgid "Mitchell"
 msgstr "Шлях:"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 #, fuzzy
 msgid "Mitilini"
 msgstr "Список листування"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "Пнд"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "Мобільний телефон"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "Мобільний"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Modesto"
 msgstr "Найнижче"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 #, fuzzy
 msgid "Mojave"
 msgstr "Перенести"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "Мобільний"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Молдова"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 #, fuzzy
 msgid "Molokai"
 msgstr "Малаві"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "Монако"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "Монако"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "Понеділок"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr ""
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 #, fuzzy
 msgid "Monroe"
 msgstr "Монако"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "Керівник"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Монтана"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr ""
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "Відображення місяця"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 #, fuzzy
 msgid "Montego Bay"
 msgstr "Монґолія"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "Монцеррат"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 #, fuzzy
 msgid "Monterrey"
 msgstr "Монцеррат"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 #, fuzzy
 msgid "Montgomery"
 msgstr "Монцеррат"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "Монако"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 #, fuzzy
 msgid "Montpelier"
 msgstr "Монцеррат"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr ""
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr ""
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr ""
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "Монцеррат"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 #, fuzzy
 msgid "Morelia"
 msgstr "Монґолія"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "Організація"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "Первинний"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Москва (Домодєдово)"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Москва (Шеремєтьєво)"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "Мобільний"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "Відображення місяця"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "Південний схід"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "Відображення місяця"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr ""
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 #, fuzzy
 msgid "Mullan"
 msgstr "Кер."
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 #, fuzzy
 msgid "Muncie"
 msgstr "Червень"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 #, fuzzy
 msgid "Murcia"
 msgstr "Мавританія"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Мурманськ"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "Роб."
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 #, fuzzy
 msgid "Muscatine"
 msgstr "Мартініка"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "Монако"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr ""
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 #, fuzzy
 msgid "Najran"
 msgstr "Бахрейн"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Нальчик"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "Ім'я:"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 #, fuzzy
 msgid "Nanning"
 msgstr "Попередження"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr ""
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr ""
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "Японія"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 #, fuzzy
 msgid "Naples"
 msgstr "Ім'я:"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Наполі"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 #, fuzzy
 msgid "Narvik"
 msgstr "Псевдо"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr ""
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr ""
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 #, fuzzy
 msgid "Natal"
 msgstr "Італія"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 #, fuzzy
 msgid "Natchez"
 msgstr "Шлях:"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Небраска"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "Ґренада"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Невада"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 #, fuzzy
 msgid "Newark"
 msgstr "Нове завдання"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 #, fuzzy
 msgid "New Bedford"
 msgstr "Нова тека"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 #, fuzzy
 msgid "New Bern"
 msgstr "Нова Зеландія"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 #, fuzzy
 msgid "Newcastle"
 msgstr "Новини"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 #, fuzzy
 msgid "New Delhi/Palam"
 msgstr "Нова Зеландія"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 #, fuzzy
 msgid "Newfoundland"
 msgstr "Нова Зеландія"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr ""
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "Нова Каледонія"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 #, fuzzy
 msgid "New Iberia"
 msgstr "Нова Каледонія"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 #, fuzzy
 msgid "New Jersey"
 msgstr "Нове повідомлення"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 #, fuzzy
 msgid "New Mexico"
 msgstr "Мексика"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 #, fuzzy
 msgid "New Orleans"
 msgstr "Голандія"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr ""
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "Північ"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "Нова віртуальна тека"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 #, fuzzy
 msgid "Newton"
 msgstr "Новий"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 #, fuzzy
 msgid "New York"
 msgstr "Нова віртуальна тека"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr ""
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr ""
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 #, fuzzy
 msgid "Nimes-Garons"
 msgstr "Розміри:"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "Іспанія"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nis"
 msgstr " "
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "Звичайний"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 #, fuzzy
 msgid "Nome"
 msgstr "Ім'я:"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 #, fuzzy
 msgid "Norfolk"
 msgstr "Звичайний"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norrkoping"
 msgstr "Робота"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 #, fuzzy
 msgid "North Adams"
 msgstr "Північний схід"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "Північ"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr ""
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "Норвеґія"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 #, fuzzy
 msgid "North Dakota"
 msgstr "Північний схід"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr ""
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr ""
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 #, fuzzy
 msgid "North Platte"
 msgstr "Північний схід"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "Норвеґія"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "Французькі Південні Території"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "Північ"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "Норвеґія"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "Примітки"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr ""
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr ""
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Новосибірськ"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "Не розпочато"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr ""
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr ""
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 #, fuzzy
 msgid "Oakland"
 msgstr "Тайланд"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 #, fuzzy
 msgid "Oaxaca"
 msgstr "Ямайка"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "Мальта"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Oceanside"
 msgstr "Ісландія"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 #, fuzzy
 msgid "Odense"
 msgstr "Відкрити"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Odesa"
 msgstr "Одеса"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "Відкрити"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 #, fuzzy
 msgid "Ogden"
 msgstr "Відкрити"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Огайо"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "Інша"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 #, fuzzy
 msgid "Ojika Island"
 msgstr "Острови Кука"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Окаяма (аеропорт)"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Окі (аеропорт)"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr ""
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr ""
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr ""
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr ""
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "Британські Вірджинові острови"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "Інша"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 #, fuzzy
 msgid "Olbia"
 msgstr "Албанія"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr ""
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 #, fuzzy
 msgid "Omaha"
 msgstr "Оман"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr ""
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "Оман"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Омськ"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 #, fuzzy
 msgid "Ontario"
 msgstr "Орієнтація"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 #, fuzzy
 msgid "Oostende"
 msgstr "Відвідування"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 #, fuzzy
 msgid "Oran"
 msgstr "Оман"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr ""
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 #, fuzzy
 msgid "Orange"
 msgstr "Орг."
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr ""
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Орегон"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Оренбург"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "Ірландія"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Орландо"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr ""
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 #, fuzzy
 msgid "Oruro"
 msgstr "Помилка"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Осака (міжнародний аеропорт)"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr "секунда"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr ""
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Острава"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr ""
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "тиждень"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Оксфорд"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr ""
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr ""
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "Сторінка"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 #, fuzzy
 msgid "Palacios"
 msgstr "Палау"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 #, fuzzy
 msgid "Palermo"
 msgstr "Пейджер"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 #, fuzzy
 msgid "Palmdale"
 msgstr "Палау"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 #, fuzzy
 msgid "Palmer"
 msgstr "Пейджер"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Палм Спрінгс"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 #, fuzzy
 msgid "Pamplona"
 msgstr "Палау"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Панама"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "Скасовано"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "Японія"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Paphos"
 msgstr "Лаос"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Париж"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr ""
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr ""
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Париж/Орлі"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "Пароль"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 #, fuzzy
 msgid "Patna"
 msgstr "Панама"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr ""
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr ""
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "Відтворити звук:"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "Відтворити звук:"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "Питання"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "Перезавантажити"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "Вибір:"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr ""
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr ""
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr ""
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "Грузія"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr ""
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "Перв."
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr ""
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 #, fuzzy
 msgid "Perth"
 msgstr "Перу"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 #, fuzzy
 msgid "Perugia"
 msgstr "Перу"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr ""
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Петропавловськ-Камчатський"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Петрозаводськ"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Філаделфія"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 #, fuzzy
 msgid "Philip"
 msgstr "Філіпіни"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Philipsburg"
 msgstr "Філіпіни"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 #, fuzzy
 msgid "Phillips"
 msgstr "Філіпіни"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr ""
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr ""
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 #, fuzzy
 msgid "Pierre"
 msgstr "Перу"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "Перегляд"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Піза"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr ""
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Піцбурґ"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr ""
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Пловдив"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Плімут"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr ""
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr ""
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "Надрукувати конверт"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr ""
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr ""
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr ""
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr ""
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr ""
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Понтіак"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr ""
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr ""
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr ""
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr ""
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Порт Елізабет"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr ""
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr ""
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr ""
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr ""
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr ""
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr ""
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr ""
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr ""
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr ""
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr ""
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr ""
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr ""
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr ""
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr ""
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Познань"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Прага"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr ""
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr ""
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr ""
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Преторія"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr ""
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr ""
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr ""
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr ""
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr ""
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr ""
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Псков"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr ""
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr ""
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr ""
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr ""
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr ""
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr ""
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr ""
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr ""
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr ""
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr ""
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr ""
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Квебек"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Квебек"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Рабат"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Райдужний"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr ""
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr ""
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr ""
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Редмонд"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr ""
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Регіна"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr ""
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr ""
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr ""
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr ""
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr ""
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr ""
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Річмонд"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr ""
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr ""
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr ""
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "Ріга"
-
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr ""
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Ріо Де Жанейро"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Ріо Гранде"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr ""
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr ""
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 msgid "Rivne"
 msgstr "Рівне"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr ""
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr ""
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Рокфорд"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Рокленд"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Рокпорт"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Родос"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr ""
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr ""
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr ""
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr ""
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr ""
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr ""
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Розаріо"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr ""
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr ""
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Ростов-на-Дону"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Росія"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Сакраменто"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr ""
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Санта Марія"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr ""
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr ""
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr ""
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Салем"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Саліда"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr ""
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Саліна"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Салінас"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr ""
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr ""
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr ""
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Солт-Лейк-Ситі"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr ""
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Сальвадор"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Зальзбурґ"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Самара"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 #, fuzzy
 msgid "Samos"
 msgstr "Самоа"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Самсун"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "Сан Антоніо"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr ""
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "Сан Карлос"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr ""
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr ""
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "Сан Дієго"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr ""
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 #, fuzzy
 msgid "Sand Point"
 msgstr "Сан Маріно"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 #, fuzzy
 msgid "Sanford"
 msgstr "Пісок"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "Сан Франциско"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "Півтони"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Joaquin"
 msgstr "Сан Маріно"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "Сан Хосе"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "Сан Хуан"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Санкт-Петербург"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "Сомалі"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 #, fuzzy
 msgid "San Miguel"
 msgstr "Сан Маріно"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "Сан Сальвадор"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "Сан Себаст'ян"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 #, fuzzy
 msgid "Santa Ana"
 msgstr "Санта Лючія"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Санта Барбара"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Санта Круз"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Санта Фе"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Санта Марія"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Санта Моніка"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "Відправник"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santarem"
 msgstr "Катар"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Санта Роза"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Сант'яго"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santorini"
 msgstr "Сан Маріно"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 #, fuzzy
 msgid "Santos"
 msgstr "Стан"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 #, fuzzy
 msgid "Sao Luiz"
 msgstr "Санта Лючія"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr ""
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Сараєво"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 #, fuzzy
 msgid "Sarasota"
 msgstr "Самоа"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Саратов"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "Шрі Ланка"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Саскачевань"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Саскатун"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Савана"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "Ндл"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "Стан"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 #, fuzzy
 msgid "Scranton"
 msgstr "Організація"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Сіетл"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 #, fuzzy
 msgid "Seattle-Boeing"
 msgstr "Параметри"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "Сомалі"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "Прочитано"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 #, fuzzy
 msgid "Sendai Airport"
 msgstr "Початок імпортування"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 #, fuzzy
 msgid "Seward"
 msgstr "Пошук"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 #, fuzzy
 msgid "Shanghai"
 msgstr "Півтони"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "Пошук"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "Субота"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "Субота"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Shearwater"
 msgstr "Дата початку"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 #, fuzzy
 msgid "Sheldon"
 msgstr "Шведція"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 #, fuzzy
 msgid "Shelton"
 msgstr "Вибір:"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr ""
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr ""
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 #, fuzzy
 msgid "Shiraz"
 msgstr "Розмір"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Shoreham"
 msgstr "Мобільний"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "Показати один тиждень"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr ""
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Сідней"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Silver City"
 msgstr "Безпека"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Сітка"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "Розмір"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 #, fuzzy
 msgid "Skopje"
 msgstr "Зупинити"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "Відіслано"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "Албанія"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "Фільтри"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Смирна"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr ""
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 #, fuzzy
 msgid "Sochi"
 msgstr "Південь"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socorro"
 msgstr "Мобільний"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 #, fuzzy
 msgid "Socotra"
 msgstr "Мобільний"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Софія"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Soldotna"
 msgstr "Словенія"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Somerset"
 msgstr "Показати"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "Відправник"
 
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 #, fuzzy
 msgid "Southampton"
 msgstr "Південний схід"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "Південь"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "Південна Кароліна"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "Південна Дакота"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "Південь"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "Маршалові острови"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 #, fuzzy
 msgid "Spencer"
 msgstr "Відправник"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 #, fuzzy
 msgid "Split"
 msgstr "список"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "Іспанія"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Спрінгфілд"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 #, fuzzy
 msgid "State College"
 msgstr "Дата виконання:"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "Півтони"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "Зберегти"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Ставрополь"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "Stephenville"
 msgstr "Сейшели"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "Зупинити"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 #, fuzzy
 msgid "St Louis"
 msgstr "Санта Лючія"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr ""
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "Шрі Ланка"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "Норвеґія"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 #, fuzzy
 msgid "St Paul"
 msgstr "Стан"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 #, fuzzy
 msgid "St Simon's Island"
 msgstr "Соломонові острови"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 #, fuzzy
 msgid "Sturgeon Bay"
 msgstr "Субота"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr ""
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 #, fuzzy
 msgid "Sucre"
 msgstr "Мобільний"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumburgh"
 msgstr "Люксембурґ"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "Зведення"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr ""
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 #, fuzzy
 msgid "Sutton"
 msgstr "Ндл"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr ""
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Сідней"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Сиктивкар"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 msgid "Sympheropol"
 msgstr ""
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Сіракузи"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "Традиційний"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr ""
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "Завдання"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "Ґана"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr ""
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 #, fuzzy
 msgid "Taejon"
 msgstr "Тоді"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Taif"
 msgstr "Тайвань"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 #, fuzzy
 msgid "Tainan"
 msgstr "Тайвань"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 #, fuzzy
 msgid "Taiyuan"
 msgstr "Тайвань"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 #, fuzzy
 msgid "Taiz"
 msgstr "Тайвань"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr "Тайвань"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Такамацу (аеропорт)"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Талара"
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr "Талін"
-
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Талін"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Тампа"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 #, fuzzy
 msgid "Tampere"
 msgstr "Папір"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr ""
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "Канада"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "Лаос"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 #, fuzzy
 msgid "Taoyuan"
 msgstr "Тайвань"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 #, fuzzy
 msgid "Taranto"
 msgstr "Тайвань"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "Тест"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Tarija"
 msgstr "Тайвань"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "Традиційний"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr ""
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "Токелау"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 #, fuzzy
 msgid "Temple"
 msgstr "Телекс"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr ""
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Техас"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 #, fuzzy
 msgid "The Dalles"
 msgstr "Сейшели"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "Титул"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "Четвер"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 #, fuzzy
 msgid "Tianjin"
 msgstr "Тайвань"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 #, fuzzy
 msgid "Tijuana"
 msgstr "Литва"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Тірана"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "Вільний"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "Титул"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "Особисте"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 #, fuzzy
 msgid "Tokunoshima Island"
 msgstr "Різдвяний острів"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Токіо (геліпорт)"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Токіо (міжнародний аеропорт)"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Токіо (новий міжнародний аеропорт)"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Толедо"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 #, fuzzy
 msgid "Toluca"
 msgstr "Токелау"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "Тонґа"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 #, fuzzy
 msgid "Topeka"
 msgstr "Токелау"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Торонто"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "Вгорі:"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 #, fuzzy
 msgid "Torrance"
 msgstr "Франція"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Torreon"
 msgstr "Корейський"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "Початок імпортування"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Тулуза"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr ""
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr ""
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trabzon"
 msgstr "Ґабон"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 #, fuzzy
 msgid "Trapani"
 msgstr "Японія"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "Телекс"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 #, fuzzy
 msgid "Trenton"
 msgstr "Орієнтація"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "Попереднє"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 #, fuzzy
 msgid "Trieste"
 msgstr "Тест"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Трінідад"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Тріполі"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr ""
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "Туреччина"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "Вівторок"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 #, fuzzy
 msgid "Tulsa"
 msgstr "Туніс"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "Втр"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turaif"
 msgstr "Турецький"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 #, fuzzy
 msgid "Turin"
 msgstr "Турецький"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 #, fuzzy
 msgid "Turku"
 msgstr "Туреччина"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 #, fuzzy
 msgid "Twenthe"
 msgstr "місяць"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 #, fuzzy
 msgid "Tyler"
 msgstr "Тип"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 #, fuzzy
 msgid "Tyumen"
 msgstr "Втр"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Уфа"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Улан-Уде"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr ""
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 #, fuzzy
 msgid "United Arab Emirates "
 msgstr "Об'єднані Арабські Емірати"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 #, fuzzy
 msgid "Unst"
 msgstr "Не прочитано"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruapan"
 msgstr "Японія"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 #, fuzzy
 msgid "Uruguaiana"
 msgstr "Уруґвай"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Юта"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr "Ужгород"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vadso"
 msgstr "Радіо"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "Закрити"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 #, fuzzy
 msgid "Vagar"
 msgstr "Пейджер"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr ""
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "Мальта"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 #, fuzzy
 msgid "Valencia"
 msgstr "Словенія"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr ""
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 #, fuzzy
 msgid "Van"
 msgstr "Кер."
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Ванкувер"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "Скасувати"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 #, fuzzy
 msgid "Varadero"
 msgstr "Барбадос"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 #, fuzzy
 msgid "Varna"
 msgstr "Вануату"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "після"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 #, fuzzy
 msgid "Venezia"
 msgstr "Венесуела"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 #, fuzzy
 msgid "Venice"
 msgstr "Unicode"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Вермонт"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "Загальне"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 #, fuzzy
 msgid "Vicenza"
 msgstr "Венесуела"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr ""
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Вікторія"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "Назва файлу:"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Вільнюс"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "Австралія"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr ""
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Владикавказ"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Владивосток"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "Фінляндія"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volkel"
 msgstr "Токелау"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 #, fuzzy
 msgid "Volk Field"
 msgstr "Поле \"Від\""
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Воронеж"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 #, fuzzy
 msgid "Voslau"
 msgstr "Токелау"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 #, fuzzy
 msgid "Waco"
 msgstr "Монако"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 #, fuzzy
 msgid "Wallops Island"
 msgstr "Фалкландські острови"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "Попередження"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Варшава"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Вашингтон"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 #, fuzzy
 msgid "Waterbury"
 msgstr "Погода"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Ватерлоо"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "Погода"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 #, fuzzy
 msgid "Waterville"
 msgstr "Категорії"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 #, fuzzy
 msgid "Wausau"
 msgstr "Вануату"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 #, fuzzy
 msgid "Webster City"
 msgstr "Сайт"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "Срд"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr ""
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "Погода"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 #, fuzzy
 msgid "Wendover"
 msgstr "Відправник"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr ""
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "West Burke"
 msgstr "Західноєвропейський"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "Голандія"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westfield"
 msgstr "Захід"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr ""
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "Планування"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "Різдвяний острів"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr ""
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr ""
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "Псевдо"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 #, fuzzy
 msgid "Wien"
 msgstr "Срд"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Вілдвуд"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 #, fuzzy
 msgid "Williston"
 msgstr "список"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr ""
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 #, fuzzy
 msgid "Winchester"
 msgstr "Ліхтенштейн"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr ""
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 #, fuzzy
 msgid "Winslow"
 msgstr "зараз"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr ""
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 #, fuzzy
 msgid "Winter Park"
 msgstr "Ввід пароля"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Вісконсін"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "Срд"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "Гонґ Конґ"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "Нижній колонтитул:"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 #, fuzzy
 msgid "Worcester"
 msgstr "завжди"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "Польща"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "Робота"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 #, fuzzy
 msgid "Wyoming"
 msgstr "Робота"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 #, fuzzy
 msgid "Xiamen"
 msgstr "Ім'я:"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Якіма"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Якушіма"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Якутат"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Якутськ"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Ямаґата (аеропорт)"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Янктон"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 #, fuzzy
 msgid "Yao Airport"
 msgstr "Не імпортувати"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Єкатеринбург"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 #, fuzzy
 msgid "Yenbo"
 msgstr "Ємен"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Йоро"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Юкон"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Южно-Сахалінськ"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 #, fuzzy
 msgid "Zadar"
 msgstr "Календар"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Загреб"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zanesville"
 msgstr "Скасовано"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Сараґоса"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr ""
 
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Цюріх"
 
@@ -23362,18 +23821,12 @@ msgstr "%l:%M %d %B"
 msgid "No description"
 msgstr "Немає опису"
 
-#: my-evolution/e-summary-mail.c:151
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "Поштове зведення"
 
-#. Make this static, saves having to recompute it each time
-#: my-evolution/e-summary-mail.c:254 my-evolution/e-summary-mail.c:758
-#, fuzzy
-msgid "VFolders"
-msgstr "Теки"
-
-#: my-evolution/e-summary-mail.c:259 my-evolution/e-summary-mail.c:401
-#: my-evolution/e-summary-mail.c:761
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
 #, fuzzy
 msgid "Local Folders"
 msgstr "Віртуальні теки"
@@ -23383,55 +23836,47 @@ msgstr "Віртуальні теки"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:92
+#: my-evolution/e-summary-preferences.c:108
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:471
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Слово дня на Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:492
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "Цитати дня"
 
-#: my-evolution/e-summary-preferences.c:720
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:728
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:732
-msgid "Name:"
-msgstr "Ім'я:"
-
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "Помилка завантаження RDF"
 
-#: my-evolution/e-summary-rdf.c:444
+#: my-evolution/e-summary-rdf.c:448
 #, fuzzy
 msgid "News Feed"
 msgstr "Нова тека"
 
-#: my-evolution/e-summary-shown.c:463
+#: my-evolution/e-summary-shown.c:536
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:472
-msgid "Add ->"
-msgstr "Додати -> "
-
-#. Fixme: Ditto
-#: my-evolution/e-summary-shown.c:479
-msgid "<- Remove"
-msgstr "<- Видалити"
+#: my-evolution/e-summary-shown.c:545
+#, fuzzy
+msgid "Add"
+msgstr "Додати"
 
-#: my-evolution/e-summary-shown.c:487 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Шведція"
@@ -23472,11 +23917,49 @@ msgstr "Надрукувати зведення"
 msgid "Printing of Summary failed"
 msgstr "Збій друку зведення"
 
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " F"
+msgstr " "
+
+#: my-evolution/metar.c:29
+#, fuzzy
+msgid " C"
+msgstr " "
+
+#: my-evolution/metar.c:33
+#, fuzzy
+msgid "knots"
+msgstr "Монако"
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+#, fuzzy
+msgid "inHg"
+msgstr "Засідання"
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "miles"
+msgstr "Сповіщення"
+
+#: my-evolution/metar.c:41
+#, fuzzy
+msgid "kilometers"
+msgstr "Фільтри"
+
 #: my-evolution/metar.c:44
 msgid "Clear sky"
 msgstr "Безхмарно"
@@ -24655,102 +25138,106 @@ msgid "C_elsius"
 msgstr "Цельсієм"
 
 #: my-evolution/my-evolution.glade.h:4
-msgid "How many days should the calendar display at once?"
-msgstr ""
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Всі новини"
 
 #: my-evolution/my-evolution.glade.h:5
-msgid "Ma_x number of items shown:"
+msgid "How many days should the calendar display at once?"
 msgstr ""
-"Максимальна кількість показуваних "
-"елементів:"
 
 #: my-evolution/my-evolution.glade.h:6
+msgid "Ma_x number of items shown:"
+msgstr "Максимальна кількість показуваних елементів:"
+
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "Параметри новин"
 
-#: my-evolution/my-evolution.glade.h:7
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "Один місяць"
 
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "Один тиждень"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "Час оновлення (в секундах):"
 
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "Час оновлення (в секундах):"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "Показувати повних шлях до тек"
 
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "Показати всі завдання"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "Показати сьогоднішні завдання"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "Показувати температуру за "
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "Завдання "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "Параметри погоди"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "Фаренгейтом"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "П'ять днів"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "Пошта"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "Новини"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "Один день"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "Планування"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "Погода"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "Configuration control for Evolution default folders."
-msgstr ""
+#, fuzzy
+msgid "Configuration control for Evolution folder settings."
+msgstr "Фабрика для редактора Evolutuion."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
 #, fuzzy
-msgid "Default Folders"
-msgstr "Вибір теки"
+msgid "Folder Settings"
+msgstr "Параметри пошти"
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Оболонка Evolutuion."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure default folders"
+msgid "This page can be used to configure various folder settings"
 msgstr ""
 
 #: shell/e-activity-handler.c:162
@@ -24761,6 +25248,38 @@ msgstr "Показати подробиці"
 msgid "Cancel Operation"
 msgstr "Скасувати операцію"
 
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Не вдалось передати теку:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Вибір теки"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Чернетки"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
+msgid "Inbox"
+msgstr "Вхідні"
+
+#: shell/e-local-storage.c:176
+#, fuzzy
+msgid "Outbox"
+msgstr "mbox"
+
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Відіслано"
+
 #: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Інсталяція Evolution"
@@ -24773,9 +25292,7 @@ msgstr ""
 
 #: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Натисніть \"Гаразд\" щоб встановити файли, "
-"чи \"Відмінити\" щоб вийти."
+msgstr "Натисніть \"Гаразд\" щоб встановити файли, чи \"Відмінити\" щоб вийти."
 
 #: shell/e-setup.c:171
 msgid "Could not update files correctly"
@@ -24797,8 +25314,7 @@ msgstr ""
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Сталася помилка під час зчитування файлу."
+msgstr "Сталася помилка під час зчитування файлу."
 
 #: shell/e-setup.c:282
 #, fuzzy, c-format
@@ -24855,6 +25371,31 @@ msgstr ""
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Дата завершення"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Вибір теки"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Вибір теки"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Вибір теки"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Дата завершення"
+
 #: shell/e-shell-folder-commands.c:140
 #, fuzzy, c-format
 msgid "Cannot copy folder: %s"
@@ -24882,26 +25423,22 @@ msgstr ""
 #: shell/e-shell-folder-commands.c:321
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr ""
-"Вкажіть теку, в яку буде скопійовано теку "
-"\"%s\":"
+msgstr "Вкажіть теку, в яку буде скопійовано теку \"%s\":"
 
-#: shell/e-shell-folder-commands.c:326
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Скопіювати теку"
 
-#: shell/e-shell-folder-commands.c:368
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
-msgstr ""
-"Вкажіть теку, в яку буде перенесено теку "
-"\"%s\":"
+msgstr "Вкажіть теку, в яку буде перенесено теку \"%s\":"
 
-#: shell/e-shell-folder-commands.c:373
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Перенести теку"
 
-#: shell/e-shell-folder-commands.c:399
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24910,18 +25447,19 @@ msgstr ""
 "Не вдалось стерти теку:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Стерти \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:425
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Ви впевнені, що хочете стерти теку \"%s\"?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"Не вдалось стерти теку:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:488
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24930,16 +25468,16 @@ msgstr ""
 "Неможливо перейменувати теку:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:549
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Перейменувати теку \"%s\" на:"
 
-#: shell/e-shell-folder-commands.c:556
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Перейменувати теку"
 
-#: shell/e-shell-folder-commands.c:566
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -24958,13 +25496,13 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Створення нової теки"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Новий..."
 
@@ -25011,32 +25549,37 @@ msgstr ""
 "Імпортування %s\n"
 "Імпортування елемента %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Вибір теки"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Файлу %s не існує"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Помилка Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "Немає нової кореспонденції на %s."
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Імпортування"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25045,100 +25588,139 @@ msgstr ""
 "Імпортування %s.\n"
 "Запуск %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Помилка запуску %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Помилка завантаження %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Назва файлу:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Вибрати файл"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Тип файлу:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
-msgstr ""
-"Імпортувати дані й параметри з старіших "
-"програм"
+msgstr "Імпортувати дані й параметри з старіших програм"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Імпорт одного файла"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Від %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Вибрати теку"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
-msgstr ""
-"Вибрати теку призначення для імпорту цих "
-"даних"
+msgstr "Вибрати теку призначення для імпорту цих даних"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Імпорт"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Закриття з'єднань..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Помилка під час \"%s\":\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Синхронізація теки"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Відкривання теки %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Відкривання теки %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Відкрити в %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Неможливо створити вказану теку:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
 "Could not start the Evolution Mailer Assistant interface\n"
 "(%s)"
-msgstr ""
-"Не вдалося ініціалізувати поштовий "
-"компонент Evolutuion."
+msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
 #: shell/e-shell-startup-wizard.c:169
 #, fuzzy
 msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr ""
-"Не вдалося ініціалізувати поштовий "
-"компонент Evolutuion."
+msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
-#: shell/e-shell-user-creatable-items-handler.c:506
-#: shell/e-shell-user-creatable-items-handler.c:551
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Новий"
@@ -25149,8 +25731,7 @@ msgstr "Не вказано назви теки."
 
 #: shell/e-shell-utils.c:121
 msgid "Folder name cannot contain the Return character."
-msgstr ""
-"Назва теки не може містити символ вводу."
+msgstr "Назва теки не може містити символ вводу."
 
 #: shell/e-shell-utils.c:127
 #, fuzzy
@@ -25159,47 +25740,45 @@ msgstr "Ця тека не може містити повідомлення."
 
 #: shell/e-shell-utils.c:133
 msgid "'.' and '..' are reserved folder names."
-msgstr ""
-"\".\" і \"..\" є зарезервованими назвами тек."
+msgstr "\".\" і \"..\" є зарезервованими назвами тек."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
-msgstr ""
-"Bug buddy не знайдено за шляхом вказаним в $PATH."
+msgstr "Bug buddy не знайдено за шляхом вказаним в $PATH."
 
-#: shell/e-shell-view-menu.c:176
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Не вдалося запустити Bug buddy"
 
-#: shell/e-shell-view-menu.c:218
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Про Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Перейти на теку..."
 
-#: shell/e-shell-view-menu.c:445
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Виберіть теку, яку ви бажаєте відкрити"
 
-#: shell/e-shell-view-menu.c:565
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Створити новий ярлик"
 
-#: shell/e-shell-view-menu.c:566
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:732
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "Робота на лінії"
 
-#: shell/e-shell-view-menu.c:745 ui/evolution.xml.h:57
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "Робота не на лінії"
 
-#: shell/e-shell-view-menu.c:758 ui/evolution.xml.h:32
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Робота не на лінії"
 
@@ -25230,7 +25809,7 @@ msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:169
+#: shell/e-shell.c:171
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25242,12 +25821,12 @@ msgstr ""
 "Помилка від системи активації:\n"
 "%s"
 
-#: shell/e-shell.c:764
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1832
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25255,24 +25834,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2133 widgets/misc/e-cell-date-edit.c:258
-msgid "OK"
-msgstr "Гаразд"
-
-#: shell/e-shell.c:2135
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Невірні аргументи"
 
-#: shell/e-shell.c:2137
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Неможливо зареєструватись на OAF"
 
-#: shell/e-shell.c:2139
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
-msgstr ""
-"Не знайдено конфігураційної бази даних"
+msgstr "Не знайдено конфігураційної бази даних"
 
-#: shell/e-shell.c:2141 shell/e-storage.c:487
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Загальна помилка"
 
@@ -25297,100 +25871,95 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Не видаляти"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Перейменувати групу ярликів"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
-msgstr ""
-"Перейменувати вибрану групу ярликів на:"
+msgstr "Перейменувати вибрану групу ярликів на:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "Малі піктограми"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Показувати ярлики як малі піктограми"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "Великі піктограми"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
-msgstr ""
-"Показувати ярлики як великі піктограми"
+msgstr "Показувати ярлики як великі піктограми"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "Нова група..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Створити нову групу ярликів"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "Видалити цю групу..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Видалити цю групу ярликів"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "Перейменувати цю групу..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Перейменувати цю групу ярликів"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "_Сховати панель ярликів"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Сховати панель ярликів"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Перейменувати ярлик"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Перейменувати вибраний ярлик на:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
-msgstr ""
-"Відкрити теку, що зв'язана з цим ярликом"
+msgstr "Відкрити теку, що зв'язана з цим ярликом"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Відкрити у новому вікні"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
-msgstr ""
-"Відкрити теку, що зв'язана з цим ярликом, у "
-"новому вікні"
+msgstr "Відкрити теку, що зв'язана з цим ярликом, у новому вікні"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "Перейменувати"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Перейменувати цей ярлик"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "Видалити"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Видалити цей ярлик з панелі ярликів"
 
@@ -25402,10 +25971,6 @@ msgstr "Помилка збереження ярликів."
 msgid "Shortcuts"
 msgstr "Ярлики"
 
-#: shell/e-shortcuts.c:1033
-msgid "Inbox"
-msgstr "Вхідні"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -25453,8 +26018,7 @@ msgstr ""
 
 #: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
-msgstr ""
-"Вказану теку не можна змінити чи видалити"
+msgstr "Вказану теку не можна змінити чи видалити"
 
 #: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
@@ -25470,11 +26034,11 @@ msgid "%s (...)"
 msgstr "%s (...)"
 
 #: shell/e-task-widget.c:196
-#, fuzzy
+#, fuzzy, c-format
 msgid "%s (%d%% complete)"
 msgstr "% завершення:"
 
-#: shell/evolution-folder-selector-button.c:84
+#: shell/evolution-folder-selector-button.c:86
 msgid "<click here to select a folder>"
 msgstr "<клацніть тут для вибору теки>"
 
@@ -25515,67 +26079,67 @@ msgstr ""
 "Помилка від системи активації:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1045
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "Помилка CORBA"
 
-#: shell/evolution-shell-component.c:1047
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1049
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Невірний аргумент"
 
-#: shell/evolution-shell-component.c:1051
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Вже має власника"
 
-#: shell/evolution-shell-component.c:1053
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Не має власника"
 
-#: shell/evolution-shell-component.c:1055
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Не знайдено"
 
-#: shell/evolution-shell-component.c:1057
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Непідтримуваний тип"
 
-#: shell/evolution-shell-component.c:1059
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Непідтримувана схема"
 
-#: shell/evolution-shell-component.c:1061
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Непідтримувана операція"
 
-#: shell/evolution-shell-component.c:1063
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
-#: shell/evolution-shell-component.c:1067
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Існує"
 
-#: shell/evolution-shell-component.c:1069
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "Невірний URI"
 
-#: shell/evolution-shell-component.c:1073
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Має підтеки"
 
-#: shell/evolution-shell-component.c:1075
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Не залишилося вільного простору"
 
-#: shell/evolution-shell-component.c:1077
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "Старого власника знищено"
 
-#: shell/evolution-test-component.c:47
+#: shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test type"
 msgstr "Тип файлу:"
@@ -25644,9 +26208,7 @@ msgstr ""
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Клацніть \"Імпорт\" для початку "
-"імпортування файлу в Evolution. "
+msgstr "Клацніть \"Імпорт\" для початку імпортування файлу в Evolution. "
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -25693,69 +26255,91 @@ msgstr "Більше не запитувати"
 
 #: shell/importer/intelligent.c:208
 msgid "Evolution can import data from the following files:"
-msgstr ""
-"Evolution може імпортувати дані з таких "
-"файлів:"
+msgstr "Evolution може імпортувати дані з таких файлів:"
 
-#: shell/main.c:89
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution завершує роботу..."
 
-#: shell/main.c:227
-msgid "Cannot access the Ximian Evolution shell."
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
-"Неможливо зв'язатись з оболонкою Ximian "
-"Evolutuion."
 
-#: shell/main.c:236
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Більше не запитувати"
+
+#: shell/main.c:347
+msgid "Cannot access the Ximian Evolution shell."
+msgstr "Неможливо зв'язатись з оболонкою Ximian Evolutuion."
+
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr ""
-"Неможливо ініціалізувати оболонку Ximian "
-"Evolutuion: %s"
+msgstr "Неможливо ініціалізувати оболонку Ximian Evolutuion: %s"
 
-#: shell/main.c:317
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "Вимкнути заставку"
 
-#: shell/main.c:318
+#: shell/main.c:438
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Початок імпортування"
 
-#: shell/main.c:319
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Початок імпортування"
 
-#: shell/main.c:320
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:338
+#: shell/main.c:458
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:368
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
-msgstr ""
-"Не вдалося ініціалізувати компонентну "
-"систему Bonobo."
+msgstr "Не вдалося ініціалізувати компонентну систему Bonobo."
 
 #: tools/evolution-addressbook-abuse.c:80
 #: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
-msgstr ""
-"Помилка завантаження початкової "
-"адресної книги."
+msgstr "Помилка завантаження початкової адресної книги."
 
 #: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
@@ -25772,8 +26356,7 @@ msgstr "Не вказано назви файлу."
 
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
-msgstr ""
-"Скопіювати вибрані контакти в іншу теку..."
+msgstr "Скопіювати вибрані контакти в іншу теку..."
 
 #: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
@@ -25801,8 +26384,7 @@ msgstr "Стерти вибрані контакти"
 
 #: ui/evolution-addressbook.xml.h:13
 msgid "Move Contact(s) to Another Folder..."
-msgstr ""
-"Перенести вибрані контакти в іншу теку..."
+msgstr "Перенести вибрані контакти в іншу теку..."
 
 #: ui/evolution-addressbook.xml.h:14
 msgid "Move to Folder..."
@@ -25815,8 +26397,7 @@ msgstr "Вставити буфер обміну"
 #: ui/evolution-addressbook.xml.h:17
 #, fuzzy
 msgid "Previews the contacts to be printed"
-msgstr ""
-"Переглянути календар, що буде надруковано"
+msgstr "Переглянути календар, що буде надруковано"
 
 #: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
@@ -25845,8 +26426,7 @@ msgstr "Відіслати повідомлення за контактом"
 
 #: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
-msgstr ""
-"Відіслати вибрані контакти іншій особі."
+msgstr "Відіслати вибрані контакти іншій особі."
 
 #: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
@@ -25862,11 +26442,11 @@ msgstr "Показати поточний контакт"
 
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:14 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
-#: ui/evolution.xml.h:35
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "Дії"
 
@@ -25938,8 +26518,7 @@ msgstr "Місяць"
 
 #: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
-msgstr ""
-"Переглянути календар, що буде надруковано"
+msgstr "Переглянути календар, що буде надруковано"
 
 #: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:12
@@ -25952,9 +26531,7 @@ msgstr "Надрукувати цей календар"
 
 #: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
-msgstr ""
-"Опублікувати інформацію про зайнятість "
-"для цього календаря"
+msgstr "Опублікувати інформацію про зайнятість для цього календаря"
 
 #: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
@@ -25992,17 +26569,15 @@ msgstr "Закрити цей елемент"
 msgid "Delete this item"
 msgstr "Стерти цей елемент"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Головна панель інструментів"
 
 #: ui/evolution-comp-editor.xml.h:7
 #, fuzzy
 msgid "Preview the printed item"
-msgstr ""
-"Переглянути повідомлення, що буде "
-"надруковано"
+msgstr "Переглянути повідомлення, що буде надруковано"
 
 #: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
@@ -26025,9 +26600,7 @@ msgstr "Зберегти та закрити"
 
 #: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
-msgstr ""
-"Зберегти елемент і закрити діалогове "
-"вікно"
+msgstr "Зберегти елемент і закрити діалогове вікно"
 
 #: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
@@ -26038,7 +26611,7 @@ msgstr "Зберегти цей елемент на диску"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "Файл"
 
@@ -26077,8 +26650,7 @@ msgstr "Стерти..."
 
 #: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
-msgstr ""
-"Зберегти список і закрити діалогове вікно"
+msgstr "Зберегти список і закрити діалогове вікно"
 
 #: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
@@ -26094,8 +26666,7 @@ msgstr "Скасувати зустріч"
 
 #: ui/evolution-event-editor.xml.h:2
 msgid "Cancel the meeting for this item"
-msgstr ""
-"Скасувати засідання для цього елемента"
+msgstr "Скасувати засідання для цього елемента"
 
 #: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
@@ -26103,36 +26674,28 @@ msgstr "Переслати як i_Calendar"
 
 #: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
-msgstr ""
-"Переслати цей елемент електронною поштою"
+msgstr "Переслати цей елемент електронною поштою"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
-msgstr ""
-"Отримати останню інформацію про "
-"засідання"
+msgstr "Отримати останню інформацію про засідання"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "Оновлення засідання"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "Планувати зустріч"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
-msgstr ""
-"Запланувати засідання для цього елемента"
+msgstr "Запланувати засідання для цього елемента"
 
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customise My Evolution"
 msgstr "Налаштувати мій Evolution"
 
-#: ui/evolution-mail-global.xml.h:1
-msgid "Cancel"
-msgstr "Скасувати"
-
 #: ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Скасувати поточну поштову операцію"
@@ -26163,15 +26726,11 @@ msgstr ""
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
-msgstr ""
-"Відкрити вікно для написання нового "
-"повідомлення"
+msgstr "Відкрити вікно для написання нового повідомлення"
 
 #: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
-"Остаточно видалити всі стерті "
-"повідомлення з усіх тек"
+msgstr "Остаточно видалити всі стерті повідомлення з усіх тек"
 
 #: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
@@ -26179,8 +26738,7 @@ msgstr ""
 
 #: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
-"Передплата на тки на віддалених серверах"
+msgstr "Передплата на тки на віддалених серверах"
 
 #: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
@@ -26237,9 +26795,7 @@ msgstr "Позначити всі прочитаними"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
-msgstr ""
-"Позначити всі видимі повідомлення як "
-"прочитані"
+msgstr "Позначити всі видимі повідомлення як прочитані"
 
 #: ui/evolution-mail-list.xml.h:11
 msgid "Paste message in the clipboard"
@@ -26247,9 +26803,7 @@ msgstr "Вставити повідомлення у буфер обміну"
 
 #: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
-msgstr ""
-"Остаточно видалити всі стерті "
-"повідомлення з цієї теки"
+msgstr "Остаточно видалити всі стерті повідомлення з цієї теки"
 
 #: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
@@ -26265,9 +26819,7 @@ msgstr ""
 
 #: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-"Вибрати всі повідомлення у гілці "
-"вибраного повідомлення"
+msgstr "Вибрати всі повідомлення у гілці вибраного повідомлення"
 
 #: ui/evolution-mail-list.xml.h:17
 msgid "Select all visible messages"
@@ -26279,20 +26831,15 @@ msgstr "П_оказати сховані повідомлення"
 
 #: ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
-msgstr ""
-"Знову показати тимчасово сховані "
-"повідомлення"
+msgstr "Знову показати тимчасово сховані повідомлення"
 
 #: ui/evolution-mail-list.xml.h:20
 msgid "Temporarily hide all messages that have already been read"
-msgstr ""
-"Тимчасово сховати всі прочитані "
-"повідомлення"
+msgstr "Тимчасово сховати всі прочитані повідомлення"
 
 #: ui/evolution-mail-list.xml.h:21
 msgid "Temporarily hide the selected messages"
-msgstr ""
-"Тимчасово сховати вибрані повідомлення"
+msgstr "Тимчасово сховати вибрані повідомлення"
 
 #: ui/evolution-mail-list.xml.h:22
 msgid "Threaded Message list"
@@ -26302,7 +26849,7 @@ msgstr "Розбитий на гілки список повідомлень"
 msgid "_Expunge"
 msgstr "Викреслити"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:41
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "Тека"
 
@@ -26335,85 +26882,59 @@ msgstr "Додати відправника в адресну книгу"
 
 #: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
-msgstr ""
-"Застосувати правила фільтрування "
-"вибраних повідомлень"
+msgstr "Застосувати правила фільтрування вибраних повідомлень"
 
 #: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr ""
-"Підготувати відповідь всім отримувачам "
-"вибраного повідомлення"
+msgstr "Підготувати відповідь всім отримувачам вибраного повідомлення"
 
 #: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr ""
-"Підготувати відповідь у список "
-"листування вибраного повідомлення"
+msgstr "Підготувати відповідь у список листування вибраного повідомлення"
 
 #: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
-msgstr ""
-"Підготувати відповідь відправнику "
-"вибраного повідомлення"
+msgstr "Підготувати відповідь відправнику вибраного повідомлення"
 
 #: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
-msgstr ""
-"Скопіювати вибрані повідомлення у іншу "
-"теку"
+msgstr "Скопіювати вибрані повідомлення у іншу теку"
 
 #: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
-msgstr ""
-"Створити віртуальну теку з повідомлення"
+msgstr "Створити віртуальну теку з повідомлення"
 
 #: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
-msgstr ""
-"Створити правило фільтрування "
-"повідомлень від цього відправника"
+msgstr "Створити правило фільтрування повідомлень від цього відправника"
 
 #: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
-msgstr ""
-"Створити правило фільтрування "
-"повідомлень до цих отримувачів"
+msgstr "Створити правило фільтрування повідомлень до цих отримувачів"
 
 #: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
-msgstr ""
-"Створити правило фільтрування "
-"повідомлень у цей список листування"
+msgstr "Створити правило фільтрування повідомлень у цей список листування"
 
 #: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
-msgstr ""
-"Створити правило фільтрування "
-"повідомлень з цією темою"
+msgstr "Створити правило фільтрування повідомлень з цією темою"
 
 #: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
-msgstr ""
-"Створити віртуальну теку для цих "
-"отримувачів"
+msgstr "Створити віртуальну теку для цих отримувачів"
 
 #: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
-msgstr ""
-"Створити віртуальну теку для цього "
-"списку листування"
+msgstr "Створити віртуальну теку для цього списку листування"
 
 #: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
-msgstr ""
-"Створити віртуальну теку для цього "
-"відправника"
+msgstr "Створити віртуальну теку для цього відправника"
 
 #: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
-msgstr ""
-"Створити віртуальну теку для цієї теми"
+msgstr "Створити віртуальну теку для цієї теми"
 
 #: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
@@ -26421,8 +26942,7 @@ msgstr "Зменшити розмір тексту"
 
 #: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
-msgstr ""
-"Показати наступне важливе повідомлення"
+msgstr "Показати наступне важливе повідомлення"
 
 #: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
@@ -26438,8 +26958,7 @@ msgstr "Показати наступну непрочитану гілку"
 
 #: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
-msgstr ""
-"Показати попереднє важливе повідомлення"
+msgstr "Показати попереднє важливе повідомлення"
 
 #: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
@@ -26447,9 +26966,7 @@ msgstr "Показати попереднє повідомлення"
 
 #: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
-msgstr ""
-"Показати попереднє непрочитане "
-"повідомлення"
+msgstr "Показати попереднє непрочитане повідомлення"
 
 #: ui/evolution-mail-message.xml.h:28
 #, fuzzy
@@ -26475,9 +26992,7 @@ msgstr "Фільтр теми..."
 #: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
-msgstr ""
-"Позначити вибрані повідомлення до "
-"видалення"
+msgstr "Позначити вибрані повідомлення до видалення"
 
 #: ui/evolution-mail-message.xml.h:34
 #, fuzzy
@@ -26490,26 +27005,19 @@ msgstr ""
 
 #: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
-msgstr ""
-"Переслати вибране повідомлення в тілі "
-"нового повідомлення"
+msgstr "Переслати вибране повідомлення в тілі нового повідомлення"
 
 #: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
-msgstr ""
-"Переслати вибране повідомлення "
-"процитоване як відповідь"
+msgstr "Переслати вибране повідомлення процитоване як відповідь"
 
 #: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
-msgstr ""
-"Переслати вибране повідомлення до когось"
+msgstr "Переслати вибране повідомлення до когось"
 
 #: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
-msgstr ""
-"Переслати вибране повідомлення до когось "
-"як долучення"
+msgstr "Переслати вибране повідомлення до когось як долучення"
 
 #: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
@@ -26534,36 +27042,26 @@ msgstr "Позначити як неважливі"
 #: ui/evolution-mail-message.xml.h:47
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
-msgstr ""
-"Позначити вибрані повідомлення як "
-"прочитані"
+msgstr "Позначити вибрані повідомлення як прочитані"
 
 #: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected message(s) as important"
-msgstr ""
-"Позначити вибрані повідомлення як "
-"важливі"
+msgstr "Позначити вибрані повідомлення як важливі"
 
 #: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
-msgstr ""
-"Позначити вибрані повідомлення "
-"непрочитані"
+msgstr "Позначити вибрані повідомлення непрочитані"
 
 #: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
-msgstr ""
-"Позначити вибрані повідомлення як "
-"неважливі"
+msgstr "Позначити вибрані повідомлення як неважливі"
 
 #: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
-msgstr ""
-"Позначити вибрані повідомлення до "
-"видалення"
+msgstr "Позначити вибрані повідомлення до видалення"
 
 #: ui/evolution-mail-message.xml.h:52
 msgid "Move"
@@ -26572,9 +27070,7 @@ msgstr "Перенести"
 #: ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Move selected message(s) to another folder"
-msgstr ""
-"Перенести вибрані повідомлення у іншу "
-"теку"
+msgstr "Перенести вибрані повідомлення у іншу теку"
 
 #: ui/evolution-mail-message.xml.h:54
 msgid "Next"
@@ -26597,15 +27093,12 @@ msgstr "Наступне непрочитане повідомлення"
 
 #: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
-msgstr ""
-"Відкрити вибране повідомлення у новому "
-"вікні"
+msgstr "Відкрити вибране повідомлення у новому вікні"
 
 #: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr ""
-"Відкрити вибране повідомлення у "
-"редакторі для його повторного посилання"
+"Відкрити вибране повідомлення у редакторі для його повторного посилання"
 
 #: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
@@ -26623,9 +27116,7 @@ msgstr "Попереднє важливе повідомлення"
 
 #: ui/evolution-mail-message.xml.h:63
 msgid "Preview the message to be printed"
-msgstr ""
-"Переглянути повідомлення, що буде "
-"надруковано"
+msgstr "Переглянути повідомлення, що буде надруковано"
 
 #: ui/evolution-mail-message.xml.h:64
 msgid "Previous"
@@ -26642,8 +27133,7 @@ msgstr ""
 #: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
-msgstr ""
-"Переслати вибране повідомлення до когось"
+msgstr "Переслати вибране повідомлення до когось"
 
 #: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
@@ -26659,8 +27149,7 @@ msgstr "Менше"
 
 #: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
-msgstr ""
-"Зберегти повідомлення як текстовий файл"
+msgstr "Зберегти повідомлення як текстовий файл"
 
 #: ui/evolution-mail-message.xml.h:78
 msgid "Search for text in the body of the displayed message"
@@ -26680,8 +27169,7 @@ msgstr "Показати повні заголовки"
 
 #: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
-msgstr ""
-"Показати повідомлення у звичайному стилі"
+msgstr "Показати повідомлення у звичайному стилі"
 
 #: ui/evolution-mail-message.xml.h:83
 #, fuzzy
@@ -26703,8 +27191,7 @@ msgstr "Відновити вибрані повідомлення"
 
 #: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
-msgstr ""
-"Вірткальна тека за списком листування..."
+msgstr "Вірткальна тека за списком листування..."
 
 #: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
@@ -26780,7 +27267,7 @@ msgstr "Попереднє повідомлення"
 msgid "_Quoted"
 msgstr "Процитовано"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:55
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "Інструменти"
 
@@ -26795,12 +27282,12 @@ msgstr "Закрити це вікно"
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
 #: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "Закрити"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:56
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "Вид"
 
@@ -26822,9 +27309,7 @@ msgstr "Зашифрувати це повідомлення PGP"
 
 #: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr ""
-"Зашифрувати це повідомлення вашим "
-"сертифікатом шифрування S/MIME"
+msgstr "Зашифрувати це повідомлення вашим сертифікатом шифрування S/MIME"
 
 #: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
@@ -26934,14 +27419,11 @@ msgstr "Показати долучення"
 
 #: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
-msgstr ""
-"Підписати це повідомлення вашим ключем PGP"
+msgstr "Підписати це повідомлення вашим ключем PGP"
 
 #: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr ""
-"Підписати це повідомлення вашим "
-"сертифікатом підпису S/MIME"
+msgstr "Підписати це повідомлення вашим сертифікатом підпису S/MIME"
 
 #: ui/evolution-message-composer.xml.h:38
 #, fuzzy
@@ -26996,15 +27478,13 @@ msgstr "Відкрити..."
 msgid "_Reply-To Field"
 msgstr "Відповідати на:"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:44
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Довідка"
 
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
-msgstr ""
-"Додати теку до вашого списку "
-"передплачених тек"
+msgstr "Додати теку до вашого списку передплачених тек"
 
 #: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
@@ -27020,9 +27500,7 @@ msgstr "Оновити список тек"
 
 #: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
-msgstr ""
-"Видалити теку з вашого списку "
-"передплачених тек"
+msgstr "Видалити теку з вашого списку передплачених тек"
 
 #: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
@@ -27082,8 +27560,7 @@ msgstr "Вставити завдання з буферу обміну"
 
 #: ui/evolution-tasks.xml.h:11
 msgid "Previews the list of tasks to be printed"
-msgstr ""
-"Переглянути список завдань, що буде надруковано"
+msgstr "Переглянути список завдань, що буде надруковано"
 
 #: ui/evolution-tasks.xml.h:13
 msgid "Print the list of tasks"
@@ -27111,9 +27588,7 @@ msgstr "Створити нову теку..."
 
 #: ui/evolution.xml.h:8
 msgid "Create a link to this folder in the shortcut bar"
-msgstr ""
-"Створити посилання на цю теку в панелі "
-"ярликів"
+msgstr "Створити посилання на цю теку в панелі ярликів"
 
 #: ui/evolution.xml.h:9
 msgid "Create a new folder"
@@ -27148,116 +27623,120 @@ msgid "Move this folder to another place"
 msgstr "Перенести цю теку в інше місце"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Створити нову теку..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Відкрити у новому вікні"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Відкрити цю теку в новому вікні"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Відіслати / отримати"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 #, fuzzy
 msgid "Send queued items and retrieve new items"
-msgstr ""
-"Відіслати повідомлення з черги та "
-"отримати нові"
+msgstr "Відіслати повідомлення з черги та отримати нові"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Показати інформацію про Ximian Evolution"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Підготувати звіт про помилку"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "Відіслати звіт про помилку"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
-msgstr ""
-"Відіслати звіт про помилку за допомогою "
-"Bug Buddy"
+msgstr "Відіслати звіт про помилку за допомогою Bug Buddy"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Перемикнути"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Перемикнути стан показу панелі тек"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
-msgstr ""
-"Перемикнути стан показу панелі ярликів"
+msgstr "Перемикнути стан показу панелі ярликів"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Перемикнути стан роботи на лінії"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Показати вибрану теки"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Часті запитання щодо Ximian Evolution"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "Про Ximian Evolution..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "Скопіювати..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "Панель тек"
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "Перейти на теку..."
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "Імпорт..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "Перенести..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "Новий"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "Нова тека"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "Установки пілота..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "Перейменувати..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Send / Receive"
 msgstr "Відіслати / отримати"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "Ярлик"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "Панель ярликів"
 
@@ -27342,21 +27821,21 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "Поточний рік"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:357
 #, fuzzy
 msgid "Custom View"
 msgstr "Поточний рік"
 
-#: widgets/menus/gal-view-menus.c:333
+#: widgets/menus/gal-view-menus.c:366
 msgid "Save Custom View"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:346
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Визначити відображення"
 
@@ -27386,9 +27865,7 @@ msgstr "Час має бути у такому форматі: %s"
 
 #: widgets/misc/e-cell-percent.c:77
 msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
-"Значення відсотка має бути між 0 та 100, "
-"включно"
+msgstr "Значення відсотка має бути між 0 та 100, включно"
 
 #: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
@@ -27480,16 +27957,21 @@ msgstr "Редактор пошуків"
 msgid "Save Search"
 msgstr "Зберегти пошук"
 
-#: widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
 #, fuzzy
 msgid "_Save Search..."
 msgstr "Зберегти пошук"
 
-#: widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 #, fuzzy
 msgid "_Edit Saved Searches..."
 msgstr "Виправити як нове повідомлення..."
 
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Додатково..."
+
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
 msgstr "Інформація"
@@ -27511,22 +27993,22 @@ msgstr "Повідомлення"
 msgid "Don't show this message again."
 msgstr "Більше не показувати це повідомлення."
 
-#: widgets/misc/e-search-bar.c:477
+#: widgets/misc/e-search-bar.c:512
 #, fuzzy
 msgid "_Find Now"
 msgstr "Знайти зараз"
 
-#: widgets/misc/e-search-bar.c:478
+#: widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Clear"
 msgstr "Календар"
 
-#: widgets/misc/e-search-bar.c:835
+#: widgets/misc/e-search-bar.c:875
 #, fuzzy
 msgid "Clear"
 msgstr "Календар"
 
-#: widgets/misc/e-search-bar.c:837
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Знайти зараз"
 
@@ -27538,14 +28020,11 @@ msgstr "Персональний сервер адресної книги"
 #: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
 #: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
-msgstr ""
-"Персональний календарний сервер; "
-"календарна фабрика"
+msgstr "Персональний календарний сервер; календарна фабрика"
 
 #: wombat/wombat.c:200
 msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr ""
-"setup_vfs(): не вдалось ініціалізувати GNOME-VFS"
+msgstr "setup_vfs(): не вдалось ініціалізувати GNOME-VFS"
 
 #: wombat/wombat.c:212
 msgid "init_corba(): could not initialize GNOME"
@@ -27555,12 +28034,193 @@ msgstr "init_corba(): не вдалось ініціалізувати GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 
+#~ msgid "Addressbook Settings"
+#~ msgstr "Налаштування адресної книги"
+
+#, fuzzy
+#~ msgid "Could not query for schema information"
+#~ msgstr "Помилка завантаження файлу: %s"
+
+#, fuzzy
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
+
+#, fuzzy
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Початок дня:"
+
+#~ msgid "_End of day:"
+#~ msgstr "Кінець дня:"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "Інший організатор"
+
+#, fuzzy
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Введіть пароль NNTP для %s@%s"
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Неможливо відіслати повідомлення: адреса відправника не вірна."
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Неможливо підписати це повідомлення: неможливо створити канал до GPG/PGP: "
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+
+#, fuzzy
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+
+#, fuzzy
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Неможливо створити канал до GPG/PGP: %s"
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Неможливо відіслати повідомлення: адреса відправника не вірна."
+
+#, fuzzy
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Неможливо створити канал до GPG/PGP: %s"
+
+#, fuzzy
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
+
+#, fuzzy
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Неможливо створити канал до GPG/PGP: %s"
+
+#, fuzzy
+#~ msgid "%s server %s"
+#~ msgstr "Сервер:"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(невідомий хост)"
+
+#~ msgid "No such message: %s"
+#~ msgstr "Немає такого повідомлення: %s"
+
+#, fuzzy
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Неможливо додати повідомлення до файлу Mbox: %s: %s"
+
+#, fuzzy
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "Не вдалося завантажити %s: %s"
+
+#, fuzzy
+#~ msgid "Store `%s' does not exist or is not a directory"
+#~ msgstr "\"%s\" не є звичайним файлом."
+
+#, fuzzy
+#~ msgid "Random"
+#~ msgstr "Радіо"
+
+#, fuzzy
+#~ msgid " Edit "
+#~ msgstr "Редагування"
+
+#~ msgid " New "
+#~ msgstr " Новий "
+
+#, fuzzy
+#~ msgid "Advanced Options"
+#~ msgstr "Скасувати операцію"
+
+#, fuzzy
+#~ msgid "Afrikaans"
+#~ msgstr "Арканзас"
+
+#, fuzzy
+#~ msgid "Arabic"
+#~ msgstr "Алґерія"
+
+#, fuzzy
+#~ msgid "Dari"
+#~ msgstr "Бахрейн"
+
+#, fuzzy
+#~ msgid "Hulu"
+#~ msgstr "Тувалу"
+
+#, fuzzy
+#~ msgid "Same as text"
+#~ msgstr "Показати"
+
+#~ msgid "Select a signature file"
+#~ msgstr "Вибрати файл підпису"
+
+#, fuzzy
+#~ msgid "Select a signature script"
+#~ msgstr "Стерти все крім підпису"
+
+#, fuzzy
+#~ msgid "Use _HTML for this signature"
+#~ msgstr "Підпис _HTML:"
+
+#~ msgid "_Filename:"
+#~ msgstr "Назва файлу:"
+
+#~ msgid "_HTML Signature:"
+#~ msgstr "Підпис _HTML:"
+
+#~ msgid "_Language:"
+#~ msgstr "Мова:"
+
+#, fuzzy
+#~ msgid "_Random"
+#~ msgstr "Радіо"
+
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "Не вдалося створити вміст PGP-шифрування."
+
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "Не вдалося створити вміст PGP-дешифрування."
+
+#~ msgid "Moving"
+#~ msgstr "Перенесення"
+
+#~ msgid "Copying"
+#~ msgstr "Копіювання"
+
+#, fuzzy
+#~ msgid "Signature name:"
+#~ msgstr "Файл підпису:"
+
+#~ msgid "Riga"
+#~ msgstr "Ріга"
+
+#~ msgid "Add ->"
+#~ msgstr "Додати -> "
+
+#~ msgid "<- Remove"
+#~ msgstr "<- Видалити"
+
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Ви впевнені, що хочете стерти теку \"%s\"?"
+
 #~ msgid "Connecting to LDAP server..."
 #~ msgstr "З'єднання з сервером LDAP..."
 
 #~ msgid "Waiting for connection to LDAP server..."
-#~ msgstr ""
-#~ "Очікування на з'єднання з сервером LDAP..."
+#~ msgstr "Очікування на з'єднання з сервером LDAP..."
 
 #~ msgid "Edit Addressbook"
 #~ msgstr "Виправити адресну книгу"
@@ -27590,8 +28250,7 @@ msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 #~ msgstr "Назва сервера"
 
 #~ msgid "This is the port that your ldap server uses."
-#~ msgstr ""
-#~ "Це порт, який використовує ваш сервер LDAP."
+#~ msgstr "Це порт, який використовує ваш сервер LDAP."
 
 #~ msgid "Name contains"
 #~ msgstr "Ім'я містить"
@@ -27600,9 +28259,7 @@ msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 #~ msgstr "Містить:"
 
 #~ msgid "Show contacts matching the following criteria:"
-#~ msgstr ""
-#~ "Показати контакти, що відповідають таким "
-#~ "критеріям:"
+#~ msgstr "Показати контакти, що відповідають таким критеріям:"
 
 #, fuzzy
 #~ msgid "Create new appointments with a default _reminder"
@@ -27619,11 +28276,6 @@ msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 #~ msgstr "Стерти це завдання"
 
 #, fuzzy
-#~ msgid "Free/Busy information (%s to %s)"
-#~ msgstr ""
-#~ "Опублікувати інформацію про зайнятість"
-
-#, fuzzy
 #~ msgid "Error hashing password."
 #~ msgstr "Помилка додавання картки"
 
@@ -27632,20 +28284,15 @@ msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 
 #, fuzzy
 #~ msgid "Could not sign: certificate not found for \"%s\"."
-#~ msgstr ""
-#~ "Не вдалося відіслати ім'я користувача на "
-#~ "сервер"
+#~ msgstr "Не вдалося відіслати ім'я користувача на сервер"
 
 #, fuzzy
 #~ msgid "Could not clearsign: certificate not found for \"%s\"."
-#~ msgstr ""
-#~ "Не вдалося відіслати ім'я користувача на "
-#~ "сервер"
+#~ msgstr "Не вдалося відіслати ім'я користувача на сервер"
 
 #, fuzzy
 #~ msgid "Could not encrypt: failed to create encryption context."
-#~ msgstr ""
-#~ "Не вдалось створити вікно конструктора."
+#~ msgstr "Не вдалось створити вікно конструктора."
 
 #, fuzzy
 #~ msgid "Could not encrypt data: invalid user key: \"%s\"."
@@ -27662,46 +28309,32 @@ msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 #~ msgstr "Сервер відкинув ім'я користувача"
 
 #~ msgid "Failed to send username to server"
-#~ msgstr ""
-#~ "Не вдалося відіслати ім'я користувача на "
-#~ "сервер"
+#~ msgstr "Не вдалося відіслати ім'я користувача на сервер"
 
 #~ msgid "Server rejected username/password"
-#~ msgstr ""
-#~ "Сервер відкинув ім'я користувача і пароль"
+#~ msgstr "Сервер відкинув ім'я користувача і пароль"
 
 #~ msgid "Could not get group list from server."
-#~ msgstr ""
-#~ "Не вдалося отримати спісок груп з сервера."
+#~ msgstr "Не вдалося отримати спісок груп з сервера."
 
 #~ msgid "Unable to load grouplist file for %s: %s"
-#~ msgstr ""
-#~ "Не вдалося завантажити список груп для %s: "
-#~ "%s"
+#~ msgstr "Не вдалося завантажити список груп для %s: %s"
 
 #~ msgid "Unable to save grouplist file for %s: %s"
-#~ msgstr ""
-#~ "Не вдалося зберегти список груп для %s: %s"
+#~ msgstr "Не вдалося зберегти список груп для %s: %s"
 
 #~ msgid "Could not find 'From' address in message"
-#~ msgstr ""
-#~ "Не вдалося знайти адресу відправника у "
-#~ "повідомленні"
+#~ msgstr "Не вдалося знайти адресу відправника у повідомленні"
 
 #~ msgid "Cannot send message: sender address not defined."
-#~ msgstr ""
-#~ "Неможливо відіслати повідомлення: адреса "
-#~ "відправника не визначена."
+#~ msgstr "Неможливо відіслати повідомлення: адреса відправника не визначена."
 
 #~ msgid "Evolution component for the executive summary."
-#~ msgstr ""
-#~ "Компонент Evolution для виконавчого зведення."
+#~ msgstr "Компонент Evolution для виконавчого зведення."
 
 #, fuzzy
 #~ msgid "Cannot initialize Evolution's Executive Summary component."
-#~ msgstr ""
-#~ "Не вдалося ініціалізувати компонент "
-#~ "зведення Evolutuion."
+#~ msgstr "Не вдалося ініціалізувати компонент зведення Evolutuion."
 
 #~ msgid "Select a service"
 #~ msgstr "Вибрати послугу"
@@ -27744,13 +28377,7 @@ msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 
 #, fuzzy
 #~ msgid "Factory for the test component."
-#~ msgstr ""
-#~ "Не вдалося ініціалізувати поштовий "
-#~ "компонент Evolutuion."
-
-#, fuzzy
-#~ msgid "Update now"
-#~ msgstr "Оновлення виконано\n"
+#~ msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
 #, fuzzy
 #~ msgid "Update every "
@@ -27777,13 +28404,6 @@ msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 #~ msgstr "Формат поштової скриньки"
 
 #, fuzzy
-#~ msgid " (default)"
-#~ msgstr "Стерти"
-
-#~ msgid "Mail Settings"
-#~ msgstr "Параметри пошти"
-
-#, fuzzy
 #~ msgid "Composer"
 #~ msgstr "Редактор"
 
@@ -27793,15 +28413,9 @@ msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 #~ msgid "Display"
 #~ msgstr "Відобразити"
 
-#~ msgid "Drafts"
-#~ msgstr "Чернетки"
-
 #~ msgid "Edit..."
 #~ msgstr "Виправити..."
 
-#~ msgid "HTML signature file:"
-#~ msgstr "Файл підпису HTML:"
-
 #~ msgid "News"
 #~ msgstr "Новини"
 
@@ -27809,9 +28423,6 @@ msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 #~ msgid "Select Filter Log file..."
 #~ msgstr "Вибрати файл"
 
-#~ msgid "Sent"
-#~ msgstr "Відіслано"
-
 #~ msgid "Sources"
 #~ msgstr "Джерела"
 
@@ -27836,9 +28447,7 @@ msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 #~ msgstr "Поштове зведення"
 
 #~ msgid "Cannot initialize Evolution's Summary component."
-#~ msgstr ""
-#~ "Не вдалося ініціалізувати компонент "
-#~ "зведення Evolutuion."
+#~ msgstr "Не вдалося ініціалізувати компонент зведення Evolutuion."
 
 #, fuzzy
 #~ msgid "Factory for the Evolution notes component."
@@ -27846,20 +28455,11 @@ msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
 
 #, fuzzy
 #~ msgid "Factory for the Notes control"
-#~ msgstr ""
-#~ "Не вдалося ініціалізувати поштовий "
-#~ "компонент Evolutuion."
+#~ msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
 #~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 #~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#~ msgid ""
-#~ "Cannot transfer folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Не вдалось передати теку:\n"
-#~ "%s"
-
 #~ msgid "(No name)"
 #~ msgstr "(Без назви)"
 
diff --git a/po/vi.po b/po/vi.po
index 15778887e0..efa7ffe511 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2002-02-07 11:27-0500\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-05-09 23:50-0400\n"
 "Last-Translator: pclouds <pclouds@gmx.net>\n"
 "Language-Team: GnomeVI <gnomevi-list@lists.sourceforge.net>\n"
@@ -30,21 +30,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Nhập tập tin VCard vào Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:849
+#: addressbook/gui/widgets/e-addressbook-view.c:335
 msgid "File As"
 msgstr "Tập tin là"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Tên"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/gui/widgets/e-addressbook-view.c:337
 msgid "Email"
 msgstr "Email"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1659
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr ""
 
@@ -54,16 +55,16 @@ msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1644
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "Phụ tá"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/contact-editor/e-contact-editor.c:1712
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "Kinh doanh"
 
@@ -73,12 +74,12 @@ msgid "Bus"
 msgstr "KD"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1648
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1650
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "Công ty"
 
@@ -89,13 +90,13 @@ msgstr "CTY"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
-#: addressbook/gui/contact-editor/e-contact-editor.c:1713
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "Nhà"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:344
 msgid "Organization"
 msgstr "Tổ chức"
 
@@ -105,19 +106,19 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1655
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "Di động"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1649
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "Xe hơi"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "Fax Kinh doanh"
 
@@ -126,13 +127,13 @@ msgid "Bus Fax"
 msgstr "Fax KD"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "Fax ở Nhà"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1646
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "Kinh doanh 2"
 
@@ -141,69 +142,68 @@ msgid "Bus 2"
 msgstr "KD 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1652
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "Nhà 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1654
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
-#: addressbook/gui/contact-editor/e-contact-editor.c:1714
-#: mail/mail-config.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "Khác"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "Fax khác"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1658
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1660
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "Rađiô"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1661
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "Telex"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:359
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1687
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
+#: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "Email 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1688
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "Email 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Web Site"
 msgstr "Web Site"
 
@@ -212,7 +212,7 @@ msgid "Url"
 msgstr "Url"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:364
 msgid "Department"
 msgstr "Cơ quan"
 
@@ -221,7 +221,7 @@ msgid "Dep"
 msgstr "CQ"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:365
 msgid "Office"
 msgstr "Văn phòng"
 
@@ -230,12 +230,12 @@ msgid "Off"
 msgstr "VP"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:366
 msgid "Title"
 msgstr "Tựa đề"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:367
 msgid "Profession"
 msgstr "Giáo sư"
 
@@ -244,7 +244,7 @@ msgid "Prof"
 msgstr "GS"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:368
 msgid "Manager"
 msgstr "Quản lý"
 
@@ -257,7 +257,7 @@ msgid "Ass"
 msgstr "TLý"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:370
 msgid "Nickname"
 msgstr "Tên hiệu"
 
@@ -266,12 +266,12 @@ msgid "Nick"
 msgstr "Hiệu"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:371
 msgid "Spouse"
 msgstr "Vợ/Chồng"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:372
 msgid "Note"
 msgstr "Ghi chú"
 
@@ -284,7 +284,7 @@ msgid "CALUri"
 msgstr "CALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:373
 msgid "Free-busy URL"
 msgstr ""
 
@@ -313,234 +313,16 @@ msgstr "Phân loại"
 msgid "Family Name"
 msgstr "Tên gia đình"
 
-#: addressbook/backend/ebook/e-card-simple.c:788
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card.c:3712
-msgid "Card: "
-msgstr "Card: "
-
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr "\nTên: "
-
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr "\n  Tiếp đầu ngữ:     "
-
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr "\n  Bổ sung: "
-
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr "\n  Gia đình:     "
-
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr "\n  Tiếp vĩ ngữ:    "
-
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr "\nNgày sinh: "
-
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr "\nĐịa chỉ:"
-
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr "\n  Hộp thư bưu điện:  "
-
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr "\n  Đường:      "
-
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr "\n  Thành phố:        "
-
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr "\n  Vùng:      "
-
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr "\n  Mã bưu điện: "
-
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr "\n  Quốc gia:     "
-
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr "\nNhãn gửi: "
-
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr "\nĐiện thoại:\n"
-
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr "\nĐiện thoại:"
-
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr "\nE-mail:\n"
-
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr "\nE-mail:"
-
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr "\nMúi giờ: "
-
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr "\nVị trí địa lý: "
-
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr "\nChức vụ kinh doanh: "
-
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr "\nTổ chức: "
-
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr "\n  Tên:  "
-
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr "\n  Đơn vị:  "
-
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr "\n  Đơn vị 2: "
-
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr "\n  Đơn vị 3: "
-
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr "\n  Đơn vị 4: "
-
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr "\nPhân loại: "
-
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr "\nGhi chú: "
-
-#. 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:3879
-msgid ""
-"\n"
-"Unique String: "
-msgstr "\nChuỗi duy nhất: "
-
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr "\nKhoá chung: "
-
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard cho %s"
@@ -548,85 +330,89 @@ msgstr "VCard cho %s"
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1548
+#: addressbook/backend/ebook/test-client.c:34
+#: addressbook/conduit/address-conduit.c:1860
 #: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1554
-#: calendar/conduits/todo/todo-conduit.c:1138
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/conduits/calendar/calendar-conduit.c:1727
+#: calendar/conduits/todo/todo-conduit.c:1385
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Không thể khởi động Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2269
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "Đang tìm..."
 
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "Đang nạp..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:270
+#: addressbook/backend/pas/pas-backend-file.c:272
 msgid "Error in search expression."
 msgstr "Lỗi trong biểu thức tìm kiếm"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:483
-msgid "Connecting to LDAP server..."
-msgstr "Đang kết nối tới LDAP Server..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:493
-msgid "Unable to connect to LDAP server."
-msgstr "Không thể kết nối tớ LDAP server."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:509
-msgid "Waiting for connection to LDAP server..."
-msgstr "Đang đợi kết nối tới LDAP server..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:912
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "Đang thêm card vào LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1013
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "Đang loại bỏ card khỏi LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1123
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "Đang sửa card trong LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2214
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
+msgid "Restarting search."
+msgstr "Khởi động lại tìm kiếm."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "Đang nhận kết quả tìm kiếm LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2219
-msgid "Restarting search."
-msgstr "Khởi động lại tìm kiếm."
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#, fuzzy
+msgid "Error performing search"
+msgstr "Lỗi khi loại bỏ card"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "Không thể phân tích URL `%s'"
 
-#: addressbook/conduit/address-conduit.c:296
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "Địa chỉ email:"
+
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "Không thể nạp con trỏ\n"
 
-#: addressbook/conduit/address-conduit.c:309
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "Không nạp được EBook\n"
 
-#: addressbook/conduit/address-conduit.c:1099
-#: calendar/conduits/calendar/calendar-conduit.c:1082
-#: calendar/conduits/todo/todo-conduit.c:698
+#: addressbook/conduit/address-conduit.c:1354
+#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "Không thể khởi động wombat server"
 
-#: addressbook/conduit/address-conduit.c:1100
-#: calendar/conduits/calendar/calendar-conduit.c:1083
-#: calendar/conduits/todo/todo-conduit.c:699
+#: addressbook/conduit/address-conduit.c:1355
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "Không thể khởi động wombat"
 
-#: addressbook/conduit/address-conduit.c:1130
-#: addressbook/conduit/address-conduit.c:1133
+#: addressbook/conduit/address-conduit.c:1385
+#: addressbook/conduit/address-conduit.c:1388
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -643,224 +429,153 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Điều khiển Bonobo mẫu để hiển thị sổ địa chỉ"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
+msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
+msgid "Directory Servers"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
+msgid "Evolution Addressbook minicard viewer"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+msgid "Evolution component for handling contacts."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+msgid "Factory for the Addressbook Minicard control"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the Addressbook's address popup"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
-#: shell/e-shortcuts.c:1061
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Liên lạc"
 
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "Thư mục chứa thông tin liên lạc"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "LDAP server chứa thông tin liên lạc"
 
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
-msgid "New Contact"
-msgstr "Liên lạc mới"
-
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
-msgstr "Liên lạc mớ_i"
-
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:578
 msgid "New Contact List"
 msgstr "Danh sách liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
-msgstr "_Danh sách liên lạc mới"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
-msgstr "Sửa Sổ địa chỉ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
-msgstr "389"
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
-msgstr "Tên tài khoản"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "Têm sổ địa chỉ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
-msgstr "Nguồn sổ địa chỉ"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "Nâng cao"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
-msgstr "Cơ sở"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "Cơ bản"
-
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "De_lete"
-msgstr "_Xóa"
-
-#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "Địa chỉ email:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution dùng địa chỉ email này để xác nhận bạn với server"
-
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "One"
-msgstr "Một"
-
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
-msgstr "_Cơ sở tìm:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search s_cope: "
-msgstr "_Phạm vị tìm: "
-
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Server Name"
-msgstr "Tên server"
-
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid "Sub"
-msgstr "Con"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "Thông tin dưới đây được yêu cầu để có thể thêm vào sổ địa chỉ."
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "This information is not required for most ldap servers. "
-msgstr "Thông tin này không cần thiết cho hầu hết các LDAP server."
-
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid ""
-"This information is used by your ldap server to specify which nodes are used "
-"in a search. Contact your server administrator for more information."
-msgstr "Thông tin này được dùng bởi LDAP server của bạn để xác định nút nào được dùng khi tìm kiếm. Liên hệ quản trị server để biết thêm thông tin chi tiết."
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "_Danh sách liên lạc"
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
-msgstr "Đây là nút cơ sở cho mọi tìm kiếm trên LDAP server. Liên hệ với quản trị server để biết thêm thông tin chi tiết."
+#: addressbook/gui/component/addressbook-component.c:581
+msgid "New Contact"
+msgstr "Liên lạc mới"
 
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "This is the name of the server where your addressbook is located."
-msgstr "Đây là tên của server, nơi đặt cuốn sổ địa chỉ của bạn."
+#: addressbook/gui/component/addressbook-component.c:581
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "_Liên lạc"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
-msgstr "Đây là cổng mà LDAP server của bạn đang dùng."
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Không thể kết nối tớ LDAP server."
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
-msgstr "Tên này sẽ được dùng để định danh tài khoản của bạn. Chỉ được dùng với mục đích hiển thị thôi."
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Không thể chứng thực IMAP server.\n"
+"%s\n"
+"\n"
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "_Account name:"
-msgstr "Tên Tài _khoản:"
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-msgid "_Add"
-msgstr "_Thêm"
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:16
-msgid "_Edit"
-msgstr "_Sửa"
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
-msgstr "Server của tôi yêu cầu _xác nhận"
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Lỗi khi nạp thông tin bộ lọc:\n"
+"%s"
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
-msgstr "_Cổng:"
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "Tín hiệu trả lời của IMAP server không chứa thông tin %s"
 
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
-msgstr "Tên Ser_ver:"
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(Phiên bản Evolution này chưa hỗ trợ SSL)"
 
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "Không thể khởi động gnome-vfs"
 
-#: addressbook/gui/component/addressbook-storage.c:167
+#: addressbook/gui/component/addressbook-storage.c:168
 msgid "Other Contacts"
 msgstr "Liên lạc khác"
 
-#: addressbook/gui/component/addressbook.c:485
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "Không thể mở sổ địa chỉ"
 
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:525
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
-msgstr "Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là do bạn đã nhập sai URI, hoặc là do LDAP server không hoạt động."
+msgstr ""
+"Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là do bạn đã nhập sai URI, "
+"hoặc là do LDAP server không hoạt động."
 
-#: addressbook/gui/component/addressbook.c:499
+#: addressbook/gui/component/addressbook.c:530
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -872,7 +587,7 @@ msgstr ""
 "lại chương trình từ mã nguồn sau khi nhận OpenLDAP từ địa chỉ\n"
 "dưới đây.\n"
 
-#: addressbook/gui/component/addressbook.c:507
+#: addressbook/gui/component/addressbook.c:538
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -880,42 +595,44 @@ msgstr ""
 "Không thể mở sổ địa chỉ này. Vui lòng kiểm tra lại đường dẫn có tồn tại\n"
 "hay không và bạn có quyền truy cập vào đường dẫn đó hay không."
 
-#: addressbook/gui/component/addressbook.c:640
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Nhập mật khẩu cho %s (người dùng %s)"
 
-#: addressbook/gui/component/addressbook.c:808
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Bất kỳ trường nào chứa"
-
-#: addressbook/gui/component/addressbook.c:809
-msgid "Name contains"
-msgstr "Tên chứa"
+#: addressbook/gui/component/addressbook.c:776
+#, fuzzy
+msgid "Name begins with"
+msgstr "kết thúc bằng"
 
-#: addressbook/gui/component/addressbook.c:810
-msgid "Email contains"
-msgstr "Email chứa"
+#: addressbook/gui/component/addressbook.c:777
+#, fuzzy
+msgid "Email is"
+msgstr "Email 2"
 
-#: addressbook/gui/component/addressbook.c:811
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:778
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Phân loại "
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:812 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:779
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Bất kỳ trường nào chứa"
+
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "Nâng cao..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1030
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1008
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Bất kỳ phân loại nào"
 
-#: addressbook/gui/component/addressbook.c:1112
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "URI sẽ được Bộ duyệt thư mục hiển thị"
 
@@ -930,7 +647,7 @@ msgstr "(không)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1686
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "Email chính"
 
@@ -976,6 +693,569 @@ msgstr "Không cho phép truy vấn"
 msgid "Enable Queries (Dangerous!)"
 msgstr "Cho phép truy vấn (Nguy hiểm!)"
 
+#: addressbook/gui/component/ldap-config.glade.h:1
+msgid "  S_how Supported Bases "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:2
+msgid "1234"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+msgid "3268"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:6
+#, fuzzy
+msgid "380"
+msgstr "80%"
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "666"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr " _Loại bỏ"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Tùy chọn"
+
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:14
+msgid "Addressbook Sources"
+msgstr "Nguồn sổ địa chỉ"
+
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
+#, fuzzy
+msgid "Always"
+msgstr "Albany"
+
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Vô danh"
+
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:18
+msgid "Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:19
+msgid ""
+"Congratulations, you are finished setting up this LDAP server. You\n"
+"are now ready to access this directory.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Connecting"
+msgstr "Connecticut"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "DN Customization"
+msgstr "Không có thông tin"
+
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "_Xóa"
+
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "Tên _danh sách:"
+
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "Địa chỉ email:"
+
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Báo động Evolution"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr "Evolution dùng địa chỉ email này để xác nhận bạn với server"
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr "Evolution dùng địa chỉ email này để xác nhận bạn với server"
+
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "_Tìm"
+
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "Chung"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "LDAP Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "Cấu hình"
+
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "Biên"
+
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "Never"
+msgstr "_mỗi"
+
+#: addressbook/gui/component/ldap-config.glade.h:38
+msgid ""
+"Now, you must specify how you want to connect to the LDAP server. The SSL "
+"(Secure Sockets Layer)\n"
+"and TLS (Transport Layer Security) protocols are used by some servers to "
+"cryptographically protect\n"
+"your connection. Ask your system administrator if your LDAP server uses "
+"these protocols."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:41
+msgid "Objectclasses"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:42
+msgid "Objectclasses Used in Evolution:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:43
+msgid "Objectclasses Used on Server:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:44
+msgid "One"
+msgstr "Một"
+
+#: addressbook/gui/component/ldap-config.glade.h:45
+msgid ""
+"Please select and Evolution attribute and an\n"
+"LDAP attribute to associate with it."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:47
+msgid "R_estore Defaults"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+msgid "Re_store Defaults"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "_Phạm vị tìm: "
+
+#. No time range is set, so don't start a query
+#: addressbook/gui/component/ldap-config.glade.h:50
+#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
+#: calendar/gui/e-week-view.c:1213
+msgid "Searching"
+msgstr "Đang tìm"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "Chọn tất cả"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "Đã xóa"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if\n"
+"your LDAP server supports SSL or TLS."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:55
+msgid ""
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
+"secure."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:59
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This \n"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
+"exploits. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:62
+msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:64
+msgid ""
+"Specifying a display name is the last required step in configuring an LDAP "
+"server."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:65
+#, fuzzy
+msgid "Step 1: Server Information"
+msgstr "Thông tin nguồn"
+
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "Đang kết nối tới server..."
+
+#: addressbook/gui/component/ldap-config.glade.h:67
+msgid "Step 3: Searching the Directory"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid "Step 4: Display Name"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:69
+msgid "Sub"
+msgstr "Con"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "Lược đồ không hỗ trợ"
+
+#: addressbook/gui/component/ldap-config.glade.h:71
+msgid ""
+"The first step in configuring an LDAP server is to provide its name, and "
+"your log in\n"
+"information. Please ask your system administrator if you are unsure of this "
+"information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:73
+msgid ""
+"The options on this page control how many entries should be included in "
+"your\n"
+"searches, and how long a search should take. Ask your system administrator "
+"if you\n"
+"need to change these options."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:76
+msgid ""
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:78
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the \n"
+"directory tree. A search scope of \"sub\" will include all entries below "
+"your search base.\n"
+"A search scope of \"one\" will only include the entries one level beneath "
+"your base."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:81
+msgid ""
+"This assistant will help you to access online directory services\n"
+"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"\n"
+"Adding a new LDAP server requires some specialized information\n"
+"about the server. Please contact your system administrator if you \n"
+"need help finding this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:87
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:88
+msgid ""
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
+"too large will slow down your addressbook."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:90
+msgid ""
+"This is the method evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your ldap "
+"server."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:91
+#, fuzzy
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
+"It is for display purposes only. "
+msgstr ""
+"Tên này sẽ được dùng để định danh tài khoản của bạn. Chỉ được dùng với mục "
+"đích hiển thị thôi."
+
+#: addressbook/gui/component/ldap-config.glade.h:93
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
+"list of standard ports has been provided. Ask your system administrator\n"
+"what port you should specify."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:96
+msgid "This option controls how long a search will be run."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:97
+msgid ""
+"To add an attribute to the DN, select it from the list and click the \"Add "
+"Attribute\" button.\n"
+"Any values that you add to the DN will become required values for any new "
+"contacts\n"
+"that you add to the directory on the LDAP server. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:100
+msgid "U_se SSL/TLS:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:101
+msgid "Using distinguished name (DN)"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+msgid "Using email address"
+msgstr "Đây là địa chỉ gửi _mail"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+msgid "Whenever Possible"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:141
+msgid "_Add"
+msgstr "_Thêm"
+
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Thêm"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "Thêm hành động"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "Thêm hành động"
+
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "Báo động"
+
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "_Xoá tất cả"
+
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "_Hiển thị"
+
+#: addressbook/gui/component/ldap-config.glade.h:111
+msgid "_Distinguished Name (DN):"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Download limit:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
+msgid "_Edit"
+msgstr "_Sửa"
+
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "_Sửa cuộc hẹn"
+
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Báo động Evolution"
+
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "_Tùy chọn"
+
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "_Cổng:"
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+msgid "_Restore Defaults"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "_Cơ sở tìm:"
+
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "Tên Ser_ver:"
+
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "Thời gian ngủ (phút)"
+
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "Tài khoản %d"
+
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "contact-list-editor"
+
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "Không có card"
+
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "Đang tái kết nối tới %s"
+
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "Chung"
+
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "Đang tìm"
+
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Giao diên chọn tên sổ địa chỉ của Evolution."
@@ -984,10 +1264,12 @@ msgstr "Giao diên chọn tên sổ địa chỉ của Evolution."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:838
-#: composer/e-msg-composer-attachment-bar.c:501 filter/filter-filter.c:436
-#: filter/filter-rule.c:637 shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:980
+#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Loại bỏ"
 
@@ -1016,7 +1298,12 @@ msgstr "(%d không hiện)"
 msgid "Unnamed Contact"
 msgstr "Liên lạc vô danh"
 
-#: addressbook/gui/component/select-names/e-select-names.c:579
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "Người gửi chứa"
+
+#: addressbook/gui/component/select-names/e-select-names.c:716
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -1031,7 +1318,7 @@ msgstr ""
 "vui lòng gửi email cho Jon Trowbridge <trow@ximian.com> với \n"
 "mô tả chi tiết về trường hợp xảy ra lỗi. Cám ơn bạn."
 
-#: addressbook/gui/component/select-names/e-select-names.c:587
+#: addressbook/gui/component/select-names/e-select-names.c:724
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "Under normal circumstances, this should never happen.\n"
@@ -1043,42 +1330,43 @@ msgstr ""
 "Có lẽ bạn cần thoát và khởi động lại Evolution để \n"
 "khắc phục sự cố."
 
-#: addressbook/gui/component/select-names/e-select-names.c:669
+#: addressbook/gui/component/select-names/e-select-names.c:806
 msgid "Select Contacts from Addressbook"
 msgstr "Chọn liên lạc từ sổ địa chỉ"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "_Chứa:"
+msgid "Select Names"
+msgstr "Chọn tên"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Co_ntacts:"
-msgstr "_Liên lạc:"
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "Xoá liên lạc?"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "F_ind"
-msgstr "_Tìm"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "Liên lạc"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "Chọn tên"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
-msgstr "Hiện liên lạc khớp với tiêu chuẩn sau:"
+msgid ""
+"Type a name into the entry, or\n"
+"select one from the list below:"
+msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "_Browse..."
+msgstr "_Di chuyển..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Phân loại:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "_thư mục:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Message Recipients:"
-msgstr "Người _nhận:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "A_ssistant's name:"
 msgstr "Tên p_hụ tá:"
@@ -1111,7 +1399,7 @@ msgstr "Hợp tác"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1293
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "Bộ hiệu chỉnh liên lạc"
 
@@ -1120,7 +1408,7 @@ msgid "D_epartment:"
 msgstr "Cơ _quan:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "Chi tiết"
 
@@ -1136,10 +1424,6 @@ msgstr "Tập tin _là:"
 msgid "Full _Name..."
 msgstr "Tên đầ_y đủ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Chung"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
@@ -1181,10 +1465,12 @@ msgstr "Muốn nhậm _HTML mail"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1468 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "_Xóa"
 
@@ -1212,1121 +1498,1127 @@ msgstr ""
 msgid "_Web page address:"
 msgstr "Địa chỉ _Web:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "Bạn có chắc muốn xoá liên lạc này?"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "Xoá liên lạc?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:757
-msgid "Category editor not available."
-msgstr "Bộ biên soạn phân loại không tồn tại."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:764
-msgid "This contact belongs to these categories:"
-msgstr "Liên lạc này thuộc các phân loại này:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:978
-msgid "Save Contact as VCard"
-msgstr "Lưu liên lạc bằng VCard"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2287
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Không thể tìm thấy widget cho trường: `%s'"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
-msgstr "Sửa toàn bộ"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr "Tên đầy đủ"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
-msgid "E-mail"
-msgstr "E-mail"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
-msgid "list"
-msgstr "danh sách"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s đã tồn tại.\n"
-"Bạn có muốn ghi đè lên nó?"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Địa chỉ _2:"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2341
+msgid "United States"
+msgstr "Mỹ"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albani"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Algêri"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "American Samoa"
 msgstr "Samoa (Mỹ)"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Andorra"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Angola"
 msgstr "Ăngôla"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Anguilla"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Antarctica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Antigua And Barbuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Achentina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Armenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Aruba"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Úc"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Áo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Azerbaijan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Bangladesh"
 msgstr "Băngladét"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Barbados"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Belarus"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Bỉ"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Benin"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bermuda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bhutan"
 msgstr "Butan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bosnia And Herzegowina"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Botswana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bouvet Island"
 msgstr "Đảo Bouvet"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brazil"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "British Indian Ocean Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:33
-msgid "British Virgin Islands"
-msgstr "Đảo British Virgin"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Brunei Darussalam"
 msgstr "Brunei"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bungari"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Burkina Faso"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Burundi"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Cambodia"
 msgstr "Campuchia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Cameroon"
 msgstr "Camơrun"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cape Verde"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Đảo cayman"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Central African Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Chad"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-msgid "Check Address"
-msgstr "Kiểm tra địa chỉ"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chi Lê"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "China"
 msgstr "Trung Quốc"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Đảo Giáng sinh"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cocos (Keeling) Islands"
 msgstr "Đảo Cocos (Keeling)"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Côlômbia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Comoros"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Congo"
 msgstr "Côngô"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Cook Islands"
 msgstr "Đảo Cook"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cote d'Ivoire"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:56
-msgid "Countr_y:"
-msgstr "_Quốc gia:"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Croátia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Cuba"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Cộng hoà Séc"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Đan Mạch"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Djibouti"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Dominica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:64
-#: my-evolution/Locations.h:607
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "East Timor"
 msgstr "Đông Timo"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:66
-#: my-evolution/Locations.h:639
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:67
-#: my-evolution/Locations.h:648
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Ai Cập"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:68
-#: my-evolution/Locations.h:664
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Equatorial Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Eritrea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:71
-#: my-evolution/Locations.h:682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Ethiopia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Falkland Islands"
 msgstr "Đảo Falkland"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Faroe Islands"
 msgstr "Đảo Faroe"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Fiji"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:76
-#: my-evolution/Locations.h:714
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Phần Lan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:77
-#: my-evolution/Locations.h:764
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Pháp"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "French Guiana"
 msgstr "Guiana (Pháp)"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "French Polynesia"
 msgstr "Polynesia (Pháp)"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Southern Territories"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Gabon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Gambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:83
-#: my-evolution/Locations.h:809
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:84
-#: my-evolution/Locations.h:810
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Đức"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Ghana"
 msgstr "Gana"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:86
-#: my-evolution/Locations.h:813
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:87
-#: my-evolution/Locations.h:844
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Hy Lạp"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Greenland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Grenada"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Guadeloupe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:92
-#: my-evolution/Locations.h:865
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guinea-bissau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guyana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:96
-#: my-evolution/Locations.h:886
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Heard And McDonald Islands"
 msgstr "Đảo Heard And MacDonald"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Holy See"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:99
-#: my-evolution/Locations.h:943
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:100
-#: my-evolution/Locations.h:944
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "Hồng Kông"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:101
-#: my-evolution/Locations.h:964
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Hungari"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:102
-#: my-evolution/Locations.h:976
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:103
-#: my-evolution/Locations.h:989
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: my-evolution/Locations.h:991
 msgid "India"
 msgstr "Ấn Độ"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:105
-#: my-evolution/Locations.h:1005
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Israel"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:107
-#: my-evolution/Locations.h:1014
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Ý"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:108
-#: my-evolution/Locations.h:1028
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:109
-#: my-evolution/Locations.h:1032
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Nhật"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:110
-#: my-evolution/Locations.h:1043
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Kazakhstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Kenya"
 msgstr "Kenia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kiribati"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:114
-#: my-evolution/Locations.h:1141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#, fuzzy
+msgid "Korea, Republic Of"
+msgstr "Korea, Republic of"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Cô oét"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Laos"
 msgstr "Lào"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:117
-#: my-evolution/Locations.h:1183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Latvia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:118
-#: my-evolution/Locations.h:1191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Lesotho"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:120
-#: my-evolution/Locations.h:1211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Liechtenstein"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:122
-#: my-evolution/Locations.h:1227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:123
-#: my-evolution/Locations.h:1261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Macau"
 msgstr "Ma Cao"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Macedonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Madagascar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Malawi"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Maldives"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Mali"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:131
-#: my-evolution/Locations.h:1289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Marshall Islands"
 msgstr "Đảo Marshall"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Martinique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Mauritania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Mauritius"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mayotte"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:137
-#: my-evolution/Locations.h:1379
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Micronesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#, fuzzy
+msgid "Moldova, Republic Of"
+msgstr "Korea, Republic of"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Monaco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mongolia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Montserrat"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:142
-#: my-evolution/Locations.h:1462
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mozambique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Myanmar"
 msgstr "Mianma"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Namibia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Nauru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Nepal"
 msgstr "Nêpan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
-#: my-evolution/Locations.h:1523
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "Hà Lan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Netherlands Antilles"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "New Caledonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:151
-#: my-evolution/Locations.h:1552
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "Niu Dilân"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:152
-#: my-evolution/Locations.h:1554
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "Nicaragoa"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Niger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nigeria"
 msgstr "Nigiơria"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niue"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:156
-#: my-evolution/Locations.h:1566
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "Đảo Norfolk"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Northern Mariana Islands"
 msgstr "Đảo Nam Marian"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
-#: my-evolution/Locations.h:1579
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "Na Uy"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:159
-#: my-evolution/Locations.h:1623
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "Ôman"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
-#: my-evolution/Locations.h:1664
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Palau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Palestinian Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:163
-#: my-evolution/Locations.h:1674
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Papua New Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:165
-#: my-evolution/Locations.h:1679
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "Paragoay"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
-#: my-evolution/Locations.h:1714
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "Pêru"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr "Philíppin"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Pitcairn"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:169
-#: my-evolution/Locations.h:1755
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "Ba Lan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
-#: my-evolution/Locations.h:1782
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "Bồ Đào Nha"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:171
-#: my-evolution/Locations.h:1815
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
-#: my-evolution/Locations.h:1827
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:173
-msgid "Republic Of Korea"
-msgstr ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:174
-msgid "Republic Of Moldova"
-msgstr ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Reunion"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:176
-#: my-evolution/Locations.h:1902
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "Rumani"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Russian Federation"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Rwanda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Saint Kitts And Nevis"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Saint Lucia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Vincent And The Grena-dines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Samoa"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "San Marino"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Sao Tome And Principe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:185
-#: my-evolution/Locations.h:2025
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "Ả Rập Saudi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Senegal"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Seychelles"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Sierra Leone"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:189
-#: my-evolution/Locations.h:2080
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:190
-#: my-evolution/Locations.h:2093
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:191
-#: my-evolution/Locations.h:2094
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Solomon Islands"
 msgstr "Đảo Solomon"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Somalia"
 msgstr "Xômali"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:194
-#: my-evolution/Locations.h:2109
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "Nam Phi"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Đảo Nam Georgia và Nam Sandwich"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "Tây Ban Nha"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Sri Lanka"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "St. Helena"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Sudan"
 msgstr "Su Đăng"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
-#: my-evolution/Locations.h:2166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Đảo Svalbard và Jan Mayen"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Swaziland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:204
-#: my-evolution/Locations.h:2171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "Thụy Điển"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:205
-#: my-evolution/Locations.h:2173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
-#: my-evolution/Locations.h:2194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "Đài Loan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Tajikistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#, fuzzy
+msgid "Tanzania, United Republic Of"
+msgstr "Iran, Islamic Republic of"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
 msgstr "Thái Lan"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Togo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Tokelau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Tonga"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Trinidad And Tobago"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tunisia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:214
-#: my-evolution/Locations.h:2310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "Thổ Nhĩ Kỳ"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Turkmenistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Turks And Caicos Islands"
 msgstr "Đảo Turks và Caicos"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tuvalu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:218
-msgid "U.S. Virgin Islands"
-msgstr "Đảo U.S. Virgin"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Uganda"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "Ucraina"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "United Arab Emirates"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:222
-#: my-evolution/Locations.h:2330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "Vương Quốc Anh"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr ""
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-#: my-evolution/Locations.h:2331
-msgid "United States"
-msgstr "Mỹ"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:226
-#: my-evolution/Locations.h:2336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Uzbekistan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Vanuatu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:229
-#: my-evolution/Locations.h:2367
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
-#: my-evolution/Locations.h:2379
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "Việt Nam"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#, fuzzy
+msgid "Virgin Islands, British"
+msgstr "Đảo U.S. Virgin"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#, fuzzy
+msgid "Virgin Islands, U.S."
+msgstr "Đảo U.S. Virgin"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Wallis And Futuna Islands"
 msgstr "Đảo Wallis và Futuna"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Western Sahara"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
-#: my-evolution/Locations.h:2499
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:234
-#: my-evolution/Locations.h:2511
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "Nam Tư"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Zambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Zimbabwe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Bạn có chắc muốn xoá liên lạc này?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+msgid "Delete Contact?"
+msgstr "Xoá liên lạc?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
+msgid "Category editor not available."
+msgstr "Bộ biên soạn phân loại không tồn tại."
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
+msgid "This contact belongs to these categories:"
+msgstr "Liên lạc này thuộc các phân loại này:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
+msgid "Save Contact as VCard"
+msgstr "Lưu liên lạc bằng VCard"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "Không thể tìm thấy widget cho trường: `%s'"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+msgid "Edit Full"
+msgstr "Sửa toàn bộ"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr "Tên đầy đủ"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+msgid "E-mail"
+msgstr "E-mail"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+msgid "list"
+msgstr "danh sách"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s đã tồn tại.\n"
+"Bạn có muốn ghi đè lên nó?"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Địa chỉ _2:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "Kiểm tra địa chỉ"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "_Quốc gia:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "Đị_a chỉ:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "Thành p_hố:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "Hộp thư _bưu điện:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Tỉnh/Bang:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "Mã ZIP:"
 
@@ -2424,11 +2716,11 @@ msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "Bộ hiệu chỉnh danh sách liên lạc"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "Lưu danh sách bằng VCard"
 
@@ -2478,7 +2770,7 @@ msgstr ""
 "Bạn có muốn thêm nữa không?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:238
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "Tìm kiếm nâng cao"
 
@@ -2487,217 +2779,340 @@ msgstr "Tìm kiếm nâng cao"
 msgid "Search"
 msgstr "Tìm"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "Không có card"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 card"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d card"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:671
-#: addressbook/gui/widgets/e-addressbook-view.c:733
-#: addressbook/gui/widgets/e-addressbook-view.c:1405
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr "Lưu là VCard"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Mở"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:734
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Chuyển tiếp liên lạc"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-msgid "Send Message to Contact"
-msgstr "Gửi thông điệp cho liên lạc"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:736
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
-#: ui/my-evolution.xml.h:2
-msgid "Print"
-msgstr "In"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr "In phong bì"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
-#: ui/evolution-tasks.xml.h:8
-msgid "Delete"
-msgstr "Xoá"
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+msgid "Error getting book view"
+msgstr "Lỗi khởi động %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Lỗi khi sửa đổi card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:33
-#: shell/evolution-shell-component.c:1007
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "Thành công"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: camel/providers/imap/camel-imap-command.c:355 shell/e-shell.c:1894
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "Lỗi lại"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "Kho ngoại tuyến"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
-#: shell/evolution-shell-component.c:1035
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "Không đủ quyền truy cập"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "Không có card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "Card ID đã tồn tại"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "Chưa hỗ trợ giao thức này"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "Bị hủy bỏ"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Chứng thực thất bại."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Yêu cầu chứng thực"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "Lỗi khác"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Bạn có muốn lưu các thay đổi không?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "Lỗi khi thêm danh sách"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "Lỗi khi thêm card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "Lỗi khi sửa đổi danh sách"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "Lỗi khi loại bỏ danh sách"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Lỗi khi loại bỏ card"
 
-#. Translators: put here a list of labels you want to see on buttons in
-#. addressbook. You may use any character to separate labels but it must
-#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:378
-msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+#: addressbook/gui/widgets/e-addressbook-util.c:207
+#, fuzzy
+msgid "Display Cards?"
+msgstr "Hiển thị"
 
-#. Translators: put here a list of characters that correspond to buttons
-#. in addressbook. You may use any character to separate labels but it
-#. must also be placed at the begining ot the string.
-#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:383
-msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+#: addressbook/gui/widgets/e-addressbook-util.c:208
+#, fuzzy
+msgid "Display Cards"
+msgstr "Hiển thị"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:212
+#, c-format
+msgid ""
+"You have requested that %d cards be cards. This will cause %d new windows to "
+"be\n"
+"displayed on your screen. Do you really want to display all of these cards?"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:347
+#, fuzzy
+msgid "Move card to"
+msgstr "Monte Scuro"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Copy card to"
+msgstr "Sao chép công việc được chọn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:848
+#: addressbook/gui/widgets/e-addressbook-util.c:352
+#, fuzzy
+msgid "Move cards to"
+msgstr "Không có card"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:354
+#, fuzzy
+msgid "Copy cards to"
+msgstr "Không có card"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* Nhấn vào đây để thêm liên lạc *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "Điện thoại chính"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "Điện thoại phụ tá"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "Điện thoại kinh doanh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "Số gọi lại"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "Điện thoại công ty"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "Điện thoại nhà"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "Địa chỉ kinh doanh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "Địa chỉ nhà"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "Điện thoại di động"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "Điện thoại xe"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "Điện thoại kinh doanh 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "Điện thoại nhà 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "Điện thoại khác"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 msgid "Other Address"
 msgstr "Địa chỉ khác"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "Sổ địa chỉ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "Lưu là VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:877
+#, fuzzy
+msgid "New Contact..."
+msgstr "Liên lạc mới"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:878
+#, fuzzy
+msgid "New Contact List..."
+msgstr "Danh sách liên lạc mới"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:881
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "Đ_i tới thư mục..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Import..."
+msgstr "_Nhập..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "_Tìm liên lạc"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "_Nguồn sổ địa chỉ..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:887
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Thiết lập thư..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "Chuyển tiếp liên lạc"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:892
+msgid "Send Message to Contact"
+msgstr "Gửi thông điệp cho liên lạc"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/my-evolution.xml.h:1
+msgid "Print"
+msgstr "In"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+msgid "Print Envelope"
+msgstr "In phong bì"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "C_hép vào thư mục..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:900
+#, fuzzy
+msgid "Move to folder..."
+msgstr "_Chuyển tới thư mục..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Cắt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Sao chép"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+msgid "Paste"
+msgstr "Dán"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+msgid "Delete"
+msgstr "Xoá"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "_Khung xem hiện thời"
+
+#. Minicard view stuff
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c:942
+msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+
+#. Translators: put here a list of characters that correspond to buttons
+#. in addressbook. You may use any character to separate labels but it
+#. must also be placed at the begining ot the string.
+#. Use lower case letters if possible.
+#: addressbook/gui/widgets/e-addressbook-view.c:947
+msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -2711,19 +3126,40 @@ msgstr "và một card khác."
 msgid "Save in addressbook"
 msgstr "Lưu vào sổ địa chỉ"
 
-#: addressbook/gui/widgets/e-minicard-view.c:150
+#: addressbook/gui/widgets/e-minicard-view.c:140
 msgid ""
 "\n"
 "\n"
-"There are no items to show in this view\n"
+"There are no items to show in this view.\n"
 "\n"
 "Double-click here to create a new Contact."
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard-view.c:143
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "Cửa sổ card"
 
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr "In phong bì"
+
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr "In card"
+
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+msgid "Print card"
+msgstr "In card"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -2793,6 +3229,7 @@ msgid "Include:"
 msgstr "Bao gồm:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "Nằm ngang"
 
@@ -2812,16 +3249,17 @@ msgstr "Biên"
 msgid "Number of columns:"
 msgstr "Số cột:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Tùy chọn"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "Hướng"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "Trang"
 
@@ -2837,7 +3275,9 @@ msgstr "Giấy"
 msgid "Paper source:"
 msgstr "Nguồn giấy:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "Thẳng đứng"
 
@@ -2893,1575 +3333,53 @@ msgstr "Rộng:"
 msgid "_Font..."
 msgstr "_Font..."
 
-#: addressbook/printing/e-contact-print.c:1115
-msgid "Print cards"
-msgstr "In card"
-
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
-msgid "Print card"
-msgstr "In card"
-
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr "In phong bì"
-
-#.
-#. * These are the timezone names from the Olson timezone data.
-#. * We only place them here so gettext picks them up for translation.
-#. * Don't include in any C files.
-#.
-#: calendar/zones.h:7
-msgid "Africa/Abidjan"
-msgstr "Châu Phi/Abidjan"
-
-#: calendar/zones.h:8
-msgid "Africa/Accra"
-msgstr "Châu Phi/Accra"
-
-#: calendar/zones.h:9
-msgid "Africa/Addis_Ababa"
-msgstr "Châu Phi/Addis_Ababa"
-
-#: calendar/zones.h:10
-msgid "Africa/Algiers"
-msgstr "Châu Phi/Algiers"
-
-#: calendar/zones.h:11
-msgid "Africa/Asmera"
-msgstr "Châu Phi/Asmera"
-
-#: calendar/zones.h:12
-msgid "Africa/Bamako"
-msgstr "Châu Phi/Bamako"
-
-#: calendar/zones.h:13
-msgid "Africa/Bangui"
-msgstr "Châu Phi/Bangui"
-
-#: calendar/zones.h:14
-msgid "Africa/Banjul"
-msgstr "Châu Phi/Banjul"
-
-#: calendar/zones.h:15
-msgid "Africa/Bissau"
-msgstr "Châu Phi/Bissau"
-
-#: calendar/zones.h:16
-msgid "Africa/Blantyre"
-msgstr "Châu Phi/Blantyre"
-
-#: calendar/zones.h:17
-msgid "Africa/Brazzaville"
-msgstr "Châu Phi/Brazzaville"
-
-#: calendar/zones.h:18
-msgid "Africa/Bujumbura"
-msgstr "Châu Phi/Bujumbura"
-
-#: calendar/zones.h:19
-msgid "Africa/Cairo"
-msgstr "Châu Phi/Cairo"
-
-#: calendar/zones.h:20
-msgid "Africa/Casablanca"
-msgstr "Châu Phi/Casablanca"
-
-#: calendar/zones.h:21
-msgid "Africa/Ceuta"
-msgstr "Châu Phi/Ceuta"
-
-#: calendar/zones.h:22
-msgid "Africa/Conakry"
-msgstr "Châu Phi/Conakry"
-
-#: calendar/zones.h:23
-msgid "Africa/Dakar"
-msgstr "Châu Phi/Dakar"
-
-#: calendar/zones.h:24
-msgid "Africa/Dar_es_Salaam"
-msgstr "Châu Phi/Dar_es_Salaam"
-
-#: calendar/zones.h:25
-msgid "Africa/Djibouti"
-msgstr "Châu Phi/Djibouti"
-
-#: calendar/zones.h:26
-msgid "Africa/Douala"
-msgstr "Châu Phi/Douala"
-
-#: calendar/zones.h:27
-msgid "Africa/El_Aaiun"
-msgstr "Châu Phi/El_Aaiun"
-
-#: calendar/zones.h:28
-msgid "Africa/Freetown"
-msgstr "Châu Phi/Freetown"
-
-#: calendar/zones.h:29
-msgid "Africa/Gaborone"
-msgstr "Châu Phi/Gaborone"
-
-#: calendar/zones.h:30
-msgid "Africa/Harare"
-msgstr "Châu Phi/Harare"
-
-#: calendar/zones.h:31
-msgid "Africa/Johannesburg"
-msgstr "Châu Phi/Johannesburg"
-
-#: calendar/zones.h:32
-msgid "Africa/Kampala"
-msgstr "Châu Phi/Kampala"
-
-#: calendar/zones.h:33
-msgid "Africa/Khartoum"
-msgstr "Châu Phi/Khartoum"
-
-#: calendar/zones.h:34
-msgid "Africa/Kigali"
-msgstr "Châu Phi/Kigali"
-
-#: calendar/zones.h:35
-msgid "Africa/Kinshasa"
-msgstr "Châu Phi/Kinshasa"
-
-#: calendar/zones.h:36
-msgid "Africa/Lagos"
-msgstr "Châu Phi/Lagos"
-
-#: calendar/zones.h:37
-msgid "Africa/Libreville"
-msgstr "Châu Phi/Libreville"
-
-#: calendar/zones.h:38
-msgid "Africa/Lome"
-msgstr "Châu Phi/Lome"
-
-#: calendar/zones.h:39
-msgid "Africa/Luanda"
-msgstr "Châu Phi/Luanda"
-
-#: calendar/zones.h:40
-msgid "Africa/Lubumbashi"
-msgstr "Châu Phi/Lubumbashi"
-
-#: calendar/zones.h:41
-msgid "Africa/Lusaka"
-msgstr "Châu Phi/Lusaka"
-
-#: calendar/zones.h:42
-msgid "Africa/Malabo"
-msgstr "Châu Phi/Malabo"
-
-#: calendar/zones.h:43
-msgid "Africa/Maputo"
-msgstr "Châu Phi/Maputo"
-
-#: calendar/zones.h:44
-msgid "Africa/Maseru"
-msgstr "Châu Phi/Maseru"
-
-#: calendar/zones.h:45
-msgid "Africa/Mbabane"
-msgstr "Châu Phi/Mbabane"
-
-#: calendar/zones.h:46
-msgid "Africa/Mogadishu"
-msgstr "Châu Phi/Mogadishu"
-
-#: calendar/zones.h:47
-msgid "Africa/Monrovia"
-msgstr "Châu Phi/Monrovia"
-
-#: calendar/zones.h:48
-msgid "Africa/Nairobi"
-msgstr "Châu Phi/Nairobi"
-
-#: calendar/zones.h:49
-msgid "Africa/Ndjamena"
-msgstr "Châu Phi/Ndjamena"
-
-#: calendar/zones.h:50
-msgid "Africa/Niamey"
-msgstr "Châu Phi/Niamey"
-
-#: calendar/zones.h:51
-msgid "Africa/Nouakchott"
-msgstr "Châu Phi/Nouakchott"
-
-#: calendar/zones.h:52
-msgid "Africa/Ouagadougou"
-msgstr "Châu Phi/Ouagadougou"
-
-#: calendar/zones.h:53
-msgid "Africa/Porto-Novo"
-msgstr "Châu Phi/Porto-Novo"
-
-#: calendar/zones.h:54
-msgid "Africa/Sao_Tome"
-msgstr "Châu Phi/Sao_Tome"
-
-#: calendar/zones.h:55
-msgid "Africa/Timbuktu"
-msgstr "Châu Phi/Timbuktu"
-
-#: calendar/zones.h:56
-msgid "Africa/Tripoli"
-msgstr "Châu Phi/Tripoli"
-
-#: calendar/zones.h:57
-msgid "Africa/Tunis"
-msgstr "Châu Phi/Tunis"
-
-#: calendar/zones.h:58
-msgid "Africa/Windhoek"
-msgstr "Châu Phi/Windhoek"
-
-#: calendar/zones.h:59
-msgid "America/Adak"
-msgstr "Châu Mỹ/Adak"
-
-#: calendar/zones.h:60
-msgid "America/Anchorage"
-msgstr "Châu Mỹ/Anchorage"
-
-#: calendar/zones.h:61
-msgid "America/Anguilla"
-msgstr "Châu Mỹ/Anguilla"
-
-#: calendar/zones.h:62
-msgid "America/Antigua"
-msgstr "Châu Mỹ/Antigua"
-
-#: calendar/zones.h:63
-msgid "America/Araguaina"
-msgstr "Châu Mỹ/Araguaina"
-
-#: calendar/zones.h:64
-msgid "America/Aruba"
-msgstr "Châu Mỹ/Aruba"
-
-#: calendar/zones.h:65
-msgid "America/Asuncion"
-msgstr "Châu Mỹ/Asuncion"
-
-#: calendar/zones.h:66
-msgid "America/Barbados"
-msgstr "Châu Mỹ/Barbados"
-
-#: calendar/zones.h:67
-msgid "America/Belem"
-msgstr "Châu Mỹ/Belem"
-
-#: calendar/zones.h:68
-msgid "America/Belize"
-msgstr "Châu Mỹ/Belize"
-
-#: calendar/zones.h:69
-msgid "America/Boa_Vista"
-msgstr "Châu Mỹ/Boa_Vista"
-
-#: calendar/zones.h:70
-msgid "America/Bogota"
-msgstr "Châu Mỹ/Bogota"
-
-#: calendar/zones.h:71
-msgid "America/Boise"
-msgstr "Châu Mỹ/Boise"
-
-#: calendar/zones.h:72
-msgid "America/Buenos_Aires"
-msgstr "Châu Mỹ/Buenos_Aires"
-
-#: calendar/zones.h:73
-msgid "America/Cambridge_Bay"
-msgstr "Châu Mỹ/Cambridge_Bay"
-
-#: calendar/zones.h:74
-msgid "America/Cancun"
-msgstr "Châu Mỹ/Cancun"
-
-#: calendar/zones.h:75
-msgid "America/Caracas"
-msgstr "Châu Mỹ/Caracas"
-
-#: calendar/zones.h:76
-msgid "America/Catamarca"
-msgstr "Châu Mỹ/Catamarca"
-
-#: calendar/zones.h:77
-msgid "America/Cayenne"
-msgstr "Châu Mỹ/Cayenne"
-
-#: calendar/zones.h:78
-msgid "America/Cayman"
-msgstr "Châu Mỹ/Cayman"
-
-#: calendar/zones.h:79
-msgid "America/Chicago"
-msgstr "Châu Mỹ/Chicago"
-
-#: calendar/zones.h:80
-msgid "America/Chihuahua"
-msgstr "Châu Mỹ/Chihuahua"
-
-#: calendar/zones.h:81
-msgid "America/Cordoba"
-msgstr "Châu Mỹ/Cordoba"
-
-#: calendar/zones.h:82
-msgid "America/Costa_Rica"
-msgstr "Châu Mỹ/Costa_Rica"
-
-#: calendar/zones.h:83
-msgid "America/Cuiaba"
-msgstr "Châu Mỹ/Cuiaba"
-
-#: calendar/zones.h:84
-msgid "America/Curacao"
-msgstr "Châu Mỹ/Curacao"
-
-#: calendar/zones.h:85
-msgid "America/Danmarkshavn"
-msgstr "Châu Mỹ/Danmarkshavn"
-
-#: calendar/zones.h:86
-msgid "America/Dawson"
-msgstr "Châu Mỹ/Dawson"
-
-#: calendar/zones.h:87
-msgid "America/Dawson_Creek"
-msgstr "Châu Mỹ/Dawson_Creek"
-
-#: calendar/zones.h:88
-msgid "America/Denver"
-msgstr "Châu Mỹ/Denver"
-
-#: calendar/zones.h:89
-msgid "America/Detroit"
-msgstr "Châu Mỹ/Detroit"
-
-#: calendar/zones.h:90
-msgid "America/Dominica"
-msgstr "Châu Mỹ/Dominica"
-
-#: calendar/zones.h:91
-msgid "America/Edmonton"
-msgstr "Châu Mỹ/Edmonton"
-
-#: calendar/zones.h:92
-msgid "America/Eirunepe"
-msgstr "Châu Mỹ/Eirunepe"
-
-#: calendar/zones.h:93
-msgid "America/El_Salvador"
-msgstr "Châu Mỹ/El_Salvador"
-
-#: calendar/zones.h:94
-msgid "America/Fortaleza"
-msgstr "Châu Mỹ/Fortaleza"
-
-#: calendar/zones.h:95
-msgid "America/Glace_Bay"
-msgstr "Châu Mỹ/Glace_Bay"
-
-#: calendar/zones.h:96
-msgid "America/Godthab"
-msgstr "Châu Mỹ/Godthab"
-
-#: calendar/zones.h:97
-msgid "America/Goose_Bay"
-msgstr "Châu Mỹ/Goose_Bay"
-
-#: calendar/zones.h:98
-msgid "America/Grand_Turk"
-msgstr "Châu Mỹ/Grand_Turk"
-
-#: calendar/zones.h:99
-msgid "America/Grenada"
-msgstr "Châu Mỹ/Grenada"
-
-#: calendar/zones.h:100
-msgid "America/Guadeloupe"
-msgstr "Châu Mỹ/Guadeloupe"
-
-#: calendar/zones.h:101
-msgid "America/Guatemala"
-msgstr "Châu Mỹ/Guatemala"
-
-#: calendar/zones.h:102
-msgid "America/Guayaquil"
-msgstr "Châu Mỹ/Guayaquil"
-
-#: calendar/zones.h:103
-msgid "America/Guyana"
-msgstr "Châu Mỹ/Guyana"
-
-#: calendar/zones.h:104
-msgid "America/Halifax"
-msgstr "Châu Mỹ/Halifax"
-
-#: calendar/zones.h:105
-msgid "America/Havana"
-msgstr "Châu Mỹ/Havana"
-
-#: calendar/zones.h:106
-msgid "America/Hermosillo"
-msgstr "Châu Mỹ/Hermosillo"
-
-#: calendar/zones.h:107
-msgid "America/Indiana/Indianapolis"
-msgstr "Châu Mỹ/Indiana/Indianapolis"
-
-#: calendar/zones.h:108
-msgid "America/Indiana/Knox"
-msgstr "Châu Mỹ/Indiana/Knox"
-
-#: calendar/zones.h:109
-msgid "America/Indiana/Marengo"
-msgstr "Châu Mỹ/Indiana/Marengo"
-
-#: calendar/zones.h:110
-msgid "America/Indiana/Vevay"
-msgstr "Châu Mỹ/Indiana/Vevay"
-
-#: calendar/zones.h:111
-msgid "America/Indianapolis"
-msgstr "Châu Mỹ/Indianapolis"
-
-#: calendar/zones.h:112
-msgid "America/Inuvik"
-msgstr "Châu Mỹ/Inuvik"
-
-#: calendar/zones.h:113
-msgid "America/Iqaluit"
-msgstr "Châu Mỹ/Iqaluit"
-
-#: calendar/zones.h:114
-msgid "America/Jamaica"
-msgstr "Châu Mỹ/Jamaica"
-
-#: calendar/zones.h:115
-msgid "America/Jujuy"
-msgstr "Châu Mỹ/Jujuy"
-
-#: calendar/zones.h:116
-msgid "America/Juneau"
-msgstr "Châu Mỹ/Juneau"
-
-#: calendar/zones.h:117
-msgid "America/Kentucky/Louisville"
-msgstr "Châu Mỹ/Kentucky/Louisville"
-
-#: calendar/zones.h:118
-msgid "America/Kentucky/Monticello"
-msgstr "Châu Mỹ/Kentucky/Monticello"
-
-#: calendar/zones.h:119
-msgid "America/La_Paz"
-msgstr "Châu Mỹ/La_Paz"
-
-#: calendar/zones.h:120
-msgid "America/Lima"
-msgstr "Châu Mỹ/Lima"
-
-#: calendar/zones.h:121
-msgid "America/Los_Angeles"
-msgstr "Châu Mỹ/Los_Angeles"
-
-#: calendar/zones.h:122
-msgid "America/Louisville"
-msgstr "Châu Mỹ/Louisville"
-
-#: calendar/zones.h:123
-msgid "America/Maceio"
-msgstr "Châu Mỹ/Maceio"
-
-#: calendar/zones.h:124
-msgid "America/Managua"
-msgstr "Châu Mỹ/Managua"
-
-#: calendar/zones.h:125
-msgid "America/Manaus"
-msgstr "Châu Mỹ/Manaus"
-
-#: calendar/zones.h:126
-msgid "America/Martinique"
-msgstr "Châu Mỹ/Martinique"
-
-#: calendar/zones.h:127
-msgid "America/Mazatlan"
-msgstr "Châu Mỹ/Mazatlan"
-
-#: calendar/zones.h:128
-msgid "America/Mendoza"
-msgstr "Châu Mỹ/Mendoza"
-
-#: calendar/zones.h:129
-msgid "America/Menominee"
-msgstr "Châu Mỹ/Menominee"
-
-#: calendar/zones.h:130
-msgid "America/Merida"
-msgstr "Châu Mỹ/Merida"
-
-#: calendar/zones.h:131
-msgid "America/Mexico_City"
-msgstr "Châu Mỹ/Mexico_City"
-
-#: calendar/zones.h:132
-msgid "America/Miquelon"
-msgstr "Châu Mỹ/Miquelon"
-
-#: calendar/zones.h:133
-msgid "America/Monterrey"
-msgstr "Châu Mỹ/Monterrey"
-
-#: calendar/zones.h:134
-msgid "America/Montevideo"
-msgstr "Châu Mỹ/Montevideo"
-
-#: calendar/zones.h:135
-msgid "America/Montreal"
-msgstr "Châu Mỹ/Montreal"
-
-#: calendar/zones.h:136
-msgid "America/Montserrat"
-msgstr "Châu Mỹ/Montserrat"
-
-#: calendar/zones.h:137
-msgid "America/Nassau"
-msgstr "Châu Mỹ/Nassau"
-
-#: calendar/zones.h:138
-msgid "America/New_York"
-msgstr "Châu Mỹ/New_York"
-
-#: calendar/zones.h:139
-msgid "America/Nipigon"
-msgstr "Châu Mỹ/Nipigon"
-
-#: calendar/zones.h:140
-msgid "America/Nome"
-msgstr "Châu Mỹ/Nome"
-
-#: calendar/zones.h:141
-msgid "America/Noronha"
-msgstr "Châu Mỹ/Noronha"
-
-#: calendar/zones.h:142
-msgid "America/North_Dakota/Center"
-msgstr "Châu Mỹ/North_Dakota/Center"
-
-#: calendar/zones.h:143
-msgid "America/Panama"
-msgstr "Châu Mỹ/Panama"
-
-#: calendar/zones.h:144
-msgid "America/Pangnirtung"
-msgstr "Châu Mỹ/Pangnirtung"
-
-#: calendar/zones.h:145
-msgid "America/Paramaribo"
-msgstr "Châu Mỹ/Paramaribo"
-
-#: calendar/zones.h:146
-msgid "America/Phoenix"
-msgstr "Châu Mỹ/Phoenix"
-
-#: calendar/zones.h:147
-msgid "America/Port-au-Prince"
-msgstr "Châu Mỹ/Port-au-Prince"
-
-#: calendar/zones.h:148
-msgid "America/Port_of_Spain"
-msgstr "Châu Mỹ/Port_of_Spain"
-
-#: calendar/zones.h:149
-msgid "America/Porto_Velho"
-msgstr "Châu Mỹ/Porto_Velho"
-
-#: calendar/zones.h:150
-msgid "America/Puerto_Rico"
-msgstr "Châu Mỹ/Puerto_Rico"
-
-#: calendar/zones.h:151
-msgid "America/Rainy_River"
-msgstr "Châu Mỹ/Rainy_River"
-
-#: calendar/zones.h:152
-msgid "America/Rankin_Inlet"
-msgstr "Châu Mỹ/Rankin_Inlet"
-
-#: calendar/zones.h:153
-msgid "America/Recife"
-msgstr "Châu Mỹ/Recife"
-
-#: calendar/zones.h:154
-msgid "America/Regina"
-msgstr "Châu Mỹ/Regina"
-
-#: calendar/zones.h:155
-msgid "America/Rio_Branco"
-msgstr "Châu Mỹ/Rio_Branco"
-
-#: calendar/zones.h:156
-msgid "America/Rosario"
-msgstr "Châu Mỹ/Rosario"
-
-#: calendar/zones.h:157
-msgid "America/Santiago"
-msgstr "Châu Mỹ/Santiago"
-
-#: calendar/zones.h:158
-msgid "America/Santo_Domingo"
-msgstr "Châu Mỹ/Santo_Domingo"
-
-#: calendar/zones.h:159
-msgid "America/Sao_Paulo"
-msgstr "Châu Mỹ/Sao_Paulo"
-
-#: calendar/zones.h:160
-msgid "America/Scoresbysund"
-msgstr "Châu Mỹ/Scoresbysund"
-
-#: calendar/zones.h:161
-msgid "America/Shiprock"
-msgstr "Châu Mỹ/Shiprock"
-
-#: calendar/zones.h:162
-msgid "America/St_Johns"
-msgstr "Châu Mỹ/St_Johns"
-
-#: calendar/zones.h:163
-msgid "America/St_Kitts"
-msgstr "Châu Mỹ/St_Kitts"
-
-#: calendar/zones.h:164
-msgid "America/St_Lucia"
-msgstr "Châu Mỹ/St_Lucia"
-
-#: calendar/zones.h:165
-msgid "America/St_Thomas"
-msgstr "Châu Mỹ/St_Thomas"
-
-#: calendar/zones.h:166
-msgid "America/St_Vincent"
-msgstr "Châu Mỹ/St_Vincent"
-
-#: calendar/zones.h:167
-msgid "America/Swift_Current"
-msgstr "Châu Mỹ/Swift_Current"
-
-#: calendar/zones.h:168
-msgid "America/Tegucigalpa"
-msgstr "Châu Mỹ/Tegucigalpa"
-
-#: calendar/zones.h:169
-msgid "America/Thule"
-msgstr "Châu Mỹ/Thule"
-
-#: calendar/zones.h:170
-msgid "America/Thunder_Bay"
-msgstr "Châu Mỹ/Thunder_Bay"
-
-#: calendar/zones.h:171
-msgid "America/Tijuana"
-msgstr "Châu Mỹ/Tijuana"
-
-#: calendar/zones.h:172
-msgid "America/Tortola"
-msgstr "Châu Mỹ/Tortola"
-
-#: calendar/zones.h:173
-msgid "America/Vancouver"
-msgstr "Châu Mỹ/Vancouver"
-
-#: calendar/zones.h:174
-msgid "America/Whitehorse"
-msgstr "Châu Mỹ/Whitehorse"
-
-#: calendar/zones.h:175
-msgid "America/Winnipeg"
-msgstr "Châu Mỹ/Winnipeg"
-
-#: calendar/zones.h:176
-msgid "America/Yakutat"
-msgstr "Châu Mỹ/Yakutat"
-
-#: calendar/zones.h:177
-msgid "America/Yellowknife"
-msgstr "Châu Mỹ/Yellowknife"
-
-#: calendar/zones.h:178
-msgid "Antarctica/Casey"
-msgstr "Nam Cực/Casey"
-
-#: calendar/zones.h:179
-msgid "Antarctica/Davis"
-msgstr "Nam Cực/Davis"
-
-#: calendar/zones.h:180
-msgid "Antarctica/DumontDUrville"
-msgstr "Nam Cực/DumontDUrville"
-
-#: calendar/zones.h:181
-msgid "Antarctica/Mawson"
-msgstr "Nam Cực/Mawson"
-
-#: calendar/zones.h:182
-msgid "Antarctica/McMurdo"
-msgstr "Nam Cực/McMurdo"
-
-#: calendar/zones.h:183
-msgid "Antarctica/Palmer"
-msgstr "Nam Cực/Palmer"
-
-#: calendar/zones.h:184
-msgid "Antarctica/South_Pole"
-msgstr "Nam Cực/South_Pole"
-
-#: calendar/zones.h:185
-msgid "Antarctica/Syowa"
-msgstr "Nam Cực/Syowa"
-
-#: calendar/zones.h:186
-msgid "Antarctica/Vostok"
-msgstr "Nam Cực/Vostok"
-
-#: calendar/zones.h:187
-msgid "Arctic/Longyearbyen"
-msgstr "Arctic/Longyearbyen"
-
-#: calendar/zones.h:188
-msgid "Asia/Aden"
-msgstr "Châu Á/Aden"
-
-#: calendar/zones.h:189
-msgid "Asia/Almaty"
-msgstr "Châu Á/Almaty"
-
-#: calendar/zones.h:190
-msgid "Asia/Amman"
-msgstr "Châu Á/Amman"
-
-#: calendar/zones.h:191
-msgid "Asia/Anadyr"
-msgstr "Châu Á/Anadyr"
-
-#: calendar/zones.h:192
-msgid "Asia/Aqtau"
-msgstr "Châu Á/Aqtau"
-
-#: calendar/zones.h:193
-msgid "Asia/Aqtobe"
-msgstr "Châu Á/Aqtobe"
-
-#: calendar/zones.h:194
-msgid "Asia/Ashgabat"
-msgstr "Châu Á/Ashgabat"
-
-#: calendar/zones.h:195
-msgid "Asia/Baghdad"
-msgstr "Châu Á/Baghdad"
-
-#: calendar/zones.h:196
-msgid "Asia/Bahrain"
-msgstr "Châu Á/Bahrain"
-
-#: calendar/zones.h:197
-msgid "Asia/Baku"
-msgstr "Châu Á/Baku"
-
-#: calendar/zones.h:198
-msgid "Asia/Bangkok"
-msgstr "Châu Á/Bangkok"
-
-#: calendar/zones.h:199
-msgid "Asia/Beirut"
-msgstr "Châu Á/Beirut"
-
-#: calendar/zones.h:200
-msgid "Asia/Bishkek"
-msgstr "Châu Á/Bishkek"
-
-#: calendar/zones.h:201
-msgid "Asia/Brunei"
-msgstr "Châu Á/Brunei"
-
-#: calendar/zones.h:202
-msgid "Asia/Calcutta"
-msgstr "Châu Á/Calcutta"
-
-#: calendar/zones.h:203
-msgid "Asia/Choibalsan"
-msgstr "Châu Á/Choibalsan"
-
-#: calendar/zones.h:204
-msgid "Asia/Chongqing"
-msgstr "Châu Á/Chongqing"
-
-#: calendar/zones.h:205
-msgid "Asia/Colombo"
-msgstr "Châu Á/Colombo"
-
-#: calendar/zones.h:206
-msgid "Asia/Damascus"
-msgstr "Châu Á/Damascus"
-
-#: calendar/zones.h:207
-msgid "Asia/Dhaka"
-msgstr "Châu Á/Dhaka"
-
-#: calendar/zones.h:208
-msgid "Asia/Dili"
-msgstr "Châu Á/Dili"
-
-#: calendar/zones.h:209
-msgid "Asia/Dubai"
-msgstr "Châu Á/Dubai"
-
-#: calendar/zones.h:210
-msgid "Asia/Dushanbe"
-msgstr "Châu Á/Dushanbe"
-
-#: calendar/zones.h:211
-msgid "Asia/Gaza"
-msgstr "Châu Á/Gaza"
-
-#: calendar/zones.h:212
-msgid "Asia/Harbin"
-msgstr "Châu Á/Harbin"
-
-#: calendar/zones.h:213
-msgid "Asia/Hong_Kong"
-msgstr "Châu Á/Hong_Kong"
-
-#: calendar/zones.h:214
-msgid "Asia/Hovd"
-msgstr "Châu Á/Hovd"
-
-#: calendar/zones.h:215
-msgid "Asia/Irkutsk"
-msgstr "Châu Á/Irkutsk"
-
-#: calendar/zones.h:216
-msgid "Asia/Istanbul"
-msgstr "Châu Á/Istanbul"
-
-#: calendar/zones.h:217
-msgid "Asia/Jakarta"
-msgstr "Châu Á/Jakarta"
-
-#: calendar/zones.h:218
-msgid "Asia/Jayapura"
-msgstr "Châu Á/Jayapura"
-
-#: calendar/zones.h:219
-msgid "Asia/Jerusalem"
-msgstr "Châu Á/Jerusalem"
-
-#: calendar/zones.h:220
-msgid "Asia/Kabul"
-msgstr "Châu Á/Kabul"
-
-#: calendar/zones.h:221
-msgid "Asia/Kamchatka"
-msgstr "Châu Á/Kamchatka"
-
-#: calendar/zones.h:222
-msgid "Asia/Karachi"
-msgstr "Châu Á/Karachi"
-
-#: calendar/zones.h:223
-msgid "Asia/Kashgar"
-msgstr "Châu Á/Kashgar"
-
-#: calendar/zones.h:224
-msgid "Asia/Katmandu"
-msgstr "Châu Á/Katmandu"
-
-#: calendar/zones.h:225
-msgid "Asia/Krasnoyarsk"
-msgstr "Châu Á/Krasnoyarsk"
-
-#: calendar/zones.h:226
-msgid "Asia/Kuala_Lumpur"
-msgstr "Châu Á/Kuala_Lumpur"
-
-#: calendar/zones.h:227
-msgid "Asia/Kuching"
-msgstr "Châu Á/Kuching"
-
-#: calendar/zones.h:228
-msgid "Asia/Kuwait"
-msgstr "Châu Á/Kuwait"
-
-#: calendar/zones.h:229
-msgid "Asia/Macao"
-msgstr "Châu Á/Macao"
-
-#: calendar/zones.h:230
-msgid "Asia/Magadan"
-msgstr "Châu Á/Magadan"
-
-#: calendar/zones.h:231
-msgid "Asia/Manila"
-msgstr "Châu Á/Manila"
-
-#: calendar/zones.h:232
-msgid "Asia/Muscat"
-msgstr "Châu Á/Muscat"
-
-#: calendar/zones.h:233
-msgid "Asia/Nicosia"
-msgstr "Châu Á/Nicosia"
-
-#: calendar/zones.h:234
-msgid "Asia/Novosibirsk"
-msgstr "Châu Á/Novosibirsk"
-
-#: calendar/zones.h:235
-msgid "Asia/Omsk"
-msgstr "Châu Á/Omsk"
-
-#: calendar/zones.h:236
-msgid "Asia/Phnom_Penh"
-msgstr "Châu Á/Phnom_Penh"
-
-#: calendar/zones.h:237
-msgid "Asia/Pontianak"
-msgstr "Châu Á/Pontianak"
-
-#: calendar/zones.h:238
-msgid "Asia/Pyongyang"
-msgstr "Châu Á/Pyongyang"
-
-#: calendar/zones.h:239
-msgid "Asia/Qatar"
-msgstr "Châu Á/Qatar"
-
-#: calendar/zones.h:240
-msgid "Asia/Rangoon"
-msgstr "Châu Á/Rangoon"
-
-#: calendar/zones.h:241
-msgid "Asia/Riyadh"
-msgstr "Châu Á/Riyadh"
-
-#: calendar/zones.h:242
-msgid "Asia/Saigon"
-msgstr "Châu Á/Sài Gòn"
-
-#: calendar/zones.h:243
-msgid "Asia/Sakhalin"
-msgstr "Châu Á/Sakhalin"
-
-#: calendar/zones.h:244
-msgid "Asia/Samarkand"
-msgstr "Châu Á/Samarkand"
-
-#: calendar/zones.h:245
-msgid "Asia/Seoul"
-msgstr "Châu Á/Seoul"
-
-#: calendar/zones.h:246
-msgid "Asia/Shanghai"
-msgstr "Châu Á/Shanghai"
-
-#: calendar/zones.h:247
-msgid "Asia/Singapore"
-msgstr "Châu Á/Singapore"
-
-#: calendar/zones.h:248
-msgid "Asia/Taipei"
-msgstr "Châu Á/Taipei"
-
-#: calendar/zones.h:249
-msgid "Asia/Tashkent"
-msgstr "Châu Á/Tashkent"
-
-#: calendar/zones.h:250
-msgid "Asia/Tbilisi"
-msgstr "Châu Á/Tbilisi"
-
-#: calendar/zones.h:251
-msgid "Asia/Tehran"
-msgstr "Châu Á/Tehran"
-
-#: calendar/zones.h:252
-msgid "Asia/Thimphu"
-msgstr "Châu Á/Thimphu"
-
-#: calendar/zones.h:253
-msgid "Asia/Tokyo"
-msgstr "Châu Á/Tokyo"
-
-#: calendar/zones.h:254
-msgid "Asia/Ujung_Pandang"
-msgstr "Châu Á/Ujung_Pandang"
-
-#: calendar/zones.h:255
-msgid "Asia/Ulaanbaatar"
-msgstr "Châu Á/Ulaanbaatar"
-
-#: calendar/zones.h:256
-msgid "Asia/Urumqi"
-msgstr "Châu Á/Urumqi"
-
-#: calendar/zones.h:257
-msgid "Asia/Vientiane"
-msgstr "Châu Á/Vientiane"
-
-#: calendar/zones.h:258
-msgid "Asia/Vladivostok"
-msgstr "Châu Á/Vladivostok"
-
-#: calendar/zones.h:259
-msgid "Asia/Yakutsk"
-msgstr "Châu Á/Yakutsk"
-
-#: calendar/zones.h:260
-msgid "Asia/Yekaterinburg"
-msgstr "Châu Á/Yekaterinburg"
-
-#: calendar/zones.h:261
-msgid "Asia/Yerevan"
-msgstr "Châu Á/Yerevan"
-
-#: calendar/zones.h:262
-msgid "Atlantic/Azores"
-msgstr "Atlantic/Azores"
-
-#: calendar/zones.h:263
-msgid "Atlantic/Bermuda"
-msgstr "Đại Tây Dương/Bermuda"
-
-#: calendar/zones.h:264
-msgid "Atlantic/Canary"
-msgstr "Đại Tây Dương/Canary"
-
-#: calendar/zones.h:265
-msgid "Atlantic/Cape_Verde"
-msgstr "Đại Tây Dương/Cape_Verde"
-
-#: calendar/zones.h:266
-msgid "Atlantic/Faeroe"
-msgstr "Đại Tây Dương/Faeroe"
-
-#: calendar/zones.h:267
-msgid "Atlantic/Jan_Mayen"
-msgstr "Đại Tây Dương/Jan_Mayen"
-
-#: calendar/zones.h:268
-msgid "Atlantic/Madeira"
-msgstr "Đại Tây Dương/Madeira"
-
-#: calendar/zones.h:269
-msgid "Atlantic/Reykjavik"
-msgstr "Đại Tây Dương/Reykjavik"
-
-#: calendar/zones.h:270
-msgid "Atlantic/South_Georgia"
-msgstr "Đại Tây Dương/South_Georgia"
-
-#: calendar/zones.h:271
-msgid "Atlantic/St_Helena"
-msgstr "Đại Tây Dương/St_Helena"
-
-#: calendar/zones.h:272
-msgid "Atlantic/Stanley"
-msgstr "Đại Tây Dương/Stanley"
-
-#: calendar/zones.h:273
-msgid "Australia/Adelaide"
-msgstr "Châu Úc/Adelaide"
-
-#: calendar/zones.h:274
-msgid "Australia/Brisbane"
-msgstr "Châu Úc/Brisbane"
-
-#: calendar/zones.h:275
-msgid "Australia/Broken_Hill"
-msgstr "Châu Úc/Broken_Hill"
-
-#: calendar/zones.h:276
-msgid "Australia/Darwin"
-msgstr "Châu Úc/Darwin"
-
-#: calendar/zones.h:277
-msgid "Australia/Hobart"
-msgstr "Châu Úc/Hobart"
-
-#: calendar/zones.h:278
-msgid "Australia/Lindeman"
-msgstr "Châu Úc/Lindeman"
-
-#: calendar/zones.h:279
-msgid "Australia/Lord_Howe"
-msgstr "Châu Úc/Lord_Howe"
-
-#: calendar/zones.h:280
-msgid "Australia/Melbourne"
-msgstr "Châu Úc/Melbourne"
-
-#: calendar/zones.h:281
-msgid "Australia/Perth"
-msgstr "Châu Úc/Perth"
-
-#: calendar/zones.h:282
-msgid "Australia/Sydney"
-msgstr "Châu Úc/Sydney"
-
-#: calendar/zones.h:283
-msgid "Europe/Amsterdam"
-msgstr "Châu Âu/Amsterdam"
-
-#: calendar/zones.h:284
-msgid "Europe/Andorra"
-msgstr "Châu Âu/Andorra"
-
-#: calendar/zones.h:285
-msgid "Europe/Athens"
-msgstr "Châu Âu/Athens"
-
-#: calendar/zones.h:286
-msgid "Europe/Belfast"
-msgstr "Châu Âu/Belfast"
-
-#: calendar/zones.h:287
-msgid "Europe/Belgrade"
-msgstr "Châu Âu/Belgrade"
-
-#: calendar/zones.h:288
-msgid "Europe/Berlin"
-msgstr "Châu Âu/Berlin"
-
-#: calendar/zones.h:289
-msgid "Europe/Bratislava"
-msgstr "Châu Âu/Bratislava"
-
-#: calendar/zones.h:290
-msgid "Europe/Brussels"
-msgstr "Châu Âu/Brussels"
-
-#: calendar/zones.h:291
-msgid "Europe/Bucharest"
-msgstr "Châu Âu/Bucharest"
-
-#: calendar/zones.h:292
-msgid "Europe/Budapest"
-msgstr "Châu Âu/Budapest"
-
-#: calendar/zones.h:293
-msgid "Europe/Chisinau"
-msgstr "Châu Âu/Chisinau"
-
-#: calendar/zones.h:294
-msgid "Europe/Copenhagen"
-msgstr "Châu Âu/Copenhagen"
-
-#: calendar/zones.h:295
-msgid "Europe/Dublin"
-msgstr "Châu Âu/Dublin"
-
-#: calendar/zones.h:296
-msgid "Europe/Gibraltar"
-msgstr "Châu Âu/Gibraltar"
-
-#: calendar/zones.h:297
-msgid "Europe/Helsinki"
-msgstr "Châu Âu/Helsinki"
-
-#: calendar/zones.h:298
-msgid "Europe/Istanbul"
-msgstr "Châu Âu/Istanbul"
-
-#: calendar/zones.h:299
-msgid "Europe/Kaliningrad"
-msgstr "Châu Âu/Kaliningrad"
-
-#: calendar/zones.h:300
-msgid "Europe/Kiev"
-msgstr "Châu Âu/Kiev"
-
-#: calendar/zones.h:301
-msgid "Europe/Lisbon"
-msgstr "Châu Âu/Lisbon"
-
-#: calendar/zones.h:302
-msgid "Europe/Ljubljana"
-msgstr "Châu Âu/Ljubljana"
-
-#: calendar/zones.h:303
-msgid "Europe/London"
-msgstr "Châu Âu/London"
-
-#: calendar/zones.h:304
-msgid "Europe/Luxembourg"
-msgstr "Châu Âu/Luxembourg"
-
-#: calendar/zones.h:305
-msgid "Europe/Madrid"
-msgstr "Châu Âu/Madrid"
-
-#: calendar/zones.h:306
-msgid "Europe/Malta"
-msgstr "Châu Âu/Malta"
-
-#: calendar/zones.h:307
-msgid "Europe/Minsk"
-msgstr "Châu Âu/Minsk"
-
-#: calendar/zones.h:308
-msgid "Europe/Monaco"
-msgstr "Châu Âu/Monaco"
-
-#: calendar/zones.h:309
-msgid "Europe/Moscow"
-msgstr "Châu Âu/Moscow"
-
-#: calendar/zones.h:310
-msgid "Europe/Nicosia"
-msgstr "Châu Âu/Nicosia"
-
-#: calendar/zones.h:311
-msgid "Europe/Oslo"
-msgstr "Châu Âu/Oslo"
-
-#: calendar/zones.h:312
-msgid "Europe/Paris"
-msgstr "Châu Âu/Paris"
-
-#: calendar/zones.h:313
-msgid "Europe/Prague"
-msgstr "Châu Âu/Prague"
-
-#: calendar/zones.h:314
-msgid "Europe/Riga"
-msgstr "Châu Âu/Riga"
-
-#: calendar/zones.h:315
-msgid "Europe/Rome"
-msgstr "Châu Âu/Rome"
-
-#: calendar/zones.h:316
-msgid "Europe/Samara"
-msgstr "Châu Âu/Samara"
-
-#: calendar/zones.h:317
-msgid "Europe/San_Marino"
-msgstr "Châu Âu/San_Marino"
-
-#: calendar/zones.h:318
-msgid "Europe/Sarajevo"
-msgstr "Châu Âu/Sarajevo"
-
-#: calendar/zones.h:319
-msgid "Europe/Simferopol"
-msgstr "Châu Âu/Simferopol"
-
-#: calendar/zones.h:320
-msgid "Europe/Skopje"
-msgstr "Châu Âu/Skopje"
-
-#: calendar/zones.h:321
-msgid "Europe/Sofia"
-msgstr "Châu Âu/Sofia"
-
-#: calendar/zones.h:322
-msgid "Europe/Stockholm"
-msgstr "Châu Âu/Stockholm"
-
-#: calendar/zones.h:323
-msgid "Europe/Tallinn"
-msgstr "Châu Âu/Tallinn"
-
-#: calendar/zones.h:324
-msgid "Europe/Tirane"
-msgstr "Châu Âu/Tirane"
-
-#: calendar/zones.h:325
-msgid "Europe/Uzhgorod"
-msgstr "Châu Âu/Uzhgorod"
-
-#: calendar/zones.h:326
-msgid "Europe/Vaduz"
-msgstr "Châu Âu/Vaduz"
-
-#: calendar/zones.h:327
-msgid "Europe/Vatican"
-msgstr "Châu Âu/Vatican"
-
-#: calendar/zones.h:328
-msgid "Europe/Vienna"
-msgstr "Châu Âu/Vienna"
-
-#: calendar/zones.h:329
-msgid "Europe/Vilnius"
-msgstr "Châu Âu/Vilnius"
-
-#: calendar/zones.h:330
-msgid "Europe/Warsaw"
-msgstr "Châu Âu/Warsaw"
-
-#: calendar/zones.h:331
-msgid "Europe/Zagreb"
-msgstr "Châu Âu/Zagreb"
-
-#: calendar/zones.h:332
-msgid "Europe/Zaporozhye"
-msgstr "Châu Âu/Zaporozhye"
-
-#: calendar/zones.h:333
-msgid "Europe/Zurich"
-msgstr "Châu Âu/Zurich"
-
-#: calendar/zones.h:334
-msgid "Indian/Antananarivo"
-msgstr "Indian/Antananarivo"
-
-#: calendar/zones.h:335
-msgid "Indian/Chagos"
-msgstr "Ấn Độ Dương/Chagos"
-
-#: calendar/zones.h:336
-msgid "Indian/Christmas"
-msgstr "Ấn Độ Dương/Christmas"
-
-#: calendar/zones.h:337
-msgid "Indian/Cocos"
-msgstr "Ấn Độ Dương/Cocos"
-
-#: calendar/zones.h:338
-msgid "Indian/Comoro"
-msgstr "Ấn Độ Dương/Comoro"
-
-#: calendar/zones.h:339
-msgid "Indian/Kerguelen"
-msgstr "Ấn Độ Dương/Kerguelen"
-
-#: calendar/zones.h:340
-msgid "Indian/Mahe"
-msgstr "Ấn Độ Dương/Mahe"
-
-#: calendar/zones.h:341
-msgid "Indian/Maldives"
-msgstr "Ấn Độ Dương/Maldives"
-
-#: calendar/zones.h:342
-msgid "Indian/Mauritius"
-msgstr "Ấn Độ Dương/Mauritius"
-
-#: calendar/zones.h:343
-msgid "Indian/Mayotte"
-msgstr "Ấn Độ Dương/Mayotte"
-
-#: calendar/zones.h:344
-msgid "Indian/Reunion"
-msgstr "Ấn Độ Dương/Reunion"
-
-#: calendar/zones.h:345
-msgid "Pacific/Apia"
-msgstr "Thái Bình Dương/Apia"
-
-#: calendar/zones.h:346
-msgid "Pacific/Auckland"
-msgstr "Thái Bình Dương/Auckland"
-
-#: calendar/zones.h:347
-msgid "Pacific/Chatham"
-msgstr "Thái Bình Dương/Chatham"
-
-#: calendar/zones.h:348
-msgid "Pacific/Easter"
-msgstr "Thái Bình Dương/Easter"
-
-#: calendar/zones.h:349
-msgid "Pacific/Efate"
-msgstr "Thái Bình Dương/Efate"
-
-#: calendar/zones.h:350
-msgid "Pacific/Enderbury"
-msgstr "Thái Bình Dương/Enderbury"
-
-#: calendar/zones.h:351
-msgid "Pacific/Fakaofo"
-msgstr "Thái Bình Dương/Fakaofo"
-
-#: calendar/zones.h:352
-msgid "Pacific/Fiji"
-msgstr "Thái Bình Dương/Fiji"
-
-#: calendar/zones.h:353
-msgid "Pacific/Funafuti"
-msgstr "Thái Bình Dương/Funafuti"
-
-#: calendar/zones.h:354
-msgid "Pacific/Galapagos"
-msgstr "Thái Bình Dương/Galapagos"
-
-#: calendar/zones.h:355
-msgid "Pacific/Gambier"
-msgstr "Thái Bình Dương/Gambier"
-
-#: calendar/zones.h:356
-msgid "Pacific/Guadalcanal"
-msgstr "Thái Bình Dương/Guadalcanal"
-
-#: calendar/zones.h:357
-msgid "Pacific/Guam"
-msgstr "Thái Bình Dương/Guam"
-
-#: calendar/zones.h:358
-msgid "Pacific/Honolulu"
-msgstr "Thái Bình Dương/Honolulu"
-
-#: calendar/zones.h:359
-msgid "Pacific/Johnston"
-msgstr "Thái Bình Dương/Johnston"
-
-#: calendar/zones.h:360
-msgid "Pacific/Kiritimati"
-msgstr "Thái Bình Dương/Kiritimati"
-
-#: calendar/zones.h:361
-msgid "Pacific/Kosrae"
-msgstr "Thái Bình Dương/Kosrae"
-
-#: calendar/zones.h:362
-msgid "Pacific/Kwajalein"
-msgstr "Thái Bình Dương/Kwajalein"
-
-#: calendar/zones.h:363
-msgid "Pacific/Majuro"
-msgstr "Thái Bình Dương/Majuro"
-
-#: calendar/zones.h:364
-msgid "Pacific/Marquesas"
-msgstr "Thái Bình Dương/Marquesas"
-
-#: calendar/zones.h:365
-msgid "Pacific/Midway"
-msgstr "Thái Bình Dương/Midway"
-
-#: calendar/zones.h:366
-msgid "Pacific/Nauru"
-msgstr "Thái Bình Dương/Nauru"
-
-#: calendar/zones.h:367
-msgid "Pacific/Niue"
-msgstr "Thái Bình Dương/Niue"
-
-#: calendar/zones.h:368
-msgid "Pacific/Norfolk"
-msgstr "Thái Bình Dương/Norfolk"
-
-#: calendar/zones.h:369
-msgid "Pacific/Noumea"
-msgstr "Thái Bình Dương/Noumea"
-
-#: calendar/zones.h:370
-msgid "Pacific/Pago_Pago"
-msgstr "Thái Bình Dương/Pago_Pago"
-
-#: calendar/zones.h:371
-msgid "Pacific/Palau"
-msgstr "Thái Bình Dương/Palau"
-
-#: calendar/zones.h:372
-msgid "Pacific/Pitcairn"
-msgstr "Thái Bình Dương/Pitcairn"
-
-#: calendar/zones.h:373
-msgid "Pacific/Ponape"
-msgstr "Thái Bình Dương/Ponape"
-
-#: calendar/zones.h:374
-msgid "Pacific/Port_Moresby"
-msgstr "Thái Bình Dương/Port_Moresby"
-
-#: calendar/zones.h:375
-msgid "Pacific/Rarotonga"
-msgstr "Thái Bình Dương/Rarotonga"
-
-#: calendar/zones.h:376
-msgid "Pacific/Saipan"
-msgstr "Thái Bình Dương/Saipan"
-
-#: calendar/zones.h:377
-msgid "Pacific/Tahiti"
-msgstr "Thái Bình Dương/Tahiti"
-
-#: calendar/zones.h:378
-msgid "Pacific/Tarawa"
-msgstr "Thái Bình Dương/Tarawa"
-
-#: calendar/zones.h:379
-msgid "Pacific/Tongatapu"
-msgstr "Thái Bình Dương/Tongatapu"
-
-#: calendar/zones.h:380
-msgid "Pacific/Truk"
-msgstr "Thái Bình Dương/Truk"
-
-#: calendar/zones.h:381
-msgid "Pacific/Wake"
-msgstr "Thái Bình Dương/Wake"
-
-#: calendar/zones.h:382
-msgid "Pacific/Wallis"
-msgstr "Thái Bình Dương/Wallis"
-
-#: calendar/zones.h:383
-msgid "Pacific/Yap"
-msgstr "Thái Bình Dương/Yap"
-
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "Cuộc hẹn không tên"
 
-#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
+#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:668
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "Cao"
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:667
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "Bình thường"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
+#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:666
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "Thấp"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:518
+#: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Chưa biết"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1029
-#: calendar/conduits/todo/todo-conduit.c:644
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "Lỗi khi liên lạc với server lịch"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1176
-#: calendar/conduits/calendar/calendar-conduit.c:1179
+#: calendar/conduits/calendar/calendar-conduit.c:1297
+#: calendar/conduits/calendar/calendar-conduit.c:1300
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:760
-#: calendar/conduits/todo/todo-conduit.c:763
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "Độ ư_u tiên:"
+
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -4474,19 +3392,20 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar executive summary component."
-msgstr ""
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Thiết lập Công việc và Lịch"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution calendar iTip/iMip viewer"
+msgid "Configuration control for the Evolution Calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution component for handling the calendar."
+msgid "Evolution calendar iTip/iMip viewer"
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Calendar Summary component."
+msgid "Evolution component for handling the calendar."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
@@ -4509,6 +3428,10 @@ msgstr ""
 msgid "Factory to create a component editor factory"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+msgid "This page can be used to configure Calendar and Task preferences"
+msgstr ""
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "Dịch vụ báo động"
@@ -4555,11 +3478,11 @@ msgstr "Thời gian ngủ (phút)"
 msgid "_Edit appointment"
 msgstr "_Sửa cuộc hẹn"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:670
+#: calendar/gui/alarm-notify/alarm-queue.c:675
 msgid "No description available."
 msgstr "Không có mô tả."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:730
+#: calendar/gui/alarm-notify/alarm-queue.c:735
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4567,74 +3490,102 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:781
+#: calendar/gui/alarm-notify/alarm-queue.c:753
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "Cảnh báo"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:758
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger.\n"
-"This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/alarm-queue.c:772
+#, fuzzy
+msgid "Do not ask me about this program again."
+msgstr "Đừng hỏi tôi lần nữa"
+
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Không thể khởi động GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "Không thể tạo dịch vụ báo động"
 
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Tóm tắt chứa"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Mô tả chứa"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Ghi chú chứa"
+
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+msgid "Unmatched"
+msgstr "Không khớp"
+
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
-#: calendar/gui/calendar-commands.c:458
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
-#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. 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/calendar-commands.c:474
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
+#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:820
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr "Không thể tạo khung xem lịch. Vui lòng kiểm tra thiết lập ORBit và OAF."
+msgstr ""
+"Không thể tạo khung xem lịch. Vui lòng kiểm tra thiết lập ORBit và OAF."
 
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Riêng tư"
 
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:385
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Tin tưởng"
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "Công cộng"
 
@@ -4655,32 +3606,32 @@ msgid "W"
 msgstr "T"
 
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:457
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Rảnh"
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
-#: calendar/gui/e-meeting-time-sel.c:432
-#: shell/evolution-shell-component.c:1029
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "Bận"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Chưa bắt đầu"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Đang làm"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:329
-#: calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Hoàn tất"
 
@@ -4695,10 +3646,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1485
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
-#: mail/mail-config.glade.h:47
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -4713,23 +3666,17 @@ msgstr "Đệ quy"
 msgid "Assigned"
 msgstr "Đã gán"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
-#: calendar/gui/e-meeting-model.c:810
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "Có"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:811
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "Không"
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-#: calendar/gui/e-week-view.c:1184
-msgid "Searching"
-msgstr "Đang tìm"
-
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Khung ngày"
@@ -4746,63 +3693,81 @@ msgstr "Khung tuần"
 msgid "Month View"
 msgstr "Khung tháng"
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
-msgstr "Tóm tắt chứa"
-
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
-msgstr "Mô tả chứa"
-
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "Ghi chú chứa"
-
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1072
-msgid "Unmatched"
-msgstr "Không khớp"
-
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Lịch"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "Thư mục chứa các cuộc hẹn và sự kiện"
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
-#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
-#: views/tasks/galview.xml.h:1
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Công việc"
 
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "Thư mục chứa các mục to-do"
 
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "Tạo cuộc hẹn mới"
+#: calendar/gui/component-factory.c:704
+#, fuzzy
+msgid "New meeting"
+msgstr "Cuộc họp"
 
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:704
+#, fuzzy
+msgid "_Meeting"
+msgstr "Cuộc họp"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New task"
+msgstr "Công việc mới"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Task"
+msgstr "Nhiệm _vụ"
+
+#: calendar/gui/component-factory.c:712
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "Cuộc hẹn mới"
+
+#: calendar/gui/component-factory.c:712
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "Cuộc _hẹn mới"
 
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
-msgstr "Tạo công việc mới"
+#: calendar/gui/component-factory.c:716
+#, fuzzy
+msgid "New appointment"
+msgstr "Cuộc hẹn mới"
 
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "Nhiệm _vụ mới"
+#: calendar/gui/component-factory.c:716
+#, fuzzy
+msgid "_Appointment"
+msgstr "Cuộc hẹn"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "Không thể mở thư mục trong `%s'"
+
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "URI mà lịch sẽ hiển thị"
 
+#: calendar/gui/control-factory.c:174
+msgid "The type of view to show"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Tùy chọn báo động âm thanh"
@@ -4847,7 +3812,9 @@ msgstr "Chạy chương trình:"
 msgid ""
 "This is an email reminder, but Evolution does not yet support this kind of "
 "reminders.  You will not be able to edit the options for this reminder."
-msgstr "Đây là bộ nhắc email, nhưng Evolution chưa hỗ trợ kiểu nhắc nhở này. Bạn sẽ không thể sửa tùy chọn cho bộ nhắc nhở này."
+msgstr ""
+"Đây là bộ nhắc email, nhưng Evolution chưa hỗ trợ kiểu nhắc nhở này. Bạn sẽ "
+"không thể sửa tùy chọn cho bộ nhắc nhở này."
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
@@ -4993,7 +3960,7 @@ msgstr "Bộ nhắc nhở"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:749 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Tóm tắt:"
 
@@ -5001,11 +3968,11 @@ msgstr "Tóm tắt:"
 msgid "_Options..."
 msgstr "_Tùy chọn..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "after"
 msgstr "sau khi"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "trước khi"
 
@@ -5022,7 +3989,7 @@ msgstr "kết thúc cuộc hẹn"
 msgid "hour(s)"
 msgstr "giờ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "phút"
 
@@ -5050,32 +4017,33 @@ msgstr "30 phút"
 msgid "60 minutes"
 msgstr "60 phút"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "Alberta"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "Thiết lập Công việc và Lịch"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "Màu công việc quá hạn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "Màu công việc trong ngày"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "Tạo cuộc hẹn mới với bộ _nhắc nhở mặc định"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Days"
-msgstr "Ngày"
+msgid "Day _ends:"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "Ngày đầu của tuần:"
+msgid "Days"
+msgstr "Ngày"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "Thứ Sáu"
 
@@ -5088,146 +4056,160 @@ msgid "Minutes"
 msgstr "Phút"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "Thứ Hai"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "Công việc quá hạn:"
+#, fuzzy
+msgid "S_un"
+msgstr "_CN"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "Thứ Bảy"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
-msgstr "Khung hiện thời điểm kết thúc cuộc hẹn trong tuần và trong tháng"
+msgid "Sh_ow a reminder"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "Hiện số tuần trong bộ duyệt ngày"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Sta_rt of day:"
-msgstr "Đầ_u ngày:"
+#: calendar/gui/dialogs/recurrence-page.c:1127
+msgid "Sunday"
+msgstr "Chủ nhật"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Su_n"
-msgstr "_CN"
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "_Công việc trong ngày:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Sunday"
-msgstr "Chủ nhật"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "T_hu"
 msgstr "_Năm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "T_ue"
-msgstr "_Ba"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "_Công việc trong ngày:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "Danh sách _công việc"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Thursday"
 msgstr "Thứ Năm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "Thời gian"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "Múi _giờ:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "Độ _lệch thời gian:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "Dạng thức thời gian:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1122
 msgid "Tuesday"
 msgstr "Thứ Ba"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "Thứ Tư"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Tuần làm việc"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 giờ (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 giờ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "Hỏi xác nhận khi _xóa mục"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr ""
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "Bắt đầu công việc: <b>"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "_Hiển thị"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "_End of day:"
-msgstr "_Cuối ngày:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Fri"
 msgstr "_Sáu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "_Chung"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "Ẩ_n công việc hoàn thành sau"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "_Hai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Khác"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "Công việc quá hạn:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "Bả_y"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "Khung hiện thời điểm kết thúc cuộc hẹn trong tuần và trong tháng"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "Danh sách _công việc"
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "Độ _lệch thời gian:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "_Ba"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "_Tư"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "trước khi bắt đầu cuộc hẹn"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
@@ -5261,7 +4243,9 @@ msgstr "Mục nhật ký đã bị xóa"
 #: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  Bạn đã tạo ra một vài thay đổi. Bỏ qua những thay đổi này và đóng bộ biên soạn?"
+msgstr ""
+"%s  Bạn đã tạo ra một vài thay đổi. Bỏ qua những thay đổi này và đóng bộ "
+"biên soạn?"
 
 #: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
@@ -5283,80 +4267,90 @@ msgstr "Mục nhật ký này đã thay đổi."
 #: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  Bạn đã tạo ra vài thay đổi. Bỏ qua những thay đổi này và cập nhật bộ biên soạn?"
+msgstr ""
+"%s  Bạn đã tạo ra vài thay đổi. Bỏ qua những thay đổi này và cập nhật bộ "
+"biên soạn?"
 
 #: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Bạn chưa thay đổi gì, cập nhật bộ biên soạn?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
 msgid " to "
 msgstr " tới "
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
 msgid " (Completed "
 msgstr " (Đã hoàn tất "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
 msgid "Completed "
 msgstr "Đã hoàn tất "
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
 msgid " (Due "
 msgstr " (Đến hạn "
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
 msgid "Due "
 msgstr "Đến hạn "
 
-#: calendar/gui/dialogs/comp-editor.c:303
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
 msgstr "Không thể cập nhật đối tượng!"
 
-#: calendar/gui/dialogs/comp-editor.c:678
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
+msgstr "Không thể cập nhật đối tượng!"
+
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Sửa cuộc hẹn"
 
-#: calendar/gui/dialogs/comp-editor.c:683
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cuộc hẹn - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:686
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Công việc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:689
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Mục nhật ký - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Không có tóm tắt"
 
-#: calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "Ghi đè tập tin?"
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+msgid "Save as..."
+msgstr "Lưu là..."
 
-#: calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1915
-#: mail/mail-display.c:106
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
 msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+"Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
-"Tập tin với tên này đã có rồi.\n"
-"Ghi đè tập tin này?"
-
-#: calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Lưu là..."
 
-#: calendar/gui/dialogs/comp-editor.c:1272
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "Không thể lấy phiên bản hiện thời!"
 
@@ -5414,27 +4408,27 @@ msgstr "Ủy nhiệm cho:"
 msgid "Enter Delegate"
 msgstr "Nhập người đại diện"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "Cuộc hẹn"
 
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "Bộ nhắc nhở"
 
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "Đệ quy"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:363
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "Lập lịch biểu"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:366
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Cuộc họp"
 
@@ -5503,19 +4497,19 @@ msgstr "Thời điểm _cuối:"
 msgid "_Start time:"
 msgstr "Thời điểm đầ_u:"
 
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "Cần một tổ chức."
 
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Cần ít nhất một người tham dự."
 
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "Người này đã có tên trong cuộc họp rồi!"
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "Ủ_y nhiệm cho..."
 
@@ -5555,7 +4549,7 @@ msgid "Member"
 msgstr "Thành viên"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -5567,14 +4561,14 @@ msgstr "Vai trò"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
-#: mail/message-list.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Trạng thái"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Kiểu"
@@ -5589,35 +4583,102 @@ msgid "_Change Organizer"
 msgstr "Đổ_i tổ chức"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "_Mời người khác..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "Tổ chức _khác"
+#: calendar/gui/dialogs/recurrence-page.c:126
+#: calendar/gui/dialogs/recurrence-page.c:146
+#: calendar/gui/dialogs/recurrence-page.c:156
+#, fuzzy
+msgid "st"
+msgstr "1"
+
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "2"
+
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "3"
+
+#: calendar/gui/dialogs/recurrence-page.c:129
+#: calendar/gui/dialogs/recurrence-page.c:130
+#: calendar/gui/dialogs/recurrence-page.c:131
+#: calendar/gui/dialogs/recurrence-page.c:132
+#: calendar/gui/dialogs/recurrence-page.c:133
+#: calendar/gui/dialogs/recurrence-page.c:134
+#: calendar/gui/dialogs/recurrence-page.c:135
+#: calendar/gui/dialogs/recurrence-page.c:136
+#: calendar/gui/dialogs/recurrence-page.c:137
+#: calendar/gui/dialogs/recurrence-page.c:138
+#: calendar/gui/dialogs/recurrence-page.c:139
+#: calendar/gui/dialogs/recurrence-page.c:140
+#: calendar/gui/dialogs/recurrence-page.c:141
+#: calendar/gui/dialogs/recurrence-page.c:142
+#: calendar/gui/dialogs/recurrence-page.c:143
+#: calendar/gui/dialogs/recurrence-page.c:144
+#: calendar/gui/dialogs/recurrence-page.c:145
+#: calendar/gui/dialogs/recurrence-page.c:149
+#: calendar/gui/dialogs/recurrence-page.c:150
+#: calendar/gui/dialogs/recurrence-page.c:151
+#: calendar/gui/dialogs/recurrence-page.c:152
+#: calendar/gui/dialogs/recurrence-page.c:153
+#: calendar/gui/dialogs/recurrence-page.c:154
+#: calendar/gui/dialogs/recurrence-page.c:155
+msgid "th"
+msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Cuộc hẹn chứa đệ quy mà Evolution không thể hiệu chỉnh."
 
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "lúc"
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "Sương mù"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "giây"
+
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "Ohrid"
+
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "Bắc"
+
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "danh sách"
+
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "Fax khác"
+
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "ngày"
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "lúc"
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr " "
-
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr "lần"
 
@@ -5681,17 +4742,23 @@ msgstr "tuần"
 msgid "year(s)"
 msgstr "năm"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:56
+#, fuzzy
+msgid "The meeting information has been created. Send it?"
+msgstr "Thông tin cuộc họp đã thay đổi. Gửi bản cập nhật?"
+
+#: calendar/gui/dialogs/send-comp.c:59
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Thông tin cuộc họp đã thay đổi. Gửi bản cập nhật?"
 
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The task information has changed. Send an updated version?"
+#: calendar/gui/dialogs/send-comp.c:66
+#, fuzzy
+msgid "The task assignment information has been created. Send it?"
 msgstr "Thông tin công việc đã thay đổi. Gửi bản cập nhật?"
 
-#: calendar/gui/dialogs/send-comp.c:65
-msgid "The journal entry has changed. Send an updated version?"
-msgstr "Mục nhật ký đã thay đổi. Gửi bản cập nhật?"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
+msgstr "Thông tin công việc đã thay đổi. Gửi bản cập nhật?"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
@@ -5708,7 +4775,7 @@ msgid "Progress"
 msgstr "Tiến trình"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:966
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL:"
 
@@ -5720,15 +4787,19 @@ msgstr "Độ ư_u tiên:"
 msgid "_Status:"
 msgstr "_Trạng thái:"
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:322
+#: calendar/gui/dialogs/task-editor.c:182
+msgid "Basic"
+msgstr "Cơ bản"
+
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:758
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Mô tả"
 
@@ -5740,137 +4811,145 @@ msgstr "Ngày _bắt đầu:"
 msgid "_Due Date:"
 msgstr "N_gày đến hạn:"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:440
+#, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:441
+#, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:442
+#, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:443
+#, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:444
+#, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:445
+#, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:446
+#, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:447
+#, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:448
+#, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:449
+#, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:450
+#, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2726
-#: calendar/gui/e-week-view.c:1824
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "Đang xóa đối tượng được chọn"
 
-#: calendar/gui/e-calendar-table.c:941 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3428 mail/folder-browser.c:1447
-#: shell/e-shortcuts-view.c:384
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "_Mở"
 
-#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3437 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Save as..."
+msgstr "Lưu là..."
+
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
+#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+msgid "_Print..."
+msgstr "_In..."
+
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Cắt"
 
-#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3557
-#: calendar/gui/e-week-view.c:3439 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:14
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Sao chép"
 
-#: calendar/gui/e-calendar-table.c:949 calendar/gui/e-day-view.c:3532
-#: calendar/gui/e-day-view.c:3559 calendar/gui/e-week-view.c:3415
-#: calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:36
-#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
+#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Dán"
 
-#: calendar/gui/e-calendar-table.c:954
+#: calendar/gui/e-calendar-table.c:996
+#, fuzzy
+msgid "_Assign Task"
+msgstr "Gán công việc"
+
+#: calendar/gui/e-calendar-table.c:997
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "Đang nạp lịch"
+
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "Đánh dấu _hoàn tất"
 
-#: calendar/gui/e-calendar-table.c:956
-msgid "_Delete this Task"
-msgstr "_Xóa công việc này"
-
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:999
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "Đánh dấu công _việc hoàn tất"
 
-#: calendar/gui/e-calendar-table.c:961
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "Xóa côn_g việc được chọn"
 
-#: calendar/gui/e-calendar-table.c:1145 calendar/gui/e-day-view.c:7137
-#: calendar/gui/e-week-view.c:3924
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "Đang cập nhật đối tượng"
 
-#: calendar/gui/e-calendar-table.c:1228
+#: calendar/gui/e-calendar-table.c:1354
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Nhấn để thêm công việc"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:357
-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/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:366
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Ngày phải được nhập theo dạng thức: \n"
-"\n"
-"%s"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Báo động"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:723
-#: camel/camel-filter-driver.c:837
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "Hoàn tất"
 
@@ -5901,8 +4980,8 @@ msgstr "Ngày bắt đầu"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Tóm tắt"
 
@@ -5914,6 +4993,29 @@ msgstr "Loại công việc"
 msgid "URL"
 msgstr "URL"
 
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+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/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Ngày phải được nhập theo dạng thức: \n"
+"\n"
+"%s"
+
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
 msgid "%02i minute divisions"
@@ -5921,382 +5023,491 @@ msgstr "lệch %02i phút"
 
 #. 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:284 calendar/gui/e-day-view.c:1389
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1416
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1440
 #: calendar/gui/e-week-view-main-item.c:347
 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:614 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:768
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:770
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3410
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "Cuộc _hẹn mới"
+
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "Sự _kiện mọi ngày mới"
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3420
-#: ui/evolution-calendar.xml.h:17
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#, fuzzy
+msgid "New Meeting"
+msgstr "Cuộc họp"
+
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "Công việc mới"
+
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "In..."
+
+#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Đi tới ngày _hôm nay"
 
-#: calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3422
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 msgid "_Go to Date..."
 msgstr "Đi tới _ngày..."
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3430
-msgid "_Delete this Appointment"
-msgstr "_Xoá cuộc hẹn"
+#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: ui/evolution-calendar.xml.h:31
+msgid "_Publish Free/Busy Information"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:39
+#, fuzzy
+msgid "_Configure..."
+msgstr "Cấu hình"
+
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+msgid "_Configure Pilot..."
+msgstr "Cấu hình"
+
+#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+msgid "_Save As..."
+msgstr "Lư_u là..."
+
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Lập lịch _cuộc họp"
+
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "_Chuyển tiếp liên lạc..."
+
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3457
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "_Xóa lần này"
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 msgid "Delete _All Occurrences"
 msgstr "Xóa _mọi lần"
 
-#: calendar/gui/e-itip-control.c:536
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:638
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:646
+#, c-format
+msgid "Error executing %s."
+msgstr "Lỗi thực hiện %s."
+
+#: calendar/gui/e-itip-control.c:678
 msgid "Meeting begins: <b>"
 msgstr "Bắt đầu cuộc họp: <b>"
 
-#: calendar/gui/e-itip-control.c:541
+#: calendar/gui/e-itip-control.c:683
 msgid "Task begins: <b>"
 msgstr "Bắt đầu công việc: <b>"
 
-#: calendar/gui/e-itip-control.c:546
+#: calendar/gui/e-itip-control.c:688
 msgid "Free/Busy info begins: <b>"
 msgstr "Bắt đầu thông tin Rảnh/Bận: <b>"
 
-#: calendar/gui/e-itip-control.c:550
+#: calendar/gui/e-itip-control.c:692
 msgid "Begins: <b>"
 msgstr "Bắt đầu: <b>"
 
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:704
 msgid "Meeting ends: <b>"
 msgstr "Kết thúc cuộc họp: <b>"
 
-#: calendar/gui/e-itip-control.c:565
+#: calendar/gui/e-itip-control.c:707
 msgid "Free/Busy info ends: <b>"
 msgstr "Kết thúc thông tin Rảnh/Bận: <b>"
 
-#: calendar/gui/e-itip-control.c:569
+#: calendar/gui/e-itip-control.c:711
 msgid "Ends: <b>"
 msgstr "Kết thúc: <b>"
 
-#: calendar/gui/e-itip-control.c:583
+#: calendar/gui/e-itip-control.c:725
 msgid "Task Completed: <b>"
 msgstr "Công việc hoàn tất: <b>"
 
-#: calendar/gui/e-itip-control.c:593
+#: calendar/gui/e-itip-control.c:735
 msgid "Task Due: <b>"
 msgstr "Công việc đến hạn: <b>"
 
-#: calendar/gui/e-itip-control.c:630 calendar/gui/e-itip-control.c:679
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
 msgid "iCalendar Information"
 msgstr "Thông tin iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:787
 msgid "iCalendar Error"
 msgstr "Lỗi iCalendar"
 
-#: calendar/gui/e-itip-control.c:710 calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
 msgid "An unknown person"
 msgstr "Người lạ"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:875
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
-msgstr "<br> Vui lòng xem lại các chỉ dẫn sau và chọn một hành động từ menu bên dưới."
+msgstr ""
+"<br> Vui lòng xem lại các chỉ dẫn sau và chọn một hành động từ menu bên dưới."
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:891
 msgid "<i>None</i>"
 msgstr "<i>Không</i>"
 
-#: calendar/gui/e-itip-control.c:790 calendar/gui/e-itip-control.c:806
-#: calendar/gui/e-itip-control.c:822 calendar/gui/e-itip-control.c:835
-#: calendar/gui/e-itip-control.c:848 calendar/gui/e-itip-control.c:861
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "_Trạng thái:"
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "Chấp nhận"
+
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "Có thể làm"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "Từ chối"
+
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
+msgid "Unknown"
+msgstr "Lạ"
+
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
 msgid "Choose an action:"
 msgstr "Chọn hành động:"
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:972
 msgid "Update"
 msgstr "Cập nhật"
 
-#: calendar/gui/e-itip-control.c:792 calendar/gui/e-itip-control.c:811
-#: calendar/gui/e-itip-control.c:824 calendar/gui/e-itip-control.c:837
-#: calendar/gui/e-itip-control.c:850 calendar/gui/e-itip-control.c:863
-#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Đồng ý"
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:1000
 msgid "Accept"
 msgstr "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:808
+#: calendar/gui/e-itip-control.c:1001
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:809
+#: calendar/gui/e-itip-control.c:1002
 msgid "Decline"
 msgstr "Từ chối"
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:1026
 msgid "Send Free/Busy Information"
 msgstr "Gửi thông tin Rảnh/Bận"
 
-#: calendar/gui/e-itip-control.c:836
+#: calendar/gui/e-itip-control.c:1039
 msgid "Update respondent status"
 msgstr "Cập nhật trạng thái trả lời"
 
-#: calendar/gui/e-itip-control.c:849
+#: calendar/gui/e-itip-control.c:1052
 msgid "Send Latest Information"
 msgstr "Gửi thông tin mới nhất"
 
-#: calendar/gui/e-itip-control.c:862 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Bỏ"
 
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:1117
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> đã công bố thông tin cuộc họp."
 
-#: calendar/gui/e-itip-control.c:911
+#: calendar/gui/e-itip-control.c:1118
 msgid "Meeting Information"
 msgstr "Thông tin cuộc họp"
 
-#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:1122
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> yêu cầu sự hiện diện của bạn tại cuộc họp."
 
-#: calendar/gui/e-itip-control.c:916
+#: calendar/gui/e-itip-control.c:1123
 msgid "Meeting Proposal"
 msgstr "Đề nghị cuộc họp"
 
-#: calendar/gui/e-itip-control.c:920
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b? muốn được dự cuộc họp đã có."
 
-#: calendar/gui/e-itip-control.c:921
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Update"
 msgstr "Cập nhật cuộc họp"
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:1132
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> muốn nhận thông tin mới nhất về cuộc họp"
 
-#: calendar/gui/e-itip-control.c:926
+#: calendar/gui/e-itip-control.c:1133
 msgid "Meeting Update Request"
 msgstr "Yêu cầu cập nhật cuộc họp"
 
-#: calendar/gui/e-itip-control.c:943 calendar/gui/e-itip-control.c:1014
-#: calendar/gui/e-meeting-model.c:257 calendar/gui/e-meeting-model.c:292
-#: calendar/gui/e-meeting-model.c:357 calendar/gui/e-meeting-model.c:782
-#: calendar/gui/e-meeting-model.c:798
-#: camel/providers/smtp/camel-smtp-transport.c:170
-#: camel/providers/smtp/camel-smtp-transport.c:225
-#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
-msgid "Unknown"
-msgstr "Lạ"
-
-#: calendar/gui/e-itip-control.c:949
+#: calendar/gui/e-itip-control.c:1156
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> đã trả lời yêu cầu họp."
 
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:1157
 msgid "Meeting Reply"
 msgstr "Trả lời họp"
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1161
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> đã hủy bỏ cuộc họp."
 
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:1162
 msgid "Meeting Cancellation"
 msgstr "Hủy bỏ cuộc họp"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/e-itip-control.c:1030
-#: calendar/gui/e-itip-control.c:1065
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> đã gửi một thông điệp khó hiểu."
 
-#: calendar/gui/e-itip-control.c:960
+#: calendar/gui/e-itip-control.c:1167
 msgid "Bad Meeting Message"
 msgstr "Thông điệp lạ về cuộc họp"
 
-#: calendar/gui/e-itip-control.c:980
+#: calendar/gui/e-itip-control.c:1189
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> đã công bố thông tin công việc."
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1190
 msgid "Task Information"
 msgstr "Thông tin công việc"
 
-#: calendar/gui/e-itip-control.c:985
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> yêu cầu thực hiện công việc."
 
-#: calendar/gui/e-itip-control.c:986
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Proposal"
 msgstr "Đề nghị công việc"
 
-#: calendar/gui/e-itip-control.c:990
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> muốn thêm vào công việc đã có."
 
-#: calendar/gui/e-itip-control.c:991
+#: calendar/gui/e-itip-control.c:1200
 msgid "Task Update"
 msgstr "Cập nhật công việc"
 
-#: calendar/gui/e-itip-control.c:995
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> muốn nhận thông tin mới nhất về công việc."
 
-#: calendar/gui/e-itip-control.c:996
+#: calendar/gui/e-itip-control.c:1205
 msgid "Task Update Request"
 msgstr "Yêu cầu cập nhật công việc"
 
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:1229
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> đã trả lời việc gán công việc."
 
-#: calendar/gui/e-itip-control.c:1021
+#: calendar/gui/e-itip-control.c:1230
 msgid "Task Reply"
 msgstr "Trả lời công việc"
 
-#: calendar/gui/e-itip-control.c:1025
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> đã hủy bỏ công việc."
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Cancellation"
 msgstr "Hủy bỏ công việc"
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1240
 msgid "Bad Task Message"
 msgstr "Thông điệp lạ về công việc"
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> đã công bố thông tin bận/rảnh."
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1260
 msgid "Free/Busy Information"
 msgstr "Thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1055
+#: calendar/gui/e-itip-control.c:1264
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> yêu cầu thông tin bận/rảnh của bạn."
 
-#: calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1265
 msgid "Free/Busy Request"
 msgstr "Yêu cầu thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1060
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> đã trả lời yêu cầu thông tin bận/rảnh."
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1270
 msgid "Free/Busy Reply"
 msgstr "Trả lời thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1066
+#: calendar/gui/e-itip-control.c:1275
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1354
 msgid "The message does not appear to be properly formed"
 msgstr "Thông điệp có lẽ không đúng hình thức"
 
-#: calendar/gui/e-itip-control.c:1158
+#: calendar/gui/e-itip-control.c:1373
 msgid "The message contains only unsupported requests."
 msgstr "Thông điệp chỉ chứa yêu cầu chưa được hỗ trợ."
 
-#: calendar/gui/e-itip-control.c:1186 calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Đồ đính kèm không chứa thông điệp lịch hợp lệ"
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1432
 msgid "The attachment has no viewable calendar items"
 msgstr "Đồ đính kèm không chứa mục lịch nào có thể xem được"
 
-#: calendar/gui/e-itip-control.c:1316
-msgid "Calendar file could not be updated!\n"
-msgstr "Không thể cập nhật tập tin lịch!\n"
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "Không thể gửi!\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "Hoàn tất cập nhật\n"
 
-#: calendar/gui/e-itip-control.c:1363
-msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "Không thể cập nhật trạng thái người tham dự vì trạng thái không hợp lệ!\n"
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "Không thể cập nhật tập tin lịch!\n"
 
-#: calendar/gui/e-itip-control.c:1371
-msgid "Attendee status could not be updated!\n"
-msgstr "Không thể cập nhật trạng thái người tham dự!\n"
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"Không thể cập nhật trạng thái người tham dự vì chưa có người nào tham dự"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1632
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1644
+msgid "Attendee status could not be updated because of an invalid status!\n"
+msgstr ""
+"Không thể cập nhật trạng thái người tham dự vì trạng thái không hợp lệ!\n"
+
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "Đã cập nhật trạng thái người tham dự\n"
 
-#: calendar/gui/e-itip-control.c:1375
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Không thể cập nhật trạng thái người tham dự vì chưa có người nào tham dự"
+#: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "Không thể cập nhật trạng thái người tham dự!\n"
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "Hoàn tất loại bỏ"
 
-#: calendar/gui/e-itip-control.c:1422 calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "Đã gửi!\n"
 
-#: calendar/gui/e-itip-control.c:1424 calendar/gui/e-itip-control.c:1476
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "Không thể gửi!\n"
 
-#: calendar/gui/e-itip-control.c:1649
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr "Không thể tìm thấy định danh của bạn trong danh sách người tham dự!\n"
+#: calendar/gui/e-itip-control.c:1896
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "Chọn thư mục"
+
+#: calendar/gui/e-itip-control.c:1903
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "Chọn thư mục"
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
@@ -6335,203 +5546,217 @@ msgstr "ngày kết thúc"
 msgid "date-start"
 msgstr "ngày bắt đầu"
 
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "Người chủ trì"
 
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1570
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "Người tham dự yêu cầu"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "Người tham dự không yêu cầu"
 
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "Người không tham dự"
 
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "Cá nhân"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:779
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "Nhóm"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:780
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "Tài nguyên"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:781
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "Phòng"
 
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:794
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "Ghế"
 
-#: calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "Người tham dự yêu cầu"
 
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:796
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "Người tham dự không yêu cầu"
 
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:797
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "Người không tham dự"
 
-#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "Cần hành động"
 
-#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
-#: calendar/gui/e-meeting-model.c:824
-msgid "Accepted"
-msgstr "Chấp nhận"
-
-#: calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
-#: calendar/gui/e-meeting-model.c:825
-msgid "Declined"
-msgstr "Từ chối"
-
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Có thể làm"
 
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "Ủy nhiệm"
 
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "Trong tiến trình"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:471
-#: calendar/gui/e-meeting-time-sel.c:2102
+#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2132 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel-item.c:479
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479 e-util/e-time-utils.c:221
+#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:221
 #: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:433
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "Không chính thức"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "Không có thông tin"
 
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "_Tùy chọn"
 
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "Chỉ hiện giờ làm _việc"
 
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "Hiện Thu _nhỏ"
 
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "_Cập nhật Rảnh/Bận"
 
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "_Tự chọn"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "_Mọi người và tài nguyên"
 
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "Mọi người và mộ_t tài nguyên"
 
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "Người _yêu cầu"
 
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "Người yêu cầu _và một tài nguyên"
 
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "Lúc _bắt đầu cuộc họp:"
 
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "Lúc _kết thúc cuộc họp:"
 
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Đang mở công việc tại %s"
 
-#: calendar/gui/e-tasks.c:355
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Không thể nập những công việc trong `%s'"
 
-#: calendar/gui/e-tasks.c:367
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Chưa hỗ trợ phương thức yêu cầu để nạp `%s'"
 
-#: calendar/gui/e-week-view.c:3408 calendar/gui/e-week-view.c:3446
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "Không thể mở thư mục trong `%s'"
+
+#: calendar/gui/e-tasks.c:558
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "Ngày hoàn tất"
+
+#: calendar/gui/e-tasks.c:581
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "Đang xóa đối tượng được chọn"
+
+#: calendar/gui/e-tasks.c:674
+#, fuzzy
+msgid "Expunging"
+msgstr "Đang bỏ thư mục"
+
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "Cuộc hẹn mớ_i..."
 
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "_Xoá cuộc hẹn"
+
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Không thể mở thư mục trong `%s'"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Chưa hỗ trợ phương thức yêu cầu để mở `%s'"
 
-#: calendar/gui/gnome-cal.c:1865
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Đang mở lịch tại %s"
@@ -6592,295 +5817,325 @@ msgstr "Tháng Mười"
 msgid "September"
 msgstr "Tháng Chín"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "Cần ít nhất một người tham dự."
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "Phải chọn một tổ chức."
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
+#: calendar/gui/itip-utils.c:354
 msgid "Event information"
 msgstr "Thông tin sự kiện"
 
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
+#: calendar/gui/itip-utils.c:356
 msgid "Task information"
 msgstr "Thông tin công việc"
 
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
+#: calendar/gui/itip-utils.c:358
 msgid "Journal information"
 msgstr "Thông tin nhật ký"
 
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
+#: calendar/gui/itip-utils.c:360
 msgid "Free/Busy information"
 msgstr "Thông tin rảnh/bận"
 
-#: calendar/gui/itip-utils.c:321
+#: calendar/gui/itip-utils.c:362
 msgid "Calendar information"
 msgstr "Thông tin lịch"
 
-#: calendar/gui/itip-utils.c:370
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Thông tin rảnh/bận (%s tới %s)"
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "Cập nhật"
 
-#: calendar/gui/itip-utils.c:382
-msgid "iCalendar information"
-msgstr "Thông tin iCalendar"
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "Cập nhật danh sách"
 
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Bạn phải là người tham dự sự kiện."
 
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr "CN"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Hai"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Ba"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Tư"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Năm"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Sáu"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Bảy"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Ngày được chọn (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
+#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1852
+#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
+#: calendar/gui/print.c:1896
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Tuần được chọn (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "Tháng được chọn (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "Năm được chọn (%Y)"
 
-#: calendar/gui/print.c:2205
+#: calendar/gui/print.c:2249
 msgid "Task"
 msgstr "Công việc"
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2306
 #, c-format
 msgid "Status: %s"
 msgstr "Trạng thái: %s"
 
-#: calendar/gui/print.c:2280
+#: calendar/gui/print.c:2324
 #, c-format
 msgid "Priority: %s"
 msgstr "Độ ưu tiên: %s"
 
-#: calendar/gui/print.c:2294
+#: calendar/gui/print.c:2338
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Phần trăm hoàn thành: %i"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2350
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2320
+#: calendar/gui/print.c:2364
 #, c-format
 msgid "Categories: %s"
 msgstr "Phân loại: %s"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2375
 msgid "Contacts: "
 msgstr "Liên lạc: "
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "In lịch"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2364 my-evolution/e-summary.c:623
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Xem thử bản in"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "In một mục"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "Thiết lập in"
 
-#: calendar/gui/tasks-control.c:126
+#: calendar/gui/tasks-control-factory.c:75
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Không thể tạo cửa sổ công việc. Vui lòng kiểm tra thiết lập ORBit và OAF."
+
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "URI của thư mục công việc cần hiển thị"
 
-#: calendar/gui/tasks-control-factory.c:75
+#: calendar/gui/tasks-control.c:456
+#, fuzzy
 msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr "Không thể tạo cửa sổ công việc. Vui lòng kiểm tra thiết lập ORBit và OAF."
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"Thao tác này sẽ xóa vĩnh viễn mọi thông điệp được đánh dấu xóa. Nếu bạn tiếp "
+"tục, bạn sẽ không thể phục hồi những thông điệp này.\n"
+"\n"
+"Bạn có thật sự muốn xóa những thông điệp này không?"
+
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
+msgid "Do not ask me again."
+msgstr "Đừng hỏi tôi lần nữa"
+
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "In card"
 
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
@@ -6914,103 +6169,145 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "CHBTNSB"
 
-#: calendar/pcs/query.c:246
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "Nhập tập tin VCard vào Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "Nhập tập tin VCard vào Evolution."
+
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "Nhập tập tin VCard vào Evolution."
+
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "Bộ nhắc nhở"
+
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Thông điệp lịch"
+
+#: calendar/importers/icalendar-importer.c:663
+#, fuzzy
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution đã tìm thấy các tập tin Pine.\n"
+"Bạn có muốn nhập chúng vào Evolution?"
+
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Lịch"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now không cần đối số"
 
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time cần 1 đối số"
 
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time cần một đối số (là chuỗi)"
 
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time cần đối số thứ nhất (là chuỗi thời gian theo ISO 8601)"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day cần 2 đối số"
 
-#: calendar/pcs/query.c:317
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "tine-add-dau cần đối số thứ nhất là time_t"
 
-#: calendar/pcs/query.c:324
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day cần đối số thứ hai là số nguyên"
 
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin cần một đối số"
 
-#: calendar/pcs/query.c:356
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin cần đối số thứ nhất là time_t"
 
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end cần một đối số"
 
-#: calendar/pcs/query.c:388
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end cần đối số thứ nhất là time_t"
 
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype không cần đối số"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? cần 2 đối số"
 
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? cần đối số một là time_t"
 
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? cần đối số thứ hai là time_t"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains cần hai đối số"
 
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? cần đối số thứ hai là chuỗi"
 
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? cần đối số thứ hai là chuỗi"
 
-#: calendar/pcs/query.c:691
+#: calendar/pcs/query.c:693
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
-msgstr "contains? cần đối số thứ nhất là \"bất kỳ\", \"tóm tắt\", hoặc \"mô tả\""
+msgstr ""
+"contains? cần đối số thứ nhất là \"bất kỳ\", \"tóm tắt\", hoặc \"mô tả\""
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? cần ít nhất một đối số"
 
-#: calendar/pcs/query.c:745
+#: calendar/pcs/query.c:747
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
-msgstr "has-categories? cần mọi đối số đều là chuỗi và hoặc chỉ có một đối số và đối số đó là boolean sai (#f)"
+msgstr ""
+"has-categories? cần mọi đối số đều là chuỗi và hoặc chỉ có một đối số và đối "
+"số đó là boolean sai (#f)"
 
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? không cần đối số"
 
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? cần một đối số"
 
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? cần đối số thứ nhất là time_t"
 
@@ -7018,27 +6315,1568 @@ msgstr "completed-before? cần đối số thứ nhất là time_t"
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Định lượng biểu thức tìm kiếm không trả về giá trị boolean"
 
-#: camel/camel-cipher-context.c:169
-msgid "Signing is not supported by this cipher"
-msgstr ""
+#.
+#. * These are the timezone names from the Olson timezone data.
+#. * We only place them here so gettext picks them up for translation.
+#. * Don't include in any C files.
+#.
+#: calendar/zones.h:7
+msgid "Africa/Abidjan"
+msgstr "Châu Phi/Abidjan"
+
+#: calendar/zones.h:8
+msgid "Africa/Accra"
+msgstr "Châu Phi/Accra"
+
+#: calendar/zones.h:9
+msgid "Africa/Addis_Ababa"
+msgstr "Châu Phi/Addis_Ababa"
+
+#: calendar/zones.h:10
+msgid "Africa/Algiers"
+msgstr "Châu Phi/Algiers"
+
+#: calendar/zones.h:11
+msgid "Africa/Asmera"
+msgstr "Châu Phi/Asmera"
+
+#: calendar/zones.h:12
+msgid "Africa/Bamako"
+msgstr "Châu Phi/Bamako"
+
+#: calendar/zones.h:13
+msgid "Africa/Bangui"
+msgstr "Châu Phi/Bangui"
+
+#: calendar/zones.h:14
+msgid "Africa/Banjul"
+msgstr "Châu Phi/Banjul"
+
+#: calendar/zones.h:15
+msgid "Africa/Bissau"
+msgstr "Châu Phi/Bissau"
+
+#: calendar/zones.h:16
+msgid "Africa/Blantyre"
+msgstr "Châu Phi/Blantyre"
+
+#: calendar/zones.h:17
+msgid "Africa/Brazzaville"
+msgstr "Châu Phi/Brazzaville"
+
+#: calendar/zones.h:18
+msgid "Africa/Bujumbura"
+msgstr "Châu Phi/Bujumbura"
+
+#: calendar/zones.h:19
+msgid "Africa/Cairo"
+msgstr "Châu Phi/Cairo"
+
+#: calendar/zones.h:20
+msgid "Africa/Casablanca"
+msgstr "Châu Phi/Casablanca"
+
+#: calendar/zones.h:21
+msgid "Africa/Ceuta"
+msgstr "Châu Phi/Ceuta"
+
+#: calendar/zones.h:22
+msgid "Africa/Conakry"
+msgstr "Châu Phi/Conakry"
+
+#: calendar/zones.h:23
+msgid "Africa/Dakar"
+msgstr "Châu Phi/Dakar"
+
+#: calendar/zones.h:24
+msgid "Africa/Dar_es_Salaam"
+msgstr "Châu Phi/Dar_es_Salaam"
+
+#: calendar/zones.h:25
+msgid "Africa/Djibouti"
+msgstr "Châu Phi/Djibouti"
+
+#: calendar/zones.h:26
+msgid "Africa/Douala"
+msgstr "Châu Phi/Douala"
+
+#: calendar/zones.h:27
+msgid "Africa/El_Aaiun"
+msgstr "Châu Phi/El_Aaiun"
+
+#: calendar/zones.h:28
+msgid "Africa/Freetown"
+msgstr "Châu Phi/Freetown"
+
+#: calendar/zones.h:29
+msgid "Africa/Gaborone"
+msgstr "Châu Phi/Gaborone"
+
+#: calendar/zones.h:30
+msgid "Africa/Harare"
+msgstr "Châu Phi/Harare"
+
+#: calendar/zones.h:31
+msgid "Africa/Johannesburg"
+msgstr "Châu Phi/Johannesburg"
+
+#: calendar/zones.h:32
+msgid "Africa/Kampala"
+msgstr "Châu Phi/Kampala"
+
+#: calendar/zones.h:33
+msgid "Africa/Khartoum"
+msgstr "Châu Phi/Khartoum"
+
+#: calendar/zones.h:34
+msgid "Africa/Kigali"
+msgstr "Châu Phi/Kigali"
+
+#: calendar/zones.h:35
+msgid "Africa/Kinshasa"
+msgstr "Châu Phi/Kinshasa"
+
+#: calendar/zones.h:36
+msgid "Africa/Lagos"
+msgstr "Châu Phi/Lagos"
+
+#: calendar/zones.h:37
+msgid "Africa/Libreville"
+msgstr "Châu Phi/Libreville"
+
+#: calendar/zones.h:38
+msgid "Africa/Lome"
+msgstr "Châu Phi/Lome"
+
+#: calendar/zones.h:39
+msgid "Africa/Luanda"
+msgstr "Châu Phi/Luanda"
+
+#: calendar/zones.h:40
+msgid "Africa/Lubumbashi"
+msgstr "Châu Phi/Lubumbashi"
+
+#: calendar/zones.h:41
+msgid "Africa/Lusaka"
+msgstr "Châu Phi/Lusaka"
+
+#: calendar/zones.h:42
+msgid "Africa/Malabo"
+msgstr "Châu Phi/Malabo"
+
+#: calendar/zones.h:43
+msgid "Africa/Maputo"
+msgstr "Châu Phi/Maputo"
+
+#: calendar/zones.h:44
+msgid "Africa/Maseru"
+msgstr "Châu Phi/Maseru"
+
+#: calendar/zones.h:45
+msgid "Africa/Mbabane"
+msgstr "Châu Phi/Mbabane"
+
+#: calendar/zones.h:46
+msgid "Africa/Mogadishu"
+msgstr "Châu Phi/Mogadishu"
+
+#: calendar/zones.h:47
+msgid "Africa/Monrovia"
+msgstr "Châu Phi/Monrovia"
+
+#: calendar/zones.h:48
+msgid "Africa/Nairobi"
+msgstr "Châu Phi/Nairobi"
+
+#: calendar/zones.h:49
+msgid "Africa/Ndjamena"
+msgstr "Châu Phi/Ndjamena"
+
+#: calendar/zones.h:50
+msgid "Africa/Niamey"
+msgstr "Châu Phi/Niamey"
+
+#: calendar/zones.h:51
+msgid "Africa/Nouakchott"
+msgstr "Châu Phi/Nouakchott"
+
+#: calendar/zones.h:52
+msgid "Africa/Ouagadougou"
+msgstr "Châu Phi/Ouagadougou"
+
+#: calendar/zones.h:53
+msgid "Africa/Porto-Novo"
+msgstr "Châu Phi/Porto-Novo"
+
+#: calendar/zones.h:54
+msgid "Africa/Sao_Tome"
+msgstr "Châu Phi/Sao_Tome"
+
+#: calendar/zones.h:55
+msgid "Africa/Timbuktu"
+msgstr "Châu Phi/Timbuktu"
+
+#: calendar/zones.h:56
+msgid "Africa/Tripoli"
+msgstr "Châu Phi/Tripoli"
+
+#: calendar/zones.h:57
+msgid "Africa/Tunis"
+msgstr "Châu Phi/Tunis"
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
+#: calendar/zones.h:58
+msgid "Africa/Windhoek"
+msgstr "Châu Phi/Windhoek"
+
+#: calendar/zones.h:59
+msgid "America/Adak"
+msgstr "Châu Mỹ/Adak"
+
+#: calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr "Châu Mỹ/Anchorage"
+
+#: calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr "Châu Mỹ/Anguilla"
+
+#: calendar/zones.h:62
+msgid "America/Antigua"
+msgstr "Châu Mỹ/Antigua"
+
+#: calendar/zones.h:63
+msgid "America/Araguaina"
+msgstr "Châu Mỹ/Araguaina"
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr "Châu Mỹ/Aruba"
+
+#: calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr "Châu Mỹ/Asuncion"
+
+#: calendar/zones.h:66
+msgid "America/Barbados"
+msgstr "Châu Mỹ/Barbados"
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr "Châu Mỹ/Belem"
+
+#: calendar/zones.h:68
+msgid "America/Belize"
+msgstr "Châu Mỹ/Belize"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr "Châu Mỹ/Boa_Vista"
+
+#: calendar/zones.h:70
+msgid "America/Bogota"
+msgstr "Châu Mỹ/Bogota"
+
+#: calendar/zones.h:71
+msgid "America/Boise"
+msgstr "Châu Mỹ/Boise"
+
+#: calendar/zones.h:72
+msgid "America/Buenos_Aires"
+msgstr "Châu Mỹ/Buenos_Aires"
+
+#: calendar/zones.h:73
+msgid "America/Cambridge_Bay"
+msgstr "Châu Mỹ/Cambridge_Bay"
+
+#: calendar/zones.h:74
+msgid "America/Cancun"
+msgstr "Châu Mỹ/Cancun"
+
+#: calendar/zones.h:75
+msgid "America/Caracas"
+msgstr "Châu Mỹ/Caracas"
+
+#: calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr "Châu Mỹ/Catamarca"
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr "Châu Mỹ/Cayenne"
+
+#: calendar/zones.h:78
+msgid "America/Cayman"
+msgstr "Châu Mỹ/Cayman"
+
+#: calendar/zones.h:79
+msgid "America/Chicago"
+msgstr "Châu Mỹ/Chicago"
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr "Châu Mỹ/Chihuahua"
+
+#: calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr "Châu Mỹ/Cordoba"
+
+#: calendar/zones.h:82
+msgid "America/Costa_Rica"
+msgstr "Châu Mỹ/Costa_Rica"
+
+#: calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr "Châu Mỹ/Cuiaba"
+
+#: calendar/zones.h:84
+msgid "America/Curacao"
+msgstr "Châu Mỹ/Curacao"
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr "Châu Mỹ/Danmarkshavn"
+
+#: calendar/zones.h:86
+msgid "America/Dawson"
+msgstr "Châu Mỹ/Dawson"
+
+#: calendar/zones.h:87
+msgid "America/Dawson_Creek"
+msgstr "Châu Mỹ/Dawson_Creek"
+
+#: calendar/zones.h:88
+msgid "America/Denver"
+msgstr "Châu Mỹ/Denver"
+
+#: calendar/zones.h:89
+msgid "America/Detroit"
+msgstr "Châu Mỹ/Detroit"
+
+#: calendar/zones.h:90
+msgid "America/Dominica"
+msgstr "Châu Mỹ/Dominica"
+
+#: calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr "Châu Mỹ/Edmonton"
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr "Châu Mỹ/Eirunepe"
+
+#: calendar/zones.h:93
+msgid "America/El_Salvador"
+msgstr "Châu Mỹ/El_Salvador"
+
+#: calendar/zones.h:94
+msgid "America/Fortaleza"
+msgstr "Châu Mỹ/Fortaleza"
+
+#: calendar/zones.h:95
+msgid "America/Glace_Bay"
+msgstr "Châu Mỹ/Glace_Bay"
+
+#: calendar/zones.h:96
+msgid "America/Godthab"
+msgstr "Châu Mỹ/Godthab"
+
+#: calendar/zones.h:97
+msgid "America/Goose_Bay"
+msgstr "Châu Mỹ/Goose_Bay"
+
+#: calendar/zones.h:98
+msgid "America/Grand_Turk"
+msgstr "Châu Mỹ/Grand_Turk"
+
+#: calendar/zones.h:99
+msgid "America/Grenada"
+msgstr "Châu Mỹ/Grenada"
+
+#: calendar/zones.h:100
+msgid "America/Guadeloupe"
+msgstr "Châu Mỹ/Guadeloupe"
+
+#: calendar/zones.h:101
+msgid "America/Guatemala"
+msgstr "Châu Mỹ/Guatemala"
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr "Châu Mỹ/Guayaquil"
+
+#: calendar/zones.h:103
+msgid "America/Guyana"
+msgstr "Châu Mỹ/Guyana"
+
+#: calendar/zones.h:104
+msgid "America/Halifax"
+msgstr "Châu Mỹ/Halifax"
+
+#: calendar/zones.h:105
+msgid "America/Havana"
+msgstr "Châu Mỹ/Havana"
+
+#: calendar/zones.h:106
+msgid "America/Hermosillo"
+msgstr "Châu Mỹ/Hermosillo"
+
+#: calendar/zones.h:107
+msgid "America/Indiana/Indianapolis"
+msgstr "Châu Mỹ/Indiana/Indianapolis"
+
+#: calendar/zones.h:108
+msgid "America/Indiana/Knox"
+msgstr "Châu Mỹ/Indiana/Knox"
+
+#: calendar/zones.h:109
+msgid "America/Indiana/Marengo"
+msgstr "Châu Mỹ/Indiana/Marengo"
+
+#: calendar/zones.h:110
+msgid "America/Indiana/Vevay"
+msgstr "Châu Mỹ/Indiana/Vevay"
+
+#: calendar/zones.h:111
+msgid "America/Indianapolis"
+msgstr "Châu Mỹ/Indianapolis"
+
+#: calendar/zones.h:112
+msgid "America/Inuvik"
+msgstr "Châu Mỹ/Inuvik"
+
+#: calendar/zones.h:113
+msgid "America/Iqaluit"
+msgstr "Châu Mỹ/Iqaluit"
+
+#: calendar/zones.h:114
+msgid "America/Jamaica"
+msgstr "Châu Mỹ/Jamaica"
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr "Châu Mỹ/Jujuy"
+
+#: calendar/zones.h:116
+msgid "America/Juneau"
+msgstr "Châu Mỹ/Juneau"
+
+#: calendar/zones.h:117
+msgid "America/Kentucky/Louisville"
+msgstr "Châu Mỹ/Kentucky/Louisville"
+
+#: calendar/zones.h:118
+msgid "America/Kentucky/Monticello"
+msgstr "Châu Mỹ/Kentucky/Monticello"
+
+#: calendar/zones.h:119
+msgid "America/La_Paz"
+msgstr "Châu Mỹ/La_Paz"
+
+#: calendar/zones.h:120
+msgid "America/Lima"
+msgstr "Châu Mỹ/Lima"
+
+#: calendar/zones.h:121
+msgid "America/Los_Angeles"
+msgstr "Châu Mỹ/Los_Angeles"
+
+#: calendar/zones.h:122
+msgid "America/Louisville"
+msgstr "Châu Mỹ/Louisville"
+
+#: calendar/zones.h:123
+msgid "America/Maceio"
+msgstr "Châu Mỹ/Maceio"
+
+#: calendar/zones.h:124
+msgid "America/Managua"
+msgstr "Châu Mỹ/Managua"
+
+#: calendar/zones.h:125
+msgid "America/Manaus"
+msgstr "Châu Mỹ/Manaus"
+
+#: calendar/zones.h:126
+msgid "America/Martinique"
+msgstr "Châu Mỹ/Martinique"
+
+#: calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr "Châu Mỹ/Mazatlan"
+
+#: calendar/zones.h:128
+msgid "America/Mendoza"
+msgstr "Châu Mỹ/Mendoza"
+
+#: calendar/zones.h:129
+msgid "America/Menominee"
+msgstr "Châu Mỹ/Menominee"
+
+#: calendar/zones.h:130
+msgid "America/Merida"
+msgstr "Châu Mỹ/Merida"
+
+#: calendar/zones.h:131
+msgid "America/Mexico_City"
+msgstr "Châu Mỹ/Mexico_City"
+
+#: calendar/zones.h:132
+msgid "America/Miquelon"
+msgstr "Châu Mỹ/Miquelon"
+
+#: calendar/zones.h:133
+msgid "America/Monterrey"
+msgstr "Châu Mỹ/Monterrey"
+
+#: calendar/zones.h:134
+msgid "America/Montevideo"
+msgstr "Châu Mỹ/Montevideo"
+
+#: calendar/zones.h:135
+msgid "America/Montreal"
+msgstr "Châu Mỹ/Montreal"
+
+#: calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr "Châu Mỹ/Montserrat"
+
+#: calendar/zones.h:137
+msgid "America/Nassau"
+msgstr "Châu Mỹ/Nassau"
+
+#: calendar/zones.h:138
+msgid "America/New_York"
+msgstr "Châu Mỹ/New_York"
+
+#: calendar/zones.h:139
+msgid "America/Nipigon"
+msgstr "Châu Mỹ/Nipigon"
+
+#: calendar/zones.h:140
+msgid "America/Nome"
+msgstr "Châu Mỹ/Nome"
+
+#: calendar/zones.h:141
+msgid "America/Noronha"
+msgstr "Châu Mỹ/Noronha"
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr "Châu Mỹ/North_Dakota/Center"
+
+#: calendar/zones.h:143
+msgid "America/Panama"
+msgstr "Châu Mỹ/Panama"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr "Châu Mỹ/Pangnirtung"
+
+#: calendar/zones.h:145
+msgid "America/Paramaribo"
+msgstr "Châu Mỹ/Paramaribo"
+
+#: calendar/zones.h:146
+msgid "America/Phoenix"
+msgstr "Châu Mỹ/Phoenix"
+
+#: calendar/zones.h:147
+msgid "America/Port-au-Prince"
+msgstr "Châu Mỹ/Port-au-Prince"
+
+#: calendar/zones.h:148
+msgid "America/Port_of_Spain"
+msgstr "Châu Mỹ/Port_of_Spain"
+
+#: calendar/zones.h:149
+msgid "America/Porto_Velho"
+msgstr "Châu Mỹ/Porto_Velho"
+
+#: calendar/zones.h:150
+msgid "America/Puerto_Rico"
+msgstr "Châu Mỹ/Puerto_Rico"
+
+#: calendar/zones.h:151
+msgid "America/Rainy_River"
+msgstr "Châu Mỹ/Rainy_River"
+
+#: calendar/zones.h:152
+msgid "America/Rankin_Inlet"
+msgstr "Châu Mỹ/Rankin_Inlet"
+
+#: calendar/zones.h:153
+msgid "America/Recife"
+msgstr "Châu Mỹ/Recife"
+
+#: calendar/zones.h:154
+msgid "America/Regina"
+msgstr "Châu Mỹ/Regina"
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr "Châu Mỹ/Rio_Branco"
+
+#: calendar/zones.h:156
+msgid "America/Rosario"
+msgstr "Châu Mỹ/Rosario"
+
+#: calendar/zones.h:157
+msgid "America/Santiago"
+msgstr "Châu Mỹ/Santiago"
+
+#: calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr "Châu Mỹ/Santo_Domingo"
+
+#: calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr "Châu Mỹ/Sao_Paulo"
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr "Châu Mỹ/Scoresbysund"
+
+#: calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr "Châu Mỹ/Shiprock"
+
+#: calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr "Châu Mỹ/St_Johns"
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr "Châu Mỹ/St_Kitts"
+
+#: calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr "Châu Mỹ/St_Lucia"
+
+#: calendar/zones.h:165
+msgid "America/St_Thomas"
+msgstr "Châu Mỹ/St_Thomas"
+
+#: calendar/zones.h:166
+msgid "America/St_Vincent"
+msgstr "Châu Mỹ/St_Vincent"
+
+#: calendar/zones.h:167
+msgid "America/Swift_Current"
+msgstr "Châu Mỹ/Swift_Current"
+
+#: calendar/zones.h:168
+msgid "America/Tegucigalpa"
+msgstr "Châu Mỹ/Tegucigalpa"
+
+#: calendar/zones.h:169
+msgid "America/Thule"
+msgstr "Châu Mỹ/Thule"
+
+#: calendar/zones.h:170
+msgid "America/Thunder_Bay"
+msgstr "Châu Mỹ/Thunder_Bay"
+
+#: calendar/zones.h:171
+msgid "America/Tijuana"
+msgstr "Châu Mỹ/Tijuana"
+
+#: calendar/zones.h:172
+msgid "America/Tortola"
+msgstr "Châu Mỹ/Tortola"
+
+#: calendar/zones.h:173
+msgid "America/Vancouver"
+msgstr "Châu Mỹ/Vancouver"
+
+#: calendar/zones.h:174
+msgid "America/Whitehorse"
+msgstr "Châu Mỹ/Whitehorse"
+
+#: calendar/zones.h:175
+msgid "America/Winnipeg"
+msgstr "Châu Mỹ/Winnipeg"
+
+#: calendar/zones.h:176
+msgid "America/Yakutat"
+msgstr "Châu Mỹ/Yakutat"
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr "Châu Mỹ/Yellowknife"
+
+#: calendar/zones.h:178
+msgid "Antarctica/Casey"
+msgstr "Nam Cực/Casey"
+
+#: calendar/zones.h:179
+msgid "Antarctica/Davis"
+msgstr "Nam Cực/Davis"
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr "Nam Cực/DumontDUrville"
+
+#: calendar/zones.h:181
+msgid "Antarctica/Mawson"
+msgstr "Nam Cực/Mawson"
+
+#: calendar/zones.h:182
+msgid "Antarctica/McMurdo"
+msgstr "Nam Cực/McMurdo"
+
+#: calendar/zones.h:183
+msgid "Antarctica/Palmer"
+msgstr "Nam Cực/Palmer"
+
+#: calendar/zones.h:184
+msgid "Antarctica/South_Pole"
+msgstr "Nam Cực/South_Pole"
+
+#: calendar/zones.h:185
+msgid "Antarctica/Syowa"
+msgstr "Nam Cực/Syowa"
+
+#: calendar/zones.h:186
+msgid "Antarctica/Vostok"
+msgstr "Nam Cực/Vostok"
+
+#: calendar/zones.h:187
+msgid "Arctic/Longyearbyen"
+msgstr "Arctic/Longyearbyen"
+
+#: calendar/zones.h:188
+msgid "Asia/Aden"
+msgstr "Châu Á/Aden"
+
+#: calendar/zones.h:189
+msgid "Asia/Almaty"
+msgstr "Châu Á/Almaty"
+
+#: calendar/zones.h:190
+msgid "Asia/Amman"
+msgstr "Châu Á/Amman"
+
+#: calendar/zones.h:191
+msgid "Asia/Anadyr"
+msgstr "Châu Á/Anadyr"
+
+#: calendar/zones.h:192
+msgid "Asia/Aqtau"
+msgstr "Châu Á/Aqtau"
+
+#: calendar/zones.h:193
+msgid "Asia/Aqtobe"
+msgstr "Châu Á/Aqtobe"
+
+#: calendar/zones.h:194
+msgid "Asia/Ashgabat"
+msgstr "Châu Á/Ashgabat"
+
+#: calendar/zones.h:195
+msgid "Asia/Baghdad"
+msgstr "Châu Á/Baghdad"
+
+#: calendar/zones.h:196
+msgid "Asia/Bahrain"
+msgstr "Châu Á/Bahrain"
+
+#: calendar/zones.h:197
+msgid "Asia/Baku"
+msgstr "Châu Á/Baku"
+
+#: calendar/zones.h:198
+msgid "Asia/Bangkok"
+msgstr "Châu Á/Bangkok"
+
+#: calendar/zones.h:199
+msgid "Asia/Beirut"
+msgstr "Châu Á/Beirut"
+
+#: calendar/zones.h:200
+msgid "Asia/Bishkek"
+msgstr "Châu Á/Bishkek"
+
+#: calendar/zones.h:201
+msgid "Asia/Brunei"
+msgstr "Châu Á/Brunei"
+
+#: calendar/zones.h:202
+msgid "Asia/Calcutta"
+msgstr "Châu Á/Calcutta"
+
+#: calendar/zones.h:203
+msgid "Asia/Choibalsan"
+msgstr "Châu Á/Choibalsan"
+
+#: calendar/zones.h:204
+msgid "Asia/Chongqing"
+msgstr "Châu Á/Chongqing"
+
+#: calendar/zones.h:205
+msgid "Asia/Colombo"
+msgstr "Châu Á/Colombo"
+
+#: calendar/zones.h:206
+msgid "Asia/Damascus"
+msgstr "Châu Á/Damascus"
+
+#: calendar/zones.h:207
+msgid "Asia/Dhaka"
+msgstr "Châu Á/Dhaka"
+
+#: calendar/zones.h:208
+msgid "Asia/Dili"
+msgstr "Châu Á/Dili"
+
+#: calendar/zones.h:209
+msgid "Asia/Dubai"
+msgstr "Châu Á/Dubai"
+
+#: calendar/zones.h:210
+msgid "Asia/Dushanbe"
+msgstr "Châu Á/Dushanbe"
+
+#: calendar/zones.h:211
+msgid "Asia/Gaza"
+msgstr "Châu Á/Gaza"
+
+#: calendar/zones.h:212
+msgid "Asia/Harbin"
+msgstr "Châu Á/Harbin"
+
+#: calendar/zones.h:213
+msgid "Asia/Hong_Kong"
+msgstr "Châu Á/Hong_Kong"
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr "Châu Á/Hovd"
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr "Châu Á/Irkutsk"
+
+#: calendar/zones.h:216
+msgid "Asia/Istanbul"
+msgstr "Châu Á/Istanbul"
+
+#: calendar/zones.h:217
+msgid "Asia/Jakarta"
+msgstr "Châu Á/Jakarta"
+
+#: calendar/zones.h:218
+msgid "Asia/Jayapura"
+msgstr "Châu Á/Jayapura"
+
+#: calendar/zones.h:219
+msgid "Asia/Jerusalem"
+msgstr "Châu Á/Jerusalem"
+
+#: calendar/zones.h:220
+msgid "Asia/Kabul"
+msgstr "Châu Á/Kabul"
+
+#: calendar/zones.h:221
+msgid "Asia/Kamchatka"
+msgstr "Châu Á/Kamchatka"
+
+#: calendar/zones.h:222
+msgid "Asia/Karachi"
+msgstr "Châu Á/Karachi"
+
+#: calendar/zones.h:223
+msgid "Asia/Kashgar"
+msgstr "Châu Á/Kashgar"
+
+#: calendar/zones.h:224
+msgid "Asia/Katmandu"
+msgstr "Châu Á/Katmandu"
+
+#: calendar/zones.h:225
+msgid "Asia/Krasnoyarsk"
+msgstr "Châu Á/Krasnoyarsk"
+
+#: calendar/zones.h:226
+msgid "Asia/Kuala_Lumpur"
+msgstr "Châu Á/Kuala_Lumpur"
+
+#: calendar/zones.h:227
+msgid "Asia/Kuching"
+msgstr "Châu Á/Kuching"
+
+#: calendar/zones.h:228
+msgid "Asia/Kuwait"
+msgstr "Châu Á/Kuwait"
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr "Châu Á/Macao"
+
+#: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Châu Á/Macao"
+
+#: calendar/zones.h:231
+msgid "Asia/Magadan"
+msgstr "Châu Á/Magadan"
+
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "Châu Á/Magadan"
+
+#: calendar/zones.h:233
+msgid "Asia/Manila"
+msgstr "Châu Á/Manila"
+
+#: calendar/zones.h:234
+msgid "Asia/Muscat"
+msgstr "Châu Á/Muscat"
+
+#: calendar/zones.h:235
+msgid "Asia/Nicosia"
+msgstr "Châu Á/Nicosia"
+
+#: calendar/zones.h:236
+msgid "Asia/Novosibirsk"
+msgstr "Châu Á/Novosibirsk"
+
+#: calendar/zones.h:237
+msgid "Asia/Omsk"
+msgstr "Châu Á/Omsk"
+
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Châu Á/Kabul"
+
+#: calendar/zones.h:239
+msgid "Asia/Phnom_Penh"
+msgstr "Châu Á/Phnom_Penh"
+
+#: calendar/zones.h:240
+msgid "Asia/Pontianak"
+msgstr "Châu Á/Pontianak"
+
+#: calendar/zones.h:241
+msgid "Asia/Pyongyang"
+msgstr "Châu Á/Pyongyang"
+
+#: calendar/zones.h:242
+msgid "Asia/Qatar"
+msgstr "Châu Á/Qatar"
+
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "Châu Á/Gaza"
+
+#: calendar/zones.h:244
+msgid "Asia/Rangoon"
+msgstr "Châu Á/Rangoon"
+
+#: calendar/zones.h:245
+msgid "Asia/Riyadh"
+msgstr "Châu Á/Riyadh"
+
+#: calendar/zones.h:246
+msgid "Asia/Saigon"
+msgstr "Châu Á/Sài Gòn"
+
+#: calendar/zones.h:247
+msgid "Asia/Sakhalin"
+msgstr "Châu Á/Sakhalin"
+
+#: calendar/zones.h:248
+msgid "Asia/Samarkand"
+msgstr "Châu Á/Samarkand"
+
+#: calendar/zones.h:249
+msgid "Asia/Seoul"
+msgstr "Châu Á/Seoul"
+
+#: calendar/zones.h:250
+msgid "Asia/Shanghai"
+msgstr "Châu Á/Shanghai"
+
+#: calendar/zones.h:251
+msgid "Asia/Singapore"
+msgstr "Châu Á/Singapore"
+
+#: calendar/zones.h:252
+msgid "Asia/Taipei"
+msgstr "Châu Á/Taipei"
+
+#: calendar/zones.h:253
+msgid "Asia/Tashkent"
+msgstr "Châu Á/Tashkent"
+
+#: calendar/zones.h:254
+msgid "Asia/Tbilisi"
+msgstr "Châu Á/Tbilisi"
+
+#: calendar/zones.h:255
+msgid "Asia/Tehran"
+msgstr "Châu Á/Tehran"
+
+#: calendar/zones.h:256
+msgid "Asia/Thimphu"
+msgstr "Châu Á/Thimphu"
+
+#: calendar/zones.h:257
+msgid "Asia/Tokyo"
+msgstr "Châu Á/Tokyo"
+
+#: calendar/zones.h:258
+msgid "Asia/Ujung_Pandang"
+msgstr "Châu Á/Ujung_Pandang"
+
+#: calendar/zones.h:259
+msgid "Asia/Ulaanbaatar"
+msgstr "Châu Á/Ulaanbaatar"
+
+#: calendar/zones.h:260
+msgid "Asia/Urumqi"
+msgstr "Châu Á/Urumqi"
+
+#: calendar/zones.h:261
+msgid "Asia/Vientiane"
+msgstr "Châu Á/Vientiane"
+
+#: calendar/zones.h:262
+msgid "Asia/Vladivostok"
+msgstr "Châu Á/Vladivostok"
+
+#: calendar/zones.h:263
+msgid "Asia/Yakutsk"
+msgstr "Châu Á/Yakutsk"
+
+#: calendar/zones.h:264
+msgid "Asia/Yekaterinburg"
+msgstr "Châu Á/Yekaterinburg"
+
+#: calendar/zones.h:265
+msgid "Asia/Yerevan"
+msgstr "Châu Á/Yerevan"
+
+#: calendar/zones.h:266
+msgid "Atlantic/Azores"
+msgstr "Atlantic/Azores"
+
+#: calendar/zones.h:267
+msgid "Atlantic/Bermuda"
+msgstr "Đại Tây Dương/Bermuda"
+
+#: calendar/zones.h:268
+msgid "Atlantic/Canary"
+msgstr "Đại Tây Dương/Canary"
+
+#: calendar/zones.h:269
+msgid "Atlantic/Cape_Verde"
+msgstr "Đại Tây Dương/Cape_Verde"
+
+#: calendar/zones.h:270
+msgid "Atlantic/Faeroe"
+msgstr "Đại Tây Dương/Faeroe"
+
+#: calendar/zones.h:271
+msgid "Atlantic/Jan_Mayen"
+msgstr "Đại Tây Dương/Jan_Mayen"
+
+#: calendar/zones.h:272
+msgid "Atlantic/Madeira"
+msgstr "Đại Tây Dương/Madeira"
+
+#: calendar/zones.h:273
+msgid "Atlantic/Reykjavik"
+msgstr "Đại Tây Dương/Reykjavik"
+
+#: calendar/zones.h:274
+msgid "Atlantic/South_Georgia"
+msgstr "Đại Tây Dương/South_Georgia"
+
+#: calendar/zones.h:275
+msgid "Atlantic/St_Helena"
+msgstr "Đại Tây Dương/St_Helena"
+
+#: calendar/zones.h:276
+msgid "Atlantic/Stanley"
+msgstr "Đại Tây Dương/Stanley"
+
+#: calendar/zones.h:277
+msgid "Australia/Adelaide"
+msgstr "Châu Úc/Adelaide"
+
+#: calendar/zones.h:278
+msgid "Australia/Brisbane"
+msgstr "Châu Úc/Brisbane"
+
+#: calendar/zones.h:279
+msgid "Australia/Broken_Hill"
+msgstr "Châu Úc/Broken_Hill"
+
+#: calendar/zones.h:280
+msgid "Australia/Darwin"
+msgstr "Châu Úc/Darwin"
+
+#: calendar/zones.h:281
+msgid "Australia/Hobart"
+msgstr "Châu Úc/Hobart"
+
+#: calendar/zones.h:282
+msgid "Australia/Lindeman"
+msgstr "Châu Úc/Lindeman"
+
+#: calendar/zones.h:283
+msgid "Australia/Lord_Howe"
+msgstr "Châu Úc/Lord_Howe"
+
+#: calendar/zones.h:284
+msgid "Australia/Melbourne"
+msgstr "Châu Úc/Melbourne"
+
+#: calendar/zones.h:285
+msgid "Australia/Perth"
+msgstr "Châu Úc/Perth"
+
+#: calendar/zones.h:286
+msgid "Australia/Sydney"
+msgstr "Châu Úc/Sydney"
+
+#: calendar/zones.h:287
+msgid "Europe/Amsterdam"
+msgstr "Châu Âu/Amsterdam"
+
+#: calendar/zones.h:288
+msgid "Europe/Andorra"
+msgstr "Châu Âu/Andorra"
+
+#: calendar/zones.h:289
+msgid "Europe/Athens"
+msgstr "Châu Âu/Athens"
+
+#: calendar/zones.h:290
+msgid "Europe/Belfast"
+msgstr "Châu Âu/Belfast"
+
+#: calendar/zones.h:291
+msgid "Europe/Belgrade"
+msgstr "Châu Âu/Belgrade"
+
+#: calendar/zones.h:292
+msgid "Europe/Berlin"
+msgstr "Châu Âu/Berlin"
+
+#: calendar/zones.h:293
+msgid "Europe/Bratislava"
+msgstr "Châu Âu/Bratislava"
+
+#: calendar/zones.h:294
+msgid "Europe/Brussels"
+msgstr "Châu Âu/Brussels"
+
+#: calendar/zones.h:295
+msgid "Europe/Bucharest"
+msgstr "Châu Âu/Bucharest"
+
+#: calendar/zones.h:296
+msgid "Europe/Budapest"
+msgstr "Châu Âu/Budapest"
+
+#: calendar/zones.h:297
+msgid "Europe/Chisinau"
+msgstr "Châu Âu/Chisinau"
+
+#: calendar/zones.h:298
+msgid "Europe/Copenhagen"
+msgstr "Châu Âu/Copenhagen"
+
+#: calendar/zones.h:299
+msgid "Europe/Dublin"
+msgstr "Châu Âu/Dublin"
+
+#: calendar/zones.h:300
+msgid "Europe/Gibraltar"
+msgstr "Châu Âu/Gibraltar"
+
+#: calendar/zones.h:301
+msgid "Europe/Helsinki"
+msgstr "Châu Âu/Helsinki"
+
+#: calendar/zones.h:302
+msgid "Europe/Istanbul"
+msgstr "Châu Âu/Istanbul"
+
+#: calendar/zones.h:303
+msgid "Europe/Kaliningrad"
+msgstr "Châu Âu/Kaliningrad"
+
+#: calendar/zones.h:304
+msgid "Europe/Kiev"
+msgstr "Châu Âu/Kiev"
+
+#: calendar/zones.h:305
+msgid "Europe/Lisbon"
+msgstr "Châu Âu/Lisbon"
+
+#: calendar/zones.h:306
+msgid "Europe/Ljubljana"
+msgstr "Châu Âu/Ljubljana"
+
+#: calendar/zones.h:307
+msgid "Europe/London"
+msgstr "Châu Âu/London"
+
+#: calendar/zones.h:308
+msgid "Europe/Luxembourg"
+msgstr "Châu Âu/Luxembourg"
+
+#: calendar/zones.h:309
+msgid "Europe/Madrid"
+msgstr "Châu Âu/Madrid"
+
+#: calendar/zones.h:310
+msgid "Europe/Malta"
+msgstr "Châu Âu/Malta"
+
+#: calendar/zones.h:311
+msgid "Europe/Minsk"
+msgstr "Châu Âu/Minsk"
+
+#: calendar/zones.h:312
+msgid "Europe/Monaco"
+msgstr "Châu Âu/Monaco"
+
+#: calendar/zones.h:313
+msgid "Europe/Moscow"
+msgstr "Châu Âu/Moscow"
+
+#: calendar/zones.h:314
+msgid "Europe/Nicosia"
+msgstr "Châu Âu/Nicosia"
+
+#: calendar/zones.h:315
+msgid "Europe/Oslo"
+msgstr "Châu Âu/Oslo"
+
+#: calendar/zones.h:316
+msgid "Europe/Paris"
+msgstr "Châu Âu/Paris"
+
+#: calendar/zones.h:317
+msgid "Europe/Prague"
+msgstr "Châu Âu/Prague"
+
+#: calendar/zones.h:318
+msgid "Europe/Riga"
+msgstr "Châu Âu/Riga"
+
+#: calendar/zones.h:319
+msgid "Europe/Rome"
+msgstr "Châu Âu/Rome"
+
+#: calendar/zones.h:320
+msgid "Europe/Samara"
+msgstr "Châu Âu/Samara"
+
+#: calendar/zones.h:321
+msgid "Europe/San_Marino"
+msgstr "Châu Âu/San_Marino"
+
+#: calendar/zones.h:322
+msgid "Europe/Sarajevo"
+msgstr "Châu Âu/Sarajevo"
+
+#: calendar/zones.h:323
+msgid "Europe/Simferopol"
+msgstr "Châu Âu/Simferopol"
+
+#: calendar/zones.h:324
+msgid "Europe/Skopje"
+msgstr "Châu Âu/Skopje"
+
+#: calendar/zones.h:325
+msgid "Europe/Sofia"
+msgstr "Châu Âu/Sofia"
+
+#: calendar/zones.h:326
+msgid "Europe/Stockholm"
+msgstr "Châu Âu/Stockholm"
+
+#: calendar/zones.h:327
+msgid "Europe/Tallinn"
+msgstr "Châu Âu/Tallinn"
+
+#: calendar/zones.h:328
+msgid "Europe/Tirane"
+msgstr "Châu Âu/Tirane"
+
+#: calendar/zones.h:329
+msgid "Europe/Uzhgorod"
+msgstr "Châu Âu/Uzhgorod"
+
+#: calendar/zones.h:330
+msgid "Europe/Vaduz"
+msgstr "Châu Âu/Vaduz"
+
+#: calendar/zones.h:331
+msgid "Europe/Vatican"
+msgstr "Châu Âu/Vatican"
+
+#: calendar/zones.h:332
+msgid "Europe/Vienna"
+msgstr "Châu Âu/Vienna"
+
+#: calendar/zones.h:333
+msgid "Europe/Vilnius"
+msgstr "Châu Âu/Vilnius"
+
+#: calendar/zones.h:334
+msgid "Europe/Warsaw"
+msgstr "Châu Âu/Warsaw"
+
+#: calendar/zones.h:335
+msgid "Europe/Zagreb"
+msgstr "Châu Âu/Zagreb"
+
+#: calendar/zones.h:336
+msgid "Europe/Zaporozhye"
+msgstr "Châu Âu/Zaporozhye"
+
+#: calendar/zones.h:337
+msgid "Europe/Zurich"
+msgstr "Châu Âu/Zurich"
+
+#: calendar/zones.h:338
+msgid "Indian/Antananarivo"
+msgstr "Indian/Antananarivo"
+
+#: calendar/zones.h:339
+msgid "Indian/Chagos"
+msgstr "Ấn Độ Dương/Chagos"
+
+#: calendar/zones.h:340
+msgid "Indian/Christmas"
+msgstr "Ấn Độ Dương/Christmas"
+
+#: calendar/zones.h:341
+msgid "Indian/Cocos"
+msgstr "Ấn Độ Dương/Cocos"
+
+#: calendar/zones.h:342
+msgid "Indian/Comoro"
+msgstr "Ấn Độ Dương/Comoro"
+
+#: calendar/zones.h:343
+msgid "Indian/Kerguelen"
+msgstr "Ấn Độ Dương/Kerguelen"
+
+#: calendar/zones.h:344
+msgid "Indian/Mahe"
+msgstr "Ấn Độ Dương/Mahe"
+
+#: calendar/zones.h:345
+msgid "Indian/Maldives"
+msgstr "Ấn Độ Dương/Maldives"
+
+#: calendar/zones.h:346
+msgid "Indian/Mauritius"
+msgstr "Ấn Độ Dương/Mauritius"
+
+#: calendar/zones.h:347
+msgid "Indian/Mayotte"
+msgstr "Ấn Độ Dương/Mayotte"
+
+#: calendar/zones.h:348
+msgid "Indian/Reunion"
+msgstr "Ấn Độ Dương/Reunion"
+
+#: calendar/zones.h:349
+msgid "Pacific/Apia"
+msgstr "Thái Bình Dương/Apia"
+
+#: calendar/zones.h:350
+msgid "Pacific/Auckland"
+msgstr "Thái Bình Dương/Auckland"
+
+#: calendar/zones.h:351
+msgid "Pacific/Chatham"
+msgstr "Thái Bình Dương/Chatham"
+
+#: calendar/zones.h:352
+msgid "Pacific/Easter"
+msgstr "Thái Bình Dương/Easter"
+
+#: calendar/zones.h:353
+msgid "Pacific/Efate"
+msgstr "Thái Bình Dương/Efate"
+
+#: calendar/zones.h:354
+msgid "Pacific/Enderbury"
+msgstr "Thái Bình Dương/Enderbury"
+
+#: calendar/zones.h:355
+msgid "Pacific/Fakaofo"
+msgstr "Thái Bình Dương/Fakaofo"
+
+#: calendar/zones.h:356
+msgid "Pacific/Fiji"
+msgstr "Thái Bình Dương/Fiji"
+
+#: calendar/zones.h:357
+msgid "Pacific/Funafuti"
+msgstr "Thái Bình Dương/Funafuti"
+
+#: calendar/zones.h:358
+msgid "Pacific/Galapagos"
+msgstr "Thái Bình Dương/Galapagos"
+
+#: calendar/zones.h:359
+msgid "Pacific/Gambier"
+msgstr "Thái Bình Dương/Gambier"
+
+#: calendar/zones.h:360
+msgid "Pacific/Guadalcanal"
+msgstr "Thái Bình Dương/Guadalcanal"
+
+#: calendar/zones.h:361
+msgid "Pacific/Guam"
+msgstr "Thái Bình Dương/Guam"
+
+#: calendar/zones.h:362
+msgid "Pacific/Honolulu"
+msgstr "Thái Bình Dương/Honolulu"
+
+#: calendar/zones.h:363
+msgid "Pacific/Johnston"
+msgstr "Thái Bình Dương/Johnston"
+
+#: calendar/zones.h:364
+msgid "Pacific/Kiritimati"
+msgstr "Thái Bình Dương/Kiritimati"
+
+#: calendar/zones.h:365
+msgid "Pacific/Kosrae"
+msgstr "Thái Bình Dương/Kosrae"
+
+#: calendar/zones.h:366
+msgid "Pacific/Kwajalein"
+msgstr "Thái Bình Dương/Kwajalein"
+
+#: calendar/zones.h:367
+msgid "Pacific/Majuro"
+msgstr "Thái Bình Dương/Majuro"
+
+#: calendar/zones.h:368
+msgid "Pacific/Marquesas"
+msgstr "Thái Bình Dương/Marquesas"
+
+#: calendar/zones.h:369
+msgid "Pacific/Midway"
+msgstr "Thái Bình Dương/Midway"
+
+#: calendar/zones.h:370
+msgid "Pacific/Nauru"
+msgstr "Thái Bình Dương/Nauru"
+
+#: calendar/zones.h:371
+msgid "Pacific/Niue"
+msgstr "Thái Bình Dương/Niue"
+
+#: calendar/zones.h:372
+msgid "Pacific/Norfolk"
+msgstr "Thái Bình Dương/Norfolk"
+
+#: calendar/zones.h:373
+msgid "Pacific/Noumea"
+msgstr "Thái Bình Dương/Noumea"
+
+#: calendar/zones.h:374
+msgid "Pacific/Pago_Pago"
+msgstr "Thái Bình Dương/Pago_Pago"
+
+#: calendar/zones.h:375
+msgid "Pacific/Palau"
+msgstr "Thái Bình Dương/Palau"
+
+#: calendar/zones.h:376
+msgid "Pacific/Pitcairn"
+msgstr "Thái Bình Dương/Pitcairn"
+
+#: calendar/zones.h:377
+msgid "Pacific/Ponape"
+msgstr "Thái Bình Dương/Ponape"
+
+#: calendar/zones.h:378
+msgid "Pacific/Port_Moresby"
+msgstr "Thái Bình Dương/Port_Moresby"
+
+#: calendar/zones.h:379
+msgid "Pacific/Rarotonga"
+msgstr "Thái Bình Dương/Rarotonga"
+
+#: calendar/zones.h:380
+msgid "Pacific/Saipan"
+msgstr "Thái Bình Dương/Saipan"
+
+#: calendar/zones.h:381
+msgid "Pacific/Tahiti"
+msgstr "Thái Bình Dương/Tahiti"
+
+#: calendar/zones.h:382
+msgid "Pacific/Tarawa"
+msgstr "Thái Bình Dương/Tarawa"
+
+#: calendar/zones.h:383
+msgid "Pacific/Tongatapu"
+msgstr "Thái Bình Dương/Tongatapu"
+
+#: calendar/zones.h:384
+msgid "Pacific/Truk"
+msgstr "Thái Bình Dương/Truk"
+
+#: calendar/zones.h:385
+msgid "Pacific/Wake"
+msgstr "Thái Bình Dương/Wake"
+
+#: calendar/zones.h:386
+msgid "Pacific/Wallis"
+msgstr "Thái Bình Dương/Wallis"
+
+#: calendar/zones.h:387
+msgid "Pacific/Yap"
+msgstr "Thái Bình Dương/Yap"
+
+#: camel/camel-cipher-context.c:170
+msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-data-cache.c:169
+#, fuzzy
+msgid "Unable to create cache path"
+msgstr ""
+"Không thể tạo tập tin output: %s\n"
+" %s"
+
+#: camel/camel-data-cache.c:443
+#, fuzzy, c-format
+msgid "Could not remove cache entry: %s: %s"
+msgstr "Không thể mở thư mục cache: %s"
+
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7046,7 +7884,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7057,118 +7895,211 @@ msgstr ""
 "%s\n"
 "Các thay đổi được tạo ra trong thư mục này sẽ không thể được tái đồng bộ."
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "Đang tái đồng bộ với server"
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "Đang lưu thư mục %s"
+
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "Bạn phải đang hoạt động trực tuyến mới có thể hoàn tất thao tác này."
 
-#: camel/camel-filter-driver.c:553 camel/camel-filter-driver.c:562
+#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
 msgid "Syncing folders"
 msgstr "Đồng bộ thư mục"
 
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "Lỗi phân tích bộ lọc: %s: %s"
+
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Lỗi thực hiện bộ lọc: %s: %s"
+
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:908
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Đang lấy thông diệp %d (%d%%)"
 
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "Không thể mở thông điệp"
 
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "Lỗi trên thông điệp %d"
 
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "Đang đồng bộ thư mục"
 
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Đang lấy thông điệp %d trên %d"
 
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Lỗi tại thông điệp %d trên %d"
 
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Lỗi phân tích bộ lọc: %s: %s"
+#: camel/camel-filter-search.c:140
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "Lỗi giải mã thông điệp."
 
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Lỗi thực hiện bộ lọc: %s: %s"
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Lỗi thông điệp cache %s: %s"
 
-#: camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Lỗi thông điệp cache %s: %s"
+
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Lỗi thực hiện tìm kiếm bộ lọc: %s: %s"
 
-#: camel/camel-folder.c:471
+#: camel/camel-folder-search.c:343
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Không thể phân tích biểu thức tìm kiếm: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:353
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Lỗi thực hiện tìm kiếm theo biểu thức: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+msgid "(match-all) requires a single bool result"
+msgstr "(khớp tất cả) yêu cầu một kết quả đơn"
+
+#: camel/camel-folder-search.c:650
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Đang thực hiện truy vấn trên header lạ: %s"
+
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Tháo tác chưa hỗ trợ: nối dài thông điệp: cho %s"
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Thao tác chưa hỗ trợ: tìm theo biểu thức: cho %s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Thao tác chưa hỗ trợ: tìm bằng UID: cho %s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "Đang di chuyển thông điệp"
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "Đang chép thông điệp vào %s"
+
+#: camel/camel-gpg-context.c:696
 #, c-format
 msgid ""
-"Cannot parse search expression: %s:\n"
+"Unexpected GnuPG status message encountered:\n"
+"\n"
 "%s"
 msgstr ""
-"Không thể phân tích biểu thức tìm kiếm: %s:\n"
-"%s"
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
 #, c-format
 msgid ""
-"Error executing search expression: %s:\n"
-"%s"
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
 msgstr ""
-"Lỗi thực hiện tìm kiếm theo biểu thức: %s:\n"
-"%s"
 
-#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
-msgid "(match-all) requires a single bool result"
-msgstr "(khớp tất cả) yêu cầu một kết quả đơn"
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "Đã hủy"
 
-#: camel/camel-folder-search.c:638
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Đang thực hiện truy vấn trên header lạ: %s"
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "Kiểu không hợp lệ trong body-contains, lẽ ra phải là chuỗi"
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "Tín hiệu trả lời không mong đợi từ POP server: %s"
+
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "Chưa có tên tập tin."
+
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "Không thể mã hóa thông điệp: chưa xác định người nhận"
+
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "Lỗi thông điệp cache %s: %s"
+
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "Lỗi thông điệp cache %s: %s"
+
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "Lỗi giải mã thông điệp."
+
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "Không thể xác minh thông điệp: không thể tạo tập tin tạm: %s"
 
 #: camel/camel-lock-client.c:111
 #, c-format
@@ -7265,136 +8196,38 @@ msgstr "Lỗi ghi tập tin mail tạm: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Lỗi sao chép tập tin mail tạm: %s"
 
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Vui lòng nhập passphrase %s của bạn cho %s"
-
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Vui lòng nhập passphrase %s của bạn"
-
-#: camel/camel-pgp-context.c:575
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "Không thể ký tên vào thông điệp: không có văn bản thô nào để ký"
-
-#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
-msgid "Cannot sign this message: no password provided"
-msgstr "Không thể ký tên vào thông điệp: chưa cung cấp mật khẩu"
-
-#: camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Không thể ký tên vào thông điệp: không thể tạo ỗng dẫn tới GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:755
-msgid "Cannot sign this message: no plaintext to clearsign"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pgp-context.c:953
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "Không thể xác minh thông điệp: không có văn bản thô nào để xác minh"
-
-#: camel/camel-pgp-context.c:959
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Không thể xác minh thông điệp: không thể tạo ống dẫn tới GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:970
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "Không thể xác minh thông điệp: không thể tạo tập tin tạm: %s"
-
-#: camel/camel-pgp-context.c:1143
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "Không thể mã hóa thông điệp: không có văn bản thô nào để mã hóa"
-
-#: camel/camel-pgp-context.c:1153
-msgid "Cannot encrypt this message: no password provided"
-msgstr "Không thể mã hóa thông điệp: chưa cung cấp mật khẩu"
-
-#: camel/camel-pgp-context.c:1160
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Không thể mã hóa thông điệp: không thể tạo ống dẫn tới GPG/PGP: %s"
-
-#: camel/camel-pgp-context.c:1169
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "Không thể mã hóa thông điệp: chưa xác định người nhận"
-
-#: camel/camel-pgp-context.c:1337
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "Không thể giải mã thông điệp: không có đoạn mã cần giải mã"
-
-#: camel/camel-pgp-context.c:1345
-msgid "Cannot decrypt this message: no password provided"
-msgstr "Không thể giải mã thông điệp: chưa cung cấp mật khẩu"
-
-#: camel/camel-pgp-context.c:1352
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "Không thể giải mã thông điệp: không thể tạo ống dẫn tới GPG/PGP: %s"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
+msgstr ""
 
-#: camel/camel-pgp-mime.c:310
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "Đây là phần thông điệp có chữ ký số"
 
-#: camel/camel-pgp-mime.c:485
-msgid "This is an encrypted message part"
-msgstr "Đây là phần thông điệp đã mã hóa"
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "Lỗi khác"
 
-#: camel/camel-provider.c:130
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Không thể nạp %s: Hệ thống này chưa hỗ trợ tính năng nạp mô đun."
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Không thể nạp %s: %s"
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Không thể nạp %s: Không có mã khởi động trong mô đun"
 
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s server %s"
-msgstr "%s server %s"
-
-#: camel/camel-remote-store.c:207
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "dịch vụ %s cho %s trên %s"
-
-#: camel/camel-remote-store.c:264
-msgid "Connection cancelled"
-msgstr "Kết nối bị hủy bỏ"
-
-#: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:273
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Không thể kết nối tới %s (cổng %d): %s"
-
-#: camel/camel-remote-store.c:268
-msgid "(unknown host)"
-msgstr "(máy chủ lạ)"
-
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:401
-msgid "Operation cancelled"
-msgstr "Thao tác bị hủy bỏ"
-
-#: camel/camel-remote-store.c:484
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Server đã ngắt kết nối bất ngờ: %s"
-
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
 msgstr "Vô danh"
@@ -7442,7 +8275,9 @@ msgstr "CRAM-MD5"
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
-msgstr "Tùy chọn này sẽ kết nối tới server dùng mật khẩu an toàn CRAM-MD5, nếu server có hỗ trợ."
+msgstr ""
+"Tùy chọn này sẽ kết nối tới server dùng mật khẩu an toàn CRAM-MD5, nếu "
+"server có hỗ trợ."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -7452,7 +8287,9 @@ msgstr "DIGEST-MD5"
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
-msgstr "Tùy chọn này sẽ kết nối tới server bằng mật khẩu an toàn DIGEST-MD5, nếu server có hỗ trợ."
+msgstr ""
+"Tùy chọn này sẽ kết nối tới server bằng mật khẩu an toàn DIGEST-MD5, nếu "
+"server có hỗ trợ."
 
 #: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
@@ -7496,13 +8333,14 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "Trả lời chứng thực từ server sai."
 
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
-msgstr "Đăng nhập NT"
+#, fuzzy
+msgid "Login"
+msgstr "Logan"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
@@ -7512,11 +8350,20 @@ msgstr "Tùy chọn này sẽ kết nối tới server bằng mật khẩu đơn
 msgid "Unknown authentication state."
 msgstr "Trạng thái chứng thực lạ."
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:301
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
-msgid "Password"
-msgstr "Mật khẩu"
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+#: camel/camel-sasl-ntlm.c:33
+#, fuzzy
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr "Tùy chọn này sẽ kết nối server bằng cơ chế xác minh Kerberos 4."
+
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7543,41 +8390,56 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Biên dịch biểu thức chính quy thất bại: %s: %s"
 
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' cần phần tên người dùng"
 
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' cần phần máy chủ"
 
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' cần phần đường dẫn"
 
-#: camel/camel-service.c:614
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "Đang phân giải: %s"
 
-#: camel/camel-service.c:641
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Lỗi tra cứu tên: %s"
 
-#: camel/camel-service.c:666
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Lỗi tra cứu máy chủ: %s: không tìm thấy máy chủ"
 
-#: camel/camel-service.c:668
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Lỗi tra cứu máy chủ: %s: lỗi lạ"
 
+#: camel/camel-service.c:850
+#, fuzzy
+msgid "Resolving address"
+msgstr "Đang phân giải: %s"
+
+#: camel/camel-service.c:912
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "Lỗi tra cứu máy chủ: %s: không tìm thấy máy chủ"
+
+#: camel/camel-service.c:915
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "Lỗi tra cứu máy chủ: %s: lỗi lạ"
+
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
 msgstr "Bộ cung cấp thư mục ảo"
@@ -7586,12 +8448,12 @@ msgstr "Bộ cung cấp thư mục ảo"
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:346 camel/camel-session.c:415
+#: camel/camel-session.c:351 camel/camel-session.c:419
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Không có bên nào cung cấp giao thức `%s'"
 
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7637,35 +8499,22 @@ msgstr "Lỗi giải mã thông điệp."
 msgid "Failed to verify certificates."
 msgstr "Lỗi xác minh chứng nhận."
 
-#: camel/camel-store.c:220
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Không thể lấy thư mục: thao tác không hợp lệ trên thiết bị lưu trữ"
 
-#: camel/camel-store.c:282
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Không thể tạo thư mục: Thao tác không hợp lệ trên thiết bị lưu trữ"
 
-#: camel/camel-tcp-stream-ssl.c:422
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
-msgstr ""
-"EMail: %s\n"
-"Tên thường gọi: %s\n"
-"Đơn vị tổ chứa: %s\n"
-"Tổ chức: %s\n"
-"Locality: %s\n"
-"Tỉnh: %s\n"
-"Quốc gia: %s"
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:438
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7680,115 +8529,159 @@ msgstr ""
 "\n"
 "Bạn có muốn chấp nhận dù bất cứ giá nào?"
 
+#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
+#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
+#: camel/camel-tcp-stream-ssl.c:495
+#, c-format
+msgid ""
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:501
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:501
+msgid "BAD"
+msgstr ""
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:504
+#, fuzzy, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
+msgstr ""
+"Chứng nhận sai từ %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Bạn có muốn chấp nhận dù bất cứ giá nào?"
+
 #: camel/camel-url.c:288
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Không thể phân tích URL `%s'"
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Không có thông điệp %s trong %s"
 
-#: camel/camel-vee-folder.c:749
-#, c-format
-msgid "No such message: %s"
-msgstr "Không có thông điệp: %s"
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Kiểm tra tìm thư mới trên mọi thư mục"
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Không thể đổi tên thư mục: %s: Không có thư mục này"
 
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "Bạn không thể sao chép các thông điệp từ thư mục Thùng rác."
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "Thao tác bị hủy bỏ"
+
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "Server đã ngắt kết nối bất ngờ: %s"
 
-#: camel/providers/imap/camel-imap-command.c:344
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Tính hiệu trả lời không mong đợi từ IMAP server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:354
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Lỗi lệnh IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "Tính hiệu trả lời của server kết thúc quá sớm."
 
-#: camel/providers/imap/camel-imap-command.c:601
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Tín hiệu trả lời của IMAP server không chứa thông tin %s"
 
-#: camel/providers/imap/camel-imap-command.c:637
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Tín hiệu trả lời OK không mong đợi từ IMAP server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:194
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Không thể tạo thư mục %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Không thể nạp tóm tắt cho %s"
 
-#: camel/providers/imap/camel-imap-folder.c:277
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "Thư mục đã bị hủy và tạo lại trên server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:461
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "Đang quét tìm các thông điệp thay đổi"
 
-#: camel/providers/imap/camel-imap-folder.c:1585
-#: camel/providers/imap/camel-imap-folder.c:2028
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "Thông điệp này hiện thời chưa sẵn sàng"
 
-#: camel/providers/imap/camel-imap-folder.c:1740
-#: camel/providers/imap/camel-imap-folder.c:1821
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "Đang lấy thông tin tóm tắt của các thông điệp mới"
 
-#: camel/providers/imap/camel-imap-folder.c:1746
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "Đang quét tìm thông điệp mới"
 
-#: camel/providers/imap/camel-imap-folder.c:2065
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "Không thể tìm thấy phần thân thông điệp trong tín hiệu trả lời FETCH"
 
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Không thể mở thư mục cache: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:256
-#: camel/providers/imap/camel-imap-message-cache.c:313
-#: camel/providers/imap/camel-imap-message-cache.c:344
-#: camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/providers/imap/camel-imap-message-cache.c:257
+#: camel/providers/imap/camel-imap-message-cache.c:314
+#: camel/providers/imap/camel-imap-message-cache.c:345
+#: camel/providers/imap/camel-imap-message-cache.c:377
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Lỗi thông điệp cache %s: %s"
@@ -7801,7 +8694,7 @@ msgstr "Kiểm tra tìm thư mới"
 msgid "Check for new messages in all folders"
 msgstr "Kiểm tra tìm thư mới trên mọi thư mục"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
 msgid "Folders"
 msgstr "Thư mục"
 
@@ -7819,7 +8712,9 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:57
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Áp dụng bộ lọc đối với những thông điệp mới trong thư mục INBOX trên server này"
+msgstr ""
+"Áp dụng bộ lọc đối với những thông điệp mới trong thư mục INBOX trên server "
+"này"
 
 #: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
@@ -7829,32 +8724,84 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Để đọc và lưu thư trên IMAP server."
 
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Mật khẩu"
+
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Tùy chọn này sẽ kết nối tới IMAP server bằng mật khẩu thô (không mã hóa)."
+msgstr ""
+"Tùy chọn này sẽ kết nối tới IMAP server bằng mật khẩu thô (không mã hóa)."
+
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "dịch vụ %s cho %s trên %s"
+
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "Kết nối bị hủy bỏ"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Không thể kết nối tới %s (cổng %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Không thể kết nối tới POP server.\n"
+"Lỗi gửi tên người dùng: %s"
+
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "Chưa hỗ trợ tác vụ"
+
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "Chứng thực thất bại."
+
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s không hỗ trợ loại chứng thực được yêu cầu %s"
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:389
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Không hỗ trợ loại chứng thực %s"
 
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVui lòng nhập mật khẩu IMAP cho %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "Bạn chưa nhập mật khẩu"
 
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -7865,121 +8812,157 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:899
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "Không có thư mục %s"
 
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Thư mục cha không được phép có các thư mục con"
 
-#: camel/providers/local/camel-local-provider.c:42
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "Không thể mở hộp thư: %s: %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "Thự mục mail với dạng thức MH"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Để lưu thư cục bộ trong thư mục dạng MH."
 
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "Gửi cục bộ"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Để nhận thư cục bộ từ spool dạng mbox."
 
-#: camel/providers/local/camel-local-provider.c:62
+#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "Áp dụng bộ lọc cho thông điệp mới trong INBOX"
 
-#: camel/providers/local/camel-local-provider.c:68
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Thư mục mail dạng thức Maildir"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "Để lưu thư cục bộ trong thư mục maildir."
 
-#: camel/providers/local/camel-local-provider.c:80
-msgid "Standard Unix mbox spools"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
 msgstr "Spool mbox Unix chuẩn"
 
-#: camel/providers/local/camel-local-provider.c:81
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
+msgid ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr "Để đọc và lưu thư cục bộ trong tập tin mbox chuẩn."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:109
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:153
-#: camel/providers/local/camel-local-store.c:169
-#: camel/providers/local/camel-local-store.c:235
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:236
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Không thể lấy thư mục: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 msgid "Local stores do not have an inbox"
 msgstr "Bộ lưu trữ cục bộ chưa có thư mục inbox"
 
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "Tập tin mail cục bộ %s"
 
-#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Không thể đổi tên thư mục %s thành %s: %s"
 
-#: camel/providers/local/camel-local-store.c:374
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "Không thể đổi tên thư mục: %s"
+
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Không thể xóa tập tin tóm tắt thư mục `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:389
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Không thể xóa tập tin chỉ mục thư mục `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Không thể lưu tóm tắt: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Không thể thêm thông điệp vào bảng tóm tắt: nguyên nhân lạ"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "Thông điệp nối thêm dạng Maildir đã bị hủy"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Không thể nối thêm thông điệp vào thư mục Maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:579
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -7988,20 +8971,19 @@ msgstr ""
 "Không thể lấy thông điệp: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:579
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Không có thông điệp như vậy"
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "Nội dung thông điệp không hợp lệ"
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -8010,15 +8992,15 @@ msgstr ""
 "Không thể mở thư mục `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Thư mục `%s' không tồn tại."
 
-#: camel/providers/local/camel-maildir-store.c:116
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-maildir-store.c:117
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8027,60 +9009,75 @@ msgstr ""
 "Không thể tạo thư mục `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:131
+#: camel/providers/local/camel-maildir-store.c:132
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' không phải là thư mục dạng Maildir."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Không thể xóa thư mục `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "không phải là thư mục dạng Maildir"
 
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Không thể quét thư mục `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:405
-#: camel/providers/local/camel-maildir-summary.c:526
+#: camel/providers/local/camel-maildir-summary.c:408
+#: camel/providers/local/camel-maildir-summary.c:531
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Không thể mở đường dẫn thư mục dang Maildir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "Kiểm tra tìm thư mới"
+
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+msgid "Checking for new messages"
+msgstr "Đang quét tìm thông điệp mới"
+
+#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
+msgid "Storing folder"
+msgstr "Đang lưu thư mục"
+
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Không thể tạo khóa thư mục trên %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:456
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Không thể mở hộp thư: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "Quá trình nối thêm mail đã bị hủy"
 
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Không thể nối thêm thông điệp vào tập tin mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8089,17 +9086,15 @@ msgstr ""
 "Không thể lấy thông điệp: %s từ thư mục%s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Thư mục này có vẽ đã bị hư và không thể được phục hồi."
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Lỗi khởi tạo thông điệp: Hộp thư đã bị hỏng?"
 
-#: camel/providers/local/camel-mbox-store.c:93
+#: camel/providers/local/camel-mbox-store.c:95
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -8108,7 +9103,7 @@ msgstr ""
 "Không thể mở tập tin `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:109
+#: camel/providers/local/camel-mbox-store.c:111
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -8117,14 +9112,14 @@ msgstr ""
 "Không thể tạp tập tin `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:118
-#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:120
+#: camel/providers/local/camel-mbox-store.c:147
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' không phải là tập tin bình thường."
 
-#: camel/providers/local/camel-mbox-store.c:137
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:139
+#: camel/providers/local/camel-mbox-store.c:162
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -8133,162 +9128,154 @@ msgstr ""
 "Không thể xóa thư mục `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:152
+#: camel/providers/local/camel-mbox-store.c:154
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Thư mục `%s' không rỗng. Chưa xóa."
 
-#. 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:248
-#: camel/providers/local/camel-mbox-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:378
-#: camel/providers/local/camel-spool-summary.c:643
-#: camel/providers/local/camel-spool-summary.c:935
-msgid "Storing folder"
-msgstr "Đang lưu thư mục"
-
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Không thể mở thư mục: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Lỗi nghiêm trọng khi phân tích mail gần vị trí %ld trong thư mục %s"
 
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Không thể kiểm tra thư mục: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:648
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Không thể mở tập tin: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Không thể mở hộp thư tạm: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:544
-#: camel/providers/local/camel-mbox-summary.c:552
-#: camel/providers/local/camel-mbox-summary.c:741
-#: camel/providers/local/camel-mbox-summary.c:749
-#: camel/providers/local/camel-spool-summary.c:697
-#: camel/providers/local/camel-spool-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:978
-#: camel/providers/local/camel-spool-summary.c:986
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Bản tóm tắt và thư mục không khớp, kể cả sau khi đồng bộ"
-
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-spool-summary.c:749
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Lỗi ghi vào hộp thư tạm: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-spool-summary.c:771
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Lỗi ghi vào hộp thư tmp: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Không thể đóng thư mục nguồn %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Không thể đóng thư mục temp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Không thể đổi tên thư mục: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:873
-#: camel/providers/local/camel-spool-summary.c:544
-#: camel/providers/local/camel-spool-summary.c:1110
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Bản tóm tắt và thư mục không khớp, kể cả sau khi đồng bộ"
+
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Lỗi lạ: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "Không thể đổi tên thư mục: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Lỗi ghi vào hộp thư tạm: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Lỗi ghi vào hộp thư tmp: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Quá trình nối thêm thông điệp dạng MH đã bị hủy"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Không thể nối thêm thông điệp vào thư mục dạng MH: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' không phải là thư mục."
 
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Không thể mở đường dẫn thư mục dạng MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:512
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "Không thể nối thông điệp vào tập tin spool: %s: %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "Không thể đổi tên thư mục spool"
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "Spool `%s' không tồn tại hoặc không phải là một tập tin bình thường"
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "`%s' không phải là thư mục dạng Maildir."
 
-#: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Thư mục `%s/%s' không tồn tại"
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Tập tin spool %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "Không thể đổi tên thư mục spool"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "Không thể đổi tên thư mục spool"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "Không thể xóa thư mục spool"
 
-#: camel/providers/local/camel-spool-summary.c:788
-#: camel/providers/local/camel-spool-summary.c:797
-#: camel/providers/local/camel-spool-summary.c:806
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Không thể đồng bộ thư mục tạm %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Không thể đồng bộ thư mục spool %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8297,48 +9284,6 @@ msgstr ""
 "Không thể đồng bộ thư mục spool %s: %s\n"
 "Có lẽ thư mục bị hư, bản sao được lưu trong `%s'"
 
-#: camel/providers/local/camel-spool-summary.c:940
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Vui lòng nhập mật khẩu NNTP cho %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Server từ chối tên người dùng"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Lỗi gửi tên người dùng cho server"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Server từ chối tên người dùng/mật khẩu"
-
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "Không tìm thấy thông điệp %s."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Không thể lấy danh sách nhóm từ server."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Không thể nạp tập tin danh sách nhóm cho %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Không thể lưu tập tin danh sách nhóm cho %s: %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET news"
@@ -8347,139 +9292,167 @@ msgstr "USENET news"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Đây là bộ cung cấp đọc và gửi thư tới các nhóm tin USENET"
 
-#: camel/providers/nntp/camel-nntp-store.c:230
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "Không thể tạo thư mục %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
 #, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "Không thể mở thư mục cho news server: %s"
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News thông qua %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
-msgstr "Tùy chọn này sẽ chứng thực với NNTP server bằng mật khẩu thô (không mã hóa)"
+msgstr ""
+"Tùy chọn này sẽ chứng thực với NNTP server bằng mật khẩu thô (không mã hóa)"
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:495
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "Không thể mở hoặc tạo tập tin .newsrc cho %s: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Không có thư mục %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "Không thể tạo ống dẫn: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Lỗi lệnh IMAP: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
+#, fuzzy, c-format
+msgid "%s: Scanning new messages"
+msgstr "Đang quét tìm thông điệp mới"
+
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "Lỗi lạ: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:566
+#, fuzzy
+msgid "Use cancel"
+msgstr "Bỏ"
+
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "Thao tác bị hủy bỏ"
+
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "Đang nhậm tóm tắt POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr ""
+#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:446
+#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:522
+#, fuzzy
+msgid "User cancelled"
+msgstr "Thao tác bị hủy bỏ"
 
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr "Không thể mở thư mục: danh sách thông điệp chưa hoàn chỉnh."
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "Không thể lấy thư mục: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "Đang bỏ các thông điệp cần xóa "
 
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "Không thể lấy thông điệp: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "Không thể nhận thông điệp từ POP server %s: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:367
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, c-format
 msgid "No message with uid %s"
 msgstr "Không có thông điệp nào vời UID %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#. Sigh, most of the crap in this function is so that the cancel button
+#. returns the proper exception code.  Sigh.
+#: camel/providers/pop3/camel-pop3-folder.c:427
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Đang nhận thông điệp POP %d"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-folder.c:448
+#: camel/providers/pop3/camel-pop3-folder.c:507
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:524
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr ""
+"Không thể lấy thông điệp: %s\n"
+"  %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Lỗi lại"
+
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "Kho lưu thông điệp"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Xóa thông điệp khỏi server"
 
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Xoá sau %s ngày"
 
-#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52
+#: camel/providers/pop3/camel-pop3-provider.c:54
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Để kết nối và tải thư về từ POP server."
 
-#: camel/providers/pop3/camel-pop3-provider.c:69
+#: camel/providers/pop3/camel-pop3-provider.c:71
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
-msgstr "Tùy chọn này sẽ kết nối tới POP server dùng mật khẩu thô (không mã hóa). Đây là tùy chọn duy nhất được hỗ trợ bởi nhiều server."
+msgstr ""
+"Tùy chọn này sẽ kết nối tới POP server dùng mật khẩu thô (không mã hóa). Đây "
+"là tùy chọn duy nhất được hỗ trợ bởi nhiều server."
 
-#: camel/providers/pop3/camel-pop3-provider.c:79
+#: camel/providers/pop3/camel-pop3-provider.c:81
 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 "Tùy chọn này sẽ kết nối tới POP server dùng mật khẩu đã mã hoá thông qua giao thức APOP. Có thể sẽ không hoạt động cho mọi người dùng, kể cả trên server tuyên bố có hỗ trợ."
-
-#: camel/providers/pop3/camel-pop3-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr "Việc này sẽ kết nối tới POP server và dùng Kerberos 4 để chứng thực."
-
-#: camel/providers/pop3/camel-pop3-store.c:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "Không thể chứng thực KPOP server: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:214
-#, c-format
-msgid "Could not connect to server: %s"
-msgstr "Không thể kết nối tới server: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Không thể kết nối tới POP server trên %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%sVui lòng nhập mật khẩu PỎP cho %s@%s"
+msgstr ""
+"Tùy chọn này sẽ kết nối tới POP server dùng mật khẩu đã mã hoá thông qua "
+"giao thức APOP. Có thể sẽ không hoạt động cho mọi người dùng, kể cả trên "
+"server tuyên bố có hỗ trợ."
 
-#: camel/providers/pop3/camel-pop3-store.c:377
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Không thể kết nối tới POP server.\n"
 "Lỗi gửi tên người dùng: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:380
-#: camel/providers/pop3/camel-pop3-store.c:417
-msgid "(Unknown)"
-msgstr "(Không biết)"
+#: camel/providers/pop3/camel-pop3-store.c:351
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "Không thể kết nối tới POP server trên %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8487,7 +9460,27 @@ msgstr ""
 "Không thể kết nối tới POP server.\n"
 "Không hỗ trợ cơ chế chứng thực yêu cầu."
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:408
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "Lỗi lệnh IMAP: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:419
+msgid "SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:434
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "Lỗi I/O"
+
+#: camel/providers/pop3/camel-pop3-store.c:455
+#, fuzzy, c-format
+msgid "%sPlease enter the POP password for %s@%s"
+msgstr "%sVui lòng nhập mật khẩu PỎP cho %s@%s"
+
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8496,18 +9489,13 @@ msgstr ""
 "Không thể kết nối tới POP server.\n"
 "Lỗi gửi mật khẩu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Không có thư mục `%s'."
 
-#: camel/providers/pop3/camel-pop3-store.c:563
-#, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "Tín hiệu trả lời không mong đợi từ POP server: %s"
-
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8515,51 +9503,53 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "Để gửi thư bằng cách chuyển nó cho chương trình sendmail trên hệ thống này."
+msgstr ""
+"Để gửi thư bằng cách chuyển nó cho chương trình sendmail trên hệ thống này."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "Không thể phân tích URL `%s'"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Không thể tạo ống dẫn tới sendmail: %s: chưa gửi mail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:123
+#: camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Không thể tạo tiến trình sendmail mới: %s: chưa gửi mail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:149
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Không thể gửi thông điệp: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:162
+#: camel/providers/sendmail/camel-sendmail-transport.c:178
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "Sendmail đã thoát với tín hiệu %s: chưa gửi mail."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:169
+#: camel/providers/sendmail/camel-sendmail-transport.c:185
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Không thể thực hiện %s: chưa gửi mail."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:174
+#: camel/providers/sendmail/camel-sendmail-transport.c:190
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "Sendmail đã thoát với trạng thái %d: chưa gửi mail."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr "Không thể tìm thấy địa chỉ 'Từ' trong thông điệp."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:204
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:248
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr "Gửi thư thông qua chương trình sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -8567,122 +9557,145 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Để gửi thư bằng cách kết nối tới mailhub từ xa dùng SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Lỗi cú pháp, không nhận ra lệnh"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Lỗi cú pháp trong tham số hoặc đối số"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Lệnh chưa được thi công"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Tham số lệnh chưa được thi công"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Trạng thái hệ thống, hoặc trả lời trợ giúp hệ thống"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Thông điệp trợ giúp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Dịch vụ sẵn sàng"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Dịch vụ đang đóng kênh truyền"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Dịch vụ chưa sẵn sàng, đang đóng kênh truyền thông"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Hành động thư tín yêu cầu đã xong"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr "Không phải người dùng cục bộ; đang chuyển tiếp tới <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Không thực hiện hành động thư tín yêu cầu: hộp thư không sẵn sàng"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Không thực hiện hành động yêu cầu: hộp thư không sẵn sàng"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Đã ngừng hành động yêu cầu: lỗi khi thực hiện"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "Không phải người dùng cục bộ; vui lòng thử <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Không thực hiện hành động yêu cầu: không đủ chỗ chứa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Không thực hiện hành động thư tín yêu cầu: không đủ chỗ chứa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Không thực hiện hành động yêu cầu: tên hộp thư không hợp lệ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Bắt đầu nhập thư; kết thức bằng <Xuống dòng>.<Xuống dòng>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Giao dịch thất bại"
 
-#: camel/providers/smtp/camel-smtp-transport.c:214
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Cần chuyển tiếp mật khẩu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Cơ chế chứng thực quá yếu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Cơ chế chứng thực yêu cầu cần phải được mã hoá"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "Lỗi chứng thực tạm"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Yêu cầu chứng thực"
 
-#: camel/providers/smtp/camel-smtp-transport.c:317
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Lỗi trả lời chào mừng: %s: có lẽ không phải lỗi chết người"
 
+#: camel/providers/smtp/camel-smtp-transport.c:337
 #: camel/providers/smtp/camel-smtp-transport.c:379
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#, fuzzy, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr ""
+"Không thể kết nối tới POP server.\n"
+"Lỗi gửi tên người dùng: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:338
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "Thông điệp có lẽ không đúng hình thức"
+
+#: camel/providers/smtp/camel-smtp-transport.c:352
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "Quá hạn yêu cầu RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:367
+#, fuzzy
+msgid "STARTTLS response error"
+msgstr "Lỗi trả lời RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP server %s không hỗ trợ loại chứng thực yêu cầu %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVui lòng nhập mật khẩu SMTP cho %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8693,128 +9706,132 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Gửi thư (SMTP) thông qua %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr "Không thể gửi thông điệp: chưa có địa chỉ người gửi."
-
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "Không thể gửi thông điệp: địaa chỉ người gửi không hợp lệ."
 
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "Đang gửi thông điệp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "Không thể gửi thông điệp: chưa có người nhận."
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:691
+#, fuzzy
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "Không thể gửi thông điệp: chưa có người nhận."
+
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "Chào hỏi của SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Yêu cầu HELO quá hạn: %s: không nghiêm trọng"
 
-#: camel/providers/smtp/camel-smtp-transport.c:726
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Lỗi trả lời HELO: %s: không nghiêm trọng"
 
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "Chứng thực SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "Lỗi tạo đối tượng chứng thực SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Yêu cầu AUTH quá hạn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "Yêu cầu AUTH thất bại."
 
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "Trả lời chứng thực từ server sai.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Quá hạn yêu cầu MAIL FROM: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:893
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1084
+#, fuzzy
+msgid "MAIL FROM response error"
 msgstr "Lỗi yêu cầu MAIL FROM: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Quá hạn yêu cầu RCPT TO: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "Lỗi yêu cầu RCPT TO: %s: chưa gửi mail"
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Quá hạn yêu cầu DATA: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "Lỗi yêu cầu DATA: %s: chưa gửi mail"
+#. we should have gotten instructions on how to use the DATA command:
+#. * 354 Enter mail, end with "." on a line by itself
+#.
+#: camel/providers/smtp/camel-smtp-transport.c:1174
+#, fuzzy
+msgid "DATA response error"
+msgstr "Lỗi trả lời RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1030
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Quá hạn gửi DATA: chấm dứt thông điệp: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "Lỗi trả lời DATA: chấm dứt thông điệp: %s: chưa gửi mail"
+#: camel/providers/smtp/camel-smtp-transport.c:1246
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "Trả lời chứng thực từ server sai."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Quá hạn yêu cầu RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1283
+#, fuzzy
+msgid "RSET response error"
 msgstr "Lỗi trả lời RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Quá hạn yêu cầu QUIT: %s: không nghiêm trọng"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "Lỗi trả lời QUIT: %s: không nghiêm trọng"
+#: camel/providers/smtp/camel-smtp-transport.c:1320
+#, fuzzy
+msgid "QUIT response error"
+msgstr "Lỗi trả lời RSET: %s"
 
 #: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
@@ -8841,19 +9858,19 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:136
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
 msgid "attachment"
 msgstr "đồ đính kèm"
 
-#: composer/e-msg-composer-attachment-bar.c:502
+#: composer/e-msg-composer-attachment-bar.c:506
 msgid "Remove selected items from the attachment list"
 msgstr "Loại bỏ những mục được chọn từ danh sách đồ đính kèm"
 
-#: composer/e-msg-composer-attachment-bar.c:533
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "Thêm đồ đính kèm..."
 
-#: composer/e-msg-composer-attachment-bar.c:534
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "Đính kèm tập tin vào thông điệp"
 
@@ -8881,67 +9898,74 @@ msgid "MIME type:"
 msgstr "Kiểu MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:135
+#: composer/e-msg-composer-select-file.c:156
 msgid "Suggest automatic display of attachment"
 msgstr "Đề nghị tự động hiển thị đồ đính kèm"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "Nhấn vào đây để xem sổ địa chỉ"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "Từ:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "Trả lời cho:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "Chủ đề:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "Tới:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "Nhập người nhận thông điệp"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "CC:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Nhập địa chỉ sẽ nhận một bản sao của thông điệp"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
-msgstr "Nhập địa chỉ sẽ nhận một bản sao của thông điệp mà không xuất hiện tên trong danh sách người nhận."
+msgstr ""
+"Nhập địa chỉ sẽ nhận một bản sao của thông điệp mà không xuất hiện tên trong "
+"danh sách người nhận."
 
-#: composer/e-msg-composer-select-file.c:228
+#: composer/e-msg-composer-select-file.c:267
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Đính kèm tập tin"
 
-#: composer/e-msg-composer.c:698
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "Không thể lưu tập tin chữ ký."
+
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -8950,53 +9974,41 @@ msgstr ""
 "Lỗi đọc tập tin %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:896
-msgid "Save as..."
-msgstr "Lưu là..."
-
-#: composer/e-msg-composer.c:905
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "Cảnh báo!"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "Tập tin đã tồn tại, ghi đè chứ?"
 
-#: composer/e-msg-composer.c:931
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Lỗi lưu tập tin: %s"
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Lỗi nạp tập tin: %s"
 
-#: composer/e-msg-composer.c:1021
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Không thể mở thư mục Nháp cho tài khoản này.\n"
-"Bạn có muốn dùng thư mục Nháp mặc định?"
-
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Lỗi truy cập tập tin: %s"
 
-#: composer/e-msg-composer.c:1079
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "Không thể nhận thông điệp từ trình biên soạn"
 
-#: composer/e-msg-composer.c:1086
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1093
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9005,7 +10017,7 @@ msgstr ""
 "Không thể cắt tập tin: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9014,7 +10026,7 @@ msgstr ""
 "Lỗi tự động lưu thông điệp: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9022,7 +10034,7 @@ msgstr ""
 "Ximian Evolution đã tìm thấy các tập tin chưa được lưu từ session trước.\n"
 "Bạn có muốn phục hồi chúng không?"
 
-#: composer/e-msg-composer.c:1358
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9032,23 +10044,43 @@ msgstr ""
 "\n"
 "Bạn có muốn lưu các thay đổi?"
 
-#: composer/e-msg-composer.c:1365
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "Cảnh báo: Thông điệp đã thay đổi"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "Mở tập tin"
 
-#: composer/e-msg-composer.c:1537
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "Chèn tập tin"
 
-#: composer/e-msg-composer.c:1923 composer/e-msg-composer.c:2366
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "Tập tin chữ ký:"
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr " (mặc định)"
+
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "Biên soạn thông điệp"
 
-#: composer/e-msg-composer.c:2383
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9056,7 +10088,7 @@ msgstr ""
 "Không thể tạo cửa sổ biên soạn:\n"
 "Không thể kích hoạt bộ chọn địa chỉ."
 
-#: composer/e-msg-composer.c:2406 composer/e-msg-composer.c:2461
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9064,7 +10096,13 @@ msgstr ""
 "Không thể tạo cửa sổ biên soạn:\n"
 "Không thể kích hoạt bộ biên soạn HTML."
 
-#: composer/evolution-composer.c:367
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
+#: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -9072,7 +10110,7 @@ msgstr ""
 "Không thể tạo cửa sổ biên soạn vì bạn chưa cấu hình thực \n"
 "thể nào trong thành phần mail."
 
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "Không thể khởi động bộ soạn thảo của Evolution."
 
@@ -9124,15 +10162,33 @@ msgstr "Chủ đề chứa"
 msgid "Subject does not contain"
 msgstr "Chủ đề không chứa"
 
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Tập tin với tên này đã có rồi.\n"
+"Ghi đè tập tin này?"
+
 #. Remember the password?
-#: e-util/e-passwords.c:360 mail/mail-session.c:267
+#: e-util/e-passwords.c:363 mail/mail-session.c:269
 msgid "Remember this password"
 msgstr "Nhớ mật khẩu này"
 
-#: e-util/e-passwords.c:362 mail/mail-session.c:268
+#: e-util/e-passwords.c:365 mail/mail-session.c:270
 msgid "Remember this password for the remainder of this session"
 msgstr "Nhớ mật khẩu này để nhắc nhở cho những lần sử dụng sau"
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "Phân loại"
+
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
@@ -9251,11 +10307,7 @@ msgstr "giờ"
 msgid "minute"
 msgstr "phút"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "giây"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "giây"
 
@@ -9330,7 +10382,7 @@ msgstr " trước"
 msgid "ago"
 msgstr "trước"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:956
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
@@ -9342,16 +10394,30 @@ msgstr "<nhấn đây để chọn ngày>"
 msgid "Filter Rules"
 msgstr "Quy tắc bộ lọc"
 
+#: filter/filter-file.c:176
+msgid "You must specify a file name"
+msgstr ""
+
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "Spool `%s' không tồn tại hoặc không phải là một tập tin bình thường"
+
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "Mở tập tin"
+
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "Thì"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "Thêm hành động"
 
-#: filter/filter-folder.c:156
+#: filter/filter-folder.c:147
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -9359,19 +10425,11 @@ msgstr ""
 "Bạn quên chưa chọn thư mục.\n"
 "Vui lòng quay lại và chọn một thư mục hợp lệ để gửi thư tới."
 
-#: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "Chọn thư mục"
 
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "Nhập URI của thư mục"
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<nhấn đây để chọn thư mục>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9381,7 +10439,11 @@ msgstr ""
 "Lỗi trong biểu thức chính quy '%s':\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Kiểm tra"
 
@@ -9389,39 +10451,39 @@ msgstr "Kiểm tra"
 msgid "You must name this filter."
 msgstr "Bạn phải đặt tên cho bộ lọc này."
 
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "Tên quy tắt: "
 
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "Vô danh"
 
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "Nếu"
 
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "Thực hiện hành động"
 
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "nếu mọi tiêu chuẩn đều thỏa"
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:769
 msgid "if any criteria are met"
 msgstr "nếu một trong các tiêu chuẩn thỏa"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "Thêm tiêu chuẩn"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "vào"
 
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "ra"
 
@@ -9467,208 +10529,238 @@ msgstr "với mọi thư mục cục bộ"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Gán điểm"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Gán màu"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Gán điểm"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Đồ đính kèm"
 
-#: filter/libfilter-i18n.h:5
-msgid "Copy to Folder"
-msgstr "Chép vào thư mục"
-
 #: filter/libfilter-i18n.h:6
-msgid "Date received"
-msgstr "Ngày nhận"
+#, fuzzy
+msgid "Beep"
+msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-msgid "Date sent"
-msgstr "Ngày gửi"
+#, fuzzy
+msgid "Command"
+msgstr "Công ty"
+
+#: filter/libfilter-i18n.h:8
+msgid "contains"
+msgstr "chứa"
 
 #: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr "Đã xóa"
+msgid "Copy to Folder"
+msgstr "Chép vào thư mục"
 
 #: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr "Không tồn tại"
+msgid "Date received"
+msgstr "Ngày nhận"
 
 #: filter/libfilter-i18n.h:11
-msgid "Draft"
-msgstr "Nháp"
-
-#: filter/libfilter-i18n.h:12
-msgid "Exist"
-msgstr "Tồn tại"
+msgid "Date sent"
+msgstr "Ngày gửi"
 
 #: filter/libfilter-i18n.h:13
-msgid "Expression"
-msgstr "Biểu thức"
+msgid "Deleted"
+msgstr "Đã xóa"
 
 #: filter/libfilter-i18n.h:14
-msgid "Important"
-msgstr "Quan trọng"
+msgid "does not contain"
+msgstr "không chứa"
 
 #: filter/libfilter-i18n.h:15
-msgid "Mailing list"
-msgstr ""
+msgid "does not end with"
+msgstr "không kết thúc bằng"
 
 #: filter/libfilter-i18n.h:16
-msgid "Message Body"
-msgstr "Thân thông điệp"
+msgid "does not exist"
+msgstr "không tồn tại"
 
 #: filter/libfilter-i18n.h:17
-msgid "Message Header"
-msgstr "Đầu thông điệp"
+msgid "does not sound like"
+msgstr "không giống với"
 
 #: filter/libfilter-i18n.h:18
-msgid "Message was received"
-msgstr "Đã nhận thông điệp"
+msgid "does not start with"
+msgstr "không bắt đầu bằng"
 
 #: filter/libfilter-i18n.h:19
-msgid "Message was sent"
-msgstr "Đã gửi thông điệp"
+msgid "Do Not Exist"
+msgstr "Không tồn tại"
 
 #: filter/libfilter-i18n.h:20
-msgid "Move to Folder"
-msgstr "Chuyển vào thư mục"
+msgid "Draft"
+msgstr "Nháp"
 
 #: filter/libfilter-i18n.h:21
-msgid "Read"
-msgstr "Đọc"
+msgid "ends with"
+msgstr "kết thúc bằng"
 
 #: filter/libfilter-i18n.h:22
-msgid "Recipients"
-msgstr "Người nhận"
+msgid "Execute Shell Command"
+msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Regex Match"
-msgstr "Khớp Regex"
+msgid "Exist"
+msgstr "Tồn tại"
 
 #: filter/libfilter-i18n.h:24
-msgid "Replied to"
-msgstr "Trả lời cho"
+msgid "exists"
+msgstr "tồn tại"
 
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
-msgid "Score"
-msgstr "Điểm"
+#: filter/libfilter-i18n.h:25
+msgid "Expression"
+msgstr "Biểu thức"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1404
-msgid "Sender"
-msgstr "Người gửi"
+#: filter/libfilter-i18n.h:26
+msgid "Follow Up"
+msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "Set Status"
-msgstr "Đặt trạng thái"
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Quan trọng"
 
 #: filter/libfilter-i18n.h:28
-msgid "Size (kB)"
-msgstr "Kích thước (kB)"
+msgid "is"
+msgstr "bằng"
 
 #: filter/libfilter-i18n.h:29
-msgid "Source Account"
-msgstr "Tài khoản nguồn"
+#, fuzzy
+msgid "is after"
+msgstr "sau"
 
 #: filter/libfilter-i18n.h:30
-msgid "Specific header"
-msgstr "Header xác định"
+#, fuzzy
+msgid "is before"
+msgstr "trước"
+
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "is Flagged"
+msgstr "Đã đặt cờ"
 
 #: filter/libfilter-i18n.h:32
-msgid "Stop Processing"
-msgstr "Dừng tiến trình"
+msgid "is greater than"
+msgstr "lớn hơn"
 
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
-msgid "Subject"
-msgstr "Chủ đề"
+#: filter/libfilter-i18n.h:33
+msgid "is less than"
+msgstr "nhỏ hơn"
 
-#: filter/libfilter-i18n.h:36
-msgid "contains"
-msgstr "chứa"
+#: filter/libfilter-i18n.h:34
+msgid "is not"
+msgstr "không phải"
+
+#: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Đã đặt cờ"
+
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "Laurel"
 
 #: filter/libfilter-i18n.h:37
-msgid "does not contain"
-msgstr "không chứa"
+msgid "Mailing list"
+msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "does not end with"
-msgstr "không kết thúc bằng"
+msgid "Message Body"
+msgstr "Thân thông điệp"
 
 #: filter/libfilter-i18n.h:39
-msgid "does not exist"
-msgstr "không tồn tại"
+msgid "Message Header"
+msgstr "Đầu thông điệp"
 
 #: filter/libfilter-i18n.h:40
-msgid "does not sound like"
-msgstr "không giống với"
+msgid "Move to Folder"
+msgstr "Chuyển vào thư mục"
 
 #: filter/libfilter-i18n.h:41
-msgid "does not start with"
-msgstr "không bắt đầu bằng"
+#, fuzzy
+msgid "Play Sound"
+msgstr "Phát âm thanh:"
 
-#: filter/libfilter-i18n.h:42
-msgid "ends with"
-msgstr "kết thúc bằng"
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+msgid "Read"
+msgstr "Đọc"
 
 #: filter/libfilter-i18n.h:43
-msgid "exists"
-msgstr "tồn tại"
+msgid "Recipients"
+msgstr "Người nhận"
 
 #: filter/libfilter-i18n.h:44
-msgid "is greater than"
-msgstr "lớn hơn"
+msgid "Regex Match"
+msgstr "Khớp Regex"
 
 #: filter/libfilter-i18n.h:45
-msgid "is less than"
-msgstr "nhỏ hơn"
+msgid "Replied to"
+msgstr "Trả lời cho"
 
-#: filter/libfilter-i18n.h:46
-msgid "is not"
-msgstr "không phải"
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Điểm"
 
-#: filter/libfilter-i18n.h:47
-msgid "is"
-msgstr "bằng"
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+msgid "Sender"
+msgstr "Người gửi"
 
 #: filter/libfilter-i18n.h:48
-msgid "on or after"
-msgstr "bây giờ hoặc sau"
+msgid "Set Status"
+msgstr "Đặt trạng thái"
 
 #: filter/libfilter-i18n.h:49
-msgid "on or before"
-msgstr "bây giờ hoặc trước"
+msgid "Size (kB)"
+msgstr "Kích thước (kB)"
 
 #: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "giống như"
 
 #: filter/libfilter-i18n.h:51
-msgid "starts with"
-msgstr "bắt đầu bằng"
+msgid "Source Account"
+msgstr "Tài khoản nguồn"
 
 #: filter/libfilter-i18n.h:52
-msgid "was after"
-msgstr "sau"
+msgid "Specific header"
+msgstr "Header xác định"
 
 #: filter/libfilter-i18n.h:53
-msgid "was before"
-msgstr "trước"
+msgid "starts with"
+msgstr "bắt đầu bằng"
+
+#: filter/libfilter-i18n.h:55
+msgid "Stop Processing"
+msgstr "Dừng tiến trình"
+
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
+msgid "Subject"
+msgstr "Chủ đề"
 
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Quy tắc"
 
-#: filter/rule-editor.c:284
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "Thêm quy tắc"
 
-#: filter/rule-editor.c:357
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Sửa quy tắc"
 
@@ -9688,30 +10780,31 @@ msgstr "Bạn cần chọn ít nhất một thư mục làm nguồn."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution đang nhập các thư cũ (dạng Elm)"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Đang nhập..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Vui lòng chờ"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:689
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Đang nhập %s như là %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:782
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Đang quét %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:958
-#: importers/pine-importer.c:637 mail/component-factory.c:100
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "Thư"
 
@@ -9727,10 +10820,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Sổ địa chỉ"
-
 #: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
@@ -9739,23 +10828,76 @@ msgstr ""
 "Evolution đã tìm thấy những tập tin GnomeCard.\n"
 "Bạn có muốn nhập nó vào Evolution?"
 
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "Độ ưu tiên: %s"
+
+#: importers/netscape-importer.c:653
+msgid ""
+"Some of your Netscape email filters are based on\n"
+"email priorities, which are not used in Evolution.\n"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
+
+#: importers/netscape-importer.c:677
+msgid ""
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
+msgstr ""
+
+#: importers/netscape-importer.c:694
+msgid ""
+"Some of your Netscape email filters test the\n"
+"body of emails for (in)equality to a given string,\n"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+msgstr ""
+
+#: importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution đang nhập các dữ liệu cũ từ Netscape"
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
+msgid "Trash"
+msgstr "Rác"
+
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "Tập tin mail cục bộ %s"
+
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Đang quét thư mục"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "Đang nhập"
 
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "Thiết lập"
 
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Sửa bộ lọc"
+
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -9780,276 +10922,358 @@ msgid "Pine"
 msgstr "Pine"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Configuration control for the Evolution Mailer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Configuration control for the Evolution Message Composer."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Thành phần xử lý thư của Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Bộ soạn thư của Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Thành phần tóm tắt thư của Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Thành phần hiển thị thư mục của Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "_Không truy hồi"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Tài khoản"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "Giao diện cấu hình mail."
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
-msgstr "Thư mục đang chứa thư"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+msgid "This Page can be used to configure the Fonts"
+msgstr ""
 
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr "Thư mục lưu trữ thư (nội tại)"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+msgid "This page can be used to configure E-Mail Accounts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19
+msgid "This page can be used to configure Mailer preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
+msgid "This page can be used to configure the Composer"
+msgstr ""
 
 #: mail/component-factory.c:102
+msgid "Folder containing mail"
+msgstr "Thư mục đang chứa thư"
+
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "Thùng rác ảo"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "Thư mục Thùng rác ảo"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Không thể kết nối tới kho: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "Thư mục này chứa các thông điệp."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "Thuộc tính..."
 
-#: mail/component-factory.c:432
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "Thay đổi thuộc tính thư mục này"
 
-#: mail/component-factory.c:783
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
-msgstr "Một vài thiết lập về thư của bạn đã bị hỏng, vui lòng kiểm tra để chắc chắn rằng mọi thứ vẫn hoạt động."
+msgstr ""
+"Một vài thiết lập về thư của bạn đã bị hỏng, vui lòng kiểm tra để chắc chắn "
+"rằng mọi thứ vẫn hoạt động."
+
+#: mail/component-factory.c:929
+msgid "You have not set a mail transport method"
+msgstr "Bạn chưa thiết lập phương thức vận chuyển thư."
 
 #: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "Cảnh báo: Thông điệp đã thay đổi"
+
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "Thông điệp thư mới"
 
-#: mail/component-factory.c:951
-msgid "New _Mail Message"
-msgstr "Thông điệp thư _mới"
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "Thông điệp thư"
 
-#: mail/component-factory.c:975
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Không thể khởi động thành phần thư của Evolution"
 
-#: mail/component-factory.c:984
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Không thể khởi động thành phần cấu hình thư của Evolution"
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Không thể khởi động thành phần thông tin thư mục của Evolution."
 
-#: mail/component-factory.c:1206
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#, fuzzy
+msgid "Connecting..."
+msgstr "Đang kết nối tới server..."
+
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "Không thể đăng ký kho lưu với shell"
 
-#: mail/folder-browser-ui.c:272
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Thuộc tính của \"%s\""
 
-#: mail/folder-browser-ui.c:274
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Không thể tạo thư mục tạm: %s"
 
-#: mail/folder-browser.c:731
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d mới"
 
-#: mail/folder-browser.c:734 mail/folder-browser.c:739
-#: mail/folder-browser.c:761
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "ẩn %d"
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:770
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "được chọn %d"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "chưa gửi %d"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "đã gửi %d"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "tổng cộng %d"
 
-#: mail/folder-browser.c:1049
-msgid "Create vFolder from Search"
-msgstr "Tạo vFolder từ bộ tìm kiếm"
+#: mail/folder-browser.c:1091
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "Tạo thư mục ả_o từ thông điệp"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "VFolder trên _chủ đề"
 
-#: mail/folder-browser.c:1431
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "VFolder trên _người gửi"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "VFolder trên n_gười nhận"
 
-#: mail/folder-browser.c:1433
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1437
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "Lọc theo _chủ đề"
 
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "Lọc theo _người gửi"
 
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "Lọc theo n_gười nhận"
 
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "Lọc _Mailing list"
 
-#: mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "_Hiệu chỉnh như thông điệp mới..."
 
-#: mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
-msgid "_Save As..."
-msgstr "Lư_u là..."
-
-#: mail/folder-browser.c:1450
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "_In"
 
-#: mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:104
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "T_rả lời người gửi"
 
-#: mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Trả lời _danh sách"
 
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Trả lời _mọi người"
 
-#: mail/folder-browser.c:1457
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "_Chuyển tiếp"
 
-#: mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1690
+msgid "Follo_w Up..."
+msgstr ""
+
+#: mail/folder-browser.c:1691
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Hoàn tất"
+
+#: mail/folder-browser.c:1692
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Xóa"
+
+#. separator here?
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Đánh dấu đã đọ_c"
 
-#: mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1697
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: mail/folder-browser.c:1461
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "Đánh dấu _quan trọng"
 
-#: mail/folder-browser.c:1462
-msgid "Mark as Unim_portant"
-msgstr "Đánh dấu khôn_g quan trọng"
+#: mail/folder-browser.c:1699
+#, fuzzy
+msgid "_Mark as Unimportant"
+msgstr "Đánh dấu _Không quan trọng"
 
-#: mail/folder-browser.c:1466
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1704
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Xóa"
+
+#: mail/folder-browser.c:1708
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "_Chuyển tới thư mục..."
 
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "C_hép vào thư mục..."
 
-#: mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
-msgid "_Undelete"
-msgstr ""
-
-#: mail/folder-browser.c:1473 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1717
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "Thêm người gửi vào sổ địa chỉ"
 
-#: mail/folder-browser.c:1476
-msgid "Apply Filters"
+#: mail/folder-browser.c:1721
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "Áp dụng bộ lọc"
 
-#: mail/folder-browser.c:1478
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1725
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "Tạo _quy tắc mới từ thông điệp"
 
-#: mail/folder-browser.c:1628
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:1990
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "Lọc mailing list"
 
-#: mail/folder-browser.c:1629
-msgid "VFolder on Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:1631
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1992
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "Lọc mailing list (%s)"
 
-#: mail/folder-browser.c:1632
-#, c-format
-msgid "VFolder on Mailing List (%s)"
-msgstr ""
+#: mail/folder-browser.c:1993
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "Lọc mailing list (%s)"
 
-#: mail/folder-browser.h:26
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
 msgid "Default"
 msgstr "Mặc định"
 
-#: mail/folder-info.c:64
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "Đang lấy thông tin thư mục"
 
@@ -10070,26 +11294,19 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Nhập tập tin Outlook Express 4 vào Evolution"
 
 #: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "Nội dung phần thân"
-
-#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Dạng thức lưu hiện thời:"
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr ""
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "Dạng thức hộp thư"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "Nội dung phần thân"
 
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Dạng thức lưu mới:"
 
-#: mail/local-config.glade.h:6
+#: 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"
@@ -10100,19 +11317,19 @@ msgstr ""
 "hồi một các tự động. Vui lòng cân nhắc cẩn thận khi dùng\n"
 "tính năng này."
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:10
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:11
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Bạn chưa điền đủ các thông tin yêu cầu."
 
@@ -10122,90 +11339,107 @@ msgid "Evolution News Editor"
 msgstr "Bộ soạn tin Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Bộ hiệu chỉnh tài khoản"
 
-#: mail/mail-account-gui.c:962
-msgid "Could not save signature file."
-msgstr "Không thể lưu tập tin chữ ký."
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+msgid "_Host:"
+msgstr "_Máy chủ:"
 
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "Lưu chữ ký"
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#, fuzzy
+msgid "User_name:"
+msgstr "_Tên người dùng:"
 
-#: mail/mail-account-gui.c:1045
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Chữ ký này đã thay đổi, nhưng vẫn chưa được lưu.\n"
-"\n"
-"Bạn có muốn lưu các thay đổi không?"
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+msgid "_Path:"
+msgstr "Đường _dẫn:"
 
-#: mail/mail-account-gui.c:1654
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "Bạn không thể tạo hai tài khoản trùng tên."
 
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr " (mặc định)"
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Tắt"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Bật"
-
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "Bạn có muốn xóa tài khoản này?"
 
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "Không xóa"
 
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "Thật sự muốn xóa tài khoản này chứ?"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
+msgid "Disable"
+msgstr "Tắt"
+
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
+msgid "Enable"
+msgstr "Bật"
+
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "Bạn có chắc chắn muốn sóa tài khoản news này không?"
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:798 mail/mail-config.glade.h:42
-msgid "Mail Settings"
-msgstr "Thiết lập thư"
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
+msgid "Enabled"
+msgstr "Bật"
+
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "Tên Tài _khoản:"
 
-#: mail/mail-autofilter.c:72
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "Portoroz"
+
+#: mail/mail-autofilter.c:78
 #, c-format
 msgid "Mail to %s"
 msgstr "Gửi thư tới %s"
 
-#: mail/mail-autofilter.c:217
+#: mail/mail-autofilter.c:223
 #, c-format
 msgid "Subject is %s"
 msgstr "Chủ để là %s"
 
-#: mail/mail-autofilter.c:233
+#: mail/mail-autofilter.c:239
 #, c-format
 msgid "Mail from %s"
 msgstr "Thừ từ %s"
 
-#: mail/mail-autofilter.c:289
+#: mail/mail-autofilter.c:295
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Thêm quy tắc lọc"
 
-#: mail/mail-callbacks.c:137
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10217,7 +11451,7 @@ msgstr ""
 "nhận hoặc biên soạn thư.\n"
 "Bán có muốn cấu hình ngay bây giờ không?"
 
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10225,7 +11459,7 @@ msgstr ""
 "Bạn cần cấu hình thực thể trước khi\n"
 "có thể biên soạn thư."
 
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10233,22 +11467,20 @@ msgstr ""
 "Bạn cần cấu hình mail transport trước\n"
 "khi có thể biên soạn thư."
 
-#: mail/mail-callbacks.c:230
-msgid "You have not set a mail transport method"
-msgstr "Bạn chưa thiết lập phương thức vận chuyển thư."
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:265
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
-msgstr "Bạn đang gửi một lá thư dùng dạng thức HTML, nhưng người nhận không muốn nhận những lá thư HTML:\n"
+msgstr ""
+"Bạn đang gửi một lá thư dùng dạng thức HTML, nhưng người nhận không muốn "
+"nhận những lá thư HTML:\n"
 
-#: mail/mail-callbacks.c:280
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "Gửi bất cứ giá nào?"
 
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10256,17 +11488,19 @@ msgstr ""
 "Thông điệp này chưa có chủ đề.\n"
 "Bạn thật sự muốn gửi chứ?"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
-msgstr "Vì danh sách liên lạc bạn đang gửi được cấu hình để ẩn các địa chỉ trong danh sách, thông điệp này sẽ chỉ điền người nhận vào trường Bcc."
+msgstr ""
+"Vì danh sách liên lạc bạn đang gửi được cấu hình để ẩn các địa chỉ trong "
+"danh sách, thông điệp này sẽ chỉ điền người nhận vào trường Bcc."
 
-#: mail/mail-callbacks.c:370
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "Thông điệp chỉ có người nhận trong Bcc."
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10276,88 +11510,100 @@ msgstr ""
 "Apparently-To.\n"
 "Gửi bất kỳ giá nào?"
 
-#: mail/mail-callbacks.c:469
-msgid "This message contains invalid recipients:"
-msgstr "Thông điệp chứa người nhận không hợp lệ:"
-
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "Bạn phải chọn người nhận để có thể gửi thông điệp này."
 
-#: mail/mail-callbacks.c:600
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "Bạn phải cấu hình tài khoản trước khi có thể gửi thư này."
 
-#: mail/mail-callbacks.c:838
+#: mail/mail-callbacks.c:644
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Không thể mở thư mục Nháp cho tài khoản này.\n"
+"Bạn có muốn dùng thư mục Nháp mặc định?"
+
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "người gửi lạ"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Vào ngày %a, %d/%m/%Y lúc %H:%M, %s viết rằng:"
 
-#: mail/mail-callbacks.c:1281 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "Chuyển thông điệp tới"
 
-#: mail/mail-callbacks.c:1283 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "Chép thông điệp vào"
 
-#: mail/mail-callbacks.c:1759
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Bạn có chắc muốn sửa tất cả %d thông điệp?"
 
-#: mail/mail-callbacks.c:1784
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr "Bạn chỉ có thể sửa những thông điệp trong thư mục Nháp."
 
-#: mail/mail-callbacks.c:1823
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr "Bạn chỉ có thể gửi lại những thông điệp trong thư mục Đã gửi"
 
-#: mail/mail-callbacks.c:1837
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Bạn có chắc muốn gửi lại %d thông điệp?"
 
-#: mail/mail-callbacks.c:1863
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "Chưa chọn thông điệp"
 
-#: mail/mail-callbacks.c:1962
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "Ghi đè tập tin?"
+
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/mail-callbacks.c:1964
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Cảnh báo"
+#: mail/mail-callbacks.c:2415
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "Hiển thị thông điệp chưa đó kế tiếp"
 
-#: mail/mail-callbacks.c:2135
+#: mail/mail-callbacks.c:2422
+msgid ""
+"There are no more new messages in this folder.\n"
+"Would you like to go to the next folder?"
+msgstr ""
+
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"Thao tác này sẽ xóa vĩnh viễn mọi thông điệp được đánh dấu xóa. Nếu bạn tiếp tục, bạn sẽ không thể phục hồi những thông điệp này.\n"
+"Thao tác này sẽ xóa vĩnh viễn mọi thông điệp được đánh dấu xóa. Nếu bạn tiếp "
+"tục, bạn sẽ không thể phục hồi những thông điệp này.\n"
 "\n"
 "Bạn có thật sự muốn xóa những thông điệp này không?"
 
-#: mail/mail-callbacks.c:2142
-msgid "Do not ask me again."
-msgstr "Đừng hỏi tôi lần nữa"
-
-#: mail/mail-callbacks.c:2250
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10366,40 +11612,87 @@ msgstr ""
 "Lỗi khi nạp thông tin bộ lọc:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2262
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "Bộ lọc"
 
-#: mail/mail-callbacks.c:2325
+#: mail/mail-callbacks.c:2833
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Đang lấy thông điệp %d trên %d"
+
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "In thông điệp"
 
-#: mail/mail-callbacks.c:2352
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2371
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "Quá trình in thông điệp thất bại"
 
-#: mail/mail-callbacks.c:2473
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "Bạn có chắc muốn mở tất cả %d thông điệp trong những cửa sổ riêng biệt không?"
+msgstr ""
+"Bạn có chắc muốn mở tất cả %d thông điệp trong những cửa sổ riêng biệt không?"
+
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "Không có mô tả"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "Liên lạc vô danh"
+
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "Gửi"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "Thêm tiêu chuẩn"
+
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "Chữ ký dạng _HTML:"
 
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in,\n"
 "unless you wish to include this information in email you send."
-msgstr "Vui lòng nhập tên và địa chỉ email vào bên dưới. Trường \"tùy chọn\" bên dưới không cần phải được chọn, trừ khi bạn muốn gộp thông tin vào email bạn cần gửi."
+msgstr ""
+"Vui lòng nhập tên và địa chỉ email vào bên dưới. Trường \"tùy chọn\" bên "
+"dưới không cần phải được chọn, trừ khi bạn muốn gộp thông tin vào email bạn "
+"cần gửi."
 
 #: mail/mail-config-druid.c:148
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
-msgstr "Vui lòng nhập thông tin về incoming mail server bên dưới. Nếu bạn không chắc, hãy hỏi quản trị hệ thống hoặc ISP của bạn."
+msgstr ""
+"Vui lòng nhập thông tin về incoming mail server bên dưới. Nếu bạn không "
+"chắc, hãy hỏi quản trị hệ thống hoặc ISP của bạn."
 
 #: mail/mail-config-druid.c:150
 msgid "Please select among the following options"
@@ -10410,7 +11703,9 @@ msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system\n"
 "administrator or Internet Service Provider."
-msgstr "Vui lòng nhập thông tin về cách bạn gửi thư. Nếu bạn không chắc, hãy hỏi quản trị hệ thống hoặc ISP của bạn."
+msgstr ""
+"Vui lòng nhập thông tin về cách bạn gửi thư. Nếu bạn không chắc, hãy hỏi "
+"quản trị hệ thống hoặc ISP của bạn."
 
 #: mail/mail-config-druid.c:154
 msgid ""
@@ -10422,108 +11717,183 @@ msgid ""
 "space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"Bạn đà hoàn thành gần xong tiến trình cấu hình thư. Thực thể, incoming mail server và outgoint mail transport mà bạn cung cấp sẽ được nhóm lại với nhau để tạo nên một tài khoản Evolution. Vui lòng nhập tên tài khoản này vào khoảng trắng dưới đây.\n"
+"Bạn đà hoàn thành gần xong tiến trình cấu hình thư. Thực thể, incoming mail "
+"server và outgoint mail transport mà bạn cung cấp sẽ được nhóm lại với nhau "
+"để tạo nên một tài khoản Evolution. Vui lòng nhập tên tài khoản này vào "
+"khoảng trắng dưới đây.\n"
 "Tên này sẽ chỉ được dùng để hiển thị thôi."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Phụ tá tài khoản Evolution"
 
-#: mail/mail-config.c:326
-#, c-format
-msgid "Account %d"
-msgstr "Tài khoản %d"
+#. red
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
 
-#: mail/mail-config.c:1859
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
+#. orange
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1870
+#. forest green
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
+#, fuzzy
+msgid "To Do"
+msgstr "Đi vào"
+
+#. blue
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "sau khi"
+
+#: mail/mail-config.c:625
 #, c-format
-msgid "%s: Inbox"
-msgstr "%s: thư mục nhận"
+msgid "Account %d"
+msgstr "Tài khoản %d"
 
-#: mail/mail-config.c:2112
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "Đang kiểm tra dịch vụ"
 
-#: mail/mail-config.c:2190 mail/mail-config.c:2194
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "Đang kết nối tới server..."
 
 #: mail/mail-config.glade.h:1
-msgid " _Check for supported types "
-msgstr ""
+#, fuzzy
+msgid " "
+msgstr " C"
 
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " màu"
+msgid " _Check for supported types "
+msgstr ""
 
 #: mail/mail-config.glade.h:3
-msgid "(SSL is not supported in this build of evolution)"
+#, fuzzy
+msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(Phiên bản Evolution này chưa hỗ trợ SSL)"
 
 #: mail/mail-config.glade.h:4
-msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr "_Luôn tự mã hoá khi gửi thư được mã hóa"
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "(Phiên bản Evolution này chưa hỗ trợ SSL)"
 
 #: mail/mail-config.glade.h:5
-msgid "Account"
-msgstr "Tài khoản"
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr "_Luôn tự mã hoá khi gửi thư được mã hóa"
 
 #: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Account Editor"
+msgstr "Tài khoản %d"
+
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "Thông tin tài khoản"
 
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Bộ quản lý tài khoản"
 
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "Tài khoản"
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "Thêm tiêu chuẩn"
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Add new signature..."
+msgstr "Lưu chữ ký"
 
-#: mail/mail-config.glade.h:9
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "Luôn _tự mã hóa khi gửi thư được mã hóa"
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "_Luôn tự mã hoá khi gửi thư được mã hóa"
 
-#: mail/mail-config.glade.h:10
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Luôn _ký tên lên thư cần gửi khi dùng tài khoản này"
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:16
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:17
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Attach original message"
+msgstr "Đính kèm tập tin vào thông điệp"
+
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Đồ đính kèm"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Chứng thực"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:22
+msgid "Automatically _detect links"
+msgstr ""
+
+#: mail/mail-config.glade.h:23
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "Bộ mã lạ: %s"
+
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_olors"
+msgstr "Đón_g"
+
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
-msgid "Composer"
-msgstr "Bộ soạn thư"
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "Màu công việc trong ngày"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "Composing Messages"
+msgstr "Biên soạn thông điệp"
+
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "Cấu hình"
 
-#: mail/mail-config.glade.h:16
-msgid "Confirm when Expunging a folder"
-msgstr ""
-
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10538,229 +11908,356 @@ msgstr ""
 "\n"
 "Nhấn \"Kết thúc\" để lưu các thiết lập."
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "_Mặc định"
 
-#: mail/mail-config.glade.h:24
-msgid "Default Forward style is: "
-msgstr "Kiểu chuyển tiếp mặc định là: "
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default Behavior"
+msgstr "Del Bajio"
 
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "Bộ mã mặc định: "
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "Đang lấy thư"
+
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr "Hiển thị"
+#: mail/mail-config.glade.h:45
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "Không thể mở thông điệp"
 
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Xong"
 
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "Nháp"
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "Thư mục _Nháp<:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "_Bật"
 
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Sửa..."
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "Đông"
 
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
-msgstr "Bật"
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Email chứa"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "Địa chỉ email:"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "_Xóa thư mục Rác khi thoát"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Execute Command..."
+msgstr "Thực hiện hành động"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "kết thúc bằng"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Font Properties"
+msgstr "Thuộc tính"
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "Thông điệp chuyển tiếp"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
-msgid "HTML signature file:"
-msgstr "tập tin chữ ký HTML:"
+#: mail/mail-config.glade.h:59
+msgid "Highlight _quotations with"
+msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Thực thể"
 
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr "Trong thư HTML"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "Lưu và đóng"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "Nạp ả_nh"
+
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Cấu hình thư"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Địa điểm hộp thư"
 
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
-msgstr "Chọn làm tài khoản _mặc định"
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "Thông điệp"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "_Hiển thị thông điệp"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "Sương mù"
+
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP Server:"
 
-#: mail/mail-config.glade.h:46
-msgid "News"
-msgstr "Tin tức"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "Cấu hình thư"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:79
+#, fuzzy
+msgid "News Servers"
+msgstr "New River"
+
+#: mail/mail-config.glade.h:81
+msgid "On Screen fonts"
+msgstr ""
+
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Thông tin tùy chọn"
 
-#: mail/mail-config.glade.h:50
-msgid "PGP _Key ID:"
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Tổ _chức:"
+
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "_Khóa ID PGP:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Chọn màu"
 
-#: mail/mail-config.glade.h:54
-msgid "Pretty Good Privacy"
-msgstr "Pretty Good Privacy"
-
-#: mail/mail-config.glade.h:55
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr "Nhắc khi gửi thư HTML cho các liên lạc không muốn nhận HTML"
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "Nhắc khi gửi thư mà chỉ có người nhận _Bcc"
 
-#: mail/mail-config.glade.h:56
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "Nhắc khi gửi thư không có chủ đề"
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:57
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "Nhắc khi gửi thư mà chỉ có người nhận _Bcc"
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "In liên lạc được chọn"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:94
+#, fuzzy
+msgid "Quote original message"
+msgstr "Không thể mở thông điệp"
+
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "Quoted"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Trả lời cho:"
+
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Đang nhận email"
 
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
-msgstr "Đang nhận thư"
-
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "Đang nhận tùy chọn"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "Nhớ mật khẩu này"
+
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Thông tin yêu cầu"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+msgstr "Bảo mật"
+
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "Secure MIME (S/MIME)"
 msgstr "MIME bảo mật"
 
-#: mail/mail-config.glade.h:67
-msgid "Security"
-msgstr "Bảo mật"
+#: mail/mail-config.glade.h:105
+msgid "Select HTML fixed width font"
+msgstr ""
 
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
-msgstr "Chọn tập tin log bộ lọc..."
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font for printing"
+msgstr ""
 
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:107
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Select PGP program"
 msgstr "Chọn chương trình PGP"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Đang gửi email"
 
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
-msgstr "Đang gửi thư"
-
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Đã gửi"
-
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Thư mục thông điệp đã gửi:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Thông điệp đã gửi và thông điệp nháp"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver yêu cầu chứng thực"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Cấu hình server"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Kiểu server:"
 
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "Lối tắt"
+
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Signature #1"
+msgstr "Tập tin chữ ký:"
+
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
 msgstr "Tập tin chữ ký:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "Nguồn"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "Thông tin nguồn"
 
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "Nguồn"
+#: mail/mail-config.glade.h:122
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "Tên kiểu:"
 
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
-msgstr "Thư mục đặc biệt"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
+msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "Dạng thức Unix mbox chuẩn"
 
-#: mail/mail-config.glade.h:86
-msgid "Use s_ecure connection (SSL)"
-msgstr "Dùng kết nối _an toàn (SSL)"
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:131
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Biến đổi"
+
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10770,337 +12267,429 @@ msgstr ""
 "\n"
 "Nhấn \"Kế tiếp\" để bắt đầu."
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "XEmacs"
+msgstr "Đông"
+
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "Chữ ký dạng _HTML:"
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "_Luôn nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Luôn ký tên lên các thư cần gửi khi dùng tài khoản này"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "_Loại chứng thực: "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:146
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "_Loại chứng thực: "
+
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:148
+msgid "_Automatically insert smiley images"
+msgstr ""
+
+#: mail/mail-config.glade.h:149
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
-msgid "_Drafts folder:"
-msgstr "Thư mục _Nháp<:"
+#: mail/mail-config.glade.h:151
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "Đang bỏ thư mục"
 
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
-msgstr "Địa chỉ _email:"
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "Xoá mọi thứ trừ chữ ký"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
-msgstr "_Xóa thư mục Rác khi thoát"
+#: mail/mail-config.glade.h:153
+#, fuzzy
+msgid "_Defaults"
+msgstr "Mặc định"
 
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
-msgstr "_Tên đầy đủ:"
+#: mail/mail-config.glade.h:155
+msgid "_Do not notify me when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:102
-msgid "_HTML Signature:"
-msgstr "Chữ ký dạng _HTML:"
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Enable"
+msgstr "Bật"
 
-#: mail/mail-config.glade.h:103
-msgid "_Highlight citations with"
+#: mail/mail-config.glade.h:158
+msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
-msgstr "_Máy chủ:"
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_Forward style:"
+msgstr "Chuyển tiếp như là"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:160
+#, fuzzy
+msgid "_Full name:"
+msgstr "_Tên đầy đủ:"
+
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "Trong thư HTML"
+
+#: mail/mail-config.glade.h:164
+#, fuzzy
+msgid "_Identity"
+msgstr "Thực thể"
+
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "_Nạp ảnh nếu người gửi có trong sổ địa chỉ"
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
-msgstr ""
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "Chọn làm tài khoản _mặc định"
 
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:167
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "Đánh dấu đã đọ_c sau "
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "_Tên:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "_Không bao giờ nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:110
-msgid "_Organization:"
-msgstr "_Tổ chức:"
-
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "Đường dẫn chương trình _PGP:"
 
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
-msgstr "Đường _dẫn:"
+#: mail/mail-config.glade.h:172
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
-msgstr "_Nhớ mật khẩu này"
+#: mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr "Nhắc khi gửi thư HTML cho các liên lạc không muốn nhận HTML"
 
-#: mail/mail-config.glade.h:114
-msgid "_Send mail in HTML format by default."
-msgstr "_Gửi thư mặc định dùng dạng HTML"
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "Nhắc khi gửi thư không có chủ đề"
 
-#: mail/mail-config.glade.h:115
-msgid "_Server Type: "
-msgstr "_Kiểu server: "
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "Đang nhận thư"
 
-#: mail/mail-config.glade.h:116
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "Trả lời tất cả"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "_Bảo mật"
+
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "_Bảo mật"
+
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "Đang gửi thư"
+
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Hiện thời gian là"
+
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
 msgstr "Tập tin _chữ ký:"
 
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
-msgstr "_Tên người dùng:"
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "Dùng kết nối _an toàn (SSL)"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:184
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "Biến đổi"
+
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "_mỗi"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:186
+#, fuzzy
+msgid "color"
+msgstr " màu"
+
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "mô tả"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr "giữ chỗ"
-
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr "giây"
-
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
 #: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr ""
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "Lưu đồ đính kèm"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Không thể tạo thư mục tạm: %s"
+
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "Lưu vào đĩa..."
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "Mở bằng %s..."
 
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Ẩn"
 
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Trình xem ngoại"
 
-#: mail/mail-display.c:1136
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "Đang nạp nôi dung thông điệp"
 
-#: mail/mail-display.c:1605
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "Công việc quá hạn:"
+
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "Mở liên kết bằng trình duyệt"
 
-#: mail/mail-display.c:1607
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "Sao chép vị trí liên kết"
 
-#: mail/mail-display.c:1610
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "Chép liên kết là (CẦN SỬA)"
 
-#: mail/mail-display.c:1613
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "Lưu ảnh là..."
 
-#: mail/mail-format.c:635
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s đồ đính kèm"
 
-#: mail/mail-format.c:680
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Không thể phân tích thông điệp MIME. Đang hiện thị mã thô."
 
-#: mail/mail-format.c:763
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Ngày"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "Địa chỉ sai"
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Từ"
 
-#: mail/mail-format.c:889
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "Trả lời cho"
 
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Tới"
 
-#: mail/mail-format.c:897
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:901
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1814
+#: mail/mail-format.c:945
+#, fuzzy
+msgid "Mailer"
+msgstr "Thư"
+
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "Lưu thông điệp là..."
+
+#: mail/mail-format.c:1832
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1837
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution không công nhận loại thông điệp được ký này."
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Không thể tạo dịch vụ báo động"
 
-#: mail/mail-format.c:1845
+#: mail/mail-format.c:1868
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1853
+#: mail/mail-format.c:1876
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2069
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Trỏ tới địa chỉ FTP (%s)"
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Trỏ tới tập tin cục bộ hợp lệ (%s) tại địa chỉ \"%s\""
 
-#: mail/mail-format.c:2088
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Trỏ tới tập tin cục bộ (%s)"
 
-#: mail/mail-format.c:2117
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Trỏ tới tập tin từ xa (%s)"
 
-#: mail/mail-format.c:2125
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Trỏ tới dữ liệu lạ bên ngoài (kiểu \"%s\")"
 
-#: mail/mail-format.c:2130
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:626
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "Thư mục cục bộ"
+
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "Cấu hình lại thư mục"
 
-#: mail/mail-local.c:707
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:763
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:815
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Đang đổi thư mục \"%s\" sang dạng thức \"%s\""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s không thể được cấu hình lại vì không phải là thư mục cục bộ"
 
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
-msgstr "Nếu bạn không còn có thể mở hộp thư này nữa thì bạn cần phải sửa chữa thủ công."
+msgstr ""
+"Nếu bạn không còn có thể mở hộp thư này nữa thì bạn cần phải sửa chữa thủ "
+"công."
 
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "Bạn không thể thay đổi dạng thức của thư-mục-không-cục-bộ."
 
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Cấu hình lại /%s"
@@ -11127,117 +12716,104 @@ msgstr ""
 msgid "Working"
 msgstr "Đang làm việc"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "Đang lọc thư mục"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Đang lấy thư"
 
-#: mail/mail-ops.c:489 mail/mail-ops.c:518
+#: mail/mail-ops.c:538 mail/mail-ops.c:567
 msgid "However, the message was successfully sent."
 msgstr "Tuy nhiên, thông điệp đã được gửi đi."
 
-#: mail/mail-ops.c:554
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Đang gửi \"%s\""
 
-#: mail/mail-ops.c:674
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Đang gửi thông điệp %d trên %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Lỗi thông điệp %d trên %d"
 
-#: mail/mail-ops.c:695 mail/mail-send-recv.c:545
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "Hoàn tất."
 
-#: mail/mail-ops.c:788
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "Đang lưu thông điệp vào thư mục"
 
-#: mail/mail-ops.c:868
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Đang chuyển thông điệp tới %s"
 
-#: mail/mail-ops.c:868
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Đang chép thông điệp vào %s"
 
-#: mail/mail-ops.c:895
-msgid "Moving"
-msgstr "Đang di chuyển"
-
-#: mail/mail-ops.c:898
-msgid "Copying"
-msgstr "Đang sao chép"
-
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Đang quét thư mục trong \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1058 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Rác"
-
-#: mail/mail-ops.c:1191
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "Đang mở thư mục %s"
 
-#: mail/mail-ops.c:1306
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "Đang mở kho %s"
 
-#: mail/mail-ops.c:1375
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "Đang gở bỏ thư mục %s"
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Đang lưu thư mục %s"
 
-#: mail/mail-ops.c:1520
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "Đang cập nhật thư mục"
 
-#: mail/mail-ops.c:1556
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "Đang bỏ thư mục"
 
-#: mail/mail-ops.c:1605
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Đang nhận thông điệp %s"
 
-#: mail/mail-ops.c:1672
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Đang nhận %d thông điệp"
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Đang lưu %d thông điệp"
 
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11246,7 +12822,7 @@ msgstr ""
 "Không thể tạo tập tin output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11255,11 +12831,11 @@ msgstr ""
 "Lỗi khi lưu thông điệp vào: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1972
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "Đang lưu đồ đính kèm"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11268,22 +12844,27 @@ msgstr ""
 "Không thể tạo tập tin output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Không thể ghi dữ liệu: %s"
 
-#: mail/mail-ops.c:2088
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Đang ngắt kết nối từ %s"
 
-#: mail/mail-ops.c:2089
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Đang tái kết nối tới %s"
 
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-ops.c:2265
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "_Tìm"
 
@@ -11319,82 +12900,122 @@ msgstr "Tìm:"
 msgid "Matches:"
 msgstr "Khớp:"
 
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Đang hủy bỏ..."
 
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Server: %s, Kiểu: %s"
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Đường dẫn: %s, Kiểu: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "Kiểu: %s"
 
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "Gửi và nhận thư"
 
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "Hủy tất cả"
 
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "Đang cập nhập..."
 
-#: mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
+#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
 msgid "Waiting..."
 msgstr "Đang chờ..."
 
-#: mail/mail-send-recv.c:541
-msgid "Cancelled."
-msgstr "Đã hủy"
-
-#: mail/mail-session.c:220
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "Người dùng đã hủy bỏ tác vụ."
 
-#: mail/mail-session.c:319
+#: mail/mail-session.c:321
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Nhập mật khẩu cho %s"
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:324
 msgid "Enter Password"
 msgstr "Nhập mật khẩu"
 
-#: mail/mail-tools.c:256
+#: mail/mail-signature-editor.c:81
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "Không thể lưu tập tin chữ ký."
+
+#: mail/mail-signature-editor.c:174
+msgid "Save signature"
+msgstr "Lưu chữ ký"
+
+#: mail/mail-signature-editor.c:180
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"Chữ ký này đã thay đổi, nhưng vẫn chưa được lưu.\n"
+"\n"
+"Bạn có muốn lưu các thay đổi không?"
+
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "Tên:"
+
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "Tập tin chữ ký:"
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "tập tin chữ ký HTML:"
+
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Thông điệp chuyển tiếp - %s"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Thiết lập vfolder: %s"
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Đang cập nhật vfolder cho URI: %s"
 
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -11403,108 +13024,172 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "Sửa VFolder"
 
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "VFolder mới"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(Không chủ đề)"
 
-#: mail/message-browser.c:214
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Thông điệp"
 
-#: mail/message-list.c:656
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "Chưa xem"
 
-#: mail/message-list.c:657
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "Đã xem"
 
-#: mail/message-list.c:658
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "Đã trả lời"
 
-#: mail/message-list.c:659
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "Nhiều thông điệp chưa xem"
 
-#: mail/message-list.c:660
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "Nhiều thông điệp"
 
-#: mail/message-list.c:664
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "Thấp nhất"
 
-#: mail/message-list.c:665
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "Thấp"
 
-#: mail/message-list.c:669
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "Cao hơn"
 
-#: mail/message-list.c:670
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "Cao nhất"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:927
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Hôm nay %l:%M %p"
 
-#: mail/message-list.c:936
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Hôm qua %l:%M %p"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:958
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2358
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "Đang tạo danh sách thông điệp"
 
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "Đến hạn "
+
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "Trạng thái"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Đã đặt cờ"
 
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Liên lạc gốc:"
+
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "Đã nhận"
 
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "Kích thước"
 
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "McCall"
+
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "Chuyển tiếp"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "Thông tin nguồn"
+
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "Chuyển tiếp"
+
+#: mail/message-tag-followup.c:62
+msgid "No Response Necessary"
+msgstr ""
+
+#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr "Trả lời"
+
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "Trả lời tất cả"
+
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "Xem thử"
+
+#: mail/message-tag-followup.c:315
+msgid "Flag to Follow Up"
+msgstr ""
+
 #: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -11526,7 +13211,7 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "Đang bỏ đăng ký trên thư mục \"%s\""
 
 #: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Thư mục"
 
@@ -11571,1423 +13256,32 @@ msgid "_Unsubscribe"
 msgstr "_Bỏ đăng ký"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
+msgid "Configuration control for the Evolution Summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:44
-msgid "Folder containing the Evolution Summary"
-msgstr ""
-
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "Không thể khởi động thành phần tóm tắt của Evolution."
-
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
-msgid "Appointments"
-msgstr "Cuộc hẹn"
-
-#: my-evolution/e-summary-calendar.c:341
-msgid "No appointments"
-msgstr "Không có cuộc hẹn"
-
-#: my-evolution/e-summary-calendar.c:375
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:377
-msgid "%l:%M %d %B"
-msgstr "%l:%M %d %B"
-
-#: my-evolution/e-summary-calendar.c:395
-msgid "No description"
-msgstr "Không có mô tả"
-
-#: my-evolution/e-summary-mail.c:129
-msgid "Mail summary"
-msgstr "Tóm tắt thư"
-
-#. translators: Put a list of codes for locations you want to see in
-#. My Evolution by default here. You can find the list of all
-#. stations and their codes in Evolution sources.
-#. (evolution/my-evolution/Locations)
-#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:81
-#: my-evolution/e-summary-weather.c:661
-msgid "KBOS"
-msgstr "KBOS"
-
-#: my-evolution/e-summary-preferences.c:445
-msgid "Dictionary.com Word of the Day"
-msgstr ""
-
-#: my-evolution/e-summary-preferences.c:466
-msgid "Quotes of the Day"
-msgstr "Trích dẫn trong ngày"
-
-#: my-evolution/e-summary-preferences.c:946
-msgid "Add a news feed"
-msgstr ""
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Bộ soạn thư của Evolution."
 
-#: my-evolution/e-summary-preferences.c:954
-msgid "Enter the URL of the news feed you wish to add"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+msgid "Factory for Evolution Summary's configuration control."
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:958
-msgid "Name:"
-msgstr "Tên:"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Không thể khởi động thành phần tóm tắt của Evolution."
 
-#: my-evolution/e-summary-preferences.c:1504
-msgid "Summary Settings"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
 msgstr "Thiết lập tóm tắt"
 
-#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
-#: my-evolution/e-summary-rdf.c:415
-msgid "Error downloading RDF"
-msgstr "Lỗi khi tải xuống RDF"
-
-#: my-evolution/e-summary-rdf.c:528
-msgid "News Feed"
-msgstr ""
-
-#: my-evolution/e-summary-tasks.c:248
-msgid "No tasks"
-msgstr "Không có công việc"
-
-#: my-evolution/e-summary-tasks.c:287
-msgid "(No Description)"
-msgstr "(Không có mô tả)"
-
-#: my-evolution/e-summary-weather.c:71
-msgid "My Weather"
-msgstr "Thời tiết của tôi"
-
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr "<dd><b>Không thể liên lạc với server thời tiết</b></dd>"
-
-#: my-evolution/e-summary-weather.c:559
-msgid "Weather"
-msgstr "Thời tiết"
-
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr "Vùng"
-
-#: my-evolution/e-summary.c:193
-msgid "%A, %B %e %Y"
-msgstr "%A, %B %e %Y"
-
-#: my-evolution/e-summary.c:493
-msgid "Please wait..."
-msgstr "Vui lòng chờ..."
-
-#: my-evolution/e-summary.c:584 ui/my-evolution.xml.h:3
-msgid "Print Summary"
-msgstr "In tóm tắt"
-
-#: my-evolution/e-summary.c:630
-msgid "Printing of Summary failed"
-msgstr "Lỗi in tóm tắt"
-
-#: my-evolution/main.c:66
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr ""
-
-#: my-evolution/metar.c:29
-msgid " F"
-msgstr " F"
-
-#: my-evolution/metar.c:29
-msgid " C"
-msgstr " C"
-
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr ""
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr ""
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr ""
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr ""
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "dặm"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "Kílô mét"
-
-#: my-evolution/metar.c:44
-msgid "Clear sky"
-msgstr "Trời trong"
-
-#: my-evolution/metar.c:45
-msgid "Broken clouds"
-msgstr "Mây tảng"
-
-#: my-evolution/metar.c:46
-msgid "Scattered clouds"
-msgstr "Nhiều mây"
-
-#: my-evolution/metar.c:47
-msgid "Few clouds"
-msgstr "Ít mây"
-
-#: my-evolution/metar.c:48
-msgid "Overcast"
-msgstr "U ám"
-
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
-msgid "Invalid"
-msgstr "Không hợp lệ"
-
-#: my-evolution/metar.c:63
-msgid "Variable"
-msgstr "Biến đổi"
-
-#: my-evolution/metar.c:64
-msgid "North"
-msgstr "Bắc"
-
-#: my-evolution/metar.c:64
-msgid "North - NorthEast"
-msgstr "Bắt - Đông Bắc"
-
-#: my-evolution/metar.c:64
-msgid "Northeast"
-msgstr "Đông Bắc"
-
-#: my-evolution/metar.c:64
-msgid "East - NorthEast"
-msgstr "Đông - Đông Bắc"
-
-#: my-evolution/metar.c:65
-msgid "East"
-msgstr "Đông"
-
-#: my-evolution/metar.c:65
-msgid "East - Southeast"
-msgstr "Đông - Đông Nam"
-
-#: my-evolution/metar.c:65
-msgid "Southeast"
-msgstr "Đông Nam"
-
-#: my-evolution/metar.c:65
-msgid "South - Southeast"
-msgstr "Nam - Đông Nam"
-
-#: my-evolution/metar.c:66
-msgid "South"
-msgstr "Nam"
-
-#: my-evolution/metar.c:66
-msgid "South - Southwest"
-msgstr "Nam - Tây Nam"
-
-#: my-evolution/metar.c:66
-msgid "Southwest"
-msgstr "Tây Nam"
-
-#: my-evolution/metar.c:66
-msgid "West - Southwest"
-msgstr "Tây - Tây Nam"
-
-#: my-evolution/metar.c:67
-msgid "West"
-msgstr "Tây"
-
-#: my-evolution/metar.c:67
-msgid "West - Northwest"
-msgstr "Tây - Tây Bắc"
-
-#: my-evolution/metar.c:67
-msgid "Northwest"
-msgstr "Tây Bắc"
-
-#: my-evolution/metar.c:67
-msgid "North - Northwest"
-msgstr "Bắc - Tây Bắc"
-
-#. DRIZZLE
-#: my-evolution/metar.c:127
-msgid "Drizzle"
-msgstr "Mưa phùn"
-
-#: my-evolution/metar.c:128
-msgid "Drizzle in the vicinity"
-msgstr "Mưa phùn trong vùng lân cận"
-
-#: my-evolution/metar.c:129
-msgid "Light drizzle"
-msgstr "Mưa phùn nhẹ"
-
-#: my-evolution/metar.c:130
-msgid "Moderate drizzle"
-msgstr "Mưa phùn vừa"
-
-#: my-evolution/metar.c:131
-msgid "Heavy drizzle"
-msgstr "Mưa phùn nặng"
-
-#: my-evolution/metar.c:132
-msgid "Shallow drizzle"
-msgstr "Chút mưa phùn"
-
-#: my-evolution/metar.c:133
-msgid "Patches of drizzle"
-msgstr "Nhiều mảng mưa phùn"
-
-#: my-evolution/metar.c:134
-msgid "Partial drizzle"
-msgstr "Một ít mưa phùn"
-
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
-msgid "Thunderstorm"
-msgstr "Bão kèm sấm"
-
-#: my-evolution/metar.c:136
-msgid "Windy drizzle"
-msgstr "Mưa gió"
-
-#: my-evolution/metar.c:137
-msgid "Showers"
-msgstr "Mưa"
-
-#: my-evolution/metar.c:138
-msgid "Drifting drizzle"
-msgstr "Mưa tí tách"
-
-#: my-evolution/metar.c:139
-msgid "Freezing drizzle"
-msgstr "Mưa phùn ớn lạnh"
-
-#. RAIN
-#: my-evolution/metar.c:142
-msgid "Rain"
-msgstr "Mưa"
-
-#: my-evolution/metar.c:143
-msgid "Rain in the vicinity"
-msgstr "Mưa trong vùng lân cận"
-
-#: my-evolution/metar.c:144
-msgid "Light rain"
-msgstr "Mưa nhẹ"
-
-#: my-evolution/metar.c:145
-msgid "Moderate rain"
-msgstr "Mưa vừa"
-
-#: my-evolution/metar.c:146
-msgid "Heavy rain"
-msgstr "Mưa nhiều"
-
-#: my-evolution/metar.c:147
-msgid "Shallow rain"
-msgstr "Chút mưa"
-
-#: my-evolution/metar.c:148
-msgid "Patches of rain"
-msgstr "Nhiều mảng mưa"
-
-#: my-evolution/metar.c:149
-msgid "Partial rainfall"
-msgstr ""
-
-#: my-evolution/metar.c:151
-msgid "Blowing rainfall"
-msgstr "Mưa gió"
-
-#: my-evolution/metar.c:152
-msgid "Rain showers"
-msgstr "Mưa tầm tã"
-
-#: my-evolution/metar.c:153
-msgid "Drifting rain"
-msgstr "Mưa tí tách"
-
-#: my-evolution/metar.c:154
-msgid "Freezing rain"
-msgstr "Mưa ớn lạnh"
-
-#. SNOW
-#: my-evolution/metar.c:157
-msgid "Snow"
-msgstr "Tuyết"
-
-#: my-evolution/metar.c:158
-msgid "Snow in the vicinity"
-msgstr "Tuyết trong vùng lân cận"
-
-#: my-evolution/metar.c:159
-msgid "Light snow"
-msgstr "Tuyết nhẹ"
-
-#: my-evolution/metar.c:160
-msgid "Moderate snow"
-msgstr "Tuyết vừa"
-
-#: my-evolution/metar.c:161
-msgid "Heavy snow"
-msgstr "Tuyết nhiều"
-
-#: my-evolution/metar.c:162
-msgid "Shallow snow"
-msgstr "Chút tuyết"
-
-#: my-evolution/metar.c:163
-msgid "Patches of snow"
-msgstr "Nhiều mảng tuyết"
-
-#: my-evolution/metar.c:164
-msgid "Partial snowfall"
-msgstr ""
-
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
-msgid "Snowstorm"
-msgstr "Bão tuyết"
-
-#: my-evolution/metar.c:166
-msgid "Blowing snowfall"
-msgstr "Gió tuyết"
-
-#: my-evolution/metar.c:167
-msgid "Snow showers"
-msgstr "Mưa tuyết"
-
-#: my-evolution/metar.c:168
-msgid "Drifting snow"
-msgstr "Tuyết tí tách ;)"
-
-#: my-evolution/metar.c:169
-msgid "Freezing snow"
-msgstr "Tuyết lạnh"
-
-#. SNOW_GRAINS
-#: my-evolution/metar.c:172
-msgid "Snow grains"
-msgstr "Chút tuyết"
-
-#: my-evolution/metar.c:173
-msgid "Snow grains in the vicinity"
-msgstr "Chút tuyết trong vùng lân cận"
-
-#: my-evolution/metar.c:174
-msgid "Light snow grains"
-msgstr "Chút tuyết nhẹ"
-
-#: my-evolution/metar.c:175
-msgid "Moderate snow grains"
-msgstr "Chút tuyết vừa"
-
-#: my-evolution/metar.c:176
-msgid "Heavy snow grains"
-msgstr "Chút tuyết nhiều"
-
-#: my-evolution/metar.c:177
-msgid "Shallow snow grains"
-msgstr "Chút chút tuyết ;)"
-
-#: my-evolution/metar.c:178
-msgid "Patches of snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:179
-msgid "Partial snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:181
-msgid "Blowing snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:182
-msgid "Snow grain showers"
-msgstr ""
-
-#: my-evolution/metar.c:183
-msgid "Drifting snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:184
-msgid "Freezing snow grains"
-msgstr ""
-
-#. ICE_CRYSTALS
-#: my-evolution/metar.c:187
-msgid "Ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:188
-msgid "Ice crystals in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:189
-msgid "Few ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:190
-msgid "Moderate ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:191
-msgid "Heavy ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:193
-msgid "Patches of ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:194
-msgid "Partial ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:195
-msgid "Ice crystal storm"
-msgstr ""
-
-#: my-evolution/metar.c:196
-msgid "Blowing ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:197
-msgid "Showers of ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:198
-msgid "Drifting ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:199
-msgid "Freezing ice crystals"
-msgstr ""
-
-#. ICE_PELLETS
-#: my-evolution/metar.c:202
-msgid "Ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:203
-msgid "Ice pellets in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:204
-msgid "Few ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:205
-msgid "Moderate ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:206
-msgid "Heavy ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:207
-msgid "Shallow ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:208
-msgid "Patches of ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:209
-msgid "Partial ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:210
-msgid "Ice pellet storm"
-msgstr ""
-
-#: my-evolution/metar.c:211
-msgid "Blowing ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:212
-msgid "Showers of ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:213
-msgid "Drifting ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:214
-msgid "Freezing ice pellets"
-msgstr ""
-
-#. HAIL
-#: my-evolution/metar.c:217 my-evolution/Locations.h:883
-msgid "Hail"
-msgstr "Mưa đá"
-
-#: my-evolution/metar.c:218
-msgid "Hail in the vicinity"
-msgstr "Mưa đá trong vùng lân cận"
-
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
-msgid "Light hail"
-msgstr "Mưa đá nhẹ"
-
-#: my-evolution/metar.c:220
-msgid "Moderate hail"
-msgstr "Mưa đá vừa"
-
-#: my-evolution/metar.c:221
-msgid "Heavy hail"
-msgstr "Mưa đá nhiều"
-
-#: my-evolution/metar.c:222
-msgid "Shallow hail"
-msgstr "Chút mưa đá"
-
-#: my-evolution/metar.c:223
-msgid "Patches of hail"
-msgstr "Nhiều mảng mưa đá"
-
-#: my-evolution/metar.c:224
-msgid "Partial hail"
-msgstr "Một ít mưa đá"
-
-#: my-evolution/metar.c:225
-msgid "Hailstorm"
-msgstr "Bão đá"
-
-#: my-evolution/metar.c:226
-msgid "Blowing hail"
-msgstr "Mưa đá kèm gió"
-
-#: my-evolution/metar.c:227
-msgid "Hail showers"
-msgstr "Mưa đá kèm mưa"
-
-#: my-evolution/metar.c:228
-msgid "Drifting hail"
-msgstr "Mưa đá tí tách"
-
-#: my-evolution/metar.c:229
-msgid "Freezing hail"
-msgstr "Mưa đá lạnh"
-
-#. SMALL_HAIL
-#: my-evolution/metar.c:232
-msgid "Small hail"
-msgstr "Mưa đá nhỏ"
-
-#: my-evolution/metar.c:233
-msgid "Small hail in the vicinity"
-msgstr "Mưa đá nhỏ trong vùng lân cận"
-
-#: my-evolution/metar.c:235
-msgid "Moderate small hail"
-msgstr "Mưa đá nhỏ vừa"
-
-#: my-evolution/metar.c:236
-msgid "Heavy small hail"
-msgstr "Mưa đá nhỏ nhiều"
-
-#: my-evolution/metar.c:237
-msgid "Shallow small hail"
-msgstr "Chút mưa đá nhỏ"
-
-#: my-evolution/metar.c:238
-msgid "Patches of small hail"
-msgstr "Nhiều mảng mưa đá nhỏ"
-
-#: my-evolution/metar.c:239
-msgid "Partial small hail"
-msgstr "Một tí mưa đá nhỏ"
-
-#: my-evolution/metar.c:240
-msgid "Small hailstorm"
-msgstr "Bão đá nhỏ"
-
-#: my-evolution/metar.c:241
-msgid "Blowing small hail"
-msgstr "Mưa đá nhỏ kèm gió"
-
-#: my-evolution/metar.c:242
-msgid "Showers of small hail"
-msgstr "Mưa đá nhỏ kèm mưa"
-
-#: my-evolution/metar.c:243
-msgid "Drifting small hail"
-msgstr "Mưa đá nhỏ tí tách"
-
-#: my-evolution/metar.c:244
-msgid "Freezing small hail"
-msgstr "Mưa đá nhỏ lạnh"
-
-#. PRECIPITATION
-#: my-evolution/metar.c:247
-msgid "Unknown precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:248
-msgid "Precipitation in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:249
-msgid "Light precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:250
-msgid "Moderate precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:251
-msgid "Heavy precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:252
-msgid "Shallow precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:253
-msgid "Patches of precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:254
-msgid "Partial precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:255
-msgid "Unknown thunderstorm"
-msgstr ""
-
-#: my-evolution/metar.c:256
-msgid "Blowing precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:257
-msgid "Showers, type unknown"
-msgstr ""
-
-#: my-evolution/metar.c:258
-msgid "Drifting precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:259
-msgid "Freezing precipitation"
-msgstr ""
-
-#. MIST
-#: my-evolution/metar.c:262
-msgid "Mist"
-msgstr "Sương mù"
-
-#: my-evolution/metar.c:263
-msgid "Mist in the vicinity"
-msgstr "Sương mù trong vùng lân cận"
-
-#: my-evolution/metar.c:264
-msgid "Light mist"
-msgstr "Sương mù nhẹ"
-
-#: my-evolution/metar.c:265
-msgid "Moderate mist"
-msgstr "Sương mù vừa"
-
-#: my-evolution/metar.c:266
-msgid "Thick mist"
-msgstr "Sương mù dày đặc"
-
-#: my-evolution/metar.c:267
-msgid "Shallow mist"
-msgstr ""
-
-#: my-evolution/metar.c:268
-msgid "Patches of mist"
-msgstr ""
-
-#: my-evolution/metar.c:269
-msgid "Partial mist"
-msgstr ""
-
-#: my-evolution/metar.c:271
-msgid "Mist with wind"
-msgstr ""
-
-#: my-evolution/metar.c:273
-msgid "Drifting mist"
-msgstr ""
-
-#: my-evolution/metar.c:274
-msgid "Freezing mist"
-msgstr "Sương mù lạnh"
-
-#. FOG
-#: my-evolution/metar.c:277
-msgid "Fog"
-msgstr "Sương"
-
-#: my-evolution/metar.c:278
-msgid "Fog in the vicinity"
-msgstr "Sương trong vùng lân cận"
-
-#: my-evolution/metar.c:279
-msgid "Light fog"
-msgstr "Sương nhẹ"
-
-#: my-evolution/metar.c:280
-msgid "Moderate fog"
-msgstr "Sương vừa"
-
-#: my-evolution/metar.c:281
-msgid "Thick fog"
-msgstr "Sương nhiều"
-
-#: my-evolution/metar.c:282
-msgid "Shallow fog"
-msgstr "Chút sương"
-
-#: my-evolution/metar.c:283
-msgid "Patches of fog"
-msgstr "Nhiều mảng sương"
-
-#: my-evolution/metar.c:284
-msgid "Partial fog"
-msgstr ""
-
-#: my-evolution/metar.c:286
-msgid "Fog with wind"
-msgstr "Sương gió"
-
-#: my-evolution/metar.c:288
-msgid "Drifting fog"
-msgstr "Sương tí tách"
-
-#: my-evolution/metar.c:289
-msgid "Freezing fog"
-msgstr "Sương lạnh"
-
-#. SMOKE
-#: my-evolution/metar.c:292
-msgid "Smoke"
-msgstr "Khói"
-
-#: my-evolution/metar.c:293
-msgid "Smoke in the vicinity"
-msgstr "Khói trong vùng lân cận"
-
-#: my-evolution/metar.c:294
-msgid "Thin smoke"
-msgstr "Khỏi mỏng"
-
-#: my-evolution/metar.c:295
-msgid "Moderate smoke"
-msgstr "Khói vừa"
-
-#: my-evolution/metar.c:296
-msgid "Thick smoke"
-msgstr "Khói dày"
-
-#: my-evolution/metar.c:297
-msgid "Shallow smoke"
-msgstr "Chút khói"
-
-#: my-evolution/metar.c:298
-msgid "Patches of smoke"
-msgstr "Nhiều mảng khói"
-
-#: my-evolution/metar.c:299
-msgid "Partial smoke"
-msgstr "Một ít khói"
-
-#: my-evolution/metar.c:300
-msgid "Thunderous smoke"
-msgstr ""
-
-#: my-evolution/metar.c:301
-msgid "Smoke with wind"
-msgstr "Khói có gió"
-
-#: my-evolution/metar.c:303
-msgid "Drifting smoke"
-msgstr ""
-
-#. VOLCANIC_ASH
-#: my-evolution/metar.c:307
-msgid "Volcanic ash"
-msgstr "Tro núi lửa"
-
-#: my-evolution/metar.c:308
-msgid "Volcanic ash in the vicinity"
-msgstr "Tro núi lửa trong vùng lân cận"
-
-#: my-evolution/metar.c:310
-msgid "Moderate volcanic ash"
-msgstr "Tro núi lửa vừa"
-
-#: my-evolution/metar.c:311
-msgid "Thick volcanic ash"
-msgstr "Tro núi lửa dày"
-
-#: my-evolution/metar.c:312
-msgid "Shallow volcanic ash"
-msgstr ""
-
-#: my-evolution/metar.c:313
-msgid "Patches of volcanic ash"
-msgstr ""
-
-#: my-evolution/metar.c:314
-msgid "Partial volcanic ash"
-msgstr ""
-
-#: my-evolution/metar.c:315
-msgid "Thunderous volcanic ash"
-msgstr ""
-
-#: my-evolution/metar.c:316
-msgid "Blowing volcanic ash"
-msgstr ""
-
-#: my-evolution/metar.c:317
-msgid "Showers of volcanic ash"
-msgstr ""
-
-#: my-evolution/metar.c:318
-msgid "Drifting volcanic ash"
-msgstr ""
-
-#: my-evolution/metar.c:319
-msgid "Freezing volcanic ash"
-msgstr ""
-
-#. SAND
-#: my-evolution/metar.c:322
-msgid "Sand"
-msgstr "Cát"
-
-#: my-evolution/metar.c:323
-msgid "Sand in the vicinity"
-msgstr "Cát trong vùng lân cận"
-
-#: my-evolution/metar.c:324
-msgid "Light sand"
-msgstr "Cát ít"
-
-#: my-evolution/metar.c:325
-msgid "Moderate sand"
-msgstr "Cát vừa"
-
-#: my-evolution/metar.c:326
-msgid "Heavy sand"
-msgstr "Cát nhiều"
-
-#: my-evolution/metar.c:328
-msgid "Patches of sand"
-msgstr ""
-
-#: my-evolution/metar.c:329
-msgid "Partial sand"
-msgstr ""
-
-#: my-evolution/metar.c:331
-msgid "Blowing sand"
-msgstr ""
-
-#: my-evolution/metar.c:333
-msgid "Drifting sand"
-msgstr ""
-
-#. HAZE
-#: my-evolution/metar.c:337
-msgid "Haze"
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+msgid "This page can be used to customize the appearance of the Summary page."
 msgstr ""
 
-#: my-evolution/metar.c:338
-msgid "Haze in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:339
-msgid "Light haze"
-msgstr ""
-
-#: my-evolution/metar.c:340
-msgid "Moderate haze"
-msgstr ""
-
-#: my-evolution/metar.c:341
-msgid "Thick haze"
-msgstr ""
-
-#: my-evolution/metar.c:342
-msgid "Shallow haze"
-msgstr ""
-
-#: my-evolution/metar.c:343
-msgid "Patches of haze"
-msgstr ""
-
-#: my-evolution/metar.c:344
-msgid "Partial haze"
-msgstr ""
-
-#: my-evolution/metar.c:346
-msgid "Haze with wind"
-msgstr ""
-
-#: my-evolution/metar.c:348
-msgid "Drifting haze"
-msgstr ""
-
-#: my-evolution/metar.c:349
-msgid "Freezing haze"
-msgstr ""
-
-#. SPRAY
-#: my-evolution/metar.c:352
-msgid "Spray"
-msgstr ""
-
-#: my-evolution/metar.c:353
-msgid "Spray in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:354
-msgid "Light spray"
-msgstr ""
-
-#: my-evolution/metar.c:355
-msgid "Moderate spray"
-msgstr ""
-
-#: my-evolution/metar.c:356
-msgid "Heavy spray"
-msgstr ""
-
-#: my-evolution/metar.c:357
-msgid "Shallow spray"
-msgstr ""
-
-#: my-evolution/metar.c:358
-msgid "Patches of spray"
-msgstr ""
-
-#: my-evolution/metar.c:359
-msgid "Partial spray"
-msgstr ""
-
-#: my-evolution/metar.c:361
-msgid "Blowing spray"
-msgstr ""
-
-#: my-evolution/metar.c:363
-msgid "Drifting spray"
-msgstr ""
-
-#: my-evolution/metar.c:364
-msgid "Freezing spray"
-msgstr ""
-
-#. DUST
-#: my-evolution/metar.c:367
-msgid "Dust"
-msgstr "Bụi"
-
-#: my-evolution/metar.c:368
-msgid "Dust in the vicinity"
-msgstr "Bụi trong vùng lân cận"
-
-#: my-evolution/metar.c:369
-msgid "Light dust"
-msgstr "Bụi nhẹ"
-
-#: my-evolution/metar.c:370
-msgid "Moderate dust"
-msgstr "Bụi vừa"
-
-#: my-evolution/metar.c:371
-msgid "Heavy dust"
-msgstr "Bụi nặng"
-
-#: my-evolution/metar.c:373
-msgid "Patches of dust"
-msgstr ""
-
-#: my-evolution/metar.c:374
-msgid "Partial dust"
-msgstr ""
-
-#: my-evolution/metar.c:376
-msgid "Blowing dust"
-msgstr ""
-
-#: my-evolution/metar.c:378
-msgid "Drifting dust"
-msgstr ""
-
-#. SQUALL
-#: my-evolution/metar.c:382
-msgid "Squall"
-msgstr "Gió lạnh"
-
-#: my-evolution/metar.c:383
-msgid "Squall in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:384
-msgid "Light squall"
-msgstr ""
-
-#: my-evolution/metar.c:385
-msgid "Moderate squall"
-msgstr ""
-
-#: my-evolution/metar.c:386
-msgid "Heavy squall"
-msgstr ""
-
-#: my-evolution/metar.c:389
-msgid "Partial squall"
-msgstr ""
-
-#: my-evolution/metar.c:390
-msgid "Thunderous squall"
-msgstr ""
-
-#: my-evolution/metar.c:391
-msgid "Blowing squall"
-msgstr ""
-
-#: my-evolution/metar.c:393
-msgid "Drifting squall"
-msgstr ""
-
-#: my-evolution/metar.c:394
-msgid "Freezing squall"
-msgstr ""
-
-#. SANDSTORM
-#: my-evolution/metar.c:397
-msgid "Sandstorm"
-msgstr "Bão cát"
-
-#: my-evolution/metar.c:398
-msgid "Sandstorm in the vicinity"
-msgstr "Bão cát trong vùng lân cận"
-
-#: my-evolution/metar.c:399
-msgid "Light standstorm"
-msgstr "Bão cát nhẹ"
-
-#: my-evolution/metar.c:400
-msgid "Moderate sandstorm"
-msgstr "Bão cát vừa"
-
-#: my-evolution/metar.c:401
-msgid "Heavy sandstorm"
-msgstr "Báo cát mạnh"
-
-#: my-evolution/metar.c:402
-msgid "Shallow sandstorm"
-msgstr ""
-
-#: my-evolution/metar.c:404
-msgid "Partial sandstorm"
-msgstr ""
-
-#: my-evolution/metar.c:405
-msgid "Thunderous sandstorm"
-msgstr ""
-
-#: my-evolution/metar.c:406
-msgid "Blowing sandstorm"
-msgstr ""
-
-#: my-evolution/metar.c:408
-msgid "Drifting sandstorm"
-msgstr ""
-
-#: my-evolution/metar.c:409
-msgid "Freezing sandstorm"
-msgstr ""
-
-#. DUSTSTORM
-#: my-evolution/metar.c:412
-msgid "Duststorm"
-msgstr "Bão bụi"
-
-#: my-evolution/metar.c:413
-msgid "Duststorm in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:414
-msgid "Light duststorm"
-msgstr ""
-
-#: my-evolution/metar.c:415
-msgid "Moderate duststorm"
-msgstr ""
-
-#: my-evolution/metar.c:416
-msgid "Heavy duststorm"
-msgstr ""
-
-#: my-evolution/metar.c:417
-msgid "Shallow duststorm"
-msgstr ""
-
-#: my-evolution/metar.c:419
-msgid "Partial duststorm"
-msgstr ""
-
-#: my-evolution/metar.c:420
-msgid "Thunderous duststorm"
-msgstr ""
-
-#: my-evolution/metar.c:421
-msgid "Blowing duststorm"
-msgstr ""
-
-#: my-evolution/metar.c:423
-msgid "Drifting duststorm"
-msgstr ""
-
-#: my-evolution/metar.c:424
-msgid "Freezing duststorm"
-msgstr ""
-
-#. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
-msgid "Funnel cloud"
-msgstr "Mây ống"
-
-#: my-evolution/metar.c:428
-msgid "Funnel cloud in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:429
-msgid "Light funnel cloud"
-msgstr ""
-
-#: my-evolution/metar.c:430
-msgid "Moderate funnel cloud"
-msgstr ""
-
-#: my-evolution/metar.c:431
-msgid "Thick funnel cloud"
-msgstr ""
-
-#: my-evolution/metar.c:432
-msgid "Shallow funnel cloud"
-msgstr ""
-
-#: my-evolution/metar.c:433
-msgid "Patches of funnel clouds"
-msgstr ""
-
-#: my-evolution/metar.c:434
-msgid "Partial funnel clouds"
-msgstr ""
-
-#: my-evolution/metar.c:436
-msgid "Funnel cloud w/ wind"
-msgstr ""
-
-#: my-evolution/metar.c:438
-msgid "Drifting funnel cloud"
-msgstr ""
-
-#. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
-msgid "Tornado"
-msgstr "Lốc xoáy"
-
-#: my-evolution/metar.c:443
-msgid "Tornado in the vicinity"
-msgstr "Lốc xoáy trong vùng lân cận"
-
-#: my-evolution/metar.c:445
-msgid "Moderate tornado"
-msgstr "Lốc xoáy vừa"
-
-#: my-evolution/metar.c:446
-msgid "Raging tornado"
-msgstr "Bão tố"
-
-#: my-evolution/metar.c:449
-msgid "Partial tornado"
-msgstr ""
-
-#: my-evolution/metar.c:450
-msgid "Thunderous tornado"
-msgstr ""
-
-#: my-evolution/metar.c:453
-msgid "Drifting tornado"
-msgstr ""
-
-#: my-evolution/metar.c:454
-msgid "Freezing tornado"
-msgstr ""
-
-#. DUST_WHIRLS
-#: my-evolution/metar.c:457
-msgid "Dust whirls"
-msgstr "Gió bụi"
-
-#: my-evolution/metar.c:458
-msgid "Dust whirls in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:459
-msgid "Light dust whirls"
-msgstr ""
-
-#: my-evolution/metar.c:460
-msgid "Moderate dust whirls"
-msgstr ""
-
-#: my-evolution/metar.c:461
-msgid "Heavy dust whirls"
-msgstr ""
-
-#: my-evolution/metar.c:462
-msgid "Shallow dust whirls"
-msgstr ""
-
-#: my-evolution/metar.c:463
-msgid "Patches of dust whirls"
-msgstr ""
-
-#: my-evolution/metar.c:464
-msgid "Partial dust whirls"
-msgstr ""
-
-#: my-evolution/metar.c:466
-msgid "Blowing dust whirls"
-msgstr ""
-
-#: my-evolution/metar.c:468
-msgid "Drifting dust whirls"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr " _Loại bỏ"
-
-#: my-evolution/my-evolution.glade.h:2
-msgid "Add n_ews feed"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "Mọi t_hư mục:"
-
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:6
-msgid "C_elsius"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:8
-msgid "How many days should the calendar display at once?"
-msgstr "Lịch hiển thị bao nhiêu ngày mỗi lần?"
-
-#: my-evolution/my-evolution.glade.h:9
-msgid "Ma_x number of items shown:"
-msgstr "Số _mục hiển thị tối đa:"
-
-#: my-evolution/my-evolution.glade.h:10
-msgid "News Feed Settings"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:11
-msgid "One mont_h"
-msgstr "_Một tháng"
-
-#: my-evolution/my-evolution.glade.h:12
-msgid "One w_eek"
-msgstr "Một _tuần"
-
-#: my-evolution/my-evolution.glade.h:13
-msgid "R_efresh time (seconds):"
-msgstr "Thời gian cập nhật (giây):"
-
-#: my-evolution/my-evolution.glade.h:14
-msgid "Refresh _time (seconds):"
-msgstr "Thời gian cập nhật (giây):"
-
-#: my-evolution/my-evolution.glade.h:15
-msgid "S_how full path for folders"
-msgstr "_Hiện toàn đường dẫn của thư mục"
-
-#: my-evolution/my-evolution.glade.h:16
-msgid "Show _all tasks"
-msgstr "Hiện mọi _công việc"
-
-#: my-evolution/my-evolution.glade.h:17
-msgid "Show _today's tasks"
-msgstr "Hiện mọi công việc trong n_gày"
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "Show temperatures in:"
-msgstr "Hiện nhiệt độ trong:"
-
-#: my-evolution/my-evolution.glade.h:19
-msgid "Tasks "
-msgstr "Công việc"
-
-#: my-evolution/my-evolution.glade.h:20
-msgid "Weather settings"
-msgstr "Thiết lập thời tiết"
-
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "_Hiển thị thư mục:"
-
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:25
-msgid "_Fahrenheit"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Five days"
-msgstr "_Năm ngày"
-
-#: my-evolution/my-evolution.glade.h:27
-msgid "_Mail"
-msgstr "_Thư"
-
-#: my-evolution/my-evolution.glade.h:28
-msgid "_News Feeds"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:29
-msgid "_One day"
-msgstr "_Một ngày"
-
-#: my-evolution/my-evolution.glade.h:30
-msgid "_Schedule"
-msgstr "_Lập lịch biểu"
-
-#: my-evolution/my-evolution.glade.h:31
-msgid "_Weather"
-msgstr "_Thời tiết"
-
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
 msgstr "Aarhus"
@@ -15305,7472 +15599,8950 @@ msgid "Diyarbakir"
 msgstr "Diyarbakir"
 
 #: my-evolution/Locations.h:603
+msgid "Dnipropetrovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:604
 msgid "Dobbiaco"
 msgstr "Dobbiaco"
 
-#: my-evolution/Locations.h:604
+#: my-evolution/Locations.h:605
 msgid "Dodge City"
 msgstr "Thành phố Dodge"
 
-#: my-evolution/Locations.h:605
+#: my-evolution/Locations.h:606
 msgid "Doha"
 msgstr "Doha"
 
-#: my-evolution/Locations.h:606
+#: my-evolution/Locations.h:607
 msgid "Dole"
 msgstr "Dole"
 
-#: my-evolution/Locations.h:608
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "Xong"
+
+#: my-evolution/Locations.h:610
 msgid "Dongsha"
 msgstr "Dongsha"
 
-#: my-evolution/Locations.h:609
+#: my-evolution/Locations.h:611
 msgid "Dongshi"
 msgstr "Dongshi"
 
-#: my-evolution/Locations.h:610
+#: my-evolution/Locations.h:612
 msgid "Don Torcuato"
 msgstr "Don Torcuato"
 
-#: my-evolution/Locations.h:611
+#: my-evolution/Locations.h:613
 msgid "Dortmund-Wickede"
 msgstr "Dortmund-Wickede"
 
-#: my-evolution/Locations.h:612
+#: my-evolution/Locations.h:614
 msgid "Dothan"
 msgstr "Dothan"
 
-#: my-evolution/Locations.h:613
+#: my-evolution/Locations.h:615
 msgid "Douglas"
 msgstr "Douglas"
 
-#: my-evolution/Locations.h:614
+#: my-evolution/Locations.h:616
 msgid "Dover"
 msgstr "Dover"
 
-#: my-evolution/Locations.h:615
+#: my-evolution/Locations.h:617
 msgid "Dresden-Klotzsche"
 msgstr "Dresden-Klotzsche"
 
-#: my-evolution/Locations.h:616
+#: my-evolution/Locations.h:618
 msgid "Drummond"
 msgstr "Drummond"
 
-#: my-evolution/Locations.h:617
+#: my-evolution/Locations.h:619
 msgid "Dubai"
 msgstr "Dubai"
 
-#: my-evolution/Locations.h:618
+#: my-evolution/Locations.h:620
 msgid "Dubbo"
 msgstr "Dubbo"
 
-#: my-evolution/Locations.h:619
+#: my-evolution/Locations.h:621
 msgid "Dublin"
 msgstr "Dublin"
 
-#: my-evolution/Locations.h:620
+#: my-evolution/Locations.h:622
 msgid "Du Bois"
 msgstr "Du Bois"
 
-#: my-evolution/Locations.h:621
+#: my-evolution/Locations.h:623
 msgid "Dubrovnik"
 msgstr "Dubrovnik"
 
-#: my-evolution/Locations.h:622
+#: my-evolution/Locations.h:624
 msgid "Dubuque"
 msgstr "Dubuque"
 
-#: my-evolution/Locations.h:623
+#: my-evolution/Locations.h:625
 msgid "Dugway"
 msgstr "Dugway"
 
-#: my-evolution/Locations.h:624
+#: my-evolution/Locations.h:626
 msgid "Duluth"
 msgstr "Duluth"
 
-#: my-evolution/Locations.h:625
+#: my-evolution/Locations.h:627
 msgid "Dundee"
 msgstr "Dundee"
 
-#: my-evolution/Locations.h:626
+#: my-evolution/Locations.h:628
 msgid "Durango"
 msgstr "Durango"
 
-#: my-evolution/Locations.h:627
+#: my-evolution/Locations.h:629
 msgid "Durango Awrs"
 msgstr "Durango Awrs"
 
-#: my-evolution/Locations.h:628
+#: my-evolution/Locations.h:630
 msgid "Durazno"
 msgstr "Durazno"
 
-#: my-evolution/Locations.h:629
+#: my-evolution/Locations.h:631
 msgid "Durban Louis Botha "
 msgstr "Durban Louis Botha "
 
-#: my-evolution/Locations.h:630
+#: my-evolution/Locations.h:632
 msgid "Dusseldorf"
 msgstr "Dusseldorf"
 
-#: my-evolution/Locations.h:631
+#: my-evolution/Locations.h:633
 msgid "Dutch Harbor"
 msgstr "Dutch Harbor"
 
-#: my-evolution/Locations.h:632
+#: my-evolution/Locations.h:634
 msgid "Dyersburg"
 msgstr "Dyersburg"
 
-#: my-evolution/Locations.h:633
+#: my-evolution/Locations.h:635
 msgid "Eagle"
 msgstr "Eagle"
 
-#: my-evolution/Locations.h:634
+#: my-evolution/Locations.h:636
 msgid "Eagle Range"
 msgstr "Eagle Range"
 
-#: my-evolution/Locations.h:635
+#: my-evolution/Locations.h:637
 msgid "East London"
 msgstr "East London"
 
-#: my-evolution/Locations.h:636
+#: my-evolution/Locations.h:638
 msgid "East Midlands"
 msgstr "East Midlands"
 
-#: my-evolution/Locations.h:637
+#: my-evolution/Locations.h:639
 msgid "East St Louis"
 msgstr "East St Louis"
 
-#: my-evolution/Locations.h:638
+#: my-evolution/Locations.h:640
 msgid "Eau Claire"
 msgstr "Eau Claire"
 
-#: my-evolution/Locations.h:640
+#: my-evolution/Locations.h:642
 msgid "Edinburgh"
 msgstr "Edinburgh"
 
-#: my-evolution/Locations.h:641
+#: my-evolution/Locations.h:643
 msgid "Edmonton"
 msgstr "Edmonton"
 
-#: my-evolution/Locations.h:642
+#: my-evolution/Locations.h:644
 msgid "Edmonton/Villeneuve"
 msgstr "Edmonton/Villeneuve"
 
-#: my-evolution/Locations.h:643
+#: my-evolution/Locations.h:645
 msgid "Eduardo Gomes International"
 msgstr "Eduardo Gomes International"
 
-#: my-evolution/Locations.h:644
+#: my-evolution/Locations.h:646
 msgid "Edwards AFB"
 msgstr "Edwards AFB"
 
-#: my-evolution/Locations.h:645
+#: my-evolution/Locations.h:647
 msgid "Egilsstadir"
 msgstr "Egilsstadir"
 
-#: my-evolution/Locations.h:646
+#: my-evolution/Locations.h:648
 msgid "Eglin"
 msgstr "Eglin"
 
-#: my-evolution/Locations.h:647
+#: my-evolution/Locations.h:649
 msgid "Eglington/Londonderry"
 msgstr "Eglington/Londonderry"
 
-#: my-evolution/Locations.h:649
+#: my-evolution/Locations.h:651
 msgid "Eindhoven"
 msgstr "Eindhoven"
 
-#: my-evolution/Locations.h:650
+#: my-evolution/Locations.h:652
 msgid "Ekofisk"
 msgstr "Ekofisk"
 
-#: my-evolution/Locations.h:651
+#: my-evolution/Locations.h:653
 msgid "Elazig"
 msgstr "Elazig"
 
-#: my-evolution/Locations.h:652
+#: my-evolution/Locations.h:654
 msgid "El Centro"
 msgstr "El Centro"
 
-#: my-evolution/Locations.h:653
+#: my-evolution/Locations.h:655
 msgid "El Dorado"
 msgstr "El Dorado"
 
-#: my-evolution/Locations.h:654
+#: my-evolution/Locations.h:656
 msgid "Elefsis"
 msgstr "Elefsis"
 
-#: my-evolution/Locations.h:655
+#: my-evolution/Locations.h:657
 msgid "Elfin Cove"
 msgstr "Elfin Cove"
 
-#: my-evolution/Locations.h:656
+#: my-evolution/Locations.h:658
 msgid "Elizabeth City"
 msgstr "Thành phố Elizabeth"
 
-#: my-evolution/Locations.h:657
+#: my-evolution/Locations.h:659
 msgid "Elk City"
 msgstr "Thành phố Elk"
 
-#: my-evolution/Locations.h:658
+#: my-evolution/Locations.h:660
 msgid "Elkhart"
 msgstr "Elkhart"
 
-#: my-evolution/Locations.h:659
+#: my-evolution/Locations.h:661
 msgid "Elkins"
 msgstr "Elkins"
 
-#: my-evolution/Locations.h:660
+#: my-evolution/Locations.h:662
 msgid "Elko"
 msgstr "Elko"
 
-#: my-evolution/Locations.h:661
+#: my-evolution/Locations.h:663
 msgid "Elmira"
 msgstr "Elmira"
 
-#: my-evolution/Locations.h:662
+#: my-evolution/Locations.h:664
 msgid "El Monte"
 msgstr "El Monte"
 
-#: my-evolution/Locations.h:663
+#: my-evolution/Locations.h:665
 msgid "El Paso"
 msgstr "El Paso"
 
-#: my-evolution/Locations.h:665
+#: my-evolution/Locations.h:667
 msgid "El Salvador Int."
 msgstr "El Salvador Int."
 
-#: my-evolution/Locations.h:666
+#: my-evolution/Locations.h:668
 msgid "Elsenborn"
 msgstr "Elsenborn"
 
-#: my-evolution/Locations.h:667
+#: my-evolution/Locations.h:669
 msgid "Ely"
 msgstr "Ely"
 
-#: my-evolution/Locations.h:668
+#: my-evolution/Locations.h:670
 msgid "Emmonak"
 msgstr "Emmonak"
 
-#: my-evolution/Locations.h:669
+#: my-evolution/Locations.h:671
 msgid "Emporia"
 msgstr "Emporia"
 
-#: my-evolution/Locations.h:670
+#: my-evolution/Locations.h:672
 msgid "Enid"
 msgstr "Enid"
 
-#: my-evolution/Locations.h:671
+#: my-evolution/Locations.h:673
 msgid "Enid/Woodring"
 msgstr "Enid/Woodring"
 
-#: my-evolution/Locations.h:672
+#: my-evolution/Locations.h:674
 msgid "Enosburg Falls"
 msgstr "Enosburg Falls"
 
-#: my-evolution/Locations.h:673
+#: my-evolution/Locations.h:675
 msgid "Ephrata"
 msgstr "Ephrata"
 
-#: my-evolution/Locations.h:674
+#: my-evolution/Locations.h:676
 msgid "Ercan"
 msgstr "Ercan"
 
-#: my-evolution/Locations.h:675
+#: my-evolution/Locations.h:677
 msgid "Erie"
 msgstr "Erie"
 
-#: my-evolution/Locations.h:676
+#: my-evolution/Locations.h:678
 msgid "Erzurum"
 msgstr "Erzurum"
 
-#: my-evolution/Locations.h:677
+#: my-evolution/Locations.h:679
 msgid "Esbjerg"
 msgstr "Esbjerg"
 
-#: my-evolution/Locations.h:678
+#: my-evolution/Locations.h:680
 msgid "Escanaba"
 msgstr "Escanaba"
 
-#: my-evolution/Locations.h:679
+#: my-evolution/Locations.h:681
 msgid "Esfahan"
 msgstr "Esfahan"
 
-#: my-evolution/Locations.h:680
+#: my-evolution/Locations.h:682
 msgid "Eskisehir"
 msgstr "Eskisehir"
 
-#: my-evolution/Locations.h:681
+#: my-evolution/Locations.h:683
 msgid "Estherville"
 msgstr "Estherville"
 
-#: my-evolution/Locations.h:683
+#: my-evolution/Locations.h:685
 msgid "Eugene"
 msgstr "Eugene"
 
-#: my-evolution/Locations.h:684
+#: my-evolution/Locations.h:686
 msgid "Eureka"
 msgstr "Eureka"
 
-#: my-evolution/Locations.h:685
+#: my-evolution/Locations.h:687
 msgid "Europe"
 msgstr "Châu Âu"
 
-#: my-evolution/Locations.h:686
+#: my-evolution/Locations.h:688
 msgid "Evanston"
 msgstr "Evanston"
 
-#: my-evolution/Locations.h:687
+#: my-evolution/Locations.h:689
 msgid "Evansville"
 msgstr "Evansville"
 
-#: my-evolution/Locations.h:688
+#: my-evolution/Locations.h:690
 msgid "Everett"
 msgstr "Everett"
 
-#: my-evolution/Locations.h:689
+#: my-evolution/Locations.h:691
 msgid "Evergreen"
 msgstr "Evergreen"
 
-#: my-evolution/Locations.h:690
+#: my-evolution/Locations.h:692
 msgid "Evreux-Fauville"
 msgstr "Evreux-Fauville"
 
-#: my-evolution/Locations.h:691
+#: my-evolution/Locations.h:693
 msgid "Exeter"
 msgstr "Exeter"
 
-#: my-evolution/Locations.h:692
+#: my-evolution/Locations.h:694
 msgid "Ezeiza"
 msgstr "Ezeiza"
 
-#: my-evolution/Locations.h:693
+#: my-evolution/Locations.h:695
 msgid "Fagernes"
 msgstr "Fagernes"
 
-#: my-evolution/Locations.h:694
+#: my-evolution/Locations.h:696
 msgid "Fairbanks"
 msgstr "Fairbanks"
 
-#: my-evolution/Locations.h:695
+#: my-evolution/Locations.h:697
 msgid "Fairchild"
 msgstr "Fairchild"
 
-#: my-evolution/Locations.h:696
+#: my-evolution/Locations.h:698
 msgid "Fairfield"
 msgstr "Fairfield"
 
-#: my-evolution/Locations.h:697
+#: my-evolution/Locations.h:699
 msgid "Fairmont"
 msgstr "Fairmont"
 
-#: my-evolution/Locations.h:698
+#: my-evolution/Locations.h:700
 msgid "Fallon"
 msgstr "Fallon"
 
-#: my-evolution/Locations.h:699
+#: my-evolution/Locations.h:701
 msgid "Falls City"
 msgstr "Thành phố Falls"
 
-#: my-evolution/Locations.h:700
+#: my-evolution/Locations.h:702
 msgid "Falmouth-Otis AFB"
 msgstr "Falmouth-Otis AFB"
 
-#: my-evolution/Locations.h:701
+#: my-evolution/Locations.h:703
 msgid "Farbanks/Eielson AFB"
 msgstr "Farbanks/Eielson AFB"
 
-#: my-evolution/Locations.h:702
+#: my-evolution/Locations.h:704
 msgid "Fargo"
 msgstr "Fargo"
 
-#: my-evolution/Locations.h:703
+#: my-evolution/Locations.h:705
 msgid "Farmingdale"
 msgstr "Farmingdale"
 
-#: my-evolution/Locations.h:704
+#: my-evolution/Locations.h:706
 msgid "Farmington"
 msgstr "Farmington"
 
-#: my-evolution/Locations.h:705
+#: my-evolution/Locations.h:707
 msgid "Farmville"
 msgstr "Farmville"
 
-#: my-evolution/Locations.h:706
+#: my-evolution/Locations.h:708
 msgid "Faro"
 msgstr "Faro"
 
-#: my-evolution/Locations.h:707
+#: my-evolution/Locations.h:709
 msgid "Fayetteville"
 msgstr "Fayetteville"
 
-#: my-evolution/Locations.h:708
+#: my-evolution/Locations.h:710
 msgid "Feng Nin"
 msgstr "Feng Nin"
 
-#: my-evolution/Locations.h:709
+#: my-evolution/Locations.h:711
 msgid "Fergus Falls"
 msgstr "Fergus Falls"
 
-#: my-evolution/Locations.h:710
+#: my-evolution/Locations.h:712
 msgid "Fernando De Noronha"
 msgstr "Fernando De Noronha"
 
-#: my-evolution/Locations.h:711
+#: my-evolution/Locations.h:713
 msgid "Ferrara"
 msgstr "Ferrara"
 
-#: my-evolution/Locations.h:712
+#: my-evolution/Locations.h:714
 msgid "Figari"
 msgstr "Figari"
 
-#: my-evolution/Locations.h:713
+#: my-evolution/Locations.h:715
 msgid "Findlay"
 msgstr "Findlay"
 
-#: my-evolution/Locations.h:715
+#: my-evolution/Locations.h:717
 msgid "Firenze"
 msgstr "Firenze"
 
-#: my-evolution/Locations.h:716
+#: my-evolution/Locations.h:718
 msgid "Fitchburg"
 msgstr "Fitchburg"
 
-#: my-evolution/Locations.h:717
+#: my-evolution/Locations.h:719
 msgid "Flagstaff"
 msgstr "Flagstaff"
 
-#: my-evolution/Locations.h:718
+#: my-evolution/Locations.h:720
 msgid "Flint"
 msgstr "Flint"
 
-#: my-evolution/Locations.h:719
+#: my-evolution/Locations.h:721
 msgid "Flippin"
 msgstr "Flippin"
 
-#: my-evolution/Locations.h:720
+#: my-evolution/Locations.h:722
 msgid "Florence"
 msgstr "Florence"
 
-#: my-evolution/Locations.h:721
+#: my-evolution/Locations.h:723
 msgid "Florennes"
 msgstr "Florennes"
 
-#: my-evolution/Locations.h:722
+#: my-evolution/Locations.h:724
 msgid "Flores"
 msgstr "Flores"
 
-#: my-evolution/Locations.h:723
+#: my-evolution/Locations.h:725
 msgid "Florianopolis"
 msgstr "Florianopolis"
 
-#: my-evolution/Locations.h:724
+#: my-evolution/Locations.h:726
 msgid "Florida"
 msgstr "Florida"
 
-#: my-evolution/Locations.h:725
+#: my-evolution/Locations.h:727
 msgid "Floro"
 msgstr "Floro"
 
-#: my-evolution/Locations.h:726
+#: my-evolution/Locations.h:728
 msgid "Fond Du Lac"
 msgstr "Fond Du Lac"
 
-#: my-evolution/Locations.h:727
+#: my-evolution/Locations.h:729
 msgid "Forde/Bringeland"
 msgstr "Forde/Bringeland"
 
-#: my-evolution/Locations.h:728
+#: my-evolution/Locations.h:730
 msgid "Forli"
 msgstr "Forli"
 
-#: my-evolution/Locations.h:729
+#: my-evolution/Locations.h:731
 msgid "Formosa"
 msgstr "Formosa"
 
-#: my-evolution/Locations.h:730
+#: my-evolution/Locations.h:732
 msgid "Fortaleza"
 msgstr "Fortaleza"
 
-#: my-evolution/Locations.h:731
+#: my-evolution/Locations.h:733
 msgid "Fort Belvoir"
 msgstr "Fort Belvoir"
 
-#: my-evolution/Locations.h:732
+#: my-evolution/Locations.h:734
 msgid "Fort Benning"
 msgstr "Fort Benning"
 
-#: my-evolution/Locations.h:733
+#: my-evolution/Locations.h:735
 msgid "Fort Bragg"
 msgstr "Fort Bragg"
 
-#: my-evolution/Locations.h:734
+#: my-evolution/Locations.h:736
 msgid "Fort Campbell"
 msgstr "Fort Campbell"
 
-#: my-evolution/Locations.h:735
+#: my-evolution/Locations.h:737
 msgid "Fort Carson"
 msgstr "Fort Carson"
 
-#: my-evolution/Locations.h:736
+#: my-evolution/Locations.h:738
 msgid "Fort Collins"
 msgstr "Fort Collins"
 
-#: my-evolution/Locations.h:737
+#: my-evolution/Locations.h:739
 msgid "Fort Collins/Lovel"
 msgstr "Fort Collins/Lovel"
 
-#: my-evolution/Locations.h:738
+#: my-evolution/Locations.h:740
 msgid "Fort Dodge"
 msgstr "Fort Dodge"
 
-#: my-evolution/Locations.h:739
+#: my-evolution/Locations.h:741
 msgid "Fort Drum"
 msgstr "Fort Drum"
 
-#: my-evolution/Locations.h:740
+#: my-evolution/Locations.h:742
 msgid "Fort Eustis"
 msgstr "Fort Eustis"
 
-#: my-evolution/Locations.h:741
+#: my-evolution/Locations.h:743
 msgid "Fort Greely/Allen AAF"
 msgstr "Fort Greely/Allen AAF"
 
-#: my-evolution/Locations.h:742
+#: my-evolution/Locations.h:744
 msgid "Fort Huachuca"
 msgstr "Fort Huachuca"
 
-#: my-evolution/Locations.h:743
+#: my-evolution/Locations.h:745
 msgid "Fort Knox"
 msgstr "Fort Knox"
 
-#: my-evolution/Locations.h:744
+#: my-evolution/Locations.h:746
 msgid "Fort Lauderdale"
 msgstr "Fort Lauderdale"
 
-#: my-evolution/Locations.h:745
+#: my-evolution/Locations.h:747
 msgid "Fort Lauderdale (International)"
 msgstr "Fort Lauderdale (International)"
 
-#: my-evolution/Locations.h:746
+#: my-evolution/Locations.h:748
 msgid "Fort Leonard"
 msgstr "Fort Leonard"
 
-#: my-evolution/Locations.h:747
+#: my-evolution/Locations.h:749
 msgid "Fort Lewis"
 msgstr "Fort Lewis"
 
-#: my-evolution/Locations.h:748
+#: my-evolution/Locations.h:750
 msgid "Fort Madison"
 msgstr "Fort Madison"
 
-#: my-evolution/Locations.h:749
+#: my-evolution/Locations.h:751
 msgid "Fort Meade"
 msgstr "Fort Meade"
 
-#: my-evolution/Locations.h:750
+#: my-evolution/Locations.h:752
 msgid "Fort Myers (Page Field)"
 msgstr "Fort Myers (Page Field)"
 
-#: my-evolution/Locations.h:751
+#: my-evolution/Locations.h:753
 msgid "Fort Myers (Southwest Florida International)"
 msgstr "Fort Myers (Southwest Florida International)"
 
-#: my-evolution/Locations.h:752
+#: my-evolution/Locations.h:754
 msgid "Fort Polk-Leesville"
 msgstr "Fort Polk-Leesville"
 
-#: my-evolution/Locations.h:753
+#: my-evolution/Locations.h:755
 msgid "Fort Riley"
 msgstr "Fort Riley"
 
-#: my-evolution/Locations.h:754
+#: my-evolution/Locations.h:756
 msgid "Fort Sill"
 msgstr "Fort Sill"
 
-#: my-evolution/Locations.h:755
+#: my-evolution/Locations.h:757
 msgid "Fort Smith"
 msgstr "Fort Smith"
 
-#: my-evolution/Locations.h:756
+#: my-evolution/Locations.h:758
 msgid "Fort Stewart"
 msgstr "Fort Stewart"
 
-#: my-evolution/Locations.h:757
+#: my-evolution/Locations.h:759
 msgid "Fort Stockton"
 msgstr "Fort Stockton"
 
-#: my-evolution/Locations.h:758
+#: my-evolution/Locations.h:760
 msgid "Fort Wayne"
 msgstr "Fort Wayne"
 
-#: my-evolution/Locations.h:759
+#: my-evolution/Locations.h:761
 msgid "Fort Worth-Alliance"
 msgstr "Fort Worth-Alliance"
 
-#: my-evolution/Locations.h:760
+#: my-evolution/Locations.h:762
 msgid "Fort Worth-Meacham"
 msgstr "Fort Worth-Meacham"
 
-#: my-evolution/Locations.h:761
+#: my-evolution/Locations.h:763
 msgid "Fort Worth NAS"
 msgstr "Fort Worth NAS"
 
-#: my-evolution/Locations.h:762
+#: my-evolution/Locations.h:764
 msgid "Fourchon"
 msgstr "Fourchon"
 
-#: my-evolution/Locations.h:763
+#: my-evolution/Locations.h:765
 msgid "Foz Do Iguacu"
 msgstr "Foz Do Iguacu"
 
-#: my-evolution/Locations.h:765
+#: my-evolution/Locations.h:767
 msgid "Frankfort"
 msgstr "Frankfort"
 
-#: my-evolution/Locations.h:766
+#: my-evolution/Locations.h:768
 msgid "Frankfurt/Main"
 msgstr "Frankfurt/Main"
 
-#: my-evolution/Locations.h:767
+#: my-evolution/Locations.h:769
 msgid "Franklin"
 msgstr "Franklin"
 
-#: my-evolution/Locations.h:768
+#: my-evolution/Locations.h:770
 msgid "Fredericton"
 msgstr "Fredericton"
 
-#: my-evolution/Locations.h:769
+#: my-evolution/Locations.h:771
 msgid "Freeport"
 msgstr "Freeport"
 
-#: my-evolution/Locations.h:770
+#: my-evolution/Locations.h:772
 msgid "Frenchville"
 msgstr "Frenchville"
 
-#: my-evolution/Locations.h:771
+#: my-evolution/Locations.h:773
 msgid "Fresno"
 msgstr "Fresno"
 
-#: my-evolution/Locations.h:772
+#: my-evolution/Locations.h:774
 msgid "Fresno-Chandler"
 msgstr "Fresno-Chandler"
 
-#: my-evolution/Locations.h:773
+#: my-evolution/Locations.h:775
 msgid "Friday Harbor"
 msgstr "Friday Harbor"
 
-#: my-evolution/Locations.h:774
+#: my-evolution/Locations.h:776
 msgid "Friedrichshafen"
 msgstr "Friedrichshafen"
 
-#: my-evolution/Locations.h:775
+#: my-evolution/Locations.h:777
 msgid "Frigg"
 msgstr "Frigg"
 
-#: my-evolution/Locations.h:776
+#: my-evolution/Locations.h:778
 msgid "Frontone"
 msgstr "Frontone"
 
-#: my-evolution/Locations.h:777
+#: my-evolution/Locations.h:779
 msgid "Frosinone"
 msgstr "Frosinone"
 
-#: my-evolution/Locations.h:778
+#: my-evolution/Locations.h:780
 msgid "Fryeburg"
 msgstr "Fryeburg"
 
-#: my-evolution/Locations.h:779
+#: my-evolution/Locations.h:781
 msgid "Fujairah"
 msgstr "Fujairah"
 
-#: my-evolution/Locations.h:780
+#: my-evolution/Locations.h:782
 msgid "Fuji Ab"
 msgstr "Fuji Ab"
 
-#: my-evolution/Locations.h:781
+#: my-evolution/Locations.h:783
 msgid "Fukue Airport"
 msgstr "Sân bay Fukue"
 
-#: my-evolution/Locations.h:782
+#: my-evolution/Locations.h:784
 msgid "Fukui Airport"
 msgstr "Sân bay Fukui"
 
-#: my-evolution/Locations.h:783
+#: my-evolution/Locations.h:785
 msgid "Fukuoka Airport"
 msgstr "Sân bay Fukuoka"
 
-#: my-evolution/Locations.h:784
+#: my-evolution/Locations.h:786
 msgid "Fullerton"
 msgstr "Fullerton"
 
-#: my-evolution/Locations.h:785
+#: my-evolution/Locations.h:787
 msgid "Funchal"
 msgstr "Funchal"
 
-#: my-evolution/Locations.h:786
+#: my-evolution/Locations.h:788
 msgid "FYR Macedonia"
 msgstr "FYR Macedonia"
 
-#: my-evolution/Locations.h:787
+#: my-evolution/Locations.h:789
 msgid "Gadsden"
 msgstr "Gadsden"
 
-#: my-evolution/Locations.h:788
+#: my-evolution/Locations.h:790
 msgid "Gage"
 msgstr "Gage"
 
-#: my-evolution/Locations.h:789
+#: my-evolution/Locations.h:791
 msgid "Gainesville"
 msgstr "Gainesville"
 
-#: my-evolution/Locations.h:790
+#: my-evolution/Locations.h:792
 msgid "Galax-Hillsville"
 msgstr "Galax-Hillsville"
 
-#: my-evolution/Locations.h:791
+#: my-evolution/Locations.h:793
 msgid "Galbraith Lake"
 msgstr "Galbraith Lake"
 
-#: my-evolution/Locations.h:792
+#: my-evolution/Locations.h:794
 msgid "Galeao"
 msgstr "Galeao"
 
-#: my-evolution/Locations.h:793
+#: my-evolution/Locations.h:795
 msgid "Galena"
 msgstr "Galena"
 
-#: my-evolution/Locations.h:794
+#: my-evolution/Locations.h:796
 msgid "Galesburg"
 msgstr "Galesburg"
 
-#: my-evolution/Locations.h:795
+#: my-evolution/Locations.h:797
 msgid "Gallup"
 msgstr "Gallup"
 
-#: my-evolution/Locations.h:796
+#: my-evolution/Locations.h:798
 msgid "Galveston"
 msgstr "Galveston"
 
-#: my-evolution/Locations.h:797
+#: my-evolution/Locations.h:799
 msgid "Gambell"
 msgstr "Gambell"
 
-#: my-evolution/Locations.h:798
+#: my-evolution/Locations.h:800
 msgid "Gander"
 msgstr "Gander"
 
-#: my-evolution/Locations.h:799
+#: my-evolution/Locations.h:801
 msgid "Garden City"
 msgstr "Thành phố Garden"
 
-#: my-evolution/Locations.h:800
+#: my-evolution/Locations.h:802
 msgid "Gary"
 msgstr "Gary"
 
-#: my-evolution/Locations.h:801
+#: my-evolution/Locations.h:803
 msgid "Gassim"
 msgstr "Gassim"
 
-#: my-evolution/Locations.h:802
+#: my-evolution/Locations.h:804
 msgid "Gatineau"
 msgstr "Gatineau"
 
-#: my-evolution/Locations.h:803
+#: my-evolution/Locations.h:805
 msgid "Gaziantep"
 msgstr "Gaziantep"
 
-#: my-evolution/Locations.h:804
+#: my-evolution/Locations.h:806
 msgid "Gdansk"
 msgstr "Gdansk"
 
-#: my-evolution/Locations.h:805
+#: my-evolution/Locations.h:807
 msgid "Geneve"
 msgstr "Geneve"
 
-#: my-evolution/Locations.h:806
+#: my-evolution/Locations.h:808
 msgid "Genova"
 msgstr "Genova"
 
-#: my-evolution/Locations.h:807
+#: my-evolution/Locations.h:809
 msgid "George Airport"
 msgstr "Sân bay George"
 
-#: my-evolution/Locations.h:808
+#: my-evolution/Locations.h:810
 msgid "Georgetown"
 msgstr "Georgetown"
 
-#: my-evolution/Locations.h:811
+#: my-evolution/Locations.h:813
 msgid "Ghardaia"
 msgstr "Ghardaia"
 
-#: my-evolution/Locations.h:812
+#: my-evolution/Locations.h:814
 msgid "Ghedi"
 msgstr "Ghedi"
 
-#: my-evolution/Locations.h:814
+#: my-evolution/Locations.h:816
 msgid "Gifu Ab"
 msgstr "Gifu Ab"
 
-#: my-evolution/Locations.h:815
+#: my-evolution/Locations.h:817
 msgid "Gila Bend"
 msgstr "Gila Bend"
 
-#: my-evolution/Locations.h:816
+#: my-evolution/Locations.h:818
 msgid "Gillette"
 msgstr "Gillette"
 
-#: my-evolution/Locations.h:817
+#: my-evolution/Locations.h:819
 msgid "Gilze-Rijen"
 msgstr "Gilze-Rijen"
 
-#: my-evolution/Locations.h:818
+#: my-evolution/Locations.h:820
 msgid "Gioia del Colle"
 msgstr "Gioia del Colle"
 
-#: my-evolution/Locations.h:819
+#: my-evolution/Locations.h:821
 msgid "Girona"
 msgstr "Girona"
 
-#: my-evolution/Locations.h:820
+#: my-evolution/Locations.h:822
 msgid "Gizan"
 msgstr "Gizan"
 
-#: my-evolution/Locations.h:821
+#: my-evolution/Locations.h:823
 msgid "Glasgow"
 msgstr "Glasgow"
 
-#: my-evolution/Locations.h:822
+#: my-evolution/Locations.h:824
 msgid "Glendive"
 msgstr "Glendive"
 
-#: my-evolution/Locations.h:823
+#: my-evolution/Locations.h:825
 msgid "Glens Falls"
 msgstr "Glens Falls"
 
-#: my-evolution/Locations.h:824
+#: my-evolution/Locations.h:826
 msgid "Goiania"
 msgstr "Goiania"
 
-#: my-evolution/Locations.h:825
+#: my-evolution/Locations.h:827
 msgid "Goldsboro"
 msgstr "Goldsboro"
 
-#: my-evolution/Locations.h:826
+#: my-evolution/Locations.h:828
 msgid "Goodland"
 msgstr "Goodland"
 
-#: my-evolution/Locations.h:827
+#: my-evolution/Locations.h:829
 msgid "Goose Bay"
 msgstr "Vịnh Goose"
 
-#: my-evolution/Locations.h:828
+#: my-evolution/Locations.h:830
 msgid "Goteborg (Landvetter)"
 msgstr "Goteborg (Landvetter)"
 
-#: my-evolution/Locations.h:829
+#: my-evolution/Locations.h:831
 msgid "Goteborg (Save)"
 msgstr "Goteborg (Save)"
 
-#: my-evolution/Locations.h:830
+#: my-evolution/Locations.h:832
 msgid "Granada"
 msgstr "Granada"
 
-#: my-evolution/Locations.h:831
+#: my-evolution/Locations.h:833
 msgid "Grand Canyon"
 msgstr "Grand Canyon"
 
-#: my-evolution/Locations.h:832
+#: my-evolution/Locations.h:834
 msgid "Grand Cayman"
 msgstr "Grand Cayman"
 
-#: my-evolution/Locations.h:833
+#: my-evolution/Locations.h:835
 msgid "Grand Forks"
 msgstr "Grand Forks"
 
-#: my-evolution/Locations.h:834
+#: my-evolution/Locations.h:836
 msgid "Grand Island"
 msgstr "Đảo Grand"
 
-#: my-evolution/Locations.h:835
+#: my-evolution/Locations.h:837
 msgid "Grand Isle"
 msgstr "Grand Isle"
 
-#: my-evolution/Locations.h:836
+#: my-evolution/Locations.h:838
 msgid "Grand Junction"
 msgstr "Grand Junction"
 
-#: my-evolution/Locations.h:837
+#: my-evolution/Locations.h:839
 msgid "Grand Marais"
 msgstr "Grand Marais"
 
-#: my-evolution/Locations.h:838
+#: my-evolution/Locations.h:840
 msgid "Grand Rapids"
 msgstr "Grand Rapids"
 
-#: my-evolution/Locations.h:839
+#: my-evolution/Locations.h:841
 msgid "Grandview"
 msgstr "Grandview"
 
-#: my-evolution/Locations.h:840
+#: my-evolution/Locations.h:842
 msgid "Grangeville"
 msgstr "Grangeville"
 
-#: my-evolution/Locations.h:841
+#: my-evolution/Locations.h:843
 msgid "Grants"
 msgstr "Grants"
 
-#: my-evolution/Locations.h:842
+#: my-evolution/Locations.h:844
 msgid "Graz"
 msgstr "Graz"
 
-#: my-evolution/Locations.h:843
+#: my-evolution/Locations.h:845
 msgid "Great Falls"
 msgstr "Great Falls"
 
-#: my-evolution/Locations.h:845
+#: my-evolution/Locations.h:847
 msgid "Greeley"
 msgstr "Greeley"
 
-#: my-evolution/Locations.h:846
+#: my-evolution/Locations.h:848
 msgid "Green Bay"
 msgstr "Vịnh Green"
 
-#: my-evolution/Locations.h:847
+#: my-evolution/Locations.h:849
 msgid "Green River"
 msgstr "Green River"
 
-#: my-evolution/Locations.h:848
+#: my-evolution/Locations.h:850
 msgid "Greensboro"
 msgstr "Greensboro"
 
-#: my-evolution/Locations.h:849
+#: my-evolution/Locations.h:851
 msgid "Greenville"
 msgstr "Greenville"
 
-#: my-evolution/Locations.h:850
+#: my-evolution/Locations.h:852
 msgid "Greenville-Spartanburg"
 msgstr "Greenville-Spartanburg"
 
-#: my-evolution/Locations.h:851
+#: my-evolution/Locations.h:853
 msgid "Greenwood"
 msgstr "Greenwood"
 
-#: my-evolution/Locations.h:852
+#: my-evolution/Locations.h:854
 msgid "Grenoble-Saint-Geoirs"
 msgstr "Grenoble-Saint-Geoirs"
 
-#: my-evolution/Locations.h:853
+#: my-evolution/Locations.h:855
 msgid "Griffiss AFB"
 msgstr "Griffiss AFB"
 
-#: my-evolution/Locations.h:854
+#: my-evolution/Locations.h:856
 msgid "Groningen"
 msgstr "Groningen"
 
-#: my-evolution/Locations.h:855
+#: my-evolution/Locations.h:857
 msgid "Grosseto"
 msgstr "Grosseto"
 
-#: my-evolution/Locations.h:856
+#: my-evolution/Locations.h:858
 msgid "Groton"
 msgstr "Groton"
 
-#: my-evolution/Locations.h:857
+#: my-evolution/Locations.h:859
 msgid "Guadalajara"
 msgstr "Guadalajara"
 
-#: my-evolution/Locations.h:858
+#: my-evolution/Locations.h:860
 msgid "Guadalupe Pass"
 msgstr "Guadalupe Pass"
 
-#: my-evolution/Locations.h:859
+#: my-evolution/Locations.h:861
 msgid "Guanare"
 msgstr "Guanare"
 
-#: my-evolution/Locations.h:860
+#: my-evolution/Locations.h:862
 msgid "Guangzhou"
 msgstr "Guangzhou"
 
-#: my-evolution/Locations.h:861
+#: my-evolution/Locations.h:863
 msgid "Guantanamo"
 msgstr "Guantanamo"
 
-#: my-evolution/Locations.h:862
+#: my-evolution/Locations.h:864
 msgid "Guarany"
 msgstr "Guarany"
 
-#: my-evolution/Locations.h:863
+#: my-evolution/Locations.h:865
 msgid "Guaratingueta"
 msgstr "Guaratingueta"
 
-#: my-evolution/Locations.h:864
+#: my-evolution/Locations.h:866
 msgid "Guarulhos"
 msgstr "Guarulhos"
 
-#: my-evolution/Locations.h:866
+#: my-evolution/Locations.h:868
 msgid "Guayaquil/Simon Bolivar"
 msgstr "Guayaquil/Simon Bolivar"
 
-#: my-evolution/Locations.h:867
+#: my-evolution/Locations.h:869
 msgid "Guaymas"
 msgstr "Guaymas"
 
-#: my-evolution/Locations.h:868
+#: my-evolution/Locations.h:870
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: my-evolution/Locations.h:869
+#: my-evolution/Locations.h:871
 msgid "Guidonia"
 msgstr "Guidonia"
 
-#: my-evolution/Locations.h:870
+#: my-evolution/Locations.h:872
 msgid "Gulfport"
 msgstr "Gulfport"
 
-#: my-evolution/Locations.h:871
+#: my-evolution/Locations.h:873
 msgid "Gulkana"
 msgstr "Gulkana"
 
-#: my-evolution/Locations.h:872
+#: my-evolution/Locations.h:874
 msgid "Gullfax C"
 msgstr "Gullfax C"
 
-#: my-evolution/Locations.h:873
+#: my-evolution/Locations.h:875
 msgid "Gunnison"
 msgstr "Gunnison"
 
-#: my-evolution/Locations.h:874
+#: my-evolution/Locations.h:876
 msgid "Gunnison (2)"
 msgstr "Gunnison (2)"
 
-#: my-evolution/Locations.h:875
+#: my-evolution/Locations.h:877
 msgid "Guriat"
 msgstr "Guriat"
 
-#: my-evolution/Locations.h:876
+#: my-evolution/Locations.h:878
 msgid "Gustavus"
 msgstr "Gustavus"
 
-#: my-evolution/Locations.h:877
+#: my-evolution/Locations.h:879
 msgid "Guymon"
 msgstr "Guymon"
 
-#: my-evolution/Locations.h:878
+#: my-evolution/Locations.h:880
 msgid "Habana"
 msgstr "Habana"
 
-#: my-evolution/Locations.h:879
+#: my-evolution/Locations.h:881
 msgid "Hachijojima Airport"
 msgstr "Sân bay Hachijojima"
 
-#: my-evolution/Locations.h:880
+#: my-evolution/Locations.h:882
 msgid "Hachinohe Ab"
 msgstr "Hachinohe Ab"
 
-#: my-evolution/Locations.h:881
+#: my-evolution/Locations.h:883
 msgid "Hafr Al-Batin"
 msgstr "Hafr Al-Batin"
 
-#: my-evolution/Locations.h:882
+#: my-evolution/Locations.h:884
 msgid "Hagerstown"
 msgstr "Hagerstown"
 
-#: my-evolution/Locations.h:884
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+msgid "Hail"
+msgstr "Mưa đá"
+
+#: my-evolution/Locations.h:886
 msgid "Hailey-Sun Valley"
 msgstr "Hailey-Sun Valley"
 
-#: my-evolution/Locations.h:885
+#: my-evolution/Locations.h:887
 msgid "Haines"
 msgstr "Haines"
 
-#: my-evolution/Locations.h:887
+#: my-evolution/Locations.h:889
 msgid "Hakodate Airport"
 msgstr "Sân bay Hakodate"
 
-#: my-evolution/Locations.h:888
+#: my-evolution/Locations.h:890
 msgid "Halifax"
 msgstr "Halifax"
 
-#: my-evolution/Locations.h:889
+#: my-evolution/Locations.h:891
 msgid "Hamamatsu Ab"
 msgstr "Hamamatsu Ab"
 
-#: my-evolution/Locations.h:890
+#: my-evolution/Locations.h:892
 msgid "Hamburg"
 msgstr "Hamburg"
 
-#: my-evolution/Locations.h:891
+#: my-evolution/Locations.h:893
 msgid "Hamburg-Finkenwerder"
 msgstr "Hamburg-Finkenwerder"
 
-#: my-evolution/Locations.h:892
+#: my-evolution/Locations.h:894
 msgid "Hamilton"
 msgstr "Hamilton"
 
-#: my-evolution/Locations.h:893
+#: my-evolution/Locations.h:895
 msgid "Hammerfest"
 msgstr "Hammerfest"
 
-#: my-evolution/Locations.h:894
+#: my-evolution/Locations.h:896
 msgid "Hampton"
 msgstr "Hampton"
 
-#: my-evolution/Locations.h:895
+#: my-evolution/Locations.h:897
 msgid "Hanamaki Airport"
 msgstr "Sân bay Hanamaki"
 
-#: my-evolution/Locations.h:896
+#: my-evolution/Locations.h:898
 msgid "Hancock"
 msgstr "Hancock"
 
-#: my-evolution/Locations.h:897
+#: my-evolution/Locations.h:899
 msgid "Hangzhou"
 msgstr "Hangzhou"
 
-#: my-evolution/Locations.h:898
+#: my-evolution/Locations.h:900
 msgid "Hanksville"
 msgstr "Hanksville"
 
-#: my-evolution/Locations.h:899
+#: my-evolution/Locations.h:901
 msgid "Hannover"
 msgstr "Hannover"
 
-#: my-evolution/Locations.h:900
+#: my-evolution/Locations.h:902
 msgid "Ha Noi"
 msgstr "Hà Nội"
 
-#: my-evolution/Locations.h:901
+#: my-evolution/Locations.h:903
 msgid "Harbor Beach"
 msgstr "Harbor Beach"
 
-#: my-evolution/Locations.h:902
+#: my-evolution/Locations.h:904
 msgid "Harlingen"
 msgstr "Harlingen"
 
-#: my-evolution/Locations.h:903
+#: my-evolution/Locations.h:905
 msgid "Harlowton"
 msgstr "Harlowton"
 
-#: my-evolution/Locations.h:904
+#: my-evolution/Locations.h:906
 msgid "Harrisburg"
 msgstr "Harrisburg"
 
-#: my-evolution/Locations.h:905
+#: my-evolution/Locations.h:907
 msgid "Harrison"
 msgstr "Harrison"
 
-#: my-evolution/Locations.h:906
+#: my-evolution/Locations.h:908
 msgid "Harstad/Narvik/Evenes"
 msgstr "Harstad/Narvik/Evenes"
 
-#: my-evolution/Locations.h:907
+#: my-evolution/Locations.h:909
 msgid "Hartford"
 msgstr "Hartford"
 
-#: my-evolution/Locations.h:908
+#: my-evolution/Locations.h:910
 msgid "Hassi-Messaoud"
 msgstr "Hassi-Messaoud"
 
-#: my-evolution/Locations.h:909
+#: my-evolution/Locations.h:911
 msgid "Hastings"
 msgstr "Hastings"
 
-#: my-evolution/Locations.h:910
+#: my-evolution/Locations.h:912
 msgid "Haugesund"
 msgstr "Haugesund"
 
-#: my-evolution/Locations.h:911
+#: my-evolution/Locations.h:913
 msgid "Havre"
 msgstr "Havre"
 
-#: my-evolution/Locations.h:912
+#: my-evolution/Locations.h:914
 msgid "Hawaii"
 msgstr "Hawaii"
 
-#: my-evolution/Locations.h:913
+#: my-evolution/Locations.h:915
 msgid "Hawthorne"
 msgstr "Hawthorne"
 
-#: my-evolution/Locations.h:914
+#: my-evolution/Locations.h:916
 msgid "Hayden"
 msgstr "Hayden"
 
-#: my-evolution/Locations.h:915
+#: my-evolution/Locations.h:917
 msgid "Hayes River"
 msgstr "Hayes River"
 
-#: my-evolution/Locations.h:916
+#: my-evolution/Locations.h:918
 msgid "Hays"
 msgstr "Hays"
 
-#: my-evolution/Locations.h:917
+#: my-evolution/Locations.h:919
 msgid "Hayward"
 msgstr "Hayward"
 
-#: my-evolution/Locations.h:918
+#: my-evolution/Locations.h:920
 msgid "Healy River"
 msgstr "Healy River"
 
-#: my-evolution/Locations.h:919
+#: my-evolution/Locations.h:921
 msgid "Helena"
 msgstr "Helena"
 
-#: my-evolution/Locations.h:920
+#: my-evolution/Locations.h:922
 msgid "Helsinki"
 msgstr "Helsinki"
 
-#: my-evolution/Locations.h:921
+#: my-evolution/Locations.h:923
 msgid "Henderson"
 msgstr "Henderson"
 
-#: my-evolution/Locations.h:922
+#: my-evolution/Locations.h:924
 msgid "Hengchun"
 msgstr "Hengchun"
 
-#: my-evolution/Locations.h:923
+#: my-evolution/Locations.h:925
 msgid "Hermosillo"
 msgstr "Hermosillo"
 
-#: my-evolution/Locations.h:924
+#: my-evolution/Locations.h:926
 msgid "Hibbing"
 msgstr "Hibbing"
 
-#: my-evolution/Locations.h:925
+#: my-evolution/Locations.h:927
 msgid "Hickory"
 msgstr "Hickory"
 
-#: my-evolution/Locations.h:926
+#: my-evolution/Locations.h:928
 msgid "Hill City"
 msgstr "Thành phố Hill"
 
-#: my-evolution/Locations.h:927
+#: my-evolution/Locations.h:929
 msgid "Hillsboro"
 msgstr "Hillsboro"
 
-#: my-evolution/Locations.h:928
+#: my-evolution/Locations.h:930
 msgid "Hilo"
 msgstr "Hilo"
 
-#: my-evolution/Locations.h:929
+#: my-evolution/Locations.h:931
 msgid "Hinesville"
 msgstr "Hinesville"
 
-#: my-evolution/Locations.h:930
+#: my-evolution/Locations.h:932
 msgid "Hiroshima Airport"
 msgstr "Sân bay Hiroshima"
 
-#: my-evolution/Locations.h:931
+#: my-evolution/Locations.h:933
 msgid "Hobart"
 msgstr "Hobart"
 
-#: my-evolution/Locations.h:932
+#: my-evolution/Locations.h:934
 msgid "Hobbs"
 msgstr "Hobbs"
 
-#: my-evolution/Locations.h:933
+#: my-evolution/Locations.h:935
 msgid "Ho Chi Minh"
 msgstr "Hồ Chí Minh"
 
-#: my-evolution/Locations.h:934
+#: my-evolution/Locations.h:936
 msgid "Hodeidah"
 msgstr "Hodeidah"
 
-#: my-evolution/Locations.h:935
+#: my-evolution/Locations.h:937
 msgid "Hof"
 msgstr "Hof"
 
-#: my-evolution/Locations.h:936
+#: my-evolution/Locations.h:938
 msgid "Hoffman"
 msgstr "Hoffman"
 
-#: my-evolution/Locations.h:937
+#: my-evolution/Locations.h:939
 msgid "Hofu Ab"
 msgstr "Hofu Ab"
 
-#: my-evolution/Locations.h:938
+#: my-evolution/Locations.h:940
 msgid "Hohenems"
 msgstr "Hohenems"
 
-#: my-evolution/Locations.h:939
+#: my-evolution/Locations.h:941
 msgid "Holguin"
 msgstr "Holguin"
 
-#: my-evolution/Locations.h:940
+#: my-evolution/Locations.h:942
 msgid "Homer"
 msgstr "Homer"
 
-#: my-evolution/Locations.h:941
+#: my-evolution/Locations.h:943
 msgid "Homestead AFB"
 msgstr "Homestead AFB"
 
-#: my-evolution/Locations.h:942
+#: my-evolution/Locations.h:944
 msgid "Hondo"
 msgstr "Hondo"
 
-#: my-evolution/Locations.h:945
+#: my-evolution/Locations.h:947
 msgid "Honningsvag"
 msgstr "Honningsvag"
 
-#: my-evolution/Locations.h:946
+#: my-evolution/Locations.h:948
 msgid "Honolulu"
 msgstr "Honolulu"
 
-#: my-evolution/Locations.h:947
+#: my-evolution/Locations.h:949
 msgid "Hoonah"
 msgstr "Hoonah"
 
-#: my-evolution/Locations.h:948
+#: my-evolution/Locations.h:950
 msgid "Hoquiam"
 msgstr "Hoquiam"
 
-#: my-evolution/Locations.h:949
+#: my-evolution/Locations.h:951
 msgid "Hot Springs"
 msgstr "Hot Springs"
 
-#: my-evolution/Locations.h:950
+#: my-evolution/Locations.h:952
 msgid "Houghton Lake"
 msgstr "Houghton Lake"
 
-#: my-evolution/Locations.h:951
+#: my-evolution/Locations.h:953
 msgid "Houlton"
 msgstr "Houlton"
 
-#: my-evolution/Locations.h:952
+#: my-evolution/Locations.h:954
 msgid "Houma"
 msgstr "Houma"
 
-#: my-evolution/Locations.h:953
+#: my-evolution/Locations.h:955
 msgid "Houston-Bush"
 msgstr "Houston-Bush"
 
-#: my-evolution/Locations.h:954
+#: my-evolution/Locations.h:956
 msgid "Houston-Clover"
 msgstr "Houston-Clover"
 
-#: my-evolution/Locations.h:955
+#: my-evolution/Locations.h:957
 msgid "Houston-Ellington Field"
 msgstr "Houston-Ellington Field"
 
-#: my-evolution/Locations.h:956
+#: my-evolution/Locations.h:958
 msgid "Houston-Hobby"
 msgstr "Houston-Hobby"
 
-#: my-evolution/Locations.h:957
+#: my-evolution/Locations.h:959
 msgid "Houston-Hooks"
 msgstr "Houston-Hooks"
 
-#: my-evolution/Locations.h:958
+#: my-evolution/Locations.h:960
 msgid "Howard AFB"
 msgstr "Howard AFB"
 
-#: my-evolution/Locations.h:959
+#: my-evolution/Locations.h:961
 msgid "Hsinchu"
 msgstr "Hsinchu"
 
-#: my-evolution/Locations.h:960
+#: my-evolution/Locations.h:962
 msgid "Huanuco"
 msgstr "Huanuco"
 
-#: my-evolution/Locations.h:961
+#: my-evolution/Locations.h:963
 msgid "Huehuetenango"
 msgstr "Huehuetenango"
 
-#: my-evolution/Locations.h:962
+#: my-evolution/Locations.h:964
 msgid "Hulien"
 msgstr "Hulien"
 
-#: my-evolution/Locations.h:963
+#: my-evolution/Locations.h:965
 msgid "Humberside"
 msgstr "Humberside"
 
-#: my-evolution/Locations.h:965
+#: my-evolution/Locations.h:967
 msgid "Huntington"
 msgstr "Huntington"
 
-#: my-evolution/Locations.h:966
+#: my-evolution/Locations.h:968
 msgid "Huntsville"
 msgstr "Huntsville"
 
-#: my-evolution/Locations.h:967
+#: my-evolution/Locations.h:969
 msgid "Hurlburt"
 msgstr "Hurlburt"
 
-#: my-evolution/Locations.h:968
+#: my-evolution/Locations.h:970
 msgid "Huron"
 msgstr "Huron"
 
-#: my-evolution/Locations.h:969
+#: my-evolution/Locations.h:971
 msgid "Hutchinson"
 msgstr "Hutchinson"
 
-#: my-evolution/Locations.h:970
+#: my-evolution/Locations.h:972
 msgid "Hyakuri Ab"
 msgstr "Hyakuri Ab"
 
-#: my-evolution/Locations.h:971
+#: my-evolution/Locations.h:973
 msgid "Hyannis"
 msgstr "Hyannis"
 
-#: my-evolution/Locations.h:972
+#: my-evolution/Locations.h:974
 msgid "Hyderabad"
 msgstr "Hyderabad"
 
-#: my-evolution/Locations.h:973
+#: my-evolution/Locations.h:975
 msgid "Hyeres-Le Palyvestre"
 msgstr "Hyeres-Le Palyvestre"
 
-#: my-evolution/Locations.h:974
+#: my-evolution/Locations.h:976
 msgid "Iasi"
 msgstr "Iasi"
 
-#: my-evolution/Locations.h:975
+#: my-evolution/Locations.h:977
 msgid "Ibiza"
 msgstr "Ibiza"
 
-#: my-evolution/Locations.h:977
+#: my-evolution/Locations.h:979
 msgid "Ichikawa"
 msgstr "Ichikawa"
 
-#: my-evolution/Locations.h:978
+#: my-evolution/Locations.h:980
 msgid "Idaho"
 msgstr "Idaho"
 
-#: my-evolution/Locations.h:979
+#: my-evolution/Locations.h:981
 msgid "Idaho Falls"
 msgstr "Idaho Falls"
 
-#: my-evolution/Locations.h:980
+#: my-evolution/Locations.h:982
 msgid "Iguazu"
 msgstr "Iguazu"
 
-#: my-evolution/Locations.h:981
+#: my-evolution/Locations.h:983
 msgid "Iki Airport"
 msgstr "Sân bay Iki"
 
-#: my-evolution/Locations.h:982
+#: my-evolution/Locations.h:984
 msgid "Ilan"
 msgstr "Ilan"
 
-#: my-evolution/Locations.h:983
+#: my-evolution/Locations.h:985
 msgid "Iliamna"
 msgstr "Iliamna"
 
-#: my-evolution/Locations.h:984
+#: my-evolution/Locations.h:986
 msgid "Illinois"
 msgstr "Illinois"
 
-#: my-evolution/Locations.h:985
+#: my-evolution/Locations.h:987
 msgid "Imperial"
 msgstr "Imperial"
 
-#: my-evolution/Locations.h:986
+#: my-evolution/Locations.h:988
 msgid "Imperial (2)"
 msgstr "Imperial (2)"
 
-#: my-evolution/Locations.h:987
+#: my-evolution/Locations.h:989
 msgid "Imperial Beach"
 msgstr "Imperial Beach"
 
-#: my-evolution/Locations.h:988
+#: my-evolution/Locations.h:990
 msgid "In Amenas"
 msgstr "In Amenas"
 
-#: my-evolution/Locations.h:990
+#: my-evolution/Locations.h:992
 msgid "Indiana"
 msgstr "Indiana"
 
-#: my-evolution/Locations.h:991
+#: my-evolution/Locations.h:993
 msgid "Indianapolis"
 msgstr "Indianapolis"
 
-#: my-evolution/Locations.h:992
+#: my-evolution/Locations.h:994
 msgid "Indian Springs"
 msgstr "Indian Springs"
 
-#: my-evolution/Locations.h:993
+#: my-evolution/Locations.h:995
 msgid "Innsbruck"
 msgstr "Innsbruck"
 
-#: my-evolution/Locations.h:994
+#: my-evolution/Locations.h:996
 msgid "International Falls"
 msgstr "International Falls"
 
-#: my-evolution/Locations.h:995
+#: my-evolution/Locations.h:997
 msgid "Intracoastal"
 msgstr "Intracoastal"
 
-#: my-evolution/Locations.h:996
+#: my-evolution/Locations.h:998
 msgid "Inverness"
 msgstr "Inverness"
 
-#: my-evolution/Locations.h:997
+#: my-evolution/Locations.h:999
 msgid "Inyokern"
 msgstr "Inyokern"
 
-#: my-evolution/Locations.h:998
+#: my-evolution/Locations.h:1000
 msgid "Iowa"
 msgstr "Iowa"
 
-#: my-evolution/Locations.h:999
+#: my-evolution/Locations.h:1001
 msgid "Iowa City"
 msgstr "Thành phố Iowa"
 
-#: my-evolution/Locations.h:1000
+#: my-evolution/Locations.h:1002
 msgid "Iqaluit"
 msgstr "Iqaluit"
 
-#: my-evolution/Locations.h:1001
+#: my-evolution/Locations.h:1003
 msgid "Iquique/Diego Arac"
 msgstr "Iquique/Diego Arac"
 
-#: my-evolution/Locations.h:1002
+#: my-evolution/Locations.h:1004
 msgid "Iquitos"
 msgstr "Iquitos"
 
-#: my-evolution/Locations.h:1003
+#: my-evolution/Locations.h:1005
 msgid "Iraklion"
 msgstr "Iraklion"
 
-#: my-evolution/Locations.h:1004
+#: my-evolution/Locations.h:1006
 msgid "Iran, Islamic Republic of"
 msgstr "Iran, Islamic Republic of"
 
-#: my-evolution/Locations.h:1006
+#: my-evolution/Locations.h:1008
 msgid "Iron Mountain"
 msgstr "Iron Mountain"
 
-#: my-evolution/Locations.h:1007
+#: my-evolution/Locations.h:1009
 msgid "Ironwood"
 msgstr "Ironwood"
 
-#: my-evolution/Locations.h:1008
+#: my-evolution/Locations.h:1010
 msgid "Iruma Ab"
 msgstr "Iruma Ab"
 
-#: my-evolution/Locations.h:1009
+#: my-evolution/Locations.h:1011
 msgid "Islamabad"
 msgstr "Islamabad"
 
-#: my-evolution/Locations.h:1010
+#: my-evolution/Locations.h:1012
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: my-evolution/Locations.h:1011
+#: my-evolution/Locations.h:1013
 msgid "Islip"
 msgstr "Islip"
 
-#: my-evolution/Locations.h:1012
+#: my-evolution/Locations.h:1014
 msgid "Istanbul"
 msgstr "Istanbul"
 
-#: my-evolution/Locations.h:1013
+#: my-evolution/Locations.h:1015
 msgid "Itaituba"
 msgstr "Itaituba"
 
-#: my-evolution/Locations.h:1015
+#: my-evolution/Locations.h:1017
 msgid "Ithaca"
 msgstr "Ithaca"
 
-#: my-evolution/Locations.h:1016
+#: my-evolution/Locations.h:1018
+msgid "Ivano-Frankivsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1019
 msgid "Iwakuni MCAS"
 msgstr "Iwakuni MCAS"
 
-#: my-evolution/Locations.h:1017
+#: my-evolution/Locations.h:1020
 msgid "Iwojima"
 msgstr "Iwojima"
 
-#: my-evolution/Locations.h:1018
+#: my-evolution/Locations.h:1021
 msgid "Ixtapa"
 msgstr "Ixtapa"
 
-#: my-evolution/Locations.h:1019
+#: my-evolution/Locations.h:1022
 msgid "Izmir/Adnan Menderes"
 msgstr "Izmir/Adnan Menderes"
 
-#: my-evolution/Locations.h:1020
+#: my-evolution/Locations.h:1023
 msgid "Izmir/Cigli"
 msgstr "Izmir/Cigli"
 
-#: my-evolution/Locations.h:1021
+#: my-evolution/Locations.h:1024
 msgid "Izmit"
 msgstr "Izmit"
 
-#: my-evolution/Locations.h:1022
+#: my-evolution/Locations.h:1025
 msgid "Izumo Airport"
 msgstr "Sân bay Izumo"
 
-#: my-evolution/Locations.h:1023
+#: my-evolution/Locations.h:1026
 msgid "Jackson"
 msgstr "Jackson"
 
-#: my-evolution/Locations.h:1024
+#: my-evolution/Locations.h:1027
 msgid "Jacksonville"
 msgstr "Jacksonville"
 
-#: my-evolution/Locations.h:1025
+#: my-evolution/Locations.h:1028
 msgid "Jacksonville-Craig Airport"
 msgstr "Sân bay Jacksonville-Craig"
 
-#: my-evolution/Locations.h:1026
+#: my-evolution/Locations.h:1029
 msgid "Jacksonville NAS"
 msgstr "Jacksonville NAS"
 
-#: my-evolution/Locations.h:1027
+#: my-evolution/Locations.h:1030
 msgid "Jaffrey"
 msgstr "Jaffrey"
 
-#: my-evolution/Locations.h:1029
+#: my-evolution/Locations.h:1032
 msgid "Jamestown"
 msgstr "Jamestown"
 
-#: my-evolution/Locations.h:1030
+#: my-evolution/Locations.h:1033
 msgid "Janesville"
 msgstr "Janesville"
 
-#: my-evolution/Locations.h:1031
+#: my-evolution/Locations.h:1034
 msgid "Jan Smuts"
 msgstr "Jan Smuts"
 
-#: my-evolution/Locations.h:1033
+#: my-evolution/Locations.h:1036
 msgid "Jeddah King Abdul Aziz International Airport"
 msgstr "Sân bay Jeddah King Abdul Aziz International"
 
-#: my-evolution/Locations.h:1034
+#: my-evolution/Locations.h:1037
 msgid "Jefferson City"
 msgstr "Thành phố Jefferson"
 
-#: my-evolution/Locations.h:1035
+#: my-evolution/Locations.h:1038
 msgid "Jerez"
 msgstr "Jerez"
 
-#: my-evolution/Locations.h:1036
+#: my-evolution/Locations.h:1039
 msgid "Jersey"
 msgstr "Jersey"
 
-#: my-evolution/Locations.h:1037
+#: my-evolution/Locations.h:1040
 msgid "Jinotega"
 msgstr "Jinotega"
 
-#: my-evolution/Locations.h:1038
+#: my-evolution/Locations.h:1041
 msgid "Johan A. Pengel"
 msgstr "Johan A. Pengel"
 
-#: my-evolution/Locations.h:1039
+#: my-evolution/Locations.h:1042
 msgid "Johnstown"
 msgstr "Johnstown"
 
-#: my-evolution/Locations.h:1040
+#: my-evolution/Locations.h:1043
 msgid "Jonesboro"
 msgstr "Jonesboro"
 
-#: my-evolution/Locations.h:1041
+#: my-evolution/Locations.h:1044
 msgid "Jonkoping"
 msgstr "Jonkoping"
 
-#: my-evolution/Locations.h:1042
+#: my-evolution/Locations.h:1045
 msgid "Joplin"
 msgstr "Joplin"
 
-#: my-evolution/Locations.h:1044
+#: my-evolution/Locations.h:1047
 msgid "Juanjui"
 msgstr "Juanjui"
 
-#: my-evolution/Locations.h:1045
+#: my-evolution/Locations.h:1048
 msgid "Juan Santamaria"
 msgstr "Juan Santamaria"
 
-#: my-evolution/Locations.h:1046
+#: my-evolution/Locations.h:1049
 msgid "Juigalpa"
 msgstr "Juigalpa"
 
-#: my-evolution/Locations.h:1047
+#: my-evolution/Locations.h:1050
 msgid "Jujuy"
 msgstr "Jujuy"
 
-#: my-evolution/Locations.h:1048
+#: my-evolution/Locations.h:1051
 msgid "Juliaca"
 msgstr "Juliaca"
 
-#: my-evolution/Locations.h:1049
+#: my-evolution/Locations.h:1052
 msgid "Junction"
 msgstr "Junction"
 
-#: my-evolution/Locations.h:1050
+#: my-evolution/Locations.h:1053
 msgid "Juneau"
 msgstr "Juneau"
 
-#: my-evolution/Locations.h:1051
+#: my-evolution/Locations.h:1054
 msgid "Kadena Ab"
 msgstr "Kadena Ab"
 
-#: my-evolution/Locations.h:1052
+#: my-evolution/Locations.h:1055
 msgid "Kagoshima Airport"
 msgstr "Sân bay Kagoshima"
 
-#: my-evolution/Locations.h:1053
+#: my-evolution/Locations.h:1056
 msgid "Kahului"
 msgstr "Kahului"
 
-#: my-evolution/Locations.h:1054
+#: my-evolution/Locations.h:1057
 msgid "Kailua-Kona"
 msgstr "Kailua-Kona"
 
-#: my-evolution/Locations.h:1055
+#: my-evolution/Locations.h:1058
 msgid "Kake"
 msgstr "Kake"
 
-#: my-evolution/Locations.h:1056
+#: my-evolution/Locations.h:1059
 msgid "Kalamata"
 msgstr "Kalamata"
 
-#: my-evolution/Locations.h:1057
+#: my-evolution/Locations.h:1060
 msgid "Kalamazoo"
 msgstr "Kalamazoo"
 
-#: my-evolution/Locations.h:1058
+#: my-evolution/Locations.h:1061
 msgid "Kalispell"
 msgstr "Kalispell"
 
-#: my-evolution/Locations.h:1059
+#: my-evolution/Locations.h:1062
 msgid "Kamigoto"
 msgstr "Kamigoto"
 
-#: my-evolution/Locations.h:1060
+#: my-evolution/Locations.h:1063
 msgid "Kaneohe"
 msgstr "Kaneohe"
 
-#: my-evolution/Locations.h:1061
+#: my-evolution/Locations.h:1064
 msgid "Kangshan"
 msgstr "Kangshan"
 
-#: my-evolution/Locations.h:1062
+#: my-evolution/Locations.h:1065
 msgid "Kanoya Ab"
 msgstr "Kanoya Ab"
 
-#: my-evolution/Locations.h:1063
+#: my-evolution/Locations.h:1066
 msgid "Kansai International Airport"
 msgstr "Sân bay quốc tế Kansai"
 
-#: my-evolution/Locations.h:1064
+#: my-evolution/Locations.h:1067
 msgid "Kansas"
 msgstr "Kansas"
 
-#: my-evolution/Locations.h:1065
+#: my-evolution/Locations.h:1068
 msgid "Kansas City"
 msgstr "Thành phố Kansas"
 
-#: my-evolution/Locations.h:1066
+#: my-evolution/Locations.h:1069
 msgid "Kansas City-Gladstone"
 msgstr "Thành phố Kansas-Gladstone"
 
-#: my-evolution/Locations.h:1067
+#: my-evolution/Locations.h:1070
 msgid "Kaohsiung"
 msgstr "Kaohsiung"
 
-#: my-evolution/Locations.h:1068
+#: my-evolution/Locations.h:1071
 msgid "Karachi"
 msgstr "Karachi"
 
-#: my-evolution/Locations.h:1069
+#: my-evolution/Locations.h:1072
 msgid "Karup"
 msgstr "Karup"
 
-#: my-evolution/Locations.h:1070
+#: my-evolution/Locations.h:1073
 msgid "Kassel-Calden"
 msgstr "Kassel-Calden"
 
-#: my-evolution/Locations.h:1071
+#: my-evolution/Locations.h:1074
 msgid "Kasumigaura Ab"
 msgstr "Kasumigaura Ab"
 
-#: my-evolution/Locations.h:1072
+#: my-evolution/Locations.h:1075
 msgid "Kasuminome Ab"
 msgstr "Kasuminome Ab"
 
-#: my-evolution/Locations.h:1073
+#: my-evolution/Locations.h:1076
 msgid "Katowice"
 msgstr "Katowice"
 
-#: my-evolution/Locations.h:1074
+#: my-evolution/Locations.h:1077
 msgid "Kavala"
 msgstr "Kavala"
 
-#: my-evolution/Locations.h:1075
+#: my-evolution/Locations.h:1078
 msgid "Kayseri"
 msgstr "Kayseri"
 
-#: my-evolution/Locations.h:1076
+#: my-evolution/Locations.h:1079
 msgid "Kazan"
 msgstr "Kazan"
 
-#: my-evolution/Locations.h:1077
+#: my-evolution/Locations.h:1080
 msgid "Kearney"
 msgstr "Kearney"
 
-#: my-evolution/Locations.h:1078
+#: my-evolution/Locations.h:1081
 msgid "Keene"
 msgstr "Keene"
 
-#: my-evolution/Locations.h:1079
+#: my-evolution/Locations.h:1082
 msgid "Kefallinia"
 msgstr "Kefallinia"
 
-#: my-evolution/Locations.h:1080
+#: my-evolution/Locations.h:1083
 msgid "Keflavik"
 msgstr "Keflavik"
 
-#: my-evolution/Locations.h:1081
+#: my-evolution/Locations.h:1084
 msgid "Kenai"
 msgstr "Kenai"
 
-#: my-evolution/Locations.h:1082
+#: my-evolution/Locations.h:1085
 msgid "Kenosha"
 msgstr "Kenosha"
 
-#: my-evolution/Locations.h:1083
+#: my-evolution/Locations.h:1086
 msgid "Kentucky"
 msgstr "Kentucky"
 
-#: my-evolution/Locations.h:1084
+#: my-evolution/Locations.h:1087
 msgid "Keokuk"
 msgstr "Keokuk"
 
-#: my-evolution/Locations.h:1085
+#: my-evolution/Locations.h:1088
 msgid "Kerkira"
 msgstr "Kerkira"
 
-#: my-evolution/Locations.h:1086
+#: my-evolution/Locations.h:1089
 msgid "Kerman"
 msgstr "Kerman"
 
-#: my-evolution/Locations.h:1087
+#: my-evolution/Locations.h:1090
 msgid "Ketchikan"
 msgstr "Ketchikan"
 
-#: my-evolution/Locations.h:1088
+#: my-evolution/Locations.h:1091
 msgid "Key West"
 msgstr "Key West"
 
-#: my-evolution/Locations.h:1089
+#: my-evolution/Locations.h:1092
 msgid "Key West NAS"
 msgstr "Key West NAS"
 
-#: my-evolution/Locations.h:1090
+#: my-evolution/Locations.h:1093
 msgid "Khabarovsk"
 msgstr "Khabarovsk"
 
-#: my-evolution/Locations.h:1091
+#: my-evolution/Locations.h:1094
 msgid "Khamis Mushait"
 msgstr "Khamis Mushait"
 
-#: my-evolution/Locations.h:1092
+#: my-evolution/Locations.h:1095
+msgid "Kharkiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1096
 msgid "Kikai Island"
 msgstr "Đảo Kikai"
 
-#: my-evolution/Locations.h:1093
+#: my-evolution/Locations.h:1097
 msgid "Killeen"
 msgstr "Killeen"
 
-#: my-evolution/Locations.h:1094
+#: my-evolution/Locations.h:1098
 msgid "Killeen-Ft Hood"
 msgstr "Killeen-Ft Hood"
 
-#: my-evolution/Locations.h:1095
+#: my-evolution/Locations.h:1099
 msgid "Killeen-Gray AAF"
 msgstr "Killeen-Gray AAF"
 
-#: my-evolution/Locations.h:1096
+#: my-evolution/Locations.h:1100
 msgid "King Khaled International Airport"
 msgstr "Sân bay quốc tế King Khaled"
 
-#: my-evolution/Locations.h:1097
+#: my-evolution/Locations.h:1101
 msgid "Kingman"
 msgstr "Kingman"
 
-#: my-evolution/Locations.h:1098
+#: my-evolution/Locations.h:1102
 msgid "King Salmon"
 msgstr "King Salmon"
 
-#: my-evolution/Locations.h:1099
+#: my-evolution/Locations.h:1103
 msgid "Kingston"
 msgstr "Kingston"
 
-#: my-evolution/Locations.h:1100
+#: my-evolution/Locations.h:1104
 msgid "Kingsville"
 msgstr "Kingsville"
 
-#: my-evolution/Locations.h:1101
+#: my-evolution/Locations.h:1105
 msgid "Kinloss"
 msgstr "Kinloss"
 
-#: my-evolution/Locations.h:1102
+#: my-evolution/Locations.h:1106
 msgid "Kinston"
 msgstr "Kinston"
 
-#: my-evolution/Locations.h:1103
+#: my-evolution/Locations.h:1107
 msgid "Kirkenes"
 msgstr "Kirkenes"
 
-#: my-evolution/Locations.h:1104
+#: my-evolution/Locations.h:1108
 msgid "Kirksville"
 msgstr "Kirksville"
 
-#: my-evolution/Locations.h:1105
+#: my-evolution/Locations.h:1109
 msgid "Kiruna"
 msgstr "Kiruna"
 
-#: my-evolution/Locations.h:1106
+#: my-evolution/Locations.h:1110
 msgid "Kisarazu Ab"
 msgstr "Kisarazu Ab"
 
-#: my-evolution/Locations.h:1107
+#: my-evolution/Locations.h:1111
 msgid "Kishineu"
 msgstr "Kishineu"
 
-#: my-evolution/Locations.h:1108
+#: my-evolution/Locations.h:1112
 msgid "Kitakyushu Airport"
 msgstr "Sân bay Kitakyushu"
 
-#: my-evolution/Locations.h:1109
+#: my-evolution/Locations.h:1113
 msgid "Klagenfurt"
 msgstr "Klagenfurt"
 
-#: my-evolution/Locations.h:1110
+#: my-evolution/Locations.h:1114
 msgid "Klamath Falls"
 msgstr "Klamath Falls"
 
-#: my-evolution/Locations.h:1111
+#: my-evolution/Locations.h:1115
 msgid "Klawock"
 msgstr "Klawock"
 
-#: my-evolution/Locations.h:1112
+#: my-evolution/Locations.h:1116
 msgid "Kleine Brogel"
 msgstr "Kleine Brogel"
 
-#: my-evolution/Locations.h:1113
+#: my-evolution/Locations.h:1117
 msgid "Kliningrad"
 msgstr "Kliningrad"
 
-#: my-evolution/Locations.h:1114
+#: my-evolution/Locations.h:1118
 msgid "Knoxville"
 msgstr "Knoxville"
 
-#: my-evolution/Locations.h:1115
+#: my-evolution/Locations.h:1119
 msgid "Knoxville-Downtown"
 msgstr "Knoxville-Downtown"
 
-#: my-evolution/Locations.h:1116
+#: my-evolution/Locations.h:1120
 msgid "Kobenhavn/Kastrup"
 msgstr "Kobenhavn/Kastrup"
 
-#: my-evolution/Locations.h:1117
+#: my-evolution/Locations.h:1121
 msgid "Kobenhavn/Roskilde"
 msgstr "Kobenhavn/Roskilde"
 
-#: my-evolution/Locations.h:1118
+#: my-evolution/Locations.h:1122
 msgid "Kochi Airport"
 msgstr "Sân bay Kochi"
 
-#: my-evolution/Locations.h:1119
+#: my-evolution/Locations.h:1123
 msgid "Kodiak"
 msgstr "Kodiak"
 
-#: my-evolution/Locations.h:1120
+#: my-evolution/Locations.h:1124
 msgid "Kogalniceanu"
 msgstr "Kogalniceanu"
 
-#: my-evolution/Locations.h:1121
+#: my-evolution/Locations.h:1125
 msgid "Kogalym"
 msgstr "Kogalym"
 
-#: my-evolution/Locations.h:1122
+#: my-evolution/Locations.h:1126
 msgid "Koksijde"
 msgstr "Koksijde"
 
-#: my-evolution/Locations.h:1123
+#: my-evolution/Locations.h:1127
 msgid "Kolding/Vandrup"
 msgstr "Kolding/Vandrup"
 
-#: my-evolution/Locations.h:1124
+#: my-evolution/Locations.h:1128
 msgid "Koln/Bonn"
 msgstr "Koln/Bonn"
 
-#: my-evolution/Locations.h:1125
+#: my-evolution/Locations.h:1129
 msgid "Komatsu Ab"
 msgstr "Komatsu Ab"
 
-#: my-evolution/Locations.h:1126
+#: my-evolution/Locations.h:1130
 msgid "Komatsujima Ab"
 msgstr "Komatsujima Ab"
 
-#: my-evolution/Locations.h:1127
+#: my-evolution/Locations.h:1131
 msgid "Konya"
 msgstr "Konya"
 
-#: my-evolution/Locations.h:1128
+#: my-evolution/Locations.h:1132
 msgid "Korea, Democratic People's Republic of"
 msgstr "Korea, Democratic People's Republic of"
 
-#: my-evolution/Locations.h:1129
+#: my-evolution/Locations.h:1133
 msgid "Korea, Republic of"
 msgstr "Korea, Republic of"
 
-#: my-evolution/Locations.h:1130
+#: my-evolution/Locations.h:1134
 msgid "Kos"
 msgstr "Kos"
 
-#: my-evolution/Locations.h:1131
+#: my-evolution/Locations.h:1135
 msgid "Kotzebue"
 msgstr "Kotzebue"
 
-#: my-evolution/Locations.h:1132
+#: my-evolution/Locations.h:1136
 msgid "Kozani"
 msgstr "Kozani"
 
-#: my-evolution/Locations.h:1133
+#: my-evolution/Locations.h:1137
 msgid "Krakow"
 msgstr "Krakow"
 
-#: my-evolution/Locations.h:1134
+#: my-evolution/Locations.h:1138
 msgid "Krasnodar"
 msgstr "Krasnodar"
 
-#: my-evolution/Locations.h:1135
+#: my-evolution/Locations.h:1139
 msgid "Krasnoyarsk"
 msgstr "Krasnoyarsk"
 
-#: my-evolution/Locations.h:1136
+#: my-evolution/Locations.h:1140
 msgid "Kristiansand/Kjevik"
 msgstr "Kristiansand/Kjevik"
 
-#: my-evolution/Locations.h:1137
+#: my-evolution/Locations.h:1141
 msgid "Kristiansund/Kvernberget"
 msgstr "Kristiansund/Kvernberget"
 
-#: my-evolution/Locations.h:1138
+#: my-evolution/Locations.h:1142
+msgid "Kryviy Rig/Lozovatka"
+msgstr ""
+
+#: my-evolution/Locations.h:1143
 msgid "Kumamoto Airport"
 msgstr "Sân bay Kumamoto"
 
-#: my-evolution/Locations.h:1139
+#: my-evolution/Locations.h:1144
 msgid "Kunming"
 msgstr "Kunming"
 
-#: my-evolution/Locations.h:1140
+#: my-evolution/Locations.h:1145
 msgid "Kushiro Airport"
 msgstr "Sân bay Kushiro"
 
-#: my-evolution/Locations.h:1142
+#: my-evolution/Locations.h:1147
+msgid "Kyyiv/Boryspil"
+msgstr ""
+
+#: my-evolution/Locations.h:1148
+msgid "Kyyiv/Zhulyany"
+msgstr ""
+
+#: my-evolution/Locations.h:1149
 msgid "La Ceiba"
 msgstr "La Ceiba"
 
-#: my-evolution/Locations.h:1143
+#: my-evolution/Locations.h:1150
 msgid "Laconia"
 msgstr "Laconia"
 
-#: my-evolution/Locations.h:1144
+#: my-evolution/Locations.h:1151
 msgid "La Coruna"
 msgstr "La Coruna"
 
-#: my-evolution/Locations.h:1145
+#: my-evolution/Locations.h:1152
 msgid "La Crosse"
 msgstr "La Crosse"
 
-#: my-evolution/Locations.h:1146
+#: my-evolution/Locations.h:1153
 msgid "La Esperanza"
 msgstr "La Esperanza"
 
-#: my-evolution/Locations.h:1147
+#: my-evolution/Locations.h:1154
 msgid "Lafayette"
 msgstr "Lafayette"
 
-#: my-evolution/Locations.h:1148
+#: my-evolution/Locations.h:1155
 msgid "La Grande"
 msgstr "La Grande"
 
-#: my-evolution/Locations.h:1149
+#: my-evolution/Locations.h:1156
 msgid "Lahaina"
 msgstr "Lahaina"
 
-#: my-evolution/Locations.h:1150
+#: my-evolution/Locations.h:1157
 msgid "Lahore"
 msgstr "Lahore"
 
-#: my-evolution/Locations.h:1151
+#: my-evolution/Locations.h:1158
 msgid "Lajes"
 msgstr "Lajes"
 
-#: my-evolution/Locations.h:1152
+#: my-evolution/Locations.h:1159
 msgid "La Junta"
 msgstr "La Junta"
 
-#: my-evolution/Locations.h:1153
+#: my-evolution/Locations.h:1160
 msgid "Lake Charles"
 msgstr "Lake Charles"
 
-#: my-evolution/Locations.h:1154
+#: my-evolution/Locations.h:1161
 msgid "Lake Hood"
 msgstr "Lake Hood"
 
-#: my-evolution/Locations.h:1155
+#: my-evolution/Locations.h:1162
 msgid "Lakehurst"
 msgstr "Lakehurst"
 
-#: my-evolution/Locations.h:1156
+#: my-evolution/Locations.h:1163
 msgid "Lakeland"
 msgstr "Lakeland"
 
-#: my-evolution/Locations.h:1157
+#: my-evolution/Locations.h:1164
 msgid "Lake Tahoe"
 msgstr "Lake Tahoe"
 
-#: my-evolution/Locations.h:1158
+#: my-evolution/Locations.h:1165
 msgid "Lakeview"
 msgstr "Lakeview"
 
-#: my-evolution/Locations.h:1159
+#: my-evolution/Locations.h:1166
 msgid "Lamar"
 msgstr "Lamar"
 
-#: my-evolution/Locations.h:1160
+#: my-evolution/Locations.h:1167
 msgid "La Mesa"
 msgstr "La Mesa"
 
-#: my-evolution/Locations.h:1161
+#: my-evolution/Locations.h:1168
 msgid "Lamezia"
 msgstr "Lamezia"
 
-#: my-evolution/Locations.h:1162
+#: my-evolution/Locations.h:1169
 msgid "Lamoni"
 msgstr "Lamoni"
 
-#: my-evolution/Locations.h:1163
+#: my-evolution/Locations.h:1170
 msgid "Lampedusa"
 msgstr "Lampedusa"
 
-#: my-evolution/Locations.h:1164
+#: my-evolution/Locations.h:1171
 msgid "Lanai"
 msgstr "Lanai"
 
-#: my-evolution/Locations.h:1165
+#: my-evolution/Locations.h:1172
 msgid "Lancaster"
 msgstr "Lancaster"
 
-#: my-evolution/Locations.h:1166
+#: my-evolution/Locations.h:1173
 msgid "Lander"
 msgstr "Lander"
 
-#: my-evolution/Locations.h:1167
+#: my-evolution/Locations.h:1174
 msgid "Langebaanweg"
 msgstr "Langebaanweg"
 
-#: my-evolution/Locations.h:1168
+#: my-evolution/Locations.h:1175
 msgid "Langley AFB"
 msgstr "Langley AFB"
 
-#: my-evolution/Locations.h:1169
+#: my-evolution/Locations.h:1176
 msgid "Lannion"
 msgstr "Lannion"
 
-#: my-evolution/Locations.h:1170
+#: my-evolution/Locations.h:1177
 msgid "Lansing"
 msgstr "Lansing"
 
-#: my-evolution/Locations.h:1171
+#: my-evolution/Locations.h:1178
 msgid "Lanzhou"
 msgstr "Lanzhou"
 
-#: my-evolution/Locations.h:1172
+#: my-evolution/Locations.h:1179
 msgid "La Paz"
 msgstr "La Paz"
 
-#: my-evolution/Locations.h:1173
+#: my-evolution/Locations.h:1180
 msgid "La Paz/Alto"
 msgstr "La Paz/Alto"
 
-#: my-evolution/Locations.h:1174
+#: my-evolution/Locations.h:1181
 msgid "Laramie"
 msgstr "Laramie"
 
-#: my-evolution/Locations.h:1175
+#: my-evolution/Locations.h:1182
 msgid "Laredo"
 msgstr "Laredo"
 
-#: my-evolution/Locations.h:1176
+#: my-evolution/Locations.h:1183
 msgid "Larnaka"
 msgstr "Larnaka"
 
-#: my-evolution/Locations.h:1177
+#: my-evolution/Locations.h:1184
 msgid "La Romana"
 msgstr "La Romana"
 
-#: my-evolution/Locations.h:1178
+#: my-evolution/Locations.h:1185
 msgid "Las Americas"
 msgstr "Las Americas"
 
-#: my-evolution/Locations.h:1179
+#: my-evolution/Locations.h:1186
 msgid "Las Tunas"
 msgstr "Las Tunas"
 
-#: my-evolution/Locations.h:1180
+#: my-evolution/Locations.h:1187
 msgid "Las Vegas"
 msgstr "Las Vegas"
 
-#: my-evolution/Locations.h:1181
+#: my-evolution/Locations.h:1188
 msgid "Latina"
 msgstr "Latina"
 
-#: my-evolution/Locations.h:1182
+#: my-evolution/Locations.h:1189
 msgid "Latrobe"
 msgstr "Latrobe"
 
-#: my-evolution/Locations.h:1184
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr "Laughlin"
 
-#: my-evolution/Locations.h:1185
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "Laurel"
 
-#: my-evolution/Locations.h:1186
+#: my-evolution/Locations.h:1192
 msgid "La Verne"
 msgstr "La Verne"
 
-#: my-evolution/Locations.h:1187
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "Lawrence"
 
-#: my-evolution/Locations.h:1188
+#: my-evolution/Locations.h:1194
 msgid "Lawton"
 msgstr "Lawton"
 
-#: my-evolution/Locations.h:1189
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr "Leadville"
 
-#: my-evolution/Locations.h:1190
+#: my-evolution/Locations.h:1196
 msgid "Learmouth"
 msgstr "Learmouth"
 
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr "Lecce"
 
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr "Leeds and Bradford"
 
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1200
 msgid "Leesburg"
 msgstr "Leesburg"
 
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "Le Havre-Octeville"
 
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "Leipzig-Schkeuditz"
 
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr "Leknes"
 
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1205
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1206
 msgid "Le Marine"
 msgstr "Le Marine"
 
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1207
 msgid "Lemmon"
 msgstr "Lemmon"
 
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1208
 msgid "Lemoore"
 msgstr "Lemoore"
 
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr "Leticia/Vasquez Cobo"
 
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr "Le Touquet"
 
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1211
 msgid "Leuchars"
 msgstr "Leuchars"
 
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1212
 msgid "Lewisburg"
 msgstr "Lewisburg"
 
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1213
 msgid "Lewiston"
 msgstr "Lewiston"
 
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1214
 msgid "Lewistown"
 msgstr "Lewistown"
 
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "Lexington"
 
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1216
 msgid "Liberal"
 msgstr "Liberal"
 
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "Libya"
 
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr "Lichtenburg"
 
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr "Lidgerwood"
 
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1221
 msgid "Liege"
 msgstr "Liege"
 
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1222
 msgid "Lihue"
 msgstr "Lihue"
 
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "Lille-Lesquin"
 
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "Lima-Callao"
 
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1225
 msgid "Limnos"
 msgstr "Limnos"
 
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "Limoges"
 
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1227
 msgid "Limon"
 msgstr "Limon"
 
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "Linz"
 
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1230
 msgid "Lisboa"
 msgstr "Lisboa"
 
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1231
 msgid "Lista"
 msgstr "Lista"
 
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1232
 msgid "Litchfield"
 msgstr "Litchfield"
 
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "Little Rock AFB"
 
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr "Livermore"
 
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "Liverpool"
 
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "Livingston"
 
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "Logan"
 
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "Lolland Falster"
 
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1242
 msgid "Lompoc"
 msgstr "Lompoc"
 
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "London"
 
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "London/Thành phố"
 
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "London/Gatwick"
 
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "London/Heathrow"
 
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "London/Stansted"
 
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1248
 msgid "Londrina"
 msgstr "Londrina"
 
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr "Lone Rock"
 
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr "Long Beach"
 
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr "Longview"
 
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr "Lorient-Lann-Bihoue"
 
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "Los Alamos"
 
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "Los Angeles"
 
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr "Los Mochis"
 
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr "Lossiemouth"
 
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "Louisville"
 
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "Louisville-Standiford Field"
 
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1259
 msgid "Lousiana"
 msgstr "Lousiana"
 
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr "Lovelock"
 
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr "Lubbock"
 
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr "Lubeck-Blankensee"
 
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr "Lufkin"
 
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1264
 msgid "Lugano"
 msgstr "Lugano"
 
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr "Luqa"
 
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "Luton"
 
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr "Luxeuil"
 
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1269
 msgid "Luxor"
 msgstr "Luxor"
 
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1270
+msgid "Lviv"
+msgstr ""
+
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr "Lynchburg"
 
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr "Lyneham"
 
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "Lyon-Bron"
 
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "Lyon-Satolas"
 
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1275
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1276
 msgid "Macae"
 msgstr "Macae"
 
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1277
 msgid "Macapa"
 msgstr "Macapa"
 
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1278
 msgid "Maceio"
 msgstr "Maceio"
 
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "Macon"
 
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1280
 msgid "Madinah"
 msgstr "Madinah"
 
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "Madison"
 
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "Madras/Minambakkam"
 
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "Madrid (Barajas)"
 
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "Madrid (Cuatro Vientos)"
 
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1285
 msgid "Magadan"
 msgstr "Magadan"
 
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "Magdalena"
 
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "Maine"
 
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "Makhachkala"
 
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "Makkah"
 
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1290
 msgid "Makung"
 msgstr "Makung"
 
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1291
 msgid "Malad City"
 msgstr "Thành phố Malad"
 
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1292
 msgid "Malaga"
 msgstr "Malaga"
 
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1293
 msgid "Malatya"
 msgstr "Malatya"
 
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr "Maldonado/Punta Est"
 
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr "Malmo/Sturup"
 
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr "Mammoth Lakes"
 
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "Managua"
 
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "Manassas"
 
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "Manaus"
 
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "Manchester"
 
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr "Mangilsan Ab"
 
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "Manhattan"
 
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "Manisa"
 
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1305
 msgid "Manistee"
 msgstr "Manistee"
 
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "Manitowoc"
 
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "Mankato"
 
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "Mansfield"
 
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1310
 msgid "Manta"
 msgstr "Manta"
 
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr "Manzanillo"
 
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1312
 msgid "Maraba"
 msgstr "Maraba"
 
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "Maracaibo-La Chinita"
 
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "Maracay-B.A.Sucre"
 
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "Marathon"
 
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr "Mar Del Plata"
 
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "Margarita"
 
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "Marianna"
 
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1319
 msgid "Marib"
 msgstr "Marib"
 
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "Maribor"
 
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "Marietta"
 
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr "Marino di Ravenna"
 
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "Marion"
 
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1325
 msgid "Marquette"
 msgstr "Marquette"
 
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1329
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1331
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1332
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1333
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1334
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1339
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "Thành phố Mason"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1342
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "Sân bay Matsumoto"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "Sân bay Matsuyama"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1347
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1348
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1349
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1350
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1354
 msgid "McCall"
 msgstr "McCall"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1355
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1357
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1361
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1362
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1364
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1367
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr "Sân bay Memambetsu"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1372
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1377
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1380
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "Middle East"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "Đảo Middleton"
 
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1393
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "Thành phố Miles"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1406
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1407
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1419
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1422
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr "Sân bay Miyakejima"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "Sân bay Miyazaki"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1425
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1426
 msgid "Mobile Downtown"
 msgstr "Mobile Downtown"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr "Sân bay Mobile Regional"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1428
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1429
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr "Mo I Rana"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1432
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr "Sân bay Mombetsu"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr "Monchengladbach"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1438
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1439
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1440
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1443
 msgid "Montague"
 msgstr "Montague"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1447
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1449
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1450
 msgid "Montego Bay"
 msgstr "Vịnh Montego"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1452
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1453
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr "Monte Scuro"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1457
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1459
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1464
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1467
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1468
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "Moscow Domodedovo"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "Moscow Sheremetyevo"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1474
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr "Mosjoen"
 
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1478
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1481
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1482
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1487
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr "Munchen"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1490
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1492
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1494
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1495
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1498
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "Sân bay Nagasaki"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "Sân bay Nagoya"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "Sân bay Naha"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1506
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr "Sân bay Nakashibetsu"
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1509
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr "Sân bay Nankishirahama"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1516
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "Naples"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr "Nasa Shuttle"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1529
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1543
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1550
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1553
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "Sân bay quốc tế New Tokyo"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK Arpt"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Cote d'Azur"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "Sân bay Niigata"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1565
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1566
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr "N Las Vegas"
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr "N Myrtle Beach"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1570
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1575
 msgid "Norrkoping"
 msgstr "Norrkoping"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1577
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1579
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1584
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1585
 msgid "Northwest Territories"
 msgstr "Northwest Territories"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1587
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1588
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1589
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1595
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr "Nurnberg"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1601
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr "Sân bay Obihiro"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1604
 msgid "Ocala"
 msgstr "Ocala"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1605
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1607
+#, fuzzy
+msgid "Odesa"
+msgstr "Odense"
+
+#: my-evolution/Locations.h:1608
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1613
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "Sân bay Oita"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1615
 msgid "Ojika Island"
 msgstr "Đảo Ojika"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "Sân bay Okayama"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr "Sân bay Oki"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "Thành phố Oklahoma"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "Thành phố Oklahoma-Bethany"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "Thành phố Oklahoma-Thành phố Midwest"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1623
 msgid "Okushiri Island"
 msgstr "Đảo Okushiri"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1624
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1626
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1630
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "Thành phố Cam"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1644
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando International)"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr "Orsta-Volda"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "Sân bay quốc tế Osaka"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1651
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr "Sân bay Oshima"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardenmoen"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1660
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1670
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1674
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1677
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1679
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1681
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "Thành phố Panama"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1684
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1685
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1686
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr "Parkersburg"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1693
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyrenees"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1705
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1706
 msgid "Payson"
 msgstr "Payson"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1707
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1708
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1709
 msgid "Pendleton"
 msgstr "Pendleton"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "People's Republic of China"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1715
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1718
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpignan-Rivesaltes"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "Petrozavodsk"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1730
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1741
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr "Pingtung North"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr "Pingtung South"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1758
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1759
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1760
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1762
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "Thành phố Ponca"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1768
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1771
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1774
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1777
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1779
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr "Porto Alegre Apt"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1785
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1786
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1788
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1791
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1795
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1797
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1798
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1804
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1805
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1806
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1808
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1809
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1811
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1813
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1815
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1817
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1818
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1819
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1820
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1821
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1822
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1824
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1827
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1829
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1836
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "Thành phố Quebec"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1849
 msgid "Rapid City"
 msgstr "Thành phố Rapid"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Thành phố Rapid-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1852
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1854
 msgid "Rebun Island"
 msgstr "Đảo Rebun"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1857
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1858
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1863
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1867
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1869
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1870
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1873
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "Đảo Rhode"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1875
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1877
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1878
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1879
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1872
-msgid "Riga"
-msgstr "Riga"
-
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1886
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1888
 msgid "Rishiri Island"
 msgstr "Đảo Rishiri"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1890
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1894
+#, fuzzy
+msgid "Rivne"
+msgstr "Rivera"
+
+#: my-evolution/Locations.h:1895
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1898
 msgid "Roatan"
 msgstr "Roatan"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1899
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1902
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1906
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "Rome-Russell"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr "Ronneby"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1916
 msgid "Roros"
 msgstr "Roros"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr "Rorvik/Ryum"
 
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1920
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1921
 msgid "Rost"
 msgstr "Rost"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1927
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "Russia"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr "Saarbrucken"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "Sân bay Safford-Municipal"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1943
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1944
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1946
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1947
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1948
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1950
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1952
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1953
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1955
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "Thành phố Salt Lake"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1960
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1964
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1966
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1967
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1975
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1976
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1977
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "Đảo San Diego-North"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjoen/Stokka"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1985
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "San Francisco"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1989
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1991
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1992
 msgid "San Jose"
 msgstr "San Jose"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr "San Jose De Chiquitos"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr "San Jose del Cabo"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "San Jose-Santa Clara"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr "Sankt-Peterburg"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1998
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:2001
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "Đảo San Nicholas"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:2005
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2011
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2012
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2013
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2019
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr "Sao Jose Dos Campo"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2022
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2023
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2029
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2038
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2039
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2048
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2049
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "Sân bay Sendai"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Sân bay quốc tế Seoul/Kimp'O "
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2062
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheikhintl"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2064
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2065
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2066
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2079
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2080
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "Shreveport Downtown"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "Shreveport Regional"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2086
 msgid "Silver City"
 msgstr "Thành phố Silver"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2087
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr "Thành phố Sioux"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2097
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2099
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2100
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2103
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2105
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2107
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2109
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2111
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2112
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2113
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2114
 msgid "Sonderborg"
 msgstr "Sonderborg"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr "Sorkjosen"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2119
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2122
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2123
 msgid "South Marsh Island"
 msgstr "Đảo South Marsh"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr "South Timbalier"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2130
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2133
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2136
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2139
 msgid "Staverton"
 msgstr "Staverton"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2140
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2143
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2144
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2148
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "St Louis-Spirit"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sorstokken"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2156
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2157
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "Đảo St Simon's"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "Vịnh Sturgeon"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2168
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2169
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr "Svolvaer/Helle"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2184
+#, fuzzy
+msgid "Sympheropol"
+msgstr "Stavropol"
+
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2188
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2190
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2192
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2201
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2206
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "Sân bay Takamatsu"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2200
-msgid "Talinn"
-msgstr "Talinn"
-
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "Talinn"
+
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2218
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr "Sân bay Tanegashima"
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2220
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2224
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2225
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2227
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "Tehran-Mehrabad"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2234
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2244
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2248
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2250
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr "Thành phố Tin"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2255
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2256
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2259
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2260
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr "Đảo Tokunoshima"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "Tokyo Heliport"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "Sân bay quốc tế Tokyo"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "Sân bay quốc tế Tokyo New"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2273
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2279
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2281
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2282
 msgid "Tottori Airport"
 msgstr "Sân bay Tottori"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "Sân bay Toyama"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2289
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr "Thành phố Traverse"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2292
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2294
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "Tromso/Langnes"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Vaernes"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2304
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "Sân bay Tsushima"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2314
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2316
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2317
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2323
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr "Umea"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "United Arab Emirates "
 
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2342
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2344
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "Uruguaiana"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Soesterberg"
 
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2352
+#, fuzzy
+msgid "Uzhgorod"
+msgstr "Châu Âu/Uzhgorod"
+
+#: my-evolution/Locations.h:2353
 msgid "Vadso"
 msgstr "Vadso"
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2354
 msgid "Vaerlose"
 msgstr "Vaerlose"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2357
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2366
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2368
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2372
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2375
 msgid "Vasteras"
 msgstr "Vasteras"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2377
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2379
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2383
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2392
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "Sân bay kỹ thuật Virginia "
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2403
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2409
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2412
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2413
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2415
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr "Sân bay Wadi Al Dawasser"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "Wakefield"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr "Sân bay Wakkanai"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2422
 msgid "Wallops Island"
 msgstr "Đảo Wallops"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2424
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "Warszawa"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2431
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2432
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2434
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "Thành phố Webster"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2438
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2440
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2441
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2443
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2444
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2445
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2451
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2452
 msgid "Whidbey Island"
 msgstr "Đảo Whidbey"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2461
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2467
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr "Sân bay Willow"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2484
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2487
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2488
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2490
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2491
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr "Wuchia Observatory"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2500
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr "Sân bay Yamagata"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr "Sân bay Yamaguchi Ube"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2505
 msgid "Yao Airport"
 msgstr "Sân bay Yao"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr "Yeonpyeungdo"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr "Zama Airfield"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2532
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "Zurich"
 
+#: my-evolution/component-factory.c:51
+msgid "Folder containing the Evolution Summary"
+msgstr ""
+
+#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
+msgid "Appointments"
+msgstr "Cuộc hẹn"
+
+#: my-evolution/e-summary-calendar.c:366
+msgid "No appointments"
+msgstr "Không có cuộc hẹn"
+
+#: my-evolution/e-summary-calendar.c:400
+msgid "%k:%M %d %B"
+msgstr "%k:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:402
+msgid "%l:%M %d %B"
+msgstr "%l:%M %d %B"
+
+#: my-evolution/e-summary-calendar.c:420
+msgid "No description"
+msgstr "Không có mô tả"
+
+#: my-evolution/e-summary-mail.c:152
+msgid "Mail summary"
+msgstr "Tóm tắt thư"
+
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+msgid "Local Folders"
+msgstr "Thư mục cục bộ"
+
+#. translators: Put a list of codes for locations you want to see in
+#. My Evolution by default here. You can find the list of all
+#. stations and their codes in Evolution sources.
+#. (evolution/my-evolution/Locations)
+#. Codes are seperated with : eg. "KBOS:EGAA"
+#: my-evolution/e-summary-preferences.c:108
+#: my-evolution/e-summary-weather.c:603
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary-preferences.c:578
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:599
+msgid "Quotes of the Day"
+msgstr "Trích dẫn trong ngày"
+
+#: my-evolution/e-summary-preferences.c:867
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:875
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:304
+msgid "Error downloading RDF"
+msgstr "Lỗi khi tải xuống RDF"
+
+#: my-evolution/e-summary-rdf.c:448
+msgid "News Feed"
+msgstr ""
+
+#: my-evolution/e-summary-shown.c:536
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:545
+#, fuzzy
+msgid "Add"
+msgstr "T_hêm"
+
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Shelton"
+
+#: my-evolution/e-summary-tasks.c:251
+msgid "No tasks"
+msgstr "Không có công việc"
+
+#: my-evolution/e-summary-tasks.c:291
+msgid "(No Description)"
+msgstr "(Không có mô tả)"
+
+#: my-evolution/e-summary-weather.c:71
+msgid "My Weather"
+msgstr "Thời tiết của tôi"
+
+#: my-evolution/e-summary-weather.c:279
+msgid "There was an error downloading data for"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:501
+msgid "Weather"
+msgstr "Thời tiết"
+
+#: my-evolution/e-summary.c:193
+msgid "%A, %B %e %Y"
+msgstr "%A, %B %e %Y"
+
+#: my-evolution/e-summary.c:488
+msgid "Please wait..."
+msgstr "Vui lòng chờ..."
+
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "In tóm tắt"
+
+#: my-evolution/e-summary.c:626
+msgid "Printing of Summary failed"
+msgstr "Lỗi in tóm tắt"
+
+#: my-evolution/main.c:139
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr ""
+
+#: my-evolution/metar.c:29
+msgid " F"
+msgstr " F"
+
+#: my-evolution/metar.c:29
+msgid " C"
+msgstr " C"
+
+#: my-evolution/metar.c:33
+msgid "knots"
+msgstr ""
+
+#: my-evolution/metar.c:33
+msgid "kph"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "inHg"
+msgstr ""
+
+#: my-evolution/metar.c:38
+msgid "mmHg"
+msgstr ""
+
+#: my-evolution/metar.c:41
+msgid "miles"
+msgstr "dặm"
+
+#: my-evolution/metar.c:41
+msgid "kilometers"
+msgstr "Kílô mét"
+
+#: my-evolution/metar.c:44
+msgid "Clear sky"
+msgstr "Trời trong"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr "Mây tảng"
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr "Nhiều mây"
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr "Ít mây"
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr "U ám"
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+msgid "Invalid"
+msgstr "Không hợp lệ"
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr "Biến đổi"
+
+#: my-evolution/metar.c:64
+msgid "North"
+msgstr "Bắc"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr "Bắt - Đông Bắc"
+
+#: my-evolution/metar.c:64
+msgid "Northeast"
+msgstr "Đông Bắc"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr "Đông - Đông Bắc"
+
+#: my-evolution/metar.c:65
+msgid "East"
+msgstr "Đông"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr "Đông - Đông Nam"
+
+#: my-evolution/metar.c:65
+msgid "Southeast"
+msgstr "Đông Nam"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr "Nam - Đông Nam"
+
+#: my-evolution/metar.c:66
+msgid "South"
+msgstr "Nam"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr "Nam - Tây Nam"
+
+#: my-evolution/metar.c:66
+msgid "Southwest"
+msgstr "Tây Nam"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr "Tây - Tây Nam"
+
+#: my-evolution/metar.c:67
+msgid "West"
+msgstr "Tây"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr "Tây - Tây Bắc"
+
+#: my-evolution/metar.c:67
+msgid "Northwest"
+msgstr "Tây Bắc"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr "Bắc - Tây Bắc"
+
+#. DRIZZLE
+#: my-evolution/metar.c:127
+msgid "Drizzle"
+msgstr "Mưa phùn"
+
+#: my-evolution/metar.c:128
+msgid "Drizzle in the vicinity"
+msgstr "Mưa phùn trong vùng lân cận"
+
+#: my-evolution/metar.c:129
+msgid "Light drizzle"
+msgstr "Mưa phùn nhẹ"
+
+#: my-evolution/metar.c:130
+msgid "Moderate drizzle"
+msgstr "Mưa phùn vừa"
+
+#: my-evolution/metar.c:131
+msgid "Heavy drizzle"
+msgstr "Mưa phùn nặng"
+
+#: my-evolution/metar.c:132
+msgid "Shallow drizzle"
+msgstr "Chút mưa phùn"
+
+#: my-evolution/metar.c:133
+msgid "Patches of drizzle"
+msgstr "Nhiều mảng mưa phùn"
+
+#: my-evolution/metar.c:134
+msgid "Partial drizzle"
+msgstr "Một ít mưa phùn"
+
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
+msgid "Thunderstorm"
+msgstr "Bão kèm sấm"
+
+#: my-evolution/metar.c:136
+msgid "Windy drizzle"
+msgstr "Mưa gió"
+
+#: my-evolution/metar.c:137
+msgid "Showers"
+msgstr "Mưa"
+
+#: my-evolution/metar.c:138
+msgid "Drifting drizzle"
+msgstr "Mưa tí tách"
+
+#: my-evolution/metar.c:139
+msgid "Freezing drizzle"
+msgstr "Mưa phùn ớn lạnh"
+
+#. RAIN
+#: my-evolution/metar.c:142
+msgid "Rain"
+msgstr "Mưa"
+
+#: my-evolution/metar.c:143
+msgid "Rain in the vicinity"
+msgstr "Mưa trong vùng lân cận"
+
+#: my-evolution/metar.c:144
+msgid "Light rain"
+msgstr "Mưa nhẹ"
+
+#: my-evolution/metar.c:145
+msgid "Moderate rain"
+msgstr "Mưa vừa"
+
+#: my-evolution/metar.c:146
+msgid "Heavy rain"
+msgstr "Mưa nhiều"
+
+#: my-evolution/metar.c:147
+msgid "Shallow rain"
+msgstr "Chút mưa"
+
+#: my-evolution/metar.c:148
+msgid "Patches of rain"
+msgstr "Nhiều mảng mưa"
+
+#: my-evolution/metar.c:149
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:151
+msgid "Blowing rainfall"
+msgstr "Mưa gió"
+
+#: my-evolution/metar.c:152
+msgid "Rain showers"
+msgstr "Mưa tầm tã"
+
+#: my-evolution/metar.c:153
+msgid "Drifting rain"
+msgstr "Mưa tí tách"
+
+#: my-evolution/metar.c:154
+msgid "Freezing rain"
+msgstr "Mưa ớn lạnh"
+
+#. SNOW
+#: my-evolution/metar.c:157
+msgid "Snow"
+msgstr "Tuyết"
+
+#: my-evolution/metar.c:158
+msgid "Snow in the vicinity"
+msgstr "Tuyết trong vùng lân cận"
+
+#: my-evolution/metar.c:159
+msgid "Light snow"
+msgstr "Tuyết nhẹ"
+
+#: my-evolution/metar.c:160
+msgid "Moderate snow"
+msgstr "Tuyết vừa"
+
+#: my-evolution/metar.c:161
+msgid "Heavy snow"
+msgstr "Tuyết nhiều"
+
+#: my-evolution/metar.c:162
+msgid "Shallow snow"
+msgstr "Chút tuyết"
+
+#: my-evolution/metar.c:163
+msgid "Patches of snow"
+msgstr "Nhiều mảng tuyết"
+
+#: my-evolution/metar.c:164
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
+msgid "Snowstorm"
+msgstr "Bão tuyết"
+
+#: my-evolution/metar.c:166
+msgid "Blowing snowfall"
+msgstr "Gió tuyết"
+
+#: my-evolution/metar.c:167
+msgid "Snow showers"
+msgstr "Mưa tuyết"
+
+#: my-evolution/metar.c:168
+msgid "Drifting snow"
+msgstr "Tuyết tí tách ;)"
+
+#: my-evolution/metar.c:169
+msgid "Freezing snow"
+msgstr "Tuyết lạnh"
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:172
+msgid "Snow grains"
+msgstr "Chút tuyết"
+
+#: my-evolution/metar.c:173
+msgid "Snow grains in the vicinity"
+msgstr "Chút tuyết trong vùng lân cận"
+
+#: my-evolution/metar.c:174
+msgid "Light snow grains"
+msgstr "Chút tuyết nhẹ"
+
+#: my-evolution/metar.c:175
+msgid "Moderate snow grains"
+msgstr "Chút tuyết vừa"
+
+#: my-evolution/metar.c:176
+msgid "Heavy snow grains"
+msgstr "Chút tuyết nhiều"
+
+#: my-evolution/metar.c:177
+msgid "Shallow snow grains"
+msgstr "Chút chút tuyết ;)"
+
+#: my-evolution/metar.c:178
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:179
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:181
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:182
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:183
+msgid "Drifting snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:184
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:187
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:188
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:189
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:190
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:191
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:193
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:194
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:195
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:196
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:197
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:198
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:199
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:202
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:203
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:204
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:205
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:206
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:207
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:208
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:209
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:210
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:211
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:212
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:213
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:214
+msgid "Freezing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:218
+msgid "Hail in the vicinity"
+msgstr "Mưa đá trong vùng lân cận"
+
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
+msgid "Light hail"
+msgstr "Mưa đá nhẹ"
+
+#: my-evolution/metar.c:220
+msgid "Moderate hail"
+msgstr "Mưa đá vừa"
+
+#: my-evolution/metar.c:221
+msgid "Heavy hail"
+msgstr "Mưa đá nhiều"
+
+#: my-evolution/metar.c:222
+msgid "Shallow hail"
+msgstr "Chút mưa đá"
+
+#: my-evolution/metar.c:223
+msgid "Patches of hail"
+msgstr "Nhiều mảng mưa đá"
+
+#: my-evolution/metar.c:224
+msgid "Partial hail"
+msgstr "Một ít mưa đá"
+
+#: my-evolution/metar.c:225
+msgid "Hailstorm"
+msgstr "Bão đá"
+
+#: my-evolution/metar.c:226
+msgid "Blowing hail"
+msgstr "Mưa đá kèm gió"
+
+#: my-evolution/metar.c:227
+msgid "Hail showers"
+msgstr "Mưa đá kèm mưa"
+
+#: my-evolution/metar.c:228
+msgid "Drifting hail"
+msgstr "Mưa đá tí tách"
+
+#: my-evolution/metar.c:229
+msgid "Freezing hail"
+msgstr "Mưa đá lạnh"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:232
+msgid "Small hail"
+msgstr "Mưa đá nhỏ"
+
+#: my-evolution/metar.c:233
+msgid "Small hail in the vicinity"
+msgstr "Mưa đá nhỏ trong vùng lân cận"
+
+#: my-evolution/metar.c:235
+msgid "Moderate small hail"
+msgstr "Mưa đá nhỏ vừa"
+
+#: my-evolution/metar.c:236
+msgid "Heavy small hail"
+msgstr "Mưa đá nhỏ nhiều"
+
+#: my-evolution/metar.c:237
+msgid "Shallow small hail"
+msgstr "Chút mưa đá nhỏ"
+
+#: my-evolution/metar.c:238
+msgid "Patches of small hail"
+msgstr "Nhiều mảng mưa đá nhỏ"
+
+#: my-evolution/metar.c:239
+msgid "Partial small hail"
+msgstr "Một tí mưa đá nhỏ"
+
+#: my-evolution/metar.c:240
+msgid "Small hailstorm"
+msgstr "Bão đá nhỏ"
+
+#: my-evolution/metar.c:241
+msgid "Blowing small hail"
+msgstr "Mưa đá nhỏ kèm gió"
+
+#: my-evolution/metar.c:242
+msgid "Showers of small hail"
+msgstr "Mưa đá nhỏ kèm mưa"
+
+#: my-evolution/metar.c:243
+msgid "Drifting small hail"
+msgstr "Mưa đá nhỏ tí tách"
+
+#: my-evolution/metar.c:244
+msgid "Freezing small hail"
+msgstr "Mưa đá nhỏ lạnh"
+
+#. PRECIPITATION
+#: my-evolution/metar.c:247
+msgid "Unknown precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:248
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:249
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:250
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:251
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:252
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:253
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:254
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:255
+msgid "Unknown thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:256
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:257
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:258
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:259
+msgid "Freezing precipitation"
+msgstr ""
+
+#. MIST
+#: my-evolution/metar.c:262
+msgid "Mist"
+msgstr "Sương mù"
+
+#: my-evolution/metar.c:263
+msgid "Mist in the vicinity"
+msgstr "Sương mù trong vùng lân cận"
+
+#: my-evolution/metar.c:264
+msgid "Light mist"
+msgstr "Sương mù nhẹ"
+
+#: my-evolution/metar.c:265
+msgid "Moderate mist"
+msgstr "Sương mù vừa"
+
+#: my-evolution/metar.c:266
+msgid "Thick mist"
+msgstr "Sương mù dày đặc"
+
+#: my-evolution/metar.c:267
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:268
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:269
+msgid "Partial mist"
+msgstr ""
+
+#: my-evolution/metar.c:271
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:273
+msgid "Drifting mist"
+msgstr ""
+
+#: my-evolution/metar.c:274
+msgid "Freezing mist"
+msgstr "Sương mù lạnh"
+
+#. FOG
+#: my-evolution/metar.c:277
+msgid "Fog"
+msgstr "Sương"
+
+#: my-evolution/metar.c:278
+msgid "Fog in the vicinity"
+msgstr "Sương trong vùng lân cận"
+
+#: my-evolution/metar.c:279
+msgid "Light fog"
+msgstr "Sương nhẹ"
+
+#: my-evolution/metar.c:280
+msgid "Moderate fog"
+msgstr "Sương vừa"
+
+#: my-evolution/metar.c:281
+msgid "Thick fog"
+msgstr "Sương nhiều"
+
+#: my-evolution/metar.c:282
+msgid "Shallow fog"
+msgstr "Chút sương"
+
+#: my-evolution/metar.c:283
+msgid "Patches of fog"
+msgstr "Nhiều mảng sương"
+
+#: my-evolution/metar.c:284
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:286
+msgid "Fog with wind"
+msgstr "Sương gió"
+
+#: my-evolution/metar.c:288
+msgid "Drifting fog"
+msgstr "Sương tí tách"
+
+#: my-evolution/metar.c:289
+msgid "Freezing fog"
+msgstr "Sương lạnh"
+
+#. SMOKE
+#: my-evolution/metar.c:292
+msgid "Smoke"
+msgstr "Khói"
+
+#: my-evolution/metar.c:293
+msgid "Smoke in the vicinity"
+msgstr "Khói trong vùng lân cận"
+
+#: my-evolution/metar.c:294
+msgid "Thin smoke"
+msgstr "Khỏi mỏng"
+
+#: my-evolution/metar.c:295
+msgid "Moderate smoke"
+msgstr "Khói vừa"
+
+#: my-evolution/metar.c:296
+msgid "Thick smoke"
+msgstr "Khói dày"
+
+#: my-evolution/metar.c:297
+msgid "Shallow smoke"
+msgstr "Chút khói"
+
+#: my-evolution/metar.c:298
+msgid "Patches of smoke"
+msgstr "Nhiều mảng khói"
+
+#: my-evolution/metar.c:299
+msgid "Partial smoke"
+msgstr "Một ít khói"
+
+#: my-evolution/metar.c:300
+msgid "Thunderous smoke"
+msgstr ""
+
+#: my-evolution/metar.c:301
+msgid "Smoke with wind"
+msgstr "Khói có gió"
+
+#: my-evolution/metar.c:303
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:307
+msgid "Volcanic ash"
+msgstr "Tro núi lửa"
+
+#: my-evolution/metar.c:308
+msgid "Volcanic ash in the vicinity"
+msgstr "Tro núi lửa trong vùng lân cận"
+
+#: my-evolution/metar.c:310
+msgid "Moderate volcanic ash"
+msgstr "Tro núi lửa vừa"
+
+#: my-evolution/metar.c:311
+msgid "Thick volcanic ash"
+msgstr "Tro núi lửa dày"
+
+#: my-evolution/metar.c:312
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:313
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:314
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:315
+msgid "Thunderous volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:316
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:317
+msgid "Showers of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:318
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:319
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:322
+msgid "Sand"
+msgstr "Cát"
+
+#: my-evolution/metar.c:323
+msgid "Sand in the vicinity"
+msgstr "Cát trong vùng lân cận"
+
+#: my-evolution/metar.c:324
+msgid "Light sand"
+msgstr "Cát ít"
+
+#: my-evolution/metar.c:325
+msgid "Moderate sand"
+msgstr "Cát vừa"
+
+#: my-evolution/metar.c:326
+msgid "Heavy sand"
+msgstr "Cát nhiều"
+
+#: my-evolution/metar.c:328
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:329
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:331
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:333
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:337
+msgid "Haze"
+msgstr ""
+
+#: my-evolution/metar.c:338
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:339
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:340
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:341
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:342
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:343
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:344
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:346
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:348
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:349
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:352
+msgid "Spray"
+msgstr ""
+
+#: my-evolution/metar.c:353
+msgid "Spray in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:354
+msgid "Light spray"
+msgstr ""
+
+#: my-evolution/metar.c:355
+msgid "Moderate spray"
+msgstr ""
+
+#: my-evolution/metar.c:356
+msgid "Heavy spray"
+msgstr ""
+
+#: my-evolution/metar.c:357
+msgid "Shallow spray"
+msgstr ""
+
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
+msgstr ""
+
+#: my-evolution/metar.c:359
+msgid "Partial spray"
+msgstr ""
+
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
+msgstr ""
+
+#: my-evolution/metar.c:363
+msgid "Drifting spray"
+msgstr ""
+
+#: my-evolution/metar.c:364
+msgid "Freezing spray"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:367
+msgid "Dust"
+msgstr "Bụi"
+
+#: my-evolution/metar.c:368
+msgid "Dust in the vicinity"
+msgstr "Bụi trong vùng lân cận"
+
+#: my-evolution/metar.c:369
+msgid "Light dust"
+msgstr "Bụi nhẹ"
+
+#: my-evolution/metar.c:370
+msgid "Moderate dust"
+msgstr "Bụi vừa"
+
+#: my-evolution/metar.c:371
+msgid "Heavy dust"
+msgstr "Bụi nặng"
+
+#: my-evolution/metar.c:373
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:374
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:376
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:378
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:382
+msgid "Squall"
+msgstr "Gió lạnh"
+
+#: my-evolution/metar.c:383
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:384
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:385
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:386
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:389
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:390
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:391
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:393
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:394
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:397
+msgid "Sandstorm"
+msgstr "Bão cát"
+
+#: my-evolution/metar.c:398
+msgid "Sandstorm in the vicinity"
+msgstr "Bão cát trong vùng lân cận"
+
+#: my-evolution/metar.c:399
+msgid "Light standstorm"
+msgstr "Bão cát nhẹ"
+
+#: my-evolution/metar.c:400
+msgid "Moderate sandstorm"
+msgstr "Bão cát vừa"
+
+#: my-evolution/metar.c:401
+msgid "Heavy sandstorm"
+msgstr "Báo cát mạnh"
+
+#: my-evolution/metar.c:402
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:404
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:405
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:406
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:408
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:409
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:412
+msgid "Duststorm"
+msgstr "Bão bụi"
+
+#: my-evolution/metar.c:413
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:414
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:415
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:416
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:417
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:419
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:420
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:421
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:423
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:424
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:427
+msgid "Funnel cloud"
+msgstr "Mây ống"
+
+#: my-evolution/metar.c:428
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:429
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:430
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:431
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:432
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:433
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:434
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:436
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:438
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
+msgid "Tornado"
+msgstr "Lốc xoáy"
+
+#: my-evolution/metar.c:443
+msgid "Tornado in the vicinity"
+msgstr "Lốc xoáy trong vùng lân cận"
+
+#: my-evolution/metar.c:445
+msgid "Moderate tornado"
+msgstr "Lốc xoáy vừa"
+
+#: my-evolution/metar.c:446
+msgid "Raging tornado"
+msgstr "Bão tố"
+
+#: my-evolution/metar.c:449
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:450
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:453
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:454
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:457
+msgid "Dust whirls"
+msgstr "Gió bụi"
+
+#: my-evolution/metar.c:458
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:459
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:460
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:461
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:462
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:463
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:464
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:466
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:468
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add n_ews feed"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:2
+msgid "C_elsius"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "Xoá thư mục này"
+
+#: my-evolution/my-evolution.glade.h:5
+msgid "How many days should the calendar display at once?"
+msgstr "Lịch hiển thị bao nhiêu ngày mỗi lần?"
+
+#: my-evolution/my-evolution.glade.h:6
+msgid "Ma_x number of items shown:"
+msgstr "Số _mục hiển thị tối đa:"
+
+#: my-evolution/my-evolution.glade.h:7
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:8
+msgid "One mont_h"
+msgstr "_Một tháng"
+
+#: my-evolution/my-evolution.glade.h:9
+msgid "One w_eek"
+msgstr "Một _tuần"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "R_efresh time (seconds):"
+msgstr "Thời gian cập nhật (giây):"
+
+#: my-evolution/my-evolution.glade.h:11
+msgid "Refresh _time (seconds):"
+msgstr "Thời gian cập nhật (giây):"
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "S_how full path for folders"
+msgstr "_Hiện toàn đường dẫn của thư mục"
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "Show _all tasks"
+msgstr "Hiện mọi _công việc"
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "Show _today's tasks"
+msgstr "Hiện mọi công việc trong n_gày"
+
+#: my-evolution/my-evolution.glade.h:15
+msgid "Show temperatures in:"
+msgstr "Hiện nhiệt độ trong:"
+
+#: my-evolution/my-evolution.glade.h:16
+msgid "Tasks "
+msgstr "Công việc"
+
+#: my-evolution/my-evolution.glade.h:17
+msgid "Weather settings"
+msgstr "Thiết lập thời tiết"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "_Fahrenheit"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+msgid "_Five days"
+msgstr "_Năm ngày"
+
+#: my-evolution/my-evolution.glade.h:20
+msgid "_Mail"
+msgstr "_Thư"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "_News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+msgid "_One day"
+msgstr "_Một ngày"
+
+#: my-evolution/my-evolution.glade.h:23
+msgid "_Schedule"
+msgstr "_Lập lịch biểu"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "_Weather"
+msgstr "_Thời tiết"
+
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution folder settings."
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Folder Settings"
+msgstr "Thiết lập thư"
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Vỏ bọc Evolution"
 
-#: shell/e-activity-handler.c:200
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure various folder settings"
+msgstr ""
+
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Xem chi tiết"
 
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Hủy tác vụ"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Không thể chuyển thư mục:\n"
+"%s"
+
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "Thư mục"
+
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "Nháp"
+
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
 msgid "Inbox"
 msgstr "Thư mục nhận"
 
-#: shell/e-local-storage.c:175
+#: shell/e-local-storage.c:176
 msgid "Outbox"
 msgstr "Thư mục gửi"
 
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "Thư mục cục bộ"
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "Đã gửi"
 
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "Cài đặt Evolution"
 
-#: shell/e-setup.c:128
+#: shell/e-setup.c:130
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "Vui lòng nhấn \"Đồng ý\" để cài đặt tập tin, hoặc nhấn \"Hủy bỏ' để thoát."
+msgstr ""
+"Vui lòng nhấn \"Đồng ý\" để cài đặt tập tin, hoặc nhấn \"Hủy bỏ' để thoát."
 
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "Không thể cập nhật tập tin một cách đúng đắn"
 
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -22781,7 +24553,7 @@ msgstr ""
 "%s\n"
 "Lỗi: %s"
 
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -22790,7 +24562,7 @@ msgstr ""
 "Xảy ra lỗi khi đang chép tập tin vào\n"
 "`%s'."
 
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -22801,7 +24573,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -22809,9 +24581,10 @@ msgid ""
 "readable and executable and restart Evolution."
 msgstr ""
 "Thư mục %s\n"
-"không có quyền truy cập cần thiết. Vui lòng gán quyền đọc và ghi cho thư mục rồi khởi động lại Evolution."
+"không có quyền truy cập cần thiết. Vui lòng gán quyền đọc và ghi cho thư mục "
+"rồi khởi động lại Evolution."
 
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -22821,7 +24594,7 @@ msgstr ""
 "Tập tin %s nên được loại bỏ để Evolution có thể làm việc đúng.\n"
 "Vui lòng gỡ bỏ tập tin này và khởi động lại Evolution."
 
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -22829,9 +24602,10 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 "Tập tin `%s' không phải là thư mục.<\n"
-"Vui lòng chuyển nó sang chỗ khác để có thể cài đặt các tập tin người dùng của Evolution."
+"Vui lòng chuyển nó sang chỗ khác để có thể cài đặt các tập tin người dùng "
+"của Evolution."
 
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -22840,57 +24614,88 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, 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 "Thư mục `%s' tồn tại nhưng không phải là thư mục của Evolution. Vui lòng chuyển nó sang chỗ khác để Evolution có thể cài đặt các tập tin người dùng."
-
-#: shell/e-shell-about-box.c:40
-msgid "Evolution "
-msgstr "Evolution "
-
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr ""
+"Thư mục `%s' tồn tại nhưng không phải là thư mục của Evolution. Vui lòng "
+"chuyển nó sang chỗ khác để Evolution có thể cài đặt các tập tin người dùng."
 
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Được mang lại bởi"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "Ngày hoàn tất"
+
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "Chọn thư mục"
+
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "Thư mục đặc biệt"
+
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "Đang lọc thư mục"
+
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "Thư mục cục bộ"
+
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Không thể kiểm tra thư mục: %s: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"Không thể đổi tên thư mục:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Không thể chuyển thư mục tới chính nó."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Không thể chép thư mục vào chính nó."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:206
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:307
+#: shell/e-shell-folder-commands.c:321
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Xác định một thư mục để chép thư mục \"%s\" vào:"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "Chép thư mục"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Xác định một thư mục để chuyển thư mục \"%s\" tới:"
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "Chuyển thư mục"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -22899,16 +24704,17 @@ msgstr ""
 "Không thể xóa thư mục:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Xoá \"%s\""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "Bạn có chắc muốn gỡ bỏ thư mục %s?"
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"Không thể xóa thư mục:\n"
+"%s"
 
 #: shell/e-shell-folder-commands.c:488
 #, c-format
@@ -22919,16 +24725,16 @@ msgstr ""
 "Không thể đổi tên thư mục:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Đổi tên thư mục \"%s\" thành:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "Đổi tên thư mục"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -22943,21 +24749,21 @@ msgstr ""
 "Không thể tạo thư mục đã cho:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:304
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Tạo thư mục mới"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "Mới..."
 
-#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
+#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr "(Không tựa)"
 
@@ -22973,9 +24779,11 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"Chọn tập tin muốn nhập vào Evolution, và chọn kiểu tập tin từ danh sách dưới đây.\n"
+"Chọn tập tin muốn nhập vào Evolution, và chọn kiểu tập tin từ danh sách dưới "
+"đây.\n"
 "\n"
-"Bạn có thể chọn \"Tự động\" nếu bạn không biết, và Evolution sẽ thử tự tìm cách hoạt động."
+"Bạn có thể chọn \"Tự động\" nếu bạn không biết, và Evolution sẽ thử tự tìm "
+"cách hoạt động."
 
 #: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
 msgid "Please select the information that you would like to import:"
@@ -23003,21 +24811,26 @@ msgstr ""
 "Đang nhập %s\n"
 "Đang nhập mục %d."
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "Chọn thư mục"
+
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "Tập tin %s không tồn tại"
 
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Lỗi Evolution"
 
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "Bạn chỉ có thể nhập vào thư mục cục bộ"
 
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -23026,11 +24839,11 @@ msgstr ""
 "Không có bộ nhập nào có thể xử lý\n"
 "%s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "Đang nhập"
 
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -23039,17 +24852,17 @@ msgstr ""
 "Đang nhập %s.\n"
 "Đang khởi động %s"
 
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "Lỗi khởi động %s"
 
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "Lỗi nạp %s"
 
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -23058,31 +24871,31 @@ msgstr ""
 "Đang nhập %s\n"
 "Đang nhập mục 1."
 
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "Tự động"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "Tên tập tin:"
 
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "Chọn tập tin"
 
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "Kiểu tập tin:"
 
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "Nhập dữ liệu và thiết lập từ chương trình cũ"
 
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "Nhập tập tin đơn"
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -23090,31 +24903,78 @@ msgstr ""
 "Vui lòng chờ...\n"
 "Đang quét tìm thiết lập hiện có"
 
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "Đang khởi động bộ nhập thông minh"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "Từ %s:"
 
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "Chọn một thư mục đích để nhập dữ liệu này"
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Nhập"
 
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "Đang đóng kết nối..."
 
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"Lỗi khi '%s':\n"
+"%s"
+
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "Đang đồng bộ thư mục"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "Đang mở thư mục %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "Đang mở thư mục %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "Mở bằng %s..."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"Không thể tạo thư mục đã cho:\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
@@ -23126,6 +24986,12 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "Mới"
+
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
 msgstr "Chưa có tên thư mục."
@@ -23142,88 +25008,94 @@ msgstr "Tên thư mục không thể chứa ký tự '/'"
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' và '..' là hai tên thư mục đặc biệt, được dành riêng."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Không tìm thấy Buf buddy trong $PATH."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "Không thể chạy Bug buddy"
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "Về Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "Đi tới thư mục..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Chọn thư mục bạn muốn mở"
 
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "Tạo lối tắt mới"
 
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Chọn thư mục bạn muốn lối tắt chỉ đến:"
 
-#: shell/e-shell-view-menu.c:577
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:585
-#, c-format
-msgid "Error executing %s."
-msgstr "Lỗi thực hiện %s."
-
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "_Trực tuyến"
 
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "_Ngoại tuyến"
 
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Ngoại tuyến"
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Chưa hiển thị thư mục)"
 
-#: shell/e-shell-view.c:1585
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1587
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(Không)"
 
-#: shell/e-shell-view.c:1634
+#: shell/e-shell-view.c:1867
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr "Ximian Evolution hiện thời đang trực tuyến. Nhấn nút này để chuyển sang ngoại tuyến."
+msgstr ""
+"Ximian Evolution hiện thời đang trực tuyến. Nhấn nút này để chuyển sang "
+"ngoại tuyến."
 
-#: shell/e-shell-view.c:1641
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Volution đang trong tiến trình chuyển sang ngoại tuyến."
 
-#: shell/e-shell-view.c:1647
+#: shell/e-shell-view.c:1880
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr "Ximian Evolution đang ngoại tuyến. Nhấn nút này để chuyển sang trực tuyến."
+msgstr ""
+"Ximian Evolution đang ngoại tuyến. Nhấn nút này để chuyển sang trực tuyến."
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:171
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Lỗi từ hệ thống kích hoạt:\n"
+"%s"
+
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23231,19 +25103,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "Đối số không hợp lệ"
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "Không thể đăng ký với OAF"
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "Không tìm thấy cơ sở dữ liệu cấu hình"
 
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Lỗi chung chung"
 
@@ -23266,168 +25138,160 @@ msgstr "Bạn có thực sự muốn bỏ nhóm `%s' từ thanh Lối tắt?"
 msgid "Don't remove"
 msgstr "Không loại bỏ"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Đổi tên nhóm lối tắt"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Đổi tên nhóm lối tắt đã chọn thành:"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "_Biểu tượng nhỏ"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "Hiện lối tắt trên biểu tượng nhỏ"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "Biểu tượng _lớn"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "Hiện lối tắt trên biểu tượng lớn"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "_Nhóm mới..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "Tạo nhóm lối tắt mới"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "Loại bỏ nhóm này..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "Loại bỏ nhóm lối tắt này"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "Đổi tên nhóm này..."
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "Đổi tên nhóm lối tắt này"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "Ẩn thanh _lối tắt"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "Ẩn Thanh lối tắt"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "Đổi tên lối tắt"
 
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "Đổi tên lối tắt đã chọn thành:"
 
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "Mở thư mục liên kết của lối tắt này"
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "Mở trong cửa sổ mới"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Mở thư mục liên kết của lối tắt này trong cửa sổ mới"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "Đổi tên"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "Đổi tên lối tắt"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "Đổi tên"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Đổi tên lối tắt từ Thanh lối tắt"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Lỗi lưu lối tắt"
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Lối tắt"
 
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Không thể chuyển thư mục:\n"
-"%s"
-
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Không tên)"
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Chico"
 
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Không có lỗi"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "Thư mục cùng tên đã tồn tại"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Kiểu thư mục không hợp lệ"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "Lỗi I/O"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Không đủ chỗ để tạp thư mục"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Thư mục không rỗng"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Không tìm thấy thư mục"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Chức năng này chưa được thực hiện trong kho lưu trữ này"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Chưa hỗ trợ tác vụ"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Kho chứa này chưa hộ trợ kiểu đã cho"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "Thư mục đã cho không thể bị thay đổi hoặc loại bỏ"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Không thể tạo một thư mục con của một trong những descendant của nó"
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "Không thể tạo thư mục với tên đó"
 
@@ -23441,102 +25305,111 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hoàn tất)"
 
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-folder-selector-button.c:86
+msgid "<click here to select a folder>"
+msgstr "<nhấn đây để chọn thư mục>"
+
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Lỗi lạ."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Lỗi từ hệ thống thành phần:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Lỗi từ hệ thống kích hoạt:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "Lỗi CORBA"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "Đã ngắt"
 
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "Đối số không hợp lệ"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "Đã có chủ sở hữu"
 
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "Không có chủ sở hữu"
 
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "Không tìm thấy"
 
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "Kiểu chưa hỗ trợ"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "Lược đồ không hỗ trợ"
 
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "Thao tác chưa hỗ trợ"
 
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "Lỗi nội tại"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "Tồn tại"
 
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "URI sai"
 
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "Có thư mục con"
 
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "Không còn chỗ"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "Chủ sở hữu cũ đã chết"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Lỗi lạ."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Lỗi từ hệ thống thành phần:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Lỗi từ hệ thống kích hoạt:\n"
-"%s"
+#: shell/evolution-test-component.c:49
+#, fuzzy
+msgid "Test type"
+msgstr "Kiểu tập tin:"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -23661,296 +25534,304 @@ msgstr "Đừng hỏi tôi lần nữa"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution có thể nhập dữ liệu từ các tập tin sau:"
 
-#: shell/main.c:83
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:89
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution đang thoát..."
 
-#: shell/main.c:210
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Đừng hỏi tôi lần nữa"
+
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Không thể truy cập Vỏ bọc Ximian Evolution"
 
-#: shell/main.c:219
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Không thể khởi động Vỏ bọc Ximian Evolution: %s"
 
-#: shell/main.c:289
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:290
+#: shell/main.c:438
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "Đang nhập"
+
+#: shell/main.c:439
+#, fuzzy
+msgid "Start in online mode"
+msgstr "Đang khởi động bộ nhập thông minh"
+
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "Gửi thông tin debug của mọi thành phần vào tập tin."
 
-#: shell/main.c:332
+#: shell/main.c:458
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Không thể khởi động hệ thống thành phần Bonobo."
 
+#: tools/evolution-addressbook-abuse.c:80
 #: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Lỗi nạp sổ địa chỉ mặc định."
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr "Tập tin output"
-
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Tập tin input"
 
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr "Tập tin output"
+
 #: tools/evolution-addressbook-import.c:80
 msgid "No filename provided."
 msgstr "Chưa có tên tập tin."
 
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "Sao chép"
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Sao chép thông điệp được chọn sang thư mục khác"
 
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Sao chép vùng chọn"
 
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "C_hép vào thư mục..."
+
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "Tạo liên lạc mới"
 
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "Tạo danh sách liên lạc mới"
 
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "Cắt"
-
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Cắt vùng chọn"
 
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "Xoá liên lạc được chọn"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "Danh sách mới"
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Chuyển thông điệp được chọn tới thư mục khác"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Dán"
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "_Chuyển tới thư mục..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Dán vào clipboard"
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "Xem trước liên lạc cần in"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "In liên lạc được chọn"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "Lưu liên lạc được chọn vào VCard."
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "Chọn tất cả"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "Chọn mọi liên lạc"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "_Gửi thông điệp tới liên lạc..."
-
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "Gửi một thông điệp tới liên lạc được chọn."
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "Gửi thông điệp cho liên lạc"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "Gửi liên lạc được chọn cho người khác"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "Dừng"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "Ngưng nạp"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-addressbook.xml.h:30
+#, fuzzy
+msgid "View the current contact"
+msgstr "thời điểm hiện thời"
+
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "_Hành động"
 
-#: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr "_Nguồn sổ địa chỉ..."
-
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr "_Liên lạc"
-
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "_Danh sách liên lạc"
 
-#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Chuyển tiếp liên lạc..."
 
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "_In..."
-
 #: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "_Chuyển tới thư mục..."
+
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "Lư_u là VCard"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "_Tìm liên lạc"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "Chọn _tất cả"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Cấu hình thiết lập lịch"
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "_Gửi thông điệp tới liên lạc..."
 
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Tạo sự kiện mọi ngày mới"
-
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a New _Task"
-msgstr "Tạo công việc mới"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Tạo cuộc hẹn mới"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "Tạo một sự kiện cho nguyên ngày"
-
-#: ui/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "Ngày"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Xoá cuộc hẹn"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Đi vào"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Đi lùi"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Đi tới"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Đi tới ngày"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Đi tới ngày xác định"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Đi tới ngày hôm nay"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Tháng"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "Cuộc hẹn mới"
-
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr "Công việc mới"
-
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Xem trước lịch cần in"
 
-#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "Xem thử bản in"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "In lịch"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Xem một ngày"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Xem một tháng"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Xem một tuần"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Xem tuần làm việc"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Tuần"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "_Cuộc hẹn..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "_Thiết lập lịch..."
-
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "Công _việc..."
-
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -23967,8 +25848,8 @@ msgstr "Đóng mục này"
 msgid "Delete this item"
 msgstr "Xóa mục này"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Thanh công cụ chính"
 
@@ -23980,18 +25861,18 @@ msgstr "Xem trước mục cần in"
 msgid "Print this item"
 msgstr "In mục này"
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "In..."
-
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "Lưu"
 
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Lưu là..."
+
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Lưu và đóng"
 
@@ -24007,8 +25888,8 @@ msgstr "Lưu mục này vào đĩa"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:36
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Tập tin"
 
@@ -24026,10 +25907,14 @@ msgstr "Lư_u là..."
 msgid "Save the contact and close the dialog box"
 msgstr "Lưu liên lạc và đóng hộp thoại"
 
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "_Gửi thông điệp tới liên lạc..."
+
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Save"
 msgstr "_Lưu"
 
@@ -24069,19 +25954,19 @@ msgstr ""
 msgid "Forward this item via email"
 msgstr "Chuyển tiếp mục này bằng email"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "Lấy thông tin mới nhất về cuộc họp"
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "Cập nhật cuộc họp"
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "Lập lịch _cuộc họp"
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "Lập lịch cuộc họp cho mục này"
 
@@ -24098,82 +25983,54 @@ msgid "Compose _New Message"
 msgstr "Soạn thông điệp mới"
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "Tạo hoặc sửa tài khoản mail và các thông số khác"
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Tạo hoặc sửa các quy tắc lọc thư mới"
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "Tạo hoặc sửa định nghĩa thư mục ảo"
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "Đổ rác"
 
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "Quên mật khẩu"
 
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Quên đi mật khẩu đã nhớ, như vậy bạn sẽ lại được nhắc nhập mật khẩu"
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "Thông điệp mới"
-
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "Mở cửa sổ soạn thư"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Loại bỏ vĩnh viễn những thông điệp đã xóa của mọi thư mục"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "Gửi / Nhận"
-
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "Gửi các thư đang đợi gửi và nhận thư mới"
-
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "Hiện khung xem trước"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Đăng ký hoặc hủy đăng ký thư mục trên server từ xa"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "Bộ hiệu chỉnh thư mục ảo..."
 
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "_Bộ lọc..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "Thông điệp thư"
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "Thiết lập thư..."
-
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "Khung xem thử"
 
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "_Gửi / Nhận"
-
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "Đă_ng ký thư mục..."
 
@@ -24208,7 +26065,8 @@ msgstr "Ẩn thông điệp đã đọc"
 #: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Ẩn thông điệp đã xoá thay vì hiển thị chúng với một đường gạch ngang qua"
+msgstr ""
+"Ẩn thông điệp đã xoá thay vì hiển thị chúng với một đường gạch ngang qua"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
@@ -24266,11 +26124,11 @@ msgstr "Ẩn tạm thời những thông điệp được chọn"
 msgid "Threaded Message list"
 msgstr "Danh sách thông điệp theo nhánh"
 
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_Bỏ"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "_thư mục"
 
@@ -24286,147 +26144,157 @@ msgstr "Thuộc tính..."
 msgid "_Threaded Message List"
 msgstr "Danh sách thông điệp nhánh"
 
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "Thêm người gửi vào sổ địa chỉ"
+
 #: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Áp dụng bộ lọc"
+
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "Thêm người gửi vào sổ địa chỉ"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Áp dụng bộ lọc cho các thông điệp đã chọn"
 
-#: ui/evolution-mail-message.xml.h:3
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Soạn thư trả lời cho mọi người nhận của thông điệp được chọn"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Soạn thư trả lời cho mailing list của thông điệp được chọn"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Soạn thông điệp trả lời cho người gửi thông điệp được chọn"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Sao chép thông điệp được chọn sang thư mục khác"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Tạo thư mục ả_o từ thông điệp"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Tạo bộ lọc thông điệp từ người gửi này"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Tạo bộ lọc thông điệp với những người nhận này"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Tạo bộ lọc thông điệp với mailing list này"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Tạo bộ lọc thông điệp với chủ đề này"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Tạo thư mục ảo cho những người nhận này"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Tạo thư mục ảo cho mailing list này"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Tạo thư mục ảo cho người gửi này"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Tạo thư mục ảo cho chủ đề này"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Giảm cỡ text"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Hiển thị thông điệp quan trọng kế"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Hiển thị thông điệp kế"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Hiển thị thông điệp chưa đó kế tiếp"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Hiển thị nhánh chưa đọc kế tiếp"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Hiển thị thông điệp quan trọng trước đó"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Hiển thị thông điệp trước đó"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Hiển thị thông điệp chưa đọc trước đó"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "Chuyển tiếp"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Lọc mailing _list..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Lọc trên Người _gửi..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Lọc trên _Người nhận..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Lọc trên _Chủ đề..."
 
-#: ui/evolution-mail-message.xml.h:30
-msgid "Force images in HTML mail to be loaded"
-msgstr "Ép ảnh được nạp trong thư HTML"
-
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward"
-msgstr "Chuyển tiếp"
-
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward As"
-msgstr "Chuyển tiếp như là"
-
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Attached"
-msgstr "Chuyển tiếp đính _kèm"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "Đánh dấu xoá cho thông điệp được chọn"
 
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Inline"
-msgstr ""
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "Tên đầ_y đủ..."
 
 #: ui/evolution-mail-message.xml.h:35
-msgid "Forward _Quoted"
-msgstr "Chuyển tiếp _trích dẫn"
+msgid "Force images in HTML mail to be loaded"
+msgstr "Ép ảnh được nạp trong thư HTML"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Chuyển tiếp thông điệp được chọn trong thân thông điệp mới"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Chuyển tiếp thông điệp được chọn như là trả lời thư"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Chuyển tiếp thông điệp được chọn tới người khác"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Chuyển tiếp thông điệp được chọn tới người khác như là đồ đính kèm"
 
@@ -24442,24 +26310,32 @@ msgstr "Nạp ả_nh"
 msgid "Mark as I_mportant"
 msgstr "Đánh dấu _Quan trọng"
 
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Đánh dấu c_hưa đọc"
+
 #: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Đánh dấu _Không quan trọng"
 
 #: ui/evolution-mail-message.xml.h:47
-msgid "Mark the selected messages as having been read"
+#, fuzzy
+msgid "Mark the selected message(s) as having been read"
 msgstr "Đánh dấu đã đọc cho thông điệp được chọn"
 
 #: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as important"
+#, fuzzy
+msgid "Mark the selected message(s) as important"
 msgstr "Đánh dấu quan trọng cho thông điệp được chọn"
 
 #: ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected messages as not having been read"
+#, fuzzy
+msgid "Mark the selected message(s) as not having been read"
 msgstr "Đánh dấu chưa đọc cho thông điệp được chọn"
 
 #: ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as unimportant"
+#, fuzzy
+msgid "Mark the selected message(s) as unimportant"
 msgstr "Đánh dấu không quan trọng cho thông điệp được chọn"
 
 #: ui/evolution-mail-message.xml.h:51
@@ -24471,7 +26347,8 @@ msgid "Move"
 msgstr "Di chuyển"
 
 #: ui/evolution-mail-message.xml.h:53
-msgid "Move selected messages to another folder"
+#, fuzzy
+msgid "Move selected message(s) to another folder"
 msgstr "Chuyển thông điệp được chọn tới thư mục khác"
 
 #: ui/evolution-mail-message.xml.h:54
@@ -24479,64 +26356,63 @@ msgid "Next"
 msgstr "Kế tiếp"
 
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Important Message"
+#, fuzzy
+msgid "Next _Important Message"
 msgstr "Thông điệp quan trọng kế"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Message"
-msgstr "Thông điệp kế"
-
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "Nhánh kế"
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Next Unread Message"
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "Thông điệp chưa đọc kế"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Mở thông điệp được chọn trong cửa sổ mới"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Mở thông điệp được chọn trong bộ soạn thảo và gửi lại"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Kích thước _gốc"
 
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Thông điệp chưa đọc trước"
+
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "Thông điệp quan trọng trước"
+
+#: ui/evolution-mail-message.xml.h:63
 msgid "Preview the message to be printed"
 msgstr "Xem trước thông điệp cần in"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous"
 msgstr "Trước đó"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Important Message"
-msgstr "Thông điệp quan trọng trước"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Message"
-msgstr "Thông điệp trước"
-
-#: ui/evolution-mail-message.xml.h:66
-msgid "Previous Unread Message"
-msgstr "Thông điệp chưa đọc trước"
-
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "In thông điệp"
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply"
-msgstr "Trả lời"
+#: ui/evolution-mail-message.xml.h:68
+#, fuzzy
+msgid "Re_direct"
+msgstr "Woensdrecht"
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "Reply to All"
-msgstr "Trả lời tất cả"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Chuyển tiếp thông điệp được chọn tới người khác"
 
 #: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
@@ -24607,8 +26483,9 @@ msgid "VFolder on _Subject..."
 msgstr "VFolder trên _Chủ đề..."
 
 #: ui/evolution-mail-message.xml.h:92
-msgid "_Apply Filters"
-msgstr "Á_p dụng bộ lọc"
+#, fuzzy
+msgid "_Attached"
+msgstr "Đính kèm"
 
 #: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
@@ -24623,43 +26500,71 @@ msgid "_Forward Message"
 msgstr "Chuyển _tiếp thông điệp"
 
 #: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "Đi vào"
+
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "_Trực tuyến"
+
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Lớn hơn"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "_Hiển thị thông điệp"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Chuyển vào thư mục"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "Thông điệp kế"
+
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "Hiển thị _bình thường"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "_Mở thông điệp"
 
-#: ui/evolution-mail-message.xml.h:106 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Thông điệp trước"
+
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "Quoted"
+
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "_Công cụ"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr ""
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Đóng cửa sổ này"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:33
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "Đón_g"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "_Xem"
 
@@ -24683,11 +26588,11 @@ msgstr "Mã hóa thông điệp này, dùng PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Mã hoá thông điệp này, dùng Chứng nhận Mã hóa S/MIME"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "_Dạng thức"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
 
@@ -24703,6 +26608,10 @@ msgstr "Chèn tập tin text vào thông điệp"
 msgid "Insert text file..."
 msgstr "Chèn tập tin text..."
 
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "Mở"
+
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Mở tập tin"
@@ -24736,7 +26645,7 @@ msgid "Save in folder..."
 msgstr "Lưu vào thư mục..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Lưu tập tin hiện thời"
 
@@ -24761,6 +26670,7 @@ msgid "Send _later"
 msgstr "Gửi _sau"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Gửi thông điệp với dạng thức HTML"
 
@@ -24829,7 +26739,7 @@ msgid "_From Field"
 msgstr "Trường _From (Từ)"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Chèn"
 
@@ -24841,11 +26751,7 @@ msgstr "_Mở..."
 msgid "_Reply-To Field"
 msgstr "Trường _Reply-To (Trả lời)"
 
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "_Bảo mật"
-
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Trợ _giúp"
 
@@ -24901,33 +26807,41 @@ msgstr "Lấy thông tin về công việc mới nhất"
 msgid "Re_fresh Task"
 msgstr "Cậ_p nhật công việc"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Cấu hình thiết lập khung công việc"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Sao chép công việc được chọn"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Cắt công việc được chọn"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "Xoá công việc được chọn"
+
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Xoá công việc được chọn"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "Đánh dấu _hoàn tất"
+
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Dán công việc từ clipboard"
 
-#: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings..."
-msgstr "Thiết lập công việc..."
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "Xem trước liên lạc cần in"
 
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
-msgstr "Nhiệm _vụ"
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "In thông điệp"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -24986,121 +26900,135 @@ msgid "Move this folder to another place"
 msgstr "Di chuyển thư mục này tới nơi khác"
 
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "Tạo thư mục mớ_i..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "Mở trong cửa sổ mới"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "Mở thư mục này trong cửa sổ khác"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
+msgid "Send / Receive"
+msgstr "Gửi / Nhận"
+
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "Gửi các thư đang đợi gửi và nhận thư mới"
+
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "Hiện thông tin về Ximian Evolution"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Gửi báo cáo lỗi"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "_Gửi báo cáo lỗi"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "Bật tắt"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "Bật tắt hiện thanh thư mục"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Bật tắt hiện thanh lối tắt"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "Bật tắt hoạt động ngoại tuyến"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "Xem thư mục được chọn"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "_Giới thiệu Ximian Evolution..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "_Sao chép..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "Thanh Thư _mục"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "Đ_i tới thư mục..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "_Nhập..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "_Di chuyển..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "Mớ_i"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "Thư mục mớ_i"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr ""
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "Đổi _tên..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:53
+msgid "_Send / Receive"
+msgstr "_Gửi / Nhận"
+
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "_Lối tắt"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "Thanh _lối tắt"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Thay đổi thiết lập của tóm tắt"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "In tóm tắt"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Nạp lại"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Nạp lại khung xem"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "Thiết lập _tóm tắt..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Card địa chỉ"
@@ -25114,18 +27042,27 @@ msgid "Phone List"
 msgstr "Danh sách điện thoại"
 
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "Chọn thư mục"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "Theo người gửi"
 
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "Theo trạng thái"
 
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "Theo chủ đề"
 
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "Thông điệp"
 
@@ -25158,11 +27095,21 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "_Khung xem hiện thời"
 
-#: widgets/menus/gal-view-menus.c:222
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:357
+#, fuzzy
+msgid "Custom View"
+msgstr "_Khung xem hiện thời"
+
+#: widgets/menus/gal-view-menus.c:366
+msgid "Save Custom View"
+msgstr ""
+
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "Định nghĩa khung xem"
 
@@ -25194,76 +27141,81 @@ msgstr "Thời gian phải theo dạng thức: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Giá trị phần trăm phải nằm giữa 0 và 100."
 
-#: widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "Trung Âu"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "Trung Hoa"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "Hy Lạp"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
+msgid "Hebrew"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
 msgid "Japanese"
 msgstr "Nhật Bản"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Korean"
 msgstr "Hàn Quốc"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Thổ Nhĩ Kỳ"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Tây Âu"
 
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 msgid "Traditional"
 msgstr "Truyền thống"
 
-#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
 msgid "Simplified"
 msgstr "Đơn giản"
 
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:92
 msgid "Ukrainian"
 msgstr "Ucraina"
 
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "Mới"
+#: widgets/misc/e-charset-picker.c:95
+#, fuzzy
+msgid "Visual"
+msgstr "Visalia"
 
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Bộ mã lạ: %s"
 
-#: widgets/misc/e-charset-picker.c:201
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Nhập vào bộ mã cần dùng"
 
-#: widgets/misc/e-charset-picker.c:276
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Khác..."
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Bộ mã"
 
@@ -25271,25 +27223,28 @@ msgstr "Bộ mã"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "Bộ biên soạn tìm kiếm"
 
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "Lưu tìm kiếm"
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "Thêm vào Những tìm kiếm được lưu"
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Lưu tìm kiếm"
 
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Xóa"
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Thêm vào Những tìm kiếm được lưu"
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Hiện tất cả"
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Nâng cao..."
 
 #: widgets/misc/e-messagebox.c:152
 msgid "Information"
@@ -25312,11 +27267,21 @@ msgstr "Thông báo"
 msgid "Don't show this message again."
 msgstr "Đừng hiện thông báo này lần nữa."
 
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "Tì_m"
+#: widgets/misc/e-search-bar.c:512
+#, fuzzy
+msgid "_Find Now"
+msgstr "Tìm ngay"
+
+#: widgets/misc/e-search-bar.c:513
+#, fuzzy
+msgid "_Clear"
+msgstr "Xóa"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:875
+msgid "Clear"
+msgstr "Xóa"
+
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "Tìm ngay"
 
@@ -25341,3 +27306,675 @@ msgstr "init_corba(): không thể khởi động GNOME"
 #: wombat/wombat.c:225
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): không thể khởi động Bonobo"
+
+#~ msgid "Card: "
+#~ msgstr "Card: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "Tên: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Tiếp đầu ngữ:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Bổ sung: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Gia đình:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Tiếp vĩ ngữ:    "
+
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "Ngày sinh: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "Địa chỉ:"
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Hộp thư bưu điện:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Đường:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  Thành phố:        "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  Vùng:      "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Mã bưu điện: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  Quốc gia:     "
+
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "Nhãn gửi: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Điện thoại:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "Điện thoại:"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "E-mail:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "E-mail:"
+
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "Múi giờ: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Geo Location: "
+#~ msgstr ""
+#~ "\n"
+#~ "Vị trí địa lý: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "Chức vụ kinh doanh: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "Tổ chức: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Tên:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  Đơn vị:  "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Đơn vị 2: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Đơn vị 3: "
+
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "  Đơn vị 4: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "Phân loại: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "Ghi chú: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "Chuỗi duy nhất: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "Khoá chung: "
+
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Đang kết nối tới LDAP Server..."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Đang đợi kết nối tới LDAP server..."
+
+#~ msgid "New _Contact"
+#~ msgstr "Liên lạc mớ_i"
+
+#~ msgid "New Contact _List"
+#~ msgstr "_Danh sách liên lạc mới"
+
+#~ msgid "Edit Addressbook"
+#~ msgstr "Sửa Sổ địa chỉ"
+
+#~ msgid "Account Name"
+#~ msgstr "Tên tài khoản"
+
+#~ msgid "Add Addressbook"
+#~ msgstr "Têm sổ địa chỉ"
+
+#~ msgid "Advanced"
+#~ msgstr "Nâng cao"
+
+#~ msgid "Base"
+#~ msgstr "Cơ sở"
+
+#~ msgid "Server Name"
+#~ msgstr "Tên server"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "Thông tin dưới đây được yêu cầu để có thể thêm vào sổ địa chỉ."
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "Thông tin này không cần thiết cho hầu hết các LDAP server."
+
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "Thông tin này được dùng bởi LDAP server của bạn để xác định nút nào được "
+#~ "dùng khi tìm kiếm. Liên hệ quản trị server để biết thêm thông tin chi "
+#~ "tiết."
+
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
+#~ msgstr ""
+#~ "Đây là nút cơ sở cho mọi tìm kiếm trên LDAP server. Liên hệ với quản trị "
+#~ "server để biết thêm thông tin chi tiết."
+
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "Đây là tên của server, nơi đặt cuốn sổ địa chỉ của bạn."
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "Đây là cổng mà LDAP server của bạn đang dùng."
+
+#~ msgid "_My server requires authentication"
+#~ msgstr "Server của tôi yêu cầu _xác nhận"
+
+#~ msgid "Name contains"
+#~ msgstr "Tên chứa"
+
+#~ msgid "C_ontaining:"
+#~ msgstr "_Chứa:"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "_Liên lạc:"
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "Hiện liên lạc khớp với tiêu chuẩn sau:"
+
+#~ msgid "_Message Recipients:"
+#~ msgstr "Người _nhận:"
+
+#~ msgid "British Virgin Islands"
+#~ msgstr "Đảo British Virgin"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Tạo cuộc hẹn mới"
+
+#~ msgid "Create a new task"
+#~ msgstr "Tạo công việc mới"
+
+#~ msgid "New _Task"
+#~ msgstr "Nhiệm _vụ mới"
+
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "Tạo cuộc hẹn mới với bộ _nhắc nhở mặc định"
+
+#~ msgid "First day of wee_k:"
+#~ msgstr "Ngày đầu của tuần:"
+
+#~ msgid "Sta_rt of day:"
+#~ msgstr "Đầ_u ngày:"
+
+#~ msgid "_End of day:"
+#~ msgstr "_Cuối ngày:"
+
+#~ msgid "_Other"
+#~ msgstr "_Khác"
+
+#~ msgid "_Other Organizer"
+#~ msgstr "Tổ chức _khác"
+
+#~ msgid "The journal entry has changed. Send an updated version?"
+#~ msgstr "Mục nhật ký đã thay đổi. Gửi bản cập nhật?"
+
+#~ msgid "_Delete this Task"
+#~ msgstr "_Xóa công việc này"
+
+#~ msgid "Unable to find any of your identities in the attendees list!\n"
+#~ msgstr ""
+#~ "Không thể tìm thấy định danh của bạn trong danh sách người tham dự!\n"
+
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "Thông tin rảnh/bận (%s tới %s)"
+
+#~ msgid "iCalendar information"
+#~ msgstr "Thông tin iCalendar"
+
+#~ msgid "Invalid type in body-contains, expecting string"
+#~ msgstr "Kiểu không hợp lệ trong body-contains, lẽ ra phải là chuỗi"
+
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "Vui lòng nhập passphrase %s của bạn cho %s"
+
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "Vui lòng nhập passphrase %s của bạn"
+
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "Không thể ký tên vào thông điệp: không có văn bản thô nào để ký"
+
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "Không thể ký tên vào thông điệp: chưa cung cấp mật khẩu"
+
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Không thể ký tên vào thông điệp: không thể tạo ỗng dẫn tới GPG/PGP: %s"
+
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "Không thể xác minh thông điệp: không có văn bản thô nào để xác minh"
+
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr ""
+#~ "Không thể xác minh thông điệp: không thể tạo ống dẫn tới GPG/PGP: %s"
+
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "Không thể mã hóa thông điệp: không có văn bản thô nào để mã hóa"
+
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "Không thể mã hóa thông điệp: chưa cung cấp mật khẩu"
+
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Không thể mã hóa thông điệp: không thể tạo ống dẫn tới GPG/PGP: %s"
+
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "Không thể giải mã thông điệp: không có đoạn mã cần giải mã"
+
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "Không thể giải mã thông điệp: chưa cung cấp mật khẩu"
+
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "Không thể giải mã thông điệp: không thể tạo ống dẫn tới GPG/PGP: %s"
+
+#~ msgid "This is an encrypted message part"
+#~ msgstr "Đây là phần thông điệp đã mã hóa"
+
+#~ msgid "%s server %s"
+#~ msgstr "%s server %s"
+
+#~ msgid "(unknown host)"
+#~ msgstr "(máy chủ lạ)"
+
+#~ msgid "NT Login"
+#~ msgstr "Đăng nhập NT"
+
+#~ msgid ""
+#~ "EMail: %s\n"
+#~ "Common Name: %s\n"
+#~ "Organization Unit: %s\n"
+#~ "Organization: %s\n"
+#~ "Locality: %s\n"
+#~ "State: %s\n"
+#~ "Country: %s"
+#~ msgstr ""
+#~ "EMail: %s\n"
+#~ "Tên thường gọi: %s\n"
+#~ "Đơn vị tổ chứa: %s\n"
+#~ "Tổ chức: %s\n"
+#~ "Locality: %s\n"
+#~ "Tỉnh: %s\n"
+#~ "Quốc gia: %s"
+
+#~ msgid "No such message: %s"
+#~ msgstr "Không có thông điệp: %s"
+
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "Bạn không thể sao chép các thông điệp từ thư mục Thùng rác."
+
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "Không thể nối thông điệp vào tập tin spool: %s: %s"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Vui lòng nhập mật khẩu NNTP cho %s@%s"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Server từ chối tên người dùng"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Lỗi gửi tên người dùng cho server"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Server từ chối tên người dùng/mật khẩu"
+
+#~ msgid "Message %s not found."
+#~ msgstr "Không tìm thấy thông điệp %s."
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Không thể lấy danh sách nhóm từ server."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Không thể nạp tập tin danh sách nhóm cho %s: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Không thể lưu tập tin danh sách nhóm cho %s: %s"
+
+#~ msgid "Could not open directory for news server: %s"
+#~ msgstr "Không thể mở thư mục cho news server: %s"
+
+#~ msgid "Unable to open or create .newsrc file for %s: %s"
+#~ msgstr "Không thể mở hoặc tạo tập tin .newsrc cho %s: %s"
+
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr "Không thể mở thư mục: danh sách thông điệp chưa hoàn chỉnh."
+
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "Không thể lấy thông điệp: %s"
+
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ msgstr "Không thể nhận thông điệp từ POP server %s: %s"
+
+#~ msgid ""
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
+#~ msgstr ""
+#~ "Việc này sẽ kết nối tới POP server và dùng Kerberos 4 để chứng thực."
+
+#~ msgid "Could not authenticate to KPOP server: %s"
+#~ msgstr "Không thể chứng thực KPOP server: %s"
+
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "Không thể kết nối tới server: %s"
+
+#~ msgid "(Unknown)"
+#~ msgstr "(Không biết)"
+
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "Không thể tìm thấy địa chỉ 'Từ' trong thông điệp."
+
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "Không thể gửi thông điệp: chưa có địa chỉ người gửi."
+
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "Lỗi yêu cầu RCPT TO: %s: chưa gửi mail"
+
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "Lỗi yêu cầu DATA: %s: chưa gửi mail"
+
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr "Lỗi trả lời DATA: chấm dứt thông điệp: %s: chưa gửi mail"
+
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "Lỗi trả lời QUIT: %s: không nghiêm trọng"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "Nhập URI của thư mục"
+
+#~ msgid "Message was received"
+#~ msgstr "Đã nhận thông điệp"
+
+#~ msgid "Message was sent"
+#~ msgstr "Đã gửi thông điệp"
+
+#~ msgid "on or after"
+#~ msgstr "bây giờ hoặc sau"
+
+#~ msgid "on or before"
+#~ msgstr "bây giờ hoặc trước"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Thư mục lưu trữ thư (nội tại)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Không thể kết nối tới kho: %s"
+
+#~ msgid "New _Mail Message"
+#~ msgstr "Thông điệp thư _mới"
+
+#~ msgid "Create vFolder from Search"
+#~ msgstr "Tạo vFolder từ bộ tìm kiếm"
+
+#~ msgid "Mark as Unim_portant"
+#~ msgstr "Đánh dấu khôn_g quan trọng"
+
+#~ msgid "Mailbox Format"
+#~ msgstr "Dạng thức hộp thư"
+
+#~ msgid "This message contains invalid recipients:"
+#~ msgstr "Thông điệp chứa người nhận không hợp lệ:"
+
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: thư mục nhận"
+
+#~ msgid "Account"
+#~ msgstr "Tài khoản"
+
+#~ msgid "Always _encrypt to myself when sending encrypted mail"
+#~ msgstr "Luôn _tự mã hóa khi gửi thư được mã hóa"
+
+#~ msgid "Composer"
+#~ msgstr "Bộ soạn thư"
+
+#~ msgid "Default Forward style is: "
+#~ msgstr "Kiểu chuyển tiếp mặc định là: "
+
+#~ msgid "Edit..."
+#~ msgstr "Sửa..."
+
+#~ msgid "News"
+#~ msgstr "Tin tức"
+
+#~ msgid "Select Filter Log file..."
+#~ msgstr "Chọn tập tin log bộ lọc..."
+
+#~ msgid "Sources"
+#~ msgstr "Nguồn"
+
+#~ msgid "_Email Address:"
+#~ msgstr "Địa chỉ _email:"
+
+#~ msgid "_Organization:"
+#~ msgstr "_Tổ chức:"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Nhớ mật khẩu này"
+
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "_Gửi thư mặc định dùng dạng HTML"
+
+#~ msgid "_Server Type: "
+#~ msgstr "_Kiểu server: "
+
+#~ msgid "placeholder"
+#~ msgstr "giữ chỗ"
+
+#~ msgid "seconds."
+#~ msgstr "giây"
+
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "Evolution không công nhận loại thông điệp được ký này."
+
+#~ msgid "Moving"
+#~ msgstr "Đang di chuyển"
+
+#~ msgid "Copying"
+#~ msgstr "Đang sao chép"
+
+#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#~ msgstr "<dd><b>Không thể liên lạc với server thời tiết</b></dd>"
+
+#~ msgid "Regions"
+#~ msgstr "Vùng"
+
+#~ msgid "All _folders:"
+#~ msgstr "Mọi t_hư mục:"
+
+#~ msgid "_Display folders:"
+#~ msgstr "_Hiển thị thư mục:"
+
+#~ msgid "Riga"
+#~ msgstr "Riga"
+
+#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+#~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
+
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "Bạn có chắc muốn gỡ bỏ thư mục %s?"
+
+#~ msgid "(No name)"
+#~ msgstr "(Không tên)"
+
+#~ msgid "New List"
+#~ msgstr "Danh sách mới"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Cấu hình thiết lập lịch"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Tạo sự kiện mọi ngày mới"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Tạo công việc mới"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Tạo cuộc hẹn mới"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Tạo một sự kiện cho nguyên ngày"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Cuộc hẹn..."
+
+#~ msgid "_Calendar Settings..."
+#~ msgstr "_Thiết lập lịch..."
+
+#~ msgid "_Task..."
+#~ msgstr "Công _việc..."
+
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "Tạo hoặc sửa tài khoản mail và các thông số khác"
+
+#~ msgid "New Message"
+#~ msgstr "Thông điệp mới"
+
+#~ msgid "Forward _Attached"
+#~ msgstr "Chuyển tiếp đính _kèm"
+
+#~ msgid "Forward _Quoted"
+#~ msgstr "Chuyển tiếp _trích dẫn"
+
+#~ msgid "_Apply Filters"
+#~ msgstr "Á_p dụng bộ lọc"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Cấu hình thiết lập khung công việc"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Thiết lập công việc..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Thay đổi thiết lập của tóm tắt"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "Thiết lập _tóm tắt..."
+
+#~ msgid "Show All"
+#~ msgstr "Hiện tất cả"
+
+#~ msgid "Sear_ch"
+#~ msgstr "Tì_m"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 24d9131492..4ed4818e18 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-02-04 22:42+0800\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2002-02-04 22:51+0800\n"
 "Last-Translator: Wang Li <charlesw1234@163.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -47,14 +47,15 @@ msgstr "将 VCard 文件导入 Evolution"
 # addressbook/backend/ebook/e-card-simple.c:60
 # addressbook/gui/widgets/e-addressbook-view.c:960
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:960
+#: addressbook/gui/widgets/e-addressbook-view.c:335
 msgid "File As"
 msgstr ""
 
 # addressbook/backend/ebook/e-card-simple.c:61
 # addressbook/backend/ebook/e-card-simple.c:61
 # addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "名称"
 
@@ -65,7 +66,7 @@ msgstr "名称"
 # addressbook/backend/ebook/e-card-simple.c:62
 # addressbook/gui/widgets/e-addressbook-view.c:962
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:962
+#: addressbook/gui/widgets/e-addressbook-view.c:337
 msgid "Email"
 msgstr "电子邮件"
 
@@ -76,7 +77,7 @@ msgstr "电子邮件"
 # addressbook/backend/ebook/e-card-simple.c:63
 # addressbook/gui/contact-editor/e-contact-editor.c:1659
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "主要"
 
@@ -101,8 +102,8 @@ msgstr "主要"
 # addressbook/gui/widgets/e-addressbook-view.c:994
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
-#: addressbook/gui/widgets/e-addressbook-view.c:994
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "助手"
 
@@ -124,8 +125,8 @@ msgstr "助手"
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "商务"
 
@@ -147,7 +148,7 @@ msgstr "商务"
 # addressbook/backend/ebook/e-card-simple.c:66
 # addressbook/gui/contact-editor/e-contact-editor.c:1648
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "反馈"
 
@@ -158,7 +159,7 @@ msgstr "反馈"
 # addressbook/backend/ebook/e-card-simple.c:67
 # addressbook/gui/contact-editor/e-contact-editor.c:1650
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "公司"
 
@@ -187,8 +188,8 @@ msgstr "公司"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "家庭"
 
@@ -199,7 +200,7 @@ msgstr "家庭"
 # addressbook/backend/ebook/e-card-simple.c:69
 # addressbook/gui/widgets/e-addressbook-view.c:969
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:969
+#: addressbook/gui/widgets/e-addressbook-view.c:344
 msgid "Organization"
 msgstr "组织"
 
@@ -221,7 +222,7 @@ msgstr "组织"
 # addressbook/gui/contact-editor/e-contact-editor.c:1655
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "手机"
 
@@ -232,7 +233,7 @@ msgstr "手机"
 # addressbook/backend/ebook/e-card-simple.c:73
 # addressbook/gui/contact-editor/e-contact-editor.c:1649
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "汽车"
 
@@ -250,8 +251,8 @@ msgstr "汽车"
 # addressbook/gui/widgets/e-addressbook-view.c:974
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
-#: addressbook/gui/widgets/e-addressbook-view.c:974
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "商务传真"
 
@@ -272,8 +273,8 @@ msgstr "商务传真"
 # addressbook/gui/contact-editor/e-contact-editor.c:1653
 # addressbook/gui/widgets/e-addressbook-view.c:975
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
-#: addressbook/gui/widgets/e-addressbook-view.c:975
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "家庭传真"
 
@@ -284,7 +285,7 @@ msgstr "家庭传真"
 # addressbook/backend/ebook/e-card-simple.c:76
 # addressbook/gui/contact-editor/e-contact-editor.c:1646
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "商务 2"
 
@@ -302,7 +303,7 @@ msgstr "商务 2"
 # addressbook/backend/ebook/e-card-simple.c:77
 # addressbook/gui/contact-editor/e-contact-editor.c:1652
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "家庭 2"
 
@@ -316,8 +317,8 @@ msgstr "家庭 2"
 # addressbook/gui/contact-editor/e-contact-editor.c:1654
 # addressbook/gui/widgets/e-addressbook-view.c:978
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
-#: addressbook/gui/widgets/e-addressbook-view.c:978
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -338,9 +339,8 @@ msgstr "ISDN"
 # mail/mail-config.glade.h:57
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
-#: mail/mail-config.glade.h:58
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "其它"
 
@@ -354,8 +354,8 @@ msgstr "其它"
 # addressbook/gui/contact-editor/e-contact-editor.c:1657
 # addressbook/gui/widgets/e-addressbook-view.c:980
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
-#: addressbook/gui/widgets/e-addressbook-view.c:980
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "其它传真"
 
@@ -369,8 +369,8 @@ msgstr "其它传真"
 # addressbook/gui/contact-editor/e-contact-editor.c:1658
 # addressbook/gui/widgets/e-addressbook-view.c:981
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
-#: addressbook/gui/widgets/e-addressbook-view.c:981
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "传呼机"
 
@@ -384,8 +384,8 @@ msgstr "传呼机"
 # addressbook/gui/contact-editor/e-contact-editor.c:1660
 # addressbook/gui/widgets/e-addressbook-view.c:982
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
-#: addressbook/gui/widgets/e-addressbook-view.c:982
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "收音机"
 
@@ -399,8 +399,8 @@ msgstr "收音机"
 # addressbook/gui/contact-editor/e-contact-editor.c:1661
 # addressbook/gui/widgets/e-addressbook-view.c:983
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
-#: addressbook/gui/widgets/e-addressbook-view.c:983
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "电传"
 
@@ -411,7 +411,7 @@ msgstr "电传"
 # addressbook/backend/ebook/e-card-simple.c:84
 # addressbook/gui/widgets/e-addressbook-view.c:984
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:984
+#: addressbook/gui/widgets/e-addressbook-view.c:359
 msgid "TTY"
 msgstr "TTY"
 
@@ -429,8 +429,8 @@ msgstr "TTY"
 # addressbook/gui/widgets/e-addressbook-view.c:986
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
-#: addressbook/gui/widgets/e-addressbook-view.c:986
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
+#: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "电子邮件 2"
 
@@ -448,8 +448,8 @@ msgstr "电子邮件 2"
 # addressbook/gui/widgets/e-addressbook-view.c:987
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
-#: addressbook/gui/widgets/e-addressbook-view.c:987
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "电子邮件 3"
 
@@ -460,7 +460,7 @@ msgstr "电子邮件 3"
 # addressbook/backend/ebook/e-card-simple.c:88
 # addressbook/gui/widgets/e-addressbook-view.c:988
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:988
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Web Site"
 msgstr "网站"
 
@@ -478,7 +478,7 @@ msgstr "Url"
 # addressbook/backend/ebook/e-card-simple.c:89
 # addressbook/gui/widgets/e-addressbook-view.c:989
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:989
+#: addressbook/gui/widgets/e-addressbook-view.c:364
 msgid "Department"
 msgstr "部门"
 
@@ -496,7 +496,7 @@ msgstr "部门"
 # addressbook/backend/ebook/e-card-simple.c:90
 # addressbook/gui/widgets/e-addressbook-view.c:990
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:990
+#: addressbook/gui/widgets/e-addressbook-view.c:365
 msgid "Office"
 msgstr "办公室"
 
@@ -514,7 +514,7 @@ msgstr "办公室"
 # addressbook/backend/ebook/e-card-simple.c:91
 # addressbook/gui/widgets/e-addressbook-view.c:991
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:991
+#: addressbook/gui/widgets/e-addressbook-view.c:366
 msgid "Title"
 msgstr "头衔"
 
@@ -525,7 +525,7 @@ msgstr "头衔"
 # addressbook/backend/ebook/e-card-simple.c:92
 # addressbook/gui/widgets/e-addressbook-view.c:992
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:992
+#: addressbook/gui/widgets/e-addressbook-view.c:367
 msgid "Profession"
 msgstr "职业"
 
@@ -543,7 +543,7 @@ msgstr "职业"
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/gui/widgets/e-addressbook-view.c:993
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:993
+#: addressbook/gui/widgets/e-addressbook-view.c:368
 msgid "Manager"
 msgstr "经理"
 
@@ -568,7 +568,7 @@ msgstr "助手"
 # addressbook/backend/ebook/e-card-simple.c:95
 # addressbook/gui/widgets/e-addressbook-view.c:995
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:995
+#: addressbook/gui/widgets/e-addressbook-view.c:370
 msgid "Nickname"
 msgstr "绰号"
 
@@ -586,7 +586,7 @@ msgstr "绰号"
 # addressbook/backend/ebook/e-card-simple.c:96
 # addressbook/gui/widgets/e-addressbook-view.c:996
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:996
+#: addressbook/gui/widgets/e-addressbook-view.c:371
 msgid "Spouse"
 msgstr "配偶"
 
@@ -597,7 +597,7 @@ msgstr "配偶"
 # addressbook/backend/ebook/e-card-simple.c:97
 # addressbook/gui/widgets/e-addressbook-view.c:997
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:997
+#: addressbook/gui/widgets/e-addressbook-view.c:372
 msgid "Note"
 msgstr "注释"
 
@@ -622,7 +622,7 @@ msgstr "日历 URI"
 # addressbook/backend/ebook/e-card-simple.c:99
 # addressbook/gui/widgets/e-addressbook-view.c:998
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:998
+#: addressbook/gui/widgets/e-addressbook-view.c:373
 msgid "Free-busy URL"
 msgstr "忙闲 URL"
 
@@ -683,14 +683,14 @@ msgstr "%x"
 # addressbook/backend/ebook/e-card.c:4235
 # addressbook/backend/ebook/e-card.c:4235
 # addressbook/backend/ebook/e-card.c:4235
-#: addressbook/backend/ebook/e-card.c:2677
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "多个 VCard"
 
 # addressbook/backend/ebook/e-card.c:4243
 # addressbook/backend/ebook/e-card.c:4243
 # addressbook/backend/ebook/e-card.c:4243
-#: addressbook/backend/ebook/e-card.c:2685
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "%s 的 VCard"
@@ -733,11 +733,11 @@ msgstr "%s 的 VCard"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1721
+#: addressbook/conduit/address-conduit.c:1860
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
-#: calendar/conduits/todo/todo-conduit.c:1316
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/conduits/todo/todo-conduit.c:1385
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -750,15 +750,15 @@ msgstr "无法初始化 Bonobo"
 # addressbook/backend/pas/pas-backend-ldap.c:2269
 # addressbook/backend/pas/pas-backend-file.c:259
 # addressbook/backend/pas/pas-backend-ldap.c:2272
-#: addressbook/backend/pas/pas-backend-file.c:260
-#: addressbook/backend/pas/pas-backend-ldap.c:2272
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 msgid "Searching..."
 msgstr "搜索..."
 
 # addressbook/backend/pas/pas-backend-file.c:261
 # addressbook/backend/pas/pas-backend-file.c:261
 # addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-file.c:262
+#: addressbook/backend/pas/pas-backend-file.c:263
 msgid "Loading..."
 msgstr "装入..."
 
@@ -766,77 +766,83 @@ msgstr "装入..."
 # addressbook/backend/pas/pas-backend-file.c:270
 # addressbook/backend/pas/pas-backend-file.c:270
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:271
+#: addressbook/backend/pas/pas-backend-file.c:272
 msgid "Error in search expression."
 msgstr "搜索表达式错误。"
 
-# addressbook/backend/pas/pas-backend-ldap.c:483
-# addressbook/backend/pas/pas-backend-ldap.c:483
-# addressbook/backend/pas/pas-backend-ldap.c:486
-#: addressbook/backend/pas/pas-backend-ldap.c:486
-msgid "Connecting to LDAP server..."
-msgstr "正在连接 LDAP 服务器..."
-
-# addressbook/backend/pas/pas-backend-ldap.c:493
-# addressbook/backend/pas/pas-backend-ldap.c:493
-# addressbook/backend/pas/pas-backend-ldap.c:496
-#: addressbook/backend/pas/pas-backend-ldap.c:496
-msgid "Unable to connect to LDAP server."
-msgstr "无法连接 LDAP 服务器。"
-
-# addressbook/backend/pas/pas-backend-ldap.c:509
-# addressbook/backend/pas/pas-backend-ldap.c:509
-# addressbook/backend/pas/pas-backend-ldap.c:512
-#: addressbook/backend/pas/pas-backend-ldap.c:512
-msgid "Waiting for connection to LDAP server..."
-msgstr "正在等待与 LDAP 服务器的连接..."
-
 # addressbook/backend/pas/pas-backend-ldap.c:912
 # addressbook/backend/pas/pas-backend-ldap.c:912
 # addressbook/backend/pas/pas-backend-ldap.c:915
-#: addressbook/backend/pas/pas-backend-ldap.c:915
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 msgid "Adding card to LDAP server..."
 msgstr "正在将卡片添加到 LDAP 服务器..."
 
 # addressbook/backend/pas/pas-backend-ldap.c:1013
 # addressbook/backend/pas/pas-backend-ldap.c:1013
 # addressbook/backend/pas/pas-backend-ldap.c:1016
-#: addressbook/backend/pas/pas-backend-ldap.c:1016
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 msgid "Removing card from LDAP server..."
 msgstr "正在从 LDAP 服务器删除卡片..."
 
 # addressbook/backend/pas/pas-backend-ldap.c:1123
 # addressbook/backend/pas/pas-backend-ldap.c:1123
 # addressbook/backend/pas/pas-backend-ldap.c:1126
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr "正在修改 LDAP 服务器上的卡片..."
 
+# addressbook/backend/pas/pas-backend-ldap.c:2219
+# addressbook/backend/pas/pas-backend-ldap.c:2219
+# addressbook/backend/pas/pas-backend-ldap.c:2222
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
+msgid "Restarting search."
+msgstr "开始搜索，"
+
 # addressbook/backend/pas/pas-backend-ldap.c:2214
 # addressbook/backend/pas/pas-backend-ldap.c:2214
 # addressbook/backend/pas/pas-backend-ldap.c:2217
-#: addressbook/backend/pas/pas-backend-ldap.c:2217
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
 msgid "Receiving LDAP search results..."
 msgstr "正在接收 LDAP 的搜索结果..."
 
-# addressbook/backend/pas/pas-backend-ldap.c:2219
-# addressbook/backend/pas/pas-backend-ldap.c:2219
-# addressbook/backend/pas/pas-backend-ldap.c:2222
-#: addressbook/backend/pas/pas-backend-ldap.c:2222
-msgid "Restarting search."
-msgstr "开始搜索，"
+# addressbook/gui/widgets/e-addressbook-util.c:95
+# addressbook/gui/widgets/e-addressbook-view.c:1278
+# addressbook/gui/widgets/e-addressbook-util.c:95
+# addressbook/gui/widgets/e-addressbook-view.c:1278
+# addressbook/gui/widgets/e-addressbook-util.c:95
+# addressbook/gui/widgets/e-addressbook-view.c:1389
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#, fuzzy
+msgid "Error performing search"
+msgstr "删除卡片错误"
+
+# camel/camel-url.c:288
+# camel/camel-url.c:288
+# camel/camel-url.c:288
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "无法解析 URL “%s”"
+
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:108
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "电子邮件地址(_E)："
 
 # addressbook/conduit/address-conduit.c:294
 # addressbook/conduit/address-conduit.c:294
 # addressbook/conduit/address-conduit.c:426
-#: addressbook/conduit/address-conduit.c:426
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "无法装入光标\n"
 
 # addressbook/conduit/address-conduit.c:307
 # addressbook/conduit/address-conduit.c:307
 # addressbook/conduit/address-conduit.c:439
-#: addressbook/conduit/address-conduit.c:439
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "没有装入 EBook\n"
 
@@ -849,9 +855,9 @@ msgstr "没有装入 EBook\n"
 # addressbook/conduit/address-conduit.c:1220
 # calendar/conduits/calendar/calendar-conduit.c:1203
 # calendar/conduits/todo/todo-conduit.c:824
-#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1354
 #: calendar/conduits/calendar/calendar-conduit.c:1203
-#: calendar/conduits/todo/todo-conduit.c:824
+#: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "无法启动 wombat 服务器"
 
@@ -864,9 +870,9 @@ msgstr "无法启动 wombat 服务器"
 # addressbook/conduit/address-conduit.c:1221
 # calendar/conduits/calendar/calendar-conduit.c:1204
 # calendar/conduits/todo/todo-conduit.c:825
-#: addressbook/conduit/address-conduit.c:1221
+#: addressbook/conduit/address-conduit.c:1355
 #: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:825
+#: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "无法启动 wombat"
 
@@ -876,8 +882,8 @@ msgstr "无法启动 wombat"
 # addressbook/conduit/address-conduit.c:1128
 # addressbook/conduit/address-conduit.c:1251
 # addressbook/conduit/address-conduit.c:1254
-#: addressbook/conduit/address-conduit.c:1251
-#: addressbook/conduit/address-conduit.c:1254
+#: addressbook/conduit/address-conduit.c:1385
+#: addressbook/conduit/address-conduit.c:1388
 msgid "Could not read pilot's Address application block"
 msgstr "无法读入 Pilot 的地址应用程序块"
 
@@ -900,59 +906,74 @@ msgstr "用于显示一条地址的 Bonobo 控制。"
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
 # notes/GNOME_Evolution_Notes.oaf.in.h:1
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-#: notes/GNOME_Evolution_Notes.oaf.in.h:1
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "显示地址簿的 Bonobo 控制示例。"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Configuration control for the Evolution Addressbook Storages."
+msgstr ""
+
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "显示 Evolution 地址簿小卡片的控制。"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Directory Servers"
+msgstr ""
+
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution 地址簿小卡片显示器"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "处理联系人的 Evolution 成员。"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "地址簿小卡片控制车间"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "地址簿地址显示器车间"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "地址簿地址对话框车间"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "示例地址簿控制车间"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
 # addressbook/gui/component/addressbook-component.c:71
 # calendar/gui/dialogs/comp-editor-util.c:310
 # calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
@@ -965,383 +986,125 @@ msgstr "示例地址簿控制车间"
 # calendar/gui/dialogs/comp-editor-util.c:310
 # calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
 # shell/e-shortcuts.c:1061
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
-#: shell/e-shortcuts.c:1061
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "联系人"
 
 # addressbook/gui/component/addressbook-component.c:71
 # addressbook/gui/component/addressbook-component.c:71
 # addressbook/gui/component/addressbook-component.c:71
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "含有联系人信息的文件夹"
 
 # addressbook/gui/component/addressbook-component.c:73
 # addressbook/gui/component/addressbook-component.c:73
 # addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
 # addressbook/gui/component/addressbook-component.c:73
 # addressbook/gui/component/addressbook-component.c:73
 # addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:75
 msgid "LDAP server containing contact information"
 msgstr "含有联系人信息的 LDAP 服务器"
 
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "新建联系人列表"
+
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "联系人列表(_C)"
+
 # addressbook/gui/component/addressbook-component.c:526
 # ui/evolution-addressbook.xml.h:11
 # addressbook/gui/component/addressbook-component.c:526
 # ui/evolution-addressbook.xml.h:11
 # addressbook/gui/component/addressbook-component.c:527
 # ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/component/addressbook-component.c:527
-#: ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/component/addressbook-component.c:581
 msgid "New Contact"
 msgstr "新建联系人"
 
-# addressbook/gui/component/addressbook-component.c:526
-# addressbook/gui/component/addressbook-component.c:526
-# addressbook/gui/component/addressbook-component.c:527
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New _Contact"
-msgstr "新建联系人(_C)"
-
-# addressbook/gui/component/addressbook-component.c:527
-# addressbook/gui/component/addressbook-component.c:527
-# addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/component/addressbook-component.c:530
-msgid "New Contact List"
-msgstr "新建联系人列表"
-
-# addressbook/gui/component/addressbook-component.c:527
-# addressbook/gui/component/addressbook-component.c:527
-# addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/component/addressbook-component.c:530
-msgid "New Contact _List"
-msgstr "新建联系人列表(_L)"
-
-# addressbook/gui/component/addressbook-config.c:186
-# addressbook/gui/component/addressbook-config.c:186
-# addressbook/gui/component/addressbook-config.c:223
-#: addressbook/gui/component/addressbook-config.c:223
-msgid "Edit Addressbook"
-msgstr "编辑地址簿"
-
-# calendar/gui/e-calendar-table.c:437
-# calendar/gui/e-calendar-table.c:437
-# addressbook/gui/component/addressbook-config.glade.h:1
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "100"
-msgstr "100"
-
-# addressbook/gui/component/addressbook-config.glade.h:1
-# addressbook/gui/component/addressbook-config.glade.h:1
-# addressbook/gui/component/addressbook-config.glade.h:2
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "389"
-msgstr "389"
-
-# camel/providers/smtp/camel-smtp-transport.c:222
-# camel/providers/smtp/camel-smtp-transport.c:222
-# addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "A_uthenticate with server using:"
-msgstr "以之与服务器进行认证(_U)："
-
-# addressbook/gui/component/addressbook-config.glade.h:2
-# addressbook/gui/component/addressbook-config.glade.h:2
-# addressbook/gui/component/addressbook-config.glade.h:4
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
-msgstr "帐号名"
-
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
-msgstr "添加地址簿"
-
-# addressbook/gui/component/addressbook-config.glade.h:4
-# addressbook/gui/component/addressbook-config.glade.h:4
-# addressbook/gui/component/addressbook-config.glade.h:6
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Addressbook Sources"
-msgstr "地址簿资源"
-
-# addressbook/gui/component/addressbook-config.glade.h:5
-# addressbook/gui/component/addressbook-config.glade.h:5
-# addressbook/gui/component/addressbook-config.glade.h:7
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "高级"
-
-# addressbook/gui/component/addressbook-config.glade.h:6
-# addressbook/gui/component/addressbook-config.glade.h:6
-# addressbook/gui/component/addressbook-config.glade.h:8
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "起点"
-
-# addressbook/gui/component/addressbook-config.glade.h:7
-# calendar/gui/dialogs/task-editor.c:178
-# addressbook/gui/component/addressbook-config.glade.h:7
-# calendar/gui/dialogs/task-editor.c:178
-# addressbook/gui/component/addressbook-config.glade.h:9
-# calendar/gui/dialogs/task-editor.c:178
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "基本"
-
-# addressbook/gui/component/addressbook-config.glade.h:26
-# addressbook/gui/component/addressbook-config.glade.h:26
-# addressbook/gui/component/addressbook-config.glade.h:10
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr "如果服务器需要您进行认证就监查它。"
-
-# addressbook/gui/component/addressbook-config.glade.h:8
-# addressbook/gui/component/addressbook-config.glade.h:8
-# addressbook/gui/component/addressbook-config.glade.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "De_lete"
-msgstr "删除(_L)"
-
-# addressbook/gui/component/addressbook-config.glade.h:12
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr "识别姓名 (DN)"
-
-# addressbook/gui/component/addressbook-config.glade.h:9
-# addressbook/gui/component/addressbook-config.glade.h:9
-# addressbook/gui/component/addressbook-config.glade.h:13
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Email address"
-msgstr "电子邮件地址"
-
-# addressbook/gui/component/addressbook-config.glade.h:10
-# addressbook/gui/component/addressbook-config.glade.h:10
-# addressbook/gui/component/addressbook-config.glade.h:14
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
-msgstr "Evolution 将使用该识别姓名 (DN) 在服务器上对您进行认证"
+# ui/evolution-addressbook.xml.h:31
+# ui/evolution-addressbook.xml.h:31
+# ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/component/addressbook-component.c:581
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "联系人(_C)"
 
-# addressbook/gui/component/addressbook-config.glade.h:10
-# addressbook/gui/component/addressbook-config.glade.h:10
-# addressbook/gui/component/addressbook-config.glade.h:15
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution 将使用该电子邮件地址在服务器上对您进行认证"
+# addressbook/backend/pas/pas-backend-ldap.c:493
+# addressbook/backend/pas/pas-backend-ldap.c:493
+# addressbook/backend/pas/pas-backend-ldap.c:496
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "无法连接 LDAP 服务器。"
 
-# addressbook/gui/component/addressbook-config.glade.h:11
-# addressbook/gui/component/addressbook-config.glade.h:11
-# addressbook/gui/component/addressbook-config.glade.h:16
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
+# camel/providers/imap/camel-imap-store.c:596
+# camel/providers/imap/camel-imap-store.c:596
+# camel/providers/imap/camel-imap-store.c:596
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
 msgstr ""
+"无法认证到 IMAP 服务器。\n"
+"%s\n"
+"\n"
 
-# addressbook/gui/component/addressbook-config.glade.h:12
-# addressbook/gui/component/addressbook-config.glade.h:12
-# addressbook/gui/component/addressbook-config.glade.h:17
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr "搜索起点(_B)："
-
-# addressbook/gui/component/addressbook-config.glade.h:13
-# addressbook/gui/component/addressbook-config.glade.h:13
-# addressbook/gui/component/addressbook-config.glade.h:18
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
-msgstr "搜索范围(_C)："
-
-# addressbook/gui/component/addressbook-config.glade.h:14
-# addressbook/gui/component/addressbook-config.glade.h:14
-# addressbook/gui/component/addressbook-config.glade.h:19
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "服务器名"
-
-# addressbook/gui/component/addressbook-config.glade.h:15
-# addressbook/gui/component/addressbook-config.glade.h:15
-# addressbook/gui/component/addressbook-config.glade.h:20
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
 msgstr ""
 
-# addressbook/gui/component/addressbook-config.glade.h:16
-# addressbook/gui/component/addressbook-config.glade.h:16
-# addressbook/gui/component/addressbook-config.glade.h:21
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "为添加地址簿，需要以下信息。  "
-
-# addressbook/gui/component/addressbook-config.glade.h:17
-# addressbook/gui/component/addressbook-config.glade.h:17
-# addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr "大部分 LDAP 服务器都不需要该信息。"
-
-# addressbook/gui/component/addressbook-config.glade.h:18
-# addressbook/gui/component/addressbook-config.glade.h:18
-# addressbook/gui/component/addressbook-config.glade.h:23
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid ""
-"This information is used by your ldap server to specify which nodes are used "
-"in a search. Contact your server administrator for more information."
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
 msgstr ""
-"您的 LDAP 服务器用该信息来确定在搜索中使用那个节点。详情请咨询您的服务器管理"
-"员。"
 
-# Addressbook/gui/component/addressbook-config.glade.h:19
-# addressbook/gui/component/addressbook-config.glade.h:19
-# addressbook/gui/component/addressbook-config.glade.h:24
-#: addressbook/gui/component/addressbook-config.glade.h:24
-msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema information"
 msgstr ""
-"这是您在 LDAP 服务器上进行的所有搜索的基本节点。详情请咨询您的服务器管理员。"
-
-# addressbook/gui/component/addressbook-config.glade.h:25
-#: addressbook/gui/component/addressbook-config.glade.h:25
-msgid ""
-"This is the maximum number of cards to download.  Setting this number too "
-"large will slow down this addressbook."
-msgstr "这是可下载卡片的最大数量。将该数值设定得太大将导致地址本变慢。"
 
-# addressbook/gui/component/addressbook-config.glade.h:26
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid ""
-"This is the method evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
-"server."
+# mail/mail-callbacks.c:2250
+# mail/mail-callbacks.c:2369
+# mail/mail-callbacks.c:2405
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
 msgstr ""
-"这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
-"对 ldap 服务器的匿名访问权限。"
-
-# addressbook/gui/component/addressbook-config.glade.h:20
-# addressbook/gui/component/addressbook-config.glade.h:20
-# addressbook/gui/component/addressbook-config.glade.h:27
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
-msgstr "这是您的地址簿所在的服务器的名称。"
-
-# addressbook/gui/component/addressbook-config.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:28
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
-msgstr "这是您的 LDAP 服务器所使用的端口。"
-
-# addressbook/gui/component/addressbook-config.glade.h:22
-# addressbook/gui/component/addressbook-config.glade.h:22
-# addressbook/gui/component/addressbook-config.glade.h:29
-#: addressbook/gui/component/addressbook-config.glade.h:29
-msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
-msgstr "这一名称将用于识别您的帐号。它只用于显示。"
-
-# addressbook/gui/component/addressbook-config.glade.h:23
-# addressbook/gui/component/addressbook-config.glade.h:23
-# addressbook/gui/component/addressbook-config.glade.h:30
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "帐号名(_A)："
-
-# addressbook/gui/component/addressbook-config.glade.h:24
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:24
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-# addressbook/gui/component/addressbook-config.glade.h:31
-# addressbook/gui/contact-editor/contact-editor.glade.h:30
-# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
-#: addressbook/gui/component/addressbook-config.glade.h:31
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:100 my-evolution/my-evolution.glade.h:21
-msgid "_Add"
-msgstr "添加(_A)"
-
-# addressbook/gui/component/addressbook-config.glade.h:32
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr "识别名称(_D)"
-
-# addressbook/gui/component/addressbook-config.glade.h:33
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr "下载上限(_D)"
-
-# addressbook/gui/component/addressbook-config.glade.h:25
-# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
-# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-# ui/evolution-message-composer.xml.h:47
-# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-# ui/evolution-tasks.xml.h:16
-# addressbook/gui/component/addressbook-config.glade.h:25
-# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
-# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-# ui/evolution-message-composer.xml.h:47
-# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-# ui/evolution-tasks.xml.h:16
-# addressbook/gui/component/addressbook-config.glade.h:34
-# filter/filter.glade.h:9 mail/mail-config.glade.h:107
-# ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:39
-# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-# ui/evolution-message-composer.xml.h:47
-# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-# ui/evolution-tasks.xml.h:19
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:109
-#: ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:39
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-# mail/mail-config.glade.h:99
-# mail/mail-config.glade.h:99
-# addressbook/gui/component/addressbook-config.glade.h:35
-#: addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:110
-msgid "_Email address:"
-msgstr "电子邮件地址(_E)："
+"装入过滤规则信息错误：\n"
+"%s"
 
-# addressbook/gui/component/addressbook-config.glade.h:27
-# addressbook/gui/component/addressbook-config.glade.h:27
-# addressbook/gui/component/addressbook-config.glade.h:36
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "端口(_P)："
+# camel/providers/imap/camel-imap-command.c:608
+# camel/providers/imap/camel-imap-command.c:608
+# camel/providers/imap/camel-imap-command.c:610
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP 服务器应答不含有 %s 信息"
 
-# addressbook/gui/component/addressbook-config.glade.h:28
-# addressbook/gui/component/addressbook-config.glade.h:28
-# addressbook/gui/component/addressbook-config.glade.h:37
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "服务器名(_S)："
+# mail/mail-config.glade.h:3
+# mail/mail-config.glade.h:3
+# mail/mail-config.glade.h:3
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(在该版本的 evolution 中不支持SSL)"
 
 # addressbook/gui/component/addressbook-factory.c:70
 # calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
@@ -1349,8 +1112,8 @@ msgstr "服务器名(_S)："
 # calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 # addressbook/gui/component/addressbook-factory.c:70
 # calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "无法创始化 gnome-vfs"
 
@@ -1364,14 +1127,14 @@ msgstr "其他联系人"
 # addressbook/gui/component/addressbook.c:485
 # addressbook/gui/component/addressbook.c:485
 # addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:499
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "无法打开地址簿"
 
 # addressbook/gui/component/addressbook.c:494
 # addressbook/gui/component/addressbook.c:494
 # addressbook/gui/component/addressbook.c:508
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:525
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -1384,7 +1147,7 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:499
 # addressbook/gui/component/addressbook.c:499
 # addressbook/gui/component/addressbook.c:513
-#: addressbook/gui/component/addressbook.c:513
+#: addressbook/gui/component/addressbook.c:530
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -1399,7 +1162,7 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:507
 # addressbook/gui/component/addressbook.c:507
 # addressbook/gui/component/addressbook.c:521
-#: addressbook/gui/component/addressbook.c:521
+#: addressbook/gui/component/addressbook.c:538
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -1411,36 +1174,33 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:640
 # addressbook/gui/component/addressbook.c:655
 # addressbook/gui/component/addressbook.c:658
-#: addressbook/gui/component/addressbook.c:655
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "为 %s (用户 %s)输入口令"
 
-# addressbook/gui/component/addressbook.c:803
-# calendar/gui/cal-search-bar.c:55
-# addressbook/gui/component/addressbook.c:803
-# calendar/gui/cal-search-bar.c:55
-# addressbook/gui/component/addressbook.c:836
-# calendar/gui/cal-search-bar.c:55
-#: addressbook/gui/component/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "任何域含有"
-
-# addressbook/gui/component/addressbook.c:804
-# addressbook/gui/component/addressbook.c:804
-# addressbook/gui/component/addressbook.c:837
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
-msgstr "名称含有"
+#: addressbook/gui/component/addressbook.c:776
+#, fuzzy
+msgid "Name begins with"
+msgstr "以之结束"
 
-# addressbook/gui/component/addressbook.c:805
-# addressbook/gui/component/addressbook.c:805
-# addressbook/gui/component/addressbook.c:838
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
-msgstr "电子邮件含有"
+# addressbook/backend/ebook/e-card-simple.c:86
+# addressbook/gui/component/e-address-popup.c:484
+# addressbook/gui/contact-editor/e-contact-editor.c:1687
+# addressbook/gui/widgets/e-addressbook-view.c:875
+# addressbook/backend/ebook/e-card-simple.c:86
+# addressbook/gui/component/e-address-popup.c:484
+# addressbook/gui/contact-editor/e-contact-editor.c:1687
+# addressbook/gui/widgets/e-addressbook-view.c:875
+# addressbook/backend/ebook/e-card-simple.c:86
+# addressbook/gui/component/e-address-popup.c:484
+# addressbook/gui/contact-editor/e-contact-editor.c:1687
+# addressbook/gui/widgets/e-addressbook-view.c:986
+#: addressbook/gui/component/addressbook.c:777
+#, fuzzy
+msgid "Email is"
+msgstr "电子邮件 2"
 
 # addressbook/gui/component/addressbook.c:806
 # calendar/gui/cal-search-bar.c:59
@@ -1448,19 +1208,29 @@ msgstr "电子邮件含有"
 # calendar/gui/cal-search-bar.c:59
 # addressbook/gui/component/addressbook.c:839
 # calendar/gui/cal-search-bar.c:59
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:778
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "类别为"
 
+# addressbook/gui/component/addressbook.c:803
+# calendar/gui/cal-search-bar.c:55
+# addressbook/gui/component/addressbook.c:803
+# calendar/gui/cal-search-bar.c:55
+# addressbook/gui/component/addressbook.c:836
+# calendar/gui/cal-search-bar.c:55
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:779
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "任何域含有"
+
 # addressbook/gui/component/addressbook.c:807 widgets/misc/e-filter-bar.h:104
 # addressbook/gui/component/addressbook.c:807 widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
 # addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "高级..."
 
@@ -1471,15 +1241,15 @@ msgstr "高级..."
 # addressbook/gui/component/addressbook.c:1067
 # calendar/gui/cal-search-bar.c:412
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1067
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1008
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "任何类别"
 
 # addressbook/gui/component/addressbook.c:1107
 # addressbook/gui/component/addressbook.c:1107
 # addressbook/gui/component/addressbook.c:1150
-#: addressbook/gui/component/addressbook.c:1150
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "文件夹浏览器将显示的 URI"
 
@@ -1506,7 +1276,7 @@ msgstr "(无)"
 # addressbook/gui/contact-editor/e-contact-editor.c:1686
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "常用电子邮件"
 
@@ -1591,6 +1361,788 @@ msgstr "关闭查询"
 msgid "Enable Queries (Dangerous!)"
 msgstr "开启查询(危险！)"
 
+# mail/mail-config.glade.h:1
+# mail/mail-config.glade.h:1
+# mail/mail-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:1
+#, fuzzy
+msgid "  S_how Supported Bases "
+msgstr "检查支持的类型(_C) "
+
+#: addressbook/gui/component/ldap-config.glade.h:2
+msgid "1234"
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:437
+# calendar/gui/e-calendar-table.c:437
+# addressbook/gui/component/addressbook-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "1:00"
+msgstr "100"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+msgid "3268"
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:435
+# calendar/gui/e-calendar-table.c:435
+# calendar/gui/e-calendar-table.c:436
+#: addressbook/gui/component/ldap-config.glade.h:6
+#, fuzzy
+msgid "380"
+msgstr "80%"
+
+# addressbook/gui/component/addressbook-config.glade.h:1
+# addressbook/gui/component/addressbook-config.glade.h:1
+# addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "666"
+msgstr ""
+
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+# my-evolution/my-evolution.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "删除(_R)"
+
+# addressbook/printing/e-contact-print.glade.h:23
+# addressbook/printing/e-contact-print.glade.h:23
+# addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "选项"
+
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:4
+# addressbook/gui/component/addressbook-config.glade.h:4
+# addressbook/gui/component/addressbook-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:14
+msgid "Addressbook Sources"
+msgstr "地址簿资源"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:3
+# addressbook/gui/contact-editor/fulladdr.glade.h:3
+# my-evolution/Locations.h:43
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
+#, fuzzy
+msgid "Always"
+msgstr "奥尔巴尼"
+
+# camel/camel-sasl-anonymous.c:33
+# camel/camel-sasl-anonymous.c:33
+# camel/camel-sasl-anonymous.c:33
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "匿名"
+
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:18
+msgid "Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:19
+msgid ""
+"Congratulations, you are finished setting up this LDAP server. You\n"
+"are now ready to access this directory.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+
+# ui/evolution-addressbook.xml.h:31
+# ui/evolution-addressbook.xml.h:31
+# my-evolution/Locations.h:502
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Connecting"
+msgstr "康涅狄格"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
+msgstr ""
+
+# calendar/gui/e-meeting-time-sel.c:431
+# calendar/gui/e-meeting-time-sel.c:434
+# calendar/gui/e-meeting-time-sel.c:434
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "DN Customization"
+msgstr "没有信息"
+
+# addressbook/gui/component/addressbook-config.glade.h:8
+# addressbook/gui/component/addressbook-config.glade.h:8
+# addressbook/gui/component/addressbook-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "删除(_L)"
+
+# addressbook/gui/component/addressbook-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "识别名称(_D)"
+
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:108
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Email Address:"
+msgstr "电子邮件地址(_E)："
+
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Evolution 提醒"
+
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr "Evolution 将使用该电子邮件地址在服务器上对您进行认证"
+
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr "Evolution 将使用该电子邮件地址在服务器上对您进行认证"
+
+# addressbook/gui/component/select-names/select-names.glade.h:3
+# addressbook/gui/component/select-names/select-names.glade.h:3
+# addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "查找(_I)"
+
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "常规"
+
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "LDAP Attribute"
+msgstr ""
+
+# mail/mail-config.glade.h:15
+# mail/mail-config.glade.h:15
+# mail/mail-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "配置"
+
+# addressbook/printing/e-contact-print.glade.h:21
+# addressbook/printing/e-contact-print.glade.h:21
+# addressbook/printing/e-contact-print.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "边界"
+
+# mail/mail-config.glade.h:118
+# mail/mail-config.glade.h:118
+# mail/mail-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "Never"
+msgstr "每(_E)"
+
+#: addressbook/gui/component/ldap-config.glade.h:38
+msgid ""
+"Now, you must specify how you want to connect to the LDAP server. The SSL "
+"(Secure Sockets Layer)\n"
+"and TLS (Transport Layer Security) protocols are used by some servers to "
+"cryptographically protect\n"
+"your connection. Ask your system administrator if your LDAP server uses "
+"these protocols."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:41
+msgid "Objectclasses"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:42
+msgid "Objectclasses Used in Evolution:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:43
+msgid "Objectclasses Used on Server:"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:11
+# addressbook/gui/component/addressbook-config.glade.h:11
+# addressbook/gui/component/addressbook-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:44
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:45
+msgid ""
+"Please select and Evolution attribute and an\n"
+"LDAP attribute to associate with it."
+msgstr ""
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
+msgid "R_estore Defaults"
+msgstr "默认"
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "Re_store Defaults"
+msgstr "默认"
+
+# addressbook/gui/component/addressbook-config.glade.h:13
+# addressbook/gui/component/addressbook-config.glade.h:13
+# addressbook/gui/component/addressbook-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "搜索范围(_C)："
+
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1675
+# calendar/gui/e-week-view.c:1182
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
+# calendar/gui/e-week-view.c:1184
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
+# calendar/gui/e-week-view.c:1188
+#. No time range is set, so don't start a query
+#: addressbook/gui/component/ldap-config.glade.h:50
+#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
+#: calendar/gui/e-week-view.c:1213
+msgid "Searching"
+msgstr "搜索"
+
+# ui/evolution-addressbook.xml.h:21
+# ui/evolution-addressbook.xml.h:21
+# ui/evolution-addressbook.xml.h:21
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "全选"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "已删除"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if\n"
+"your LDAP server supports SSL or TLS."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:55
+msgid ""
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
+"secure."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:59
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This \n"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
+"exploits. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:62
+msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:64
+msgid ""
+"Specifying a display name is the last required step in configuring an LDAP "
+"server."
+msgstr ""
+
+# mail/mail-config.glade.h:81
+# mail/mail-config.glade.h:81
+# mail/mail-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:65
+#, fuzzy
+msgid "Step 1: Server Information"
+msgstr "来源信息"
+
+# mail/mail-config.c:2184 mail/mail-config.c:2188
+# mail/mail-config.c:2233 mail/mail-config.c:2237
+# mail/mail-config.c:2326 mail/mail-config.c:2330
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "正在连接服务器..."
+
+#: addressbook/gui/component/ldap-config.glade.h:67
+msgid "Step 3: Searching the Directory"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid "Step 4: Display Name"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:15
+# addressbook/gui/component/addressbook-config.glade.h:15
+# addressbook/gui/component/addressbook-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:69
+msgid "Sub"
+msgstr ""
+
+# shell/evolution-shell-component.c:1023
+# shell/evolution-shell-component.c:1023
+# shell/evolution-shell-component.c:1036
+#: addressbook/gui/component/ldap-config.glade.h:70
+#, fuzzy
+msgid "Supported Search Bases"
+msgstr "不支持的方案"
+
+#: addressbook/gui/component/ldap-config.glade.h:71
+msgid ""
+"The first step in configuring an LDAP server is to provide its name, and "
+"your log in\n"
+"information. Please ask your system administrator if you are unsure of this "
+"information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:73
+msgid ""
+"The options on this page control how many entries should be included in "
+"your\n"
+"searches, and how long a search should take. Ask your system administrator "
+"if you\n"
+"need to change these options."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:76
+msgid ""
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:78
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the \n"
+"directory tree. A search scope of \"sub\" will include all entries below "
+"your search base.\n"
+"A search scope of \"one\" will only include the entries one level beneath "
+"your base."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:81
+msgid ""
+"This assistant will help you to access online directory services\n"
+"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"\n"
+"Adding a new LDAP server requires some specialized information\n"
+"about the server. Please contact your system administrator if you \n"
+"need help finding this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:87
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:88
+#, fuzzy
+msgid ""
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
+"too large will slow down your addressbook."
+msgstr "这是可下载卡片的最大数量。将该数值设定得太大将导致地址本变慢。"
+
+# addressbook/gui/component/addressbook-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:90
+msgid ""
+"This is the method evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your ldap "
+"server."
+msgstr ""
+"这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
+"对 ldap 服务器的匿名访问权限。"
+
+# addressbook/gui/component/addressbook-config.glade.h:22
+# addressbook/gui/component/addressbook-config.glade.h:22
+# addressbook/gui/component/addressbook-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:91
+#, fuzzy
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
+"It is for display purposes only. "
+msgstr "这一名称将用于识别您的帐号。它只用于显示。"
+
+#: addressbook/gui/component/ldap-config.glade.h:93
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
+"list of standard ports has been provided. Ask your system administrator\n"
+"what port you should specify."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:96
+msgid "This option controls how long a search will be run."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:97
+msgid ""
+"To add an attribute to the DN, select it from the list and click the \"Add "
+"Attribute\" button.\n"
+"Any values that you add to the DN will become required values for any new "
+"contacts\n"
+"that you add to the directory on the LDAP server. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:100
+msgid "U_se SSL/TLS:"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:101
+#, fuzzy
+msgid "Using distinguished name (DN)"
+msgstr "识别姓名 (DN)"
+
+# addressbook/gui/component/addressbook-config.glade.h:9
+# addressbook/gui/component/addressbook-config.glade.h:9
+# addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+msgid "Using email address"
+msgstr "电子邮件地址"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+msgid "Whenever Possible"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:24
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:24
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:31
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:141
+msgid "_Add"
+msgstr "添加(_A)"
+
+# addressbook/gui/component/addressbook-config.glade.h:24
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:24
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:31
+# addressbook/gui/contact-editor/contact-editor.glade.h:30
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+# calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+# mail/mail-config.glade.h:99 my-evolution/my-evolution.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "添加(_A)"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "添加动作"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "添加动作"
+
+# calendar/gui/e-calendar-table.etspec.h:3
+# calendar/gui/e-calendar-table.etspec.h:3
+# calendar/gui/e-calendar-table.etspec.h:3
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "提醒"
+
+# ui/evolution-message-composer.xml.h:46
+# ui/evolution-message-composer.xml.h:46
+# ui/evolution-message-composer.xml.h:46
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "全部删除(_D)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "显示(_D)"
+
+# addressbook/gui/component/addressbook-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:111
+#, fuzzy
+msgid "_Distinguished Name (DN):"
+msgstr "识别姓名 (DN)"
+
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:113
+#, fuzzy
+msgid "_Download limit:"
+msgstr "下载上限(_D)"
+
+# addressbook/gui/component/addressbook-config.glade.h:25
+# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+# ui/evolution-message-composer.xml.h:47
+# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+# ui/evolution-tasks.xml.h:16
+# addressbook/gui/component/addressbook-config.glade.h:25
+# ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+# ui/evolution-message-composer.xml.h:47
+# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+# ui/evolution-tasks.xml.h:16
+# addressbook/gui/component/addressbook-config.glade.h:34
+# ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:39
+# ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
+# ui/evolution-message-composer.xml.h:47
+# ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+# ui/evolution-tasks.xml.h:19
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+# calendar/gui/alarm-notify/alarm-notify.glade.h:4
+# calendar/gui/alarm-notify/alarm-notify.glade.h:4
+# calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "编辑约会(_E)"
+
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+# calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution 提醒"
+
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
+msgstr ""
+
+# calendar/gui/e-meeting-time-sel.c:467
+# calendar/gui/e-meeting-time-sel.c:470
+# calendar/gui/e-meeting-time-sel.c:470
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "选项(_O)"
+
+# addressbook/gui/component/addressbook-config.glade.h:27
+# addressbook/gui/component/addressbook-config.glade.h:27
+# addressbook/gui/component/addressbook-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "端口(_P)："
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:123
+#, fuzzy
+msgid "_Restore Defaults"
+msgstr "默认"
+
+# addressbook/gui/component/addressbook-config.glade.h:12
+# addressbook/gui/component/addressbook-config.glade.h:12
+# addressbook/gui/component/addressbook-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "搜索起点(_B)："
+
+# addressbook/gui/component/addressbook-config.glade.h:28
+# addressbook/gui/component/addressbook-config.glade.h:28
+# addressbook/gui/component/addressbook-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "服务器名(_S)："
+
+# calendar/gui/alarm-notify/alarm-notify.glade.h:3
+# calendar/gui/alarm-notify/alarm-notify.glade.h:3
+# calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "午睡时间(分钟)"
+
+# mail/mail-config.c:326
+# mail/mail-config.c:329
+# mail/mail-config.c:354
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "帐号 %d"
+
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+# addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "联系人列表编辑器"
+
+# addressbook/gui/widgets/e-addressbook-model.c:127
+# addressbook/gui/widgets/e-addressbook-model.c:127
+# addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "没有卡片"
+
+# mail/mail-ops.c:2089
+# mail/mail-ops.c:2091
+# mail/mail-ops.c:2134
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "重新与 %s 连接"
+
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
+
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+# addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "常规"
+
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
+msgstr ""
+
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1675
+# calendar/gui/e-week-view.c:1182
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
+# calendar/gui/e-week-view.c:1184
+# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
+# calendar/gui/e-week-view.c:1188
+#: addressbook/gui/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "搜索"
+
 # addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 # addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 # addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
@@ -1614,11 +2166,12 @@ msgstr "地址簿名称选择界面车间"
 # addressbook/gui/component/select-names/e-select-names-popup.c:163
 # addressbook/gui/component/select-names/e-select-names.c:830
 # composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
-# filter/filter-rule.c:637 shell/e-shortcuts-view.c:180
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:830
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
-#: filter/filter-rule.c:637 shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:980
+#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "删除"
 
@@ -1665,10 +2218,18 @@ msgstr "(%d 未显示)"
 msgid "Unnamed Contact"
 msgstr "未命名的联系人"
 
+# default_user/searches.xml.h:6
+# default_user/searches.xml.h:6
+# default_user/searches.xml.h:6
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "发件人含有"
+
 # addressbook/gui/component/select-names/e-select-names.c:524
 # addressbook/gui/component/select-names/e-select-names.c:524
 # addressbook/gui/component/select-names/e-select-names.c:581
-#: addressbook/gui/component/select-names/e-select-names.c:581
+#: addressbook/gui/component/select-names/e-select-names.c:716
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -1687,7 +2248,7 @@ msgstr ""
 # addressbook/gui/component/select-names/e-select-names.c:532
 # addressbook/gui/component/select-names/e-select-names.c:532
 # addressbook/gui/component/select-names/e-select-names.c:589
-#: addressbook/gui/component/select-names/e-select-names.c:589
+#: addressbook/gui/component/select-names/e-select-names.c:724
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "Under normal circumstances, this should never happen.\n"
@@ -1702,49 +2263,67 @@ msgstr ""
 # addressbook/gui/component/select-names/e-select-names.c:608
 # addressbook/gui/component/select-names/e-select-names.c:608
 # addressbook/gui/component/select-names/e-select-names.c:671
-#: addressbook/gui/component/select-names/e-select-names.c:671
+#: addressbook/gui/component/select-names/e-select-names.c:806
 msgid "Select Contacts from Addressbook"
 msgstr "从地址簿中选择联系人"
 
-# addressbook/gui/component/select-names/select-names.glade.h:1
-# addressbook/gui/component/select-names/select-names.glade.h:1
-# addressbook/gui/component/select-names/select-names.glade.h:1
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "含有(_O)："
-
-# addressbook/gui/component/select-names/select-names.glade.h:3
-# addressbook/gui/component/select-names/select-names.glade.h:3
-# addressbook/gui/component/select-names/select-names.glade.h:2
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "查找(_I)"
-
 # addressbook/gui/component/select-names/select-names.glade.h:4
 # addressbook/gui/component/select-names/select-names.glade.h:4
 # addressbook/gui/component/select-names/select-names.glade.h:3
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "选择名称"
 
-# addressbook/gui/component/select-names/select-names.glade.h:5
-# addressbook/gui/component/select-names/select-names.glade.h:5
-# addressbook/gui/component/select-names/select-names.glade.h:4
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+# addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "删除联系人？"
+
+# addressbook/gui/component/addressbook-component.c:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+# shell/e-shortcuts.c:1061
+# addressbook/gui/component/addressbook-component.c:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+# shell/e-shortcuts.c:1061
+# addressbook/gui/component/addressbook-component.c:71
+# calendar/gui/dialogs/comp-editor-util.c:310
+# calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
+# shell/e-shortcuts.c:1061
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Show Contacts"
+msgstr "联系人"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr "显示符合以下条件的联系人："
+msgid ""
+"Type a name into the entry, or\n"
+"select one from the list below:"
+msgstr ""
+
+# ui/evolution.xml.h:42
+# ui/evolution.xml.h:42
+# ui/evolution.xml.h:42
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "_Browse..."
+msgstr "移动(_M)..."
 
 # addressbook/gui/component/select-names/select-names.glade.h:6
 # addressbook/gui/component/select-names/select-names.glade.h:6
 # addressbook/gui/component/select-names/select-names.glade.h:5
-#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "类别(_C)："
 
 # addressbook/gui/component/select-names/select-names.glade.h:7
 # addressbook/gui/component/select-names/select-names.glade.h:7
 # addressbook/gui/component/select-names/select-names.glade.h:6
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "文件夹(_F)："
 
@@ -1813,7 +2392,7 @@ msgstr "合作"
 # addressbook/gui/contact-editor/e-contact-editor.c:1293
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "联系人编辑器"
 
@@ -1831,7 +2410,7 @@ msgstr "部门(_E)："
 # addressbook/gui/contact-editor/contact-editor.glade.h:12
 # calendar/gui/dialogs/task-editor.c:183
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "细节"
 
@@ -1856,13 +2435,6 @@ msgstr ""
 msgid "Full _Name..."
 msgstr "全名(_N)..."
 
-# addressbook/gui/contact-editor/contact-editor.glade.h:16
-# addressbook/gui/contact-editor/contact-editor.glade.h:16
-# addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "常规"
-
 # addressbook/gui/contact-editor/contact-editor.glade.h:18
 # addressbook/gui/contact-editor/contact-editor.glade.h:18
 # addressbook/gui/contact-editor/contact-editor.glade.h:18
@@ -1949,10 +2521,12 @@ msgstr "愿意接收 HTML 邮件(_H)"
 # ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1478 mail/mail-config.glade.h:107
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:18 ui/evolution.xml.h:35
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "删除(_D)"
 
@@ -2003,7 +2577,7 @@ msgstr "网页地址(_W)："
 # addressbook/gui/contact-editor/e-contact-editor-address.c:128
 # my-evolution/Locations.h:2343
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2341
 msgid "United States"
 msgstr "美国"
 
@@ -2899,7 +3473,6 @@ msgstr "老挝"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:243
 # my-evolution/Locations.h:1190
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
 msgid "Latvia"
 msgstr "拉脱维亚"
 
@@ -2908,7 +3481,7 @@ msgstr "拉脱维亚"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:244
 # my-evolution/Locations.h:1198
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
@@ -2924,7 +3497,7 @@ msgstr "莱索托"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:246
 # my-evolution/Locations.h:1218
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "利比里亚"
 
@@ -2940,7 +3513,7 @@ msgstr "列支敦士登"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:248
 # my-evolution/Locations.h:1234
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "立陶宛"
 
@@ -2949,7 +3522,7 @@ msgstr "立陶宛"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:249
 # my-evolution/Locations.h:1268
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "卢森堡"
 
@@ -3007,7 +3580,7 @@ msgstr "马里"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:257
 # my-evolution/Locations.h:1297
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "马耳他"
 
@@ -3051,7 +3624,7 @@ msgstr "马约特岛"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:263
 # my-evolution/Locations.h:1387
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "墨西哥"
 
@@ -3095,7 +3668,7 @@ msgstr "蒙特塞拉特群岛"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:269
 # my-evolution/Locations.h:1470
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "摩洛哥"
 
@@ -3139,7 +3712,7 @@ msgstr "尼泊尔"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:275
 # my-evolution/Locations.h:1531
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "荷兰"
 
@@ -3162,7 +3735,7 @@ msgstr "新喀里多尼亚"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:278
 # my-evolution/Locations.h:1560
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "新西兰"
 
@@ -3171,7 +3744,7 @@ msgstr "新西兰"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:279
 # my-evolution/Locations.h:1562
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
@@ -3201,7 +3774,7 @@ msgstr "纽埃岛"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:283
 # my-evolution/Locations.h:1574
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "诺福克岛"
 
@@ -3217,7 +3790,7 @@ msgstr "北马里亚那群岛"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:285
 # my-evolution/Locations.h:1587
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "挪威"
 
@@ -3226,7 +3799,7 @@ msgstr "挪威"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:286
 # my-evolution/Locations.h:1632
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "阿曼"
 
@@ -3235,7 +3808,7 @@ msgstr "阿曼"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:287
 # my-evolution/Locations.h:1673
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "巴基斯坦"
 
@@ -3258,7 +3831,7 @@ msgstr "巴勒斯坦地区"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:290
 # my-evolution/Locations.h:1683
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "巴拿马"
 
@@ -3274,7 +3847,7 @@ msgstr "巴布亚新几内亚"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:292
 # my-evolution/Locations.h:1688
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "巴拉圭"
 
@@ -3283,7 +3856,7 @@ msgstr "巴拉圭"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:293
 # my-evolution/Locations.h:1723
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "秘鲁"
 
@@ -3306,7 +3879,7 @@ msgstr "皮特克恩岛"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:296
 # my-evolution/Locations.h:1764
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "波兰"
 
@@ -3315,7 +3888,7 @@ msgstr "波兰"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:297
 # my-evolution/Locations.h:1791
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "葡萄牙"
 
@@ -3324,7 +3897,7 @@ msgstr "葡萄牙"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:298
 # my-evolution/Locations.h:1824
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "波多黎各"
 
@@ -3333,7 +3906,7 @@ msgstr "波多黎各"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:299
 # my-evolution/Locations.h:1836
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "卡塔尔"
 
@@ -3349,7 +3922,7 @@ msgstr "留尼汪"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:301
 # my-evolution/Locations.h:1912
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "罗马尼亚"
 
@@ -3414,7 +3987,7 @@ msgstr "圣多美和普林西比"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:310
 # my-evolution/Locations.h:2035
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "沙特阿拉伯"
 
@@ -3444,7 +4017,7 @@ msgstr "塞拉利昂"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:314
 # my-evolution/Locations.h:2090
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "新加坡"
 
@@ -3453,7 +4026,7 @@ msgstr "新加坡"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:315
 # my-evolution/Locations.h:2103
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
@@ -3462,7 +4035,7 @@ msgstr "斯洛伐克"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:316
 # my-evolution/Locations.h:2104
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "斯洛文尼亚"
 
@@ -3485,7 +4058,7 @@ msgstr "索马里"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:319
 # my-evolution/Locations.h:2119
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "南非"
 
@@ -3501,7 +4074,7 @@ msgstr "南乔治亚和南三文治群岛"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:321
 # my-evolution/Locations.h:2127
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "西班牙"
 
@@ -3538,7 +4111,7 @@ msgstr "苏丹"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:326
 # my-evolution/Locations.h:2176
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "苏里南"
 
@@ -3561,7 +4134,7 @@ msgstr "斯威士兰"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:329
 # my-evolution/Locations.h:2181
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "瑞典"
 
@@ -3570,7 +4143,7 @@ msgstr "瑞典"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:330
 # my-evolution/Locations.h:2183
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "瑞士"
 
@@ -3579,7 +4152,7 @@ msgstr "瑞士"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:331
 # my-evolution/Locations.h:2205
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "台湾"
 
@@ -3644,7 +4217,7 @@ msgstr "突尼斯"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:340
 # my-evolution/Locations.h:2321
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "土耳其"
 
@@ -3681,7 +4254,7 @@ msgstr "乌干达"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:345
 # my-evolution/Locations.h:2334
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "乌克兰"
 
@@ -3697,7 +4270,7 @@ msgstr "阿拉伯联合酋长国"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:347
 # my-evolution/Locations.h:2342
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "英国"
 
@@ -3713,7 +4286,7 @@ msgstr "美国小型外岛"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:349
 # my-evolution/Locations.h:2348
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "乌拉圭"
 
@@ -3736,7 +4309,7 @@ msgstr "努瓦阿图"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:352
 # my-evolution/Locations.h:2380
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "委内瑞拉"
 
@@ -3745,7 +4318,7 @@ msgstr "委内瑞拉"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:353
 # my-evolution/Locations.h:2392
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "越南"
 
@@ -3782,7 +4355,7 @@ msgstr "西撒哈拉"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:358
 # my-evolution/Locations.h:2512
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "也门"
 
@@ -3791,7 +4364,7 @@ msgstr "也门"
 # addressbook/gui/contact-editor/e-contact-editor-address.c:359
 # my-evolution/Locations.h:2524
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "南斯拉夫"
 
@@ -3828,35 +4401,35 @@ msgstr "删除联系人？"
 # addressbook/gui/contact-editor/e-contact-editor.c:757
 # addressbook/gui/contact-editor/e-contact-editor.c:757
 # addressbook/gui/contact-editor/e-contact-editor.c:757
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
 msgid "Category editor not available."
 msgstr "类别编辑器不可用。"
 
 # addressbook/gui/contact-editor/e-contact-editor.c:764
 # addressbook/gui/contact-editor/e-contact-editor.c:764
 # addressbook/gui/contact-editor/e-contact-editor.c:764
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
 msgid "This contact belongs to these categories:"
 msgstr "该联系人属于这些范畴："
 
 # addressbook/gui/contact-editor/e-contact-editor.c:978
 # addressbook/gui/contact-editor/e-contact-editor.c:978
 # addressbook/gui/contact-editor/e-contact-editor.c:978
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
 msgid "Save Contact as VCard"
 msgstr "将联系人保存为 VCard"
 
 # addressbook/gui/contact-editor/e-contact-editor.c:1662
 # addressbook/gui/contact-editor/e-contact-editor.c:1662
 # addressbook/gui/contact-editor/e-contact-editor.c:1662
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 # addressbook/gui/contact-editor/e-contact-editor.c:2287
 # addressbook/gui/contact-editor/e-contact-editor.c:2287
 # addressbook/gui/contact-editor/e-contact-editor.c:2309
-#: addressbook/gui/contact-editor/e-contact-editor.c:2417
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "无法为域找到构件：“%s”"
@@ -3882,7 +4455,7 @@ msgstr "完全编辑"
 # addressbook/gui/contact-editor/e-contact-quick-add.c:326
 # addressbook/gui/widgets/e-addressbook-view.c:961
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:961
+#: addressbook/gui/widgets/e-addressbook-view.c:336
 msgid "Full Name"
 msgstr "全名"
 
@@ -3904,14 +4477,14 @@ msgstr "card.vcf"
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
 msgid "list"
 msgstr "列表"
 
 # addressbook/gui/contact-editor/e-contact-save-as.c:201
 # addressbook/gui/contact-editor/e-contact-save-as.c:201
 # addressbook/gui/contact-editor/e-contact-save-as.c:201
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -4145,14 +4718,14 @@ msgstr "联系人列表编辑器"
 # addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 # addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "联系人列表编辑器"
 
 # addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
 # addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
 # addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
 msgid "Save List as VCard"
 msgstr "将列表保存为 VCard"
 
@@ -4238,7 +4811,7 @@ msgstr ""
 # addressbook/gui/search/e-addressbook-search-dialog.c:145
 # widgets/misc/e-filter-bar.c:238
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:238
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "高级搜索"
 
@@ -4256,184 +4829,32 @@ msgstr "搜索"
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "没有卡片"
 
 # addressbook/gui/widgets/e-addressbook-model.c:130
 # addressbook/gui/widgets/e-addressbook-model.c:130
 # addressbook/gui/widgets/e-addressbook-model.c:130
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 张卡片"
 
 # addressbook/gui/widgets/e-addressbook-model.c:133
 # addressbook/gui/widgets/e-addressbook-model.c:133
 # addressbook/gui/widgets/e-addressbook-model.c:133
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr "%d 张卡片"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-# addressbook/gui/widgets/e-addressbook-view.c:671
-# addressbook/gui/widgets/e-addressbook-view.c:733
-# addressbook/gui/widgets/e-addressbook-view.c:1405
-# ui/evolution-addressbook.xml.h:19
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-# addressbook/gui/widgets/e-addressbook-view.c:671
-# addressbook/gui/widgets/e-addressbook-view.c:733
-# addressbook/gui/widgets/e-addressbook-view.c:1405
-# ui/evolution-addressbook.xml.h:19
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:141
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:278
-# addressbook/gui/widgets/e-addressbook-view.c:734
-# addressbook/gui/widgets/e-addressbook-view.c:834
-# addressbook/gui/widgets/e-addressbook-view.c:1516
-# ui/evolution-addressbook.xml.h:19
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:141
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:278
-#: addressbook/gui/widgets/e-addressbook-view.c:734
-#: addressbook/gui/widgets/e-addressbook-view.c:834
-#: addressbook/gui/widgets/e-addressbook-view.c:1516
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr "保存为 VCard"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-# ui/evolution-message-composer.xml.h:13
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-# ui/evolution-message-composer.xml.h:13
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
-# ui/evolution-message-composer.xml.h:13
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "打开"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-# addressbook/gui/widgets/e-addressbook-view.c:734
-# ui/evolution-addressbook.xml.h:10
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-# addressbook/gui/widgets/e-addressbook-view.c:734
-# ui/evolution-addressbook.xml.h:10
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
-# addressbook/gui/widgets/e-addressbook-view.c:835
-# ui/evolution-addressbook.xml.h:10
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
-#: addressbook/gui/widgets/e-addressbook-view.c:835
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "转发联系人"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-# addressbook/gui/widgets/e-addressbook-view.c:735
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-# addressbook/gui/widgets/e-addressbook-view.c:735
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
-# addressbook/gui/widgets/e-addressbook-view.c:836
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
-#: addressbook/gui/widgets/e-addressbook-view.c:836
-msgid "Send Message to Contact"
-msgstr "给联系人发邮件"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-# addressbook/gui/widgets/e-addressbook-view.c:736
-# ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-# ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
-# ui/my-evolution.xml.h:2
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-# addressbook/gui/widgets/e-addressbook-view.c:736
-# ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-# ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
-# ui/my-evolution.xml.h:2
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
-# addressbook/gui/widgets/e-addressbook-view.c:837
-# ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-# ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
-# ui/my-evolution.xml.h:2
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
-#: addressbook/gui/widgets/e-addressbook-view.c:837
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
-#: ui/my-evolution.xml.h:2
-msgid "Print"
-msgstr "打印"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-# addressbook/gui/widgets/e-addressbook-view.c:738
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-# addressbook/gui/widgets/e-addressbook-view.c:738
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
-# addressbook/gui/widgets/e-addressbook-view.c:839
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
-#: addressbook/gui/widgets/e-addressbook-view.c:839
-msgid "Print Envelope"
-msgstr "打印信封"
-
-# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
-# addressbook/gui/widgets/e-addressbook-view.c:841
-# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
-#: addressbook/gui/widgets/e-addressbook-view.c:841
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
-msgid "Cut"
-msgstr "剪切"
-
-# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-# ui/evolution-tasks.xml.h:3
-# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-# ui/evolution-tasks.xml.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
-# addressbook/gui/widgets/e-addressbook-view.c:842
-# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-# ui/evolution-tasks.xml.h:3
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
-#: addressbook/gui/widgets/e-addressbook-view.c:842
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "复制"
-
-# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
-# addressbook/gui/widgets/e-addressbook-view.c:843
-# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
-#: addressbook/gui/widgets/e-addressbook-view.c:843
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
-msgid "Paste"
-msgstr "粘贴"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-# addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:8
-# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
-# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
-# ui/evolution-tasks.xml.h:8
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-# addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:8
-# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
-# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
-# ui/evolution-tasks.xml.h:8
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
-# addressbook/gui/widgets/e-addressbook-view.c:844 filter/libfilter-i18n.h:9
-# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
-# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
-#: addressbook/gui/widgets/e-addressbook-view.c:844 filter/libfilter-i18n.h:9
-#: mail/mail-accounts.c:295 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
-msgid "Delete"
-msgstr "删除"
+# shell/e-shell-importer.c:455
+# shell/e-shell-importer.c:455
+# shell/e-shell-importer.c:466
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+msgid "Error getting book view"
+msgstr "启动 %s 错误"
 
 # addressbook/gui/widgets/e-addressbook-table-adapter.c:140
 # addressbook/gui/widgets/e-addressbook-util.c:85
@@ -4445,7 +4866,7 @@ msgstr "删除"
 # addressbook/gui/widgets/e-addressbook-util.c:85
 # addressbook/gui/widgets/e-minicard.c:475
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "修改卡片错误"
@@ -4456,8 +4877,8 @@ msgstr "修改卡片错误"
 # shell/evolution-shell-component.c:1007
 # addressbook/gui/widgets/e-addressbook-util.c:33
 # shell/evolution-shell-component.c:1020
-#: addressbook/gui/widgets/e-addressbook-util.c:33
-#: shell/evolution-shell-component.c:1020
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "成功"
 
@@ -4473,17 +4894,18 @@ msgstr "成功"
 # camel/providers/imap/camel-imap-command.c:275
 # camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
 # shell/e-storage.c:528 shell/evolution-shell-component.c:1057
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1895
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "未知的错误"
 
 # addressbook/gui/widgets/e-addressbook-util.c:35
 # addressbook/gui/widgets/e-addressbook-util.c:35
 # addressbook/gui/widgets/e-addressbook-util.c:35
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "仓库离线"
 
@@ -4493,29 +4915,29 @@ msgstr "仓库离线"
 # shell/evolution-shell-component.c:1035
 # addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
 # shell/evolution-shell-component.c:1048
-#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
-#: shell/evolution-shell-component.c:1048
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "没有权限"
 
 # addressbook/gui/widgets/e-addressbook-util.c:37
 # addressbook/gui/widgets/e-addressbook-util.c:37
 # addressbook/gui/widgets/e-addressbook-util.c:37
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "找不到卡片"
 
 # addressbook/gui/widgets/e-addressbook-util.c:38
 # addressbook/gui/widgets/e-addressbook-util.c:38
 # addressbook/gui/widgets/e-addressbook-util.c:38
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "卡片 ID 已经存在"
 
 # addressbook/gui/widgets/e-addressbook-util.c:39
 # addressbook/gui/widgets/e-addressbook-util.c:39
 # addressbook/gui/widgets/e-addressbook-util.c:39
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "不支持的协议"
 
@@ -4534,18 +4956,39 @@ msgstr "不支持的协议"
 # calendar/gui/dialogs/task-details-page.glade.h:3
 # calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
 # camel/camel-service.c:610 camel/camel-service.c:646
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "已经取消"
 
+# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "认证失败。"
+
+# camel/providers/smtp/camel-smtp-transport.c:222
+# camel/providers/smtp/camel-smtp-transport.c:222
+# camel/providers/smtp/camel-smtp-transport.c:223
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "必须认证"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
 # addressbook/gui/widgets/e-addressbook-util.c:41
 # addressbook/gui/widgets/e-addressbook-util.c:41
 # addressbook/gui/widgets/e-addressbook-util.c:41
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "其它错误"
 
@@ -4555,7 +4998,7 @@ msgstr "其它错误"
 # calendar/gui/dialogs/save-comp.c:50
 # addressbook/gui/widgets/e-addressbook-util.c:57
 # calendar/gui/dialogs/save-comp.c:50
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "您希望保存修改吗？"
@@ -4563,28 +5006,29 @@ msgstr "您希望保存修改吗？"
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "添加列表错误"
 
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "添加卡片错误"
 
 # addressbook/gui/widgets/e-addressbook-util.c:85
 # addressbook/gui/widgets/e-addressbook-util.c:85
 # addressbook/gui/widgets/e-addressbook-util.c:85
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "修改列表错误"
 
 # addressbook/gui/widgets/e-addressbook-util.c:95
 # addressbook/gui/widgets/e-addressbook-util.c:95
 # addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "删除列表错误"
 
@@ -4594,27 +5038,28 @@ msgstr "删除列表错误"
 # addressbook/gui/widgets/e-addressbook-view.c:1278
 # addressbook/gui/widgets/e-addressbook-util.c:95
 # addressbook/gui/widgets/e-addressbook-view.c:1389
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1389
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "删除卡片错误"
 
 # mail/mail-config.glade.h:28
 # mail/mail-config.glade.h:28
 # addressbook/gui/widgets/e-addressbook-util.c:202
-#: addressbook/gui/widgets/e-addressbook-util.c:202
+#: addressbook/gui/widgets/e-addressbook-util.c:207
 msgid "Display Cards?"
 msgstr "显示卡片？"
 
 # mail/mail-config.glade.h:28
 # mail/mail-config.glade.h:28
 # addressbook/gui/widgets/e-addressbook-util.c:203
-#: addressbook/gui/widgets/e-addressbook-util.c:203
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards"
 msgstr "显示卡片"
 
 # addressbook/gui/widgets/e-addressbook-util.c:207
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:212
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -4624,132 +5069,397 @@ msgstr ""
 "您已经请求 %d 个卡片。这将在您的显示屏上打开\n"
 " %d 个新窗口。您真的希望显示所有这些卡片？"
 
-# addressbook/gui/widgets/e-addressbook-view.c:378
-# addressbook/gui/widgets/e-addressbook-view.c:378
-# addressbook/gui/widgets/e-addressbook-view.c:404
-#. Translators: put here a list of labels you want to see on buttons in
-#. addressbook. You may use any character to separate labels but it must
-#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:404
-msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+# mail/mail-callbacks.c:1281 mail/message-browser.c:130
+# mail/mail-callbacks.c:1376 mail/message-browser.c:130
+# mail/mail-callbacks.c:1411 mail/message-browser.c:130
+#: addressbook/gui/widgets/e-addressbook-util.c:347
+#, fuzzy
+msgid "Move card to"
+msgstr "将消息移动到"
 
-# addressbook/gui/widgets/e-addressbook-view.c:383
-# addressbook/gui/widgets/e-addressbook-view.c:383
-# addressbook/gui/widgets/e-addressbook-view.c:409
-#. Translators: put here a list of characters that correspond to buttons
-#. in addressbook. You may use any character to separate labels but it
-#. must also be placed at the begining ot the string.
-#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:409
-msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+# ui/evolution-tasks.xml.h:4
+# ui/evolution-tasks.xml.h:4
+# ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Copy card to"
+msgstr "复制选中的任务"
+
+# addressbook/gui/widgets/e-addressbook-model.c:127
+# addressbook/gui/widgets/e-addressbook-model.c:127
+# addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-util.c:352
+#, fuzzy
+msgid "Move cards to"
+msgstr "没有卡片"
+
+# addressbook/gui/widgets/e-addressbook-model.c:127
+# addressbook/gui/widgets/e-addressbook-model.c:127
+# addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-util.c:354
+#, fuzzy
+msgid "Copy cards to"
+msgstr "没有卡片"
 
 # addressbook/gui/widgets/e-addressbook-view.c:848
 # addressbook/gui/widgets/e-addressbook-view.c:848
 # addressbook/gui/widgets/e-addressbook-view.c:959
-#: addressbook/gui/widgets/e-addressbook-view.c:959
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* 点击此处以便添加联系人 *"
 
 # addressbook/gui/widgets/e-addressbook-view.c:852
 # addressbook/gui/widgets/e-addressbook-view.c:852
 # addressbook/gui/widgets/e-addressbook-view.c:963
-#: addressbook/gui/widgets/e-addressbook-view.c:963
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "主要电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:853
 # addressbook/gui/widgets/e-addressbook-view.c:853
 # addressbook/gui/widgets/e-addressbook-view.c:964
-#: addressbook/gui/widgets/e-addressbook-view.c:964
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "辅助电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:854
 # addressbook/gui/widgets/e-addressbook-view.c:854
 # addressbook/gui/widgets/e-addressbook-view.c:965
-#: addressbook/gui/widgets/e-addressbook-view.c:965
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "商务电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:855
 # addressbook/gui/widgets/e-addressbook-view.c:855
 # addressbook/gui/widgets/e-addressbook-view.c:966
-#: addressbook/gui/widgets/e-addressbook-view.c:966
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "反馈电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:856
 # addressbook/gui/widgets/e-addressbook-view.c:856
 # addressbook/gui/widgets/e-addressbook-view.c:967
-#: addressbook/gui/widgets/e-addressbook-view.c:967
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "公司电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:857
 # addressbook/gui/widgets/e-addressbook-view.c:857
 # addressbook/gui/widgets/e-addressbook-view.c:968
-#: addressbook/gui/widgets/e-addressbook-view.c:968
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "家庭电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:859
 # addressbook/gui/widgets/e-addressbook-view.c:859
 # addressbook/gui/widgets/e-addressbook-view.c:970
-#: addressbook/gui/widgets/e-addressbook-view.c:970
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "商务地址"
 
 # addressbook/gui/widgets/e-addressbook-view.c:860
 # addressbook/gui/widgets/e-addressbook-view.c:860
 # addressbook/gui/widgets/e-addressbook-view.c:971
-#: addressbook/gui/widgets/e-addressbook-view.c:971
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "家庭地址"
 
 # addressbook/gui/widgets/e-addressbook-view.c:861
 # addressbook/gui/widgets/e-addressbook-view.c:861
 # addressbook/gui/widgets/e-addressbook-view.c:972
-#: addressbook/gui/widgets/e-addressbook-view.c:972
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "手机"
 
 # addressbook/gui/widgets/e-addressbook-view.c:862
 # addressbook/gui/widgets/e-addressbook-view.c:862
 # addressbook/gui/widgets/e-addressbook-view.c:973
-#: addressbook/gui/widgets/e-addressbook-view.c:973
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "汽车电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:865
 # addressbook/gui/widgets/e-addressbook-view.c:865
 # addressbook/gui/widgets/e-addressbook-view.c:976
-#: addressbook/gui/widgets/e-addressbook-view.c:976
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "商务电话 2"
 
 # addressbook/gui/widgets/e-addressbook-view.c:866
 # addressbook/gui/widgets/e-addressbook-view.c:866
 # addressbook/gui/widgets/e-addressbook-view.c:977
-#: addressbook/gui/widgets/e-addressbook-view.c:977
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "家庭电话 2"
 
 # addressbook/gui/widgets/e-addressbook-view.c:868
 # addressbook/gui/widgets/e-addressbook-view.c:868
 # addressbook/gui/widgets/e-addressbook-view.c:979
-#: addressbook/gui/widgets/e-addressbook-view.c:979
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "其它电话"
 
 # addressbook/gui/widgets/e-addressbook-view.c:874
 # addressbook/gui/widgets/e-addressbook-view.c:874
 # addressbook/gui/widgets/e-addressbook-view.c:985
-#: addressbook/gui/widgets/e-addressbook-view.c:985
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 msgid "Other Address"
 msgstr "其它地址"
 
+# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "地址簿"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+# addressbook/gui/widgets/e-addressbook-view.c:671
+# addressbook/gui/widgets/e-addressbook-view.c:733
+# addressbook/gui/widgets/e-addressbook-view.c:1405
+# ui/evolution-addressbook.xml.h:19
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+# addressbook/gui/widgets/e-addressbook-view.c:671
+# addressbook/gui/widgets/e-addressbook-view.c:733
+# addressbook/gui/widgets/e-addressbook-view.c:1405
+# ui/evolution-addressbook.xml.h:19
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:141
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:278
+# addressbook/gui/widgets/e-addressbook-view.c:734
+# addressbook/gui/widgets/e-addressbook-view.c:834
+# addressbook/gui/widgets/e-addressbook-view.c:1516
+# ui/evolution-addressbook.xml.h:19
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "保存为 VCard"
+
+# addressbook/gui/component/addressbook-component.c:526
+# ui/evolution-addressbook.xml.h:11
+# addressbook/gui/component/addressbook-component.c:526
+# ui/evolution-addressbook.xml.h:11
+# addressbook/gui/component/addressbook-component.c:527
+# ui/evolution-addressbook.xml.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:877
+#, fuzzy
+msgid "New Contact..."
+msgstr "新建联系人"
+
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/widgets/e-addressbook-view.c:878
+#, fuzzy
+msgid "New Contact List..."
+msgstr "新建联系人列表"
+
+# ui/evolution.xml.h:39
+# ui/evolution.xml.h:39
+# ui/evolution.xml.h:39
+#: addressbook/gui/widgets/e-addressbook-view.c:881
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "转到文件夹(_G)..."
+
+# ui/evolution.xml.h:41
+# ui/evolution.xml.h:41
+# ui/evolution.xml.h:41
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Import..."
+msgstr "正在导入(_I)..."
+
+# ui/evolution-addressbook.xml.h:39
+# ui/evolution-addressbook.xml.h:39
+# ui/evolution-addressbook.xml.h:41
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "搜索联系人(_S)"
+
+# ui/evolution-addressbook.xml.h:30
+# ui/evolution-addressbook.xml.h:30
+# ui/evolution-addressbook.xml.h:31
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "地址簿来源(_A)..."
+
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+#: addressbook/gui/widgets/e-addressbook-view.c:887
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Pilot 设置(_P)..."
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+# addressbook/gui/widgets/e-addressbook-view.c:734
+# ui/evolution-addressbook.xml.h:10
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+# addressbook/gui/widgets/e-addressbook-view.c:734
+# ui/evolution-addressbook.xml.h:10
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:279
+# addressbook/gui/widgets/e-addressbook-view.c:835
+# ui/evolution-addressbook.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "转发联系人"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+# addressbook/gui/widgets/e-addressbook-view.c:735
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+# addressbook/gui/widgets/e-addressbook-view.c:735
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:280
+# addressbook/gui/widgets/e-addressbook-view.c:836
+#: addressbook/gui/widgets/e-addressbook-view.c:892
+msgid "Send Message to Contact"
+msgstr "给联系人发邮件"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+# addressbook/gui/widgets/e-addressbook-view.c:736
+# ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+# ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+# ui/my-evolution.xml.h:2
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+# addressbook/gui/widgets/e-addressbook-view.c:736
+# ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+# ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+# ui/my-evolution.xml.h:2
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:281
+# addressbook/gui/widgets/e-addressbook-view.c:837
+# ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+# ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+# ui/my-evolution.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/my-evolution.xml.h:1
+msgid "Print"
+msgstr "打印"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+# addressbook/gui/widgets/e-addressbook-view.c:738
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+# addressbook/gui/widgets/e-addressbook-view.c:738
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:283
+# addressbook/gui/widgets/e-addressbook-view.c:839
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+msgid "Print Envelope"
+msgstr "打印信封"
+
+# mail/folder-browser.c:1467
+# mail/folder-browser.c:1476
+# mail/folder-browser.c:1477
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "复制到文件夹..."
+
+# mail/folder-browser.c:1466
+# mail/folder-browser.c:1475
+# mail/folder-browser.c:1476
+#: addressbook/gui/widgets/e-addressbook-view.c:900
+#, fuzzy
+msgid "Move to folder..."
+msgstr "移动到文件夹(_M)..."
+
+# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
+# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:285
+# addressbook/gui/widgets/e-addressbook-view.c:841
+# ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "剪切"
+
+# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
+# ui/evolution-tasks.xml.h:3
+# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
+# ui/evolution-tasks.xml.h:3
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:286
+# addressbook/gui/widgets/e-addressbook-view.c:842
+# ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:6
+# ui/evolution-tasks.xml.h:3
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "复制"
+
+# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:287
+# addressbook/gui/widgets/e-addressbook-view.c:843
+# ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
+#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+msgid "Paste"
+msgstr "粘贴"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+# addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:8
+# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
+# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
+# ui/evolution-tasks.xml.h:8
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+# addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:8
+# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
+# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
+# ui/evolution-tasks.xml.h:8
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:288
+# addressbook/gui/widgets/e-addressbook-view.c:844 filter/libfilter-i18n.h:9
+# mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
+# ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+# ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+msgid "Delete"
+msgstr "删除"
+
+# widgets/menus/gal-view-menus.c:195
+# widgets/menus/gal-view-menus.c:195
+# widgets/menus/gal-view-menus.c:195
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "当前视图(_C)"
+
+# addressbook/gui/widgets/e-addressbook-view.c:378
+# addressbook/gui/widgets/e-addressbook-view.c:378
+# addressbook/gui/widgets/e-addressbook-view.c:404
+#. Minicard view stuff
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c:942
+msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+
+# addressbook/gui/widgets/e-addressbook-view.c:383
+# addressbook/gui/widgets/e-addressbook-view.c:383
+# addressbook/gui/widgets/e-addressbook-view.c:409
+#. Translators: put here a list of characters that correspond to buttons
+#. in addressbook. You may use any character to separate labels but it
+#. must also be placed at the begining ot the string.
+#. Use lower case letters if possible.
+#: addressbook/gui/widgets/e-addressbook-view.c:947
+msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+
 # addressbook/gui/widgets/e-minicard-control.c:185
 # addressbook/gui/widgets/e-minicard-control.c:185
 # addressbook/gui/widgets/e-minicard-control.c:185
@@ -4775,11 +5485,12 @@ msgstr "保存在地址簿中"
 # addressbook/gui/widgets/e-minicard-view.c:150
 # addressbook/gui/widgets/e-minicard-view.c:150
 # addressbook/gui/widgets/e-minicard-view.c:150
-#: addressbook/gui/widgets/e-minicard-view.c:150
+#: addressbook/gui/widgets/e-minicard-view.c:140
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"There are no items to show in this view\n"
+"There are no items to show in this view.\n"
 "\n"
 "Double-click here to create a new Contact."
 msgstr ""
@@ -4789,6 +5500,22 @@ msgstr ""
 "\n"
 "在这里双击以创建新联系人。"
 
+# addressbook/gui/widgets/e-minicard-view.c:150
+# addressbook/gui/widgets/e-minicard-view.c:150
+# addressbook/gui/widgets/e-minicard-view.c:150
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"本视图中没有可显示的项\n"
+"\n"
+"在这里双击以创建新联系人。"
+
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
@@ -4948,6 +5675,7 @@ msgstr "包含："
 # addressbook/printing/e-contact-print.glade.h:18
 # addressbook/printing/e-contact-print.glade.h:18
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "横向"
 
@@ -4982,7 +5710,7 @@ msgstr "列数："
 # addressbook/printing/e-contact-print.glade.h:23
 # addressbook/printing/e-contact-print.glade.h:23
 # addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "选项"
 
@@ -4990,6 +5718,7 @@ msgstr "选项"
 # addressbook/printing/e-contact-print.glade.h:24
 # addressbook/printing/e-contact-print.glade.h:24
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "方向"
 
@@ -4998,7 +5727,7 @@ msgstr "方向"
 # addressbook/printing/e-contact-print.glade.h:25
 # my-evolution/Locations.h:1672
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "页面"
 
@@ -5026,7 +5755,9 @@ msgstr "纸张来源："
 # addressbook/printing/e-contact-print.glade.h:29
 # addressbook/printing/e-contact-print.glade.h:29
 # addressbook/printing/e-contact-print.glade.h:29
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "纵向"
 
@@ -5124,7 +5855,7 @@ msgstr "字体(_F)..."
 # calendar/cal-util/cal-component.c:1202
 # calendar/cal-util/cal-component.c:1202
 # calendar/cal-util/cal-component.c:1207
-#: calendar/cal-util/cal-component.c:1207
+#: calendar/cal-util/cal-component.c:1221
 msgid "Untitled appointment"
 msgstr "无标题约会"
 
@@ -5137,9 +5868,9 @@ msgstr "无标题约会"
 # calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
 # calendar/gui/dialogs/task-details-page.glade.h:6
 # calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
-#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
+#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "高"
 
@@ -5155,10 +5886,10 @@ msgstr "高"
 # calendar/gui/calendar-model.c:1711
 # calendar/gui/dialogs/task-details-page.glade.h:9
 # calendar/gui/e-calendar-table.c:407 mail/message-list.c:678
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/calendar-model.c:1711
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:678
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "中"
 
@@ -5171,9 +5902,9 @@ msgstr "中"
 # calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 # calendar/gui/dialogs/task-details-page.glade.h:8
 # calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
+#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "低"
 
@@ -5187,9 +5918,9 @@ msgstr "低"
 # calendar/gui/dialogs/task-details-page.glade.h:13
 # calendar/gui/e-calendar-table.c:409
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:518
+#: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:409
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "未定义"
 
@@ -5200,7 +5931,7 @@ msgstr "未定义"
 # calendar/conduits/calendar/calendar-conduit.c:1150
 # calendar/conduits/todo/todo-conduit.c:770
 #: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:770
+#: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "在与日历服务器通讯时发生错误"
 
@@ -5215,14 +5946,22 @@ msgstr "在与日历服务器通讯时发生错误"
 msgid "Could not read pilot's Calendar application block"
 msgstr "无法读入 Pilot 日历应用程序块"
 
+# calendar/gui/dialogs/task-details-page.glade.h:14
+# calendar/gui/dialogs/task-details-page.glade.h:14
+# calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "优先级(_P)："
+
 # calendar/conduits/todo/todo-conduit.c:756
 # calendar/conduits/todo/todo-conduit.c:759
 # calendar/conduits/todo/todo-conduit.c:756
 # calendar/conduits/todo/todo-conduit.c:759
 # calendar/conduits/todo/todo-conduit.c:886
 # calendar/conduits/todo/todo-conduit.c:889
-#: calendar/conduits/todo/todo-conduit.c:886
-#: calendar/conduits/todo/todo-conduit.c:889
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "无法读入 Pilot ToDo 应用程序块"
 
@@ -5240,34 +5979,36 @@ msgstr "显示任务列表的 Bonobo 控制。"
 msgid "A sample Bonobo control which displays an calendar."
 msgstr "显示日历的示例 Bonobo 控制。"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution 日历实施概要组件。"
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "日历和任务设置"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Calendar."
+msgstr "Evolution 撰写器车间。"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution 日历 iTip/iMip 查看器"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "处理日历的 Evolution 组件。"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Calendar Summary component."
-msgstr "日历概要组件车间。"
-
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
@@ -5303,6 +6044,10 @@ msgstr "日历组件编辑器对话框集中车间"
 msgid "Factory to create a component editor factory"
 msgstr "创建组件编辑车间的车间"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+msgid "This page can be used to configure Calendar and Task preferences"
+msgstr ""
+
 # calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 # calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 # calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
@@ -5413,7 +6158,7 @@ msgstr ""
 # calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2283
 # widgets/misc/e-messagebox.c:159
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2297
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "警告"
@@ -5447,56 +6192,56 @@ msgstr "不要再次询问该问题。"
 # calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 # calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
 # calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "无法初始化 GNOME"
 
 # calendar/gui/alarm-notify/notify-main.c:181
 # calendar/gui/alarm-notify/notify-main.c:181
 # calendar/gui/alarm-notify/notify-main.c:181
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service"
 msgstr "无法创建提醒服务"
 
 # calendar/gui/alarm-notify/notify-main.c:186
 # calendar/gui/alarm-notify/notify-main.c:186
 # calendar/gui/alarm-notify/notify-main.c:186
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "无法创建提醒服务车间"
 
 # calendar/gui/cal-search-bar.c:56
 # calendar/gui/cal-search-bar.c:56
 # calendar/gui/cal-search-bar.c:56
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "概要含有"
 
 # calendar/gui/cal-search-bar.c:57
 # calendar/gui/cal-search-bar.c:57
 # calendar/gui/cal-search-bar.c:57
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "描述含有"
 
 # calendar/gui/cal-search-bar.c:58
 # calendar/gui/cal-search-bar.c:58
 # calendar/gui/cal-search-bar.c:58
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "注释含有"
 
 # calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1072
 # calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1074
 # calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
 msgid "Unmatched"
 msgstr "未匹配"
 
 # calendar/gui/calendar-commands.c:446
 # calendar/gui/calendar-commands.c:446
 # calendar/gui/calendar-commands.c:446
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%Y %B %d %A"
 
@@ -5508,8 +6253,8 @@ msgstr "%Y %B %d %A"
 # calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%b %d %a"
 
@@ -5519,8 +6264,8 @@ msgstr "%b %d %a"
 # calendar/gui/calendar-commands.c:458
 # calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
 # calendar/gui/calendar-commands.c:458
-#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
-#: calendar/gui/calendar-commands.c:458
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
 msgid "%a %d %b %Y"
 msgstr "%Y %b %d %a"
 
@@ -5530,8 +6275,8 @@ msgstr "%Y %b %d %a"
 # calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
 # calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
 # calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
-#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
-#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
 msgid "%d %B %Y"
 msgstr "%Y %B %d"
 
@@ -5544,15 +6289,15 @@ msgstr "%Y %B %d"
 #. 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/calendar-commands.c:474
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
+#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
 msgid "%d %B"
 msgstr "%B %d"
 
 # calendar/gui/calendar-commands.c:805
 # calendar/gui/calendar-commands.c:820
 # calendar/gui/calendar-commands.c:820
-#: calendar/gui/calendar-commands.c:820
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
@@ -5564,7 +6309,7 @@ msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
 # calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
 # calendar/gui/e-calendar-table.c:385
 #: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:385
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "保密"
 
@@ -5575,14 +6320,14 @@ msgstr "保密"
 # calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
 # calendar/gui/e-calendar-table.c:386
 #: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "机密"
 
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "公开"
 
@@ -5621,7 +6366,7 @@ msgstr "西"
 # calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
 # calendar/gui/e-calendar-table.c:458
 #: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "放假"
 
@@ -5634,9 +6379,9 @@ msgstr "放假"
 # calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
 # calendar/gui/e-meeting-time-sel.c:432
 # shell/evolution-shell-component.c:1042
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
-#: calendar/gui/e-meeting-time-sel.c:432
-#: shell/evolution-shell-component.c:1042
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "繁忙"
 
@@ -5651,7 +6396,7 @@ msgstr "繁忙"
 # calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "尚未开始"
 
@@ -5666,7 +6411,7 @@ msgstr "尚未开始"
 # calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "正在进行中"
 
@@ -5684,8 +6429,8 @@ msgstr "正在进行中"
 # calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
-#: calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "已完成"
 
@@ -5724,10 +6469,12 @@ msgstr ""
 # widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 # widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1496
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:404
-#: mail/mail-config.glade.h:56
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -5757,9 +6504,9 @@ msgstr "已分派"
 # calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
 # calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
 # calendar/gui/e-meeting-model.c:810
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
-#: calendar/gui/e-meeting-model.c:810
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "是"
 
@@ -5769,23 +6516,11 @@ msgstr "是"
 # calendar/gui/e-meeting-model.c:811
 # calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
 # calendar/gui/e-meeting-model.c:811
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:811
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "否"
 
-# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1675
-# calendar/gui/e-week-view.c:1182
-# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-# calendar/gui/e-week-view.c:1184
-# calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-# calendar/gui/e-week-view.c:1188
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-#: calendar/gui/e-week-view.c:1188
-msgid "Searching"
-msgstr "搜索"
-
 # calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 # calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 # calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
@@ -5820,15 +6555,16 @@ msgstr "月视图"
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "日历"
 
 # calendar/gui/component-factory.c:64
 # calendar/gui/component-factory.c:64
 # calendar/gui/component-factory.c:64
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "文件夹含有约会和事件"
 
@@ -5844,59 +6580,114 @@ msgstr "文件夹含有约会和事件"
 # my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
 # shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 # views/tasks/galview.xml.h:1
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
-#: my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
-#: views/tasks/galview.xml.h:1
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "任务"
 
 # calendar/gui/component-factory.c:69
 # calendar/gui/component-factory.c:69
 # calendar/gui/component-factory.c:69
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "文件夹含有 to-do 项"
 
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "创建新约会"
+# my-evolution/my-evolution.glade.h:10
+# my-evolution/my-evolution.glade.h:10
+# my-evolution/my-evolution.glade.h:10
+#: calendar/gui/component-factory.c:704
+#, fuzzy
+msgid "New meeting"
+msgstr "新闻来源设置"
+
+# calendar/gui/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+# calendar/gui/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+# calendar/gui/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+#: calendar/gui/component-factory.c:704
+#, fuzzy
+msgid "_Meeting"
+msgstr "会见"
+
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New task"
+msgstr "新建任务"
+
+# ui/evolution-tasks.xml.h:18
+# ui/evolution-tasks.xml.h:18
+# ui/evolution-tasks.xml.h:22
+#: calendar/gui/component-factory.c:708
+msgid "_Task"
+msgstr "任务(_T)"
+
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+#: calendar/gui/component-factory.c:712
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "新建约会"
 
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:712
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "新建约会(_A)"
 
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:6
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "创建新任务"
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+#: calendar/gui/component-factory.c:716
+#, fuzzy
+msgid "New appointment"
+msgstr "新建约会"
 
-# calendar/gui/component-factory.c:649
-# calendar/gui/component-factory.c:649
-# calendar/gui/component-factory.c:649
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "新建任务(_T)"
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/component-factory.c:716
+#, fuzzy
+msgid "_Appointment"
+msgstr "约会"
+
+# calendar/gui/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1493
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "无法打开“%s”中的文件夹"
 
 # calendar/gui/control-factory.c:127
 # calendar/gui/control-factory.c:127
 # calendar/gui/control-factory.c:127
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "日历将显示的 URI"
 
+# ui/evolution.xml.h:3
+# ui/evolution.xml.h:3
+# executive-summary/component/e-summary-url.c:72
+#: calendar/gui/control-factory.c:174
+#, fuzzy
+msgid "The type of view to show"
+msgstr "将视图改变为 %s"
+
 # calendar/gui/dialogs/alarm-options.c:359
 # calendar/gui/dialogs/alarm-options.c:359
 # calendar/gui/dialogs/alarm-options.c:359
@@ -6010,10 +6801,7 @@ msgstr "小时"
 # calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 # calendar/gui/dialogs/alarm-options.glade.h:11
 # executive-summary/test-service/rdf-summary.c:806
-# filter/filter-datespec.c:85
-#: calendar/gui/dialogs/alarm-options.glade.h:11
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 msgid "minutes"
 msgstr "分钟"
 
@@ -6243,7 +7031,7 @@ msgstr "提示器"
 # calendar/gui/e-itip-control.c:748 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:748 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "概要："
 
@@ -6296,7 +7084,7 @@ msgstr "小时"
 # calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 # calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 # calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:129
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:131
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "分钟"
 
@@ -6342,48 +7130,46 @@ msgstr "30 分钟"
 msgid "60 minutes"
 msgstr "60 分钟"
 
+# addressbook/gui/contact-editor/fulladdr.glade.h:4
+# addressbook/gui/contact-editor/fulladdr.glade.h:4
+# my-evolution/Locations.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "阿尔伯达"
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "日历和任务设置"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "被延误任务的颜色"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "今天到期任务的颜色"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "用默认提醒器创建新约会(_R)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "天数"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "每周的第一天(_K)："
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 # calendar/gui/dialogs/recurrence-page.c:963
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
@@ -6391,7 +7177,7 @@ msgstr "每周的第一天(_K)："
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 # calendar/gui/dialogs/recurrence-page.c:963
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "星期五"
 
@@ -6416,16 +7202,17 @@ msgstr "分钟"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 # calendar/gui/dialogs/recurrence-page.c:959
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "星期一"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "被延误的任务(_V)："
+#, fuzzy
+msgid "S_un"
+msgstr "星期日(_N)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 # calendar/gui/dialogs/recurrence-page.c:964
@@ -6434,16 +7221,13 @@ msgstr "被延误的任务(_V)："
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 # calendar/gui/dialogs/recurrence-page.c:964
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "星期六"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
-msgstr "在周视图和月视图中显示约会结束时间(_E)"
+msgid "Sh_ow a reminder"
+msgstr ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
@@ -6452,51 +7236,39 @@ msgstr "在周视图和月视图中显示约会结束时间(_E)"
 msgid "Show week _numbers in date navigator"
 msgstr "在日期浏览器中显示周数(_N)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Sta_rt of day:"
-msgstr "每天的开始(_R)："
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Su_n"
-msgstr "星期日(_N)"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 # calendar/gui/dialogs/recurrence-page.c:965
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 # calendar/gui/dialogs/recurrence-page.c:965
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 # calendar/gui/dialogs/recurrence-page.c:965
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "星期日"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "今天到期的任务(_K)："
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "星期四(_H)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "T_ue"
-msgstr "星期二(_U)"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "今天到期的任务(_K)："
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "任务列表(_T)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 # calendar/gui/dialogs/recurrence-page.c:962
@@ -6504,36 +7276,29 @@ msgstr "今天到期的任务(_K)："
 # calendar/gui/dialogs/recurrence-page.c:962
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 # calendar/gui/dialogs/recurrence-page.c:962
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Thursday"
 msgstr "星期四"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "时间"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "时区(_Z)："
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "时间分割(_V)："
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "时间格式："
 
@@ -6543,19 +7308,23 @@ msgstr "时间格式："
 # calendar/gui/dialogs/recurrence-page.c:960
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 # calendar/gui/dialogs/recurrence-page.c:960
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1122
 msgid "Tuesday"
 msgstr "星期二"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 # calendar/gui/dialogs/recurrence-page.c:961
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 # calendar/gui/dialogs/recurrence-page.c:961
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 # calendar/gui/dialogs/recurrence-page.c:961
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "星期三"
 
@@ -6565,39 +7334,51 @@ msgstr "星期三"
 # ui/evolution-calendar.xml.h:33
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 # ui/evolution-calendar.xml.h:33
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "一周工作日"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "12 小时 (AM/PM) (_1)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "24 小时(_2)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "删除项时要求确认(_A)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "不在月视图中显示周末(_C)"
 
+# calendar/gui/e-itip-control.c:537
+# calendar/gui/e-itip-control.c:537
+# calendar/gui/e-itip-control.c:540
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "任务开始：<b>"
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
@@ -6605,74 +7386,87 @@ msgstr "不在月视图中显示周末(_C)"
 msgid "_Display"
 msgstr "显示(_D)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "_End of day:"
-msgstr "每天的结束(_E)："
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "星期五(_F)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "常规(_G)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "随后隐藏已完成的任务(_H)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "星期一(_M)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "其它(_O)"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "被延误的任务(_V)："
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "星期六(_S)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "在周视图和月视图中显示约会结束时间(_E)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "任务列表(_T)"
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "时间分割(_V)："
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "星期二(_U)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "星期三(_W)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "before the start of the appointment"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
 msgstr "在约会开始以前"
 
 # calendar/gui/dialogs/cancel-comp.c:51
@@ -6780,56 +7574,73 @@ msgstr "%s  您还没有进行修改，更新编辑器？"
 # calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 # calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
 # calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
 msgid " to "
 msgstr " 到 "
 
 # calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 # calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
 # calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
 msgid " (Completed "
 msgstr " (完成 "
 
 # calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 # calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
 # calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
 msgid "Completed "
 msgstr "已完成 "
 
 # calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 # calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
 # calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
 msgid " (Due "
 msgstr " (预定 "
 
 # calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 # calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
 # calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
 msgid "Due "
 msgstr "预定 "
 
 # calendar/gui/dialogs/comp-editor.c:303
 # calendar/gui/dialogs/comp-editor.c:303
 # calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:321
-msgid "Could not update object!"
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "无法更新对象！"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+# calendar/gui/dialogs/comp-editor.c:303
+# calendar/gui/dialogs/comp-editor.c:303
+# calendar/gui/dialogs/comp-editor.c:321
+#: calendar/gui/dialogs/comp-editor.c:351
+#, fuzzy
+msgid "Could not update object"
 msgstr "无法更新对象！"
 
 # calendar/gui/dialogs/comp-editor.c:678
 # calendar/gui/dialogs/comp-editor.c:678
 # calendar/gui/dialogs/comp-editor.c:692
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "编辑约会"
 
 # calendar/gui/dialogs/comp-editor.c:683
 # calendar/gui/dialogs/comp-editor.c:683
 # calendar/gui/dialogs/comp-editor.c:697
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
@@ -6837,7 +7648,7 @@ msgstr "约会 - %s"
 # calendar/gui/dialogs/comp-editor.c:686
 # calendar/gui/dialogs/comp-editor.c:686
 # calendar/gui/dialogs/comp-editor.c:700
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
@@ -6845,7 +7656,7 @@ msgstr "任务 - %s"
 # calendar/gui/dialogs/comp-editor.c:689
 # calendar/gui/dialogs/comp-editor.c:689
 # calendar/gui/dialogs/comp-editor.c:703
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日志条目 - %s"
@@ -6853,51 +7664,30 @@ msgstr "日志条目 - %s"
 # calendar/gui/dialogs/comp-editor.c:703
 # calendar/gui/dialogs/comp-editor.c:703
 # calendar/gui/dialogs/comp-editor.c:717
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "没有概要"
 
-# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
-# mail/mail-display.c:102
-# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:2027
-# mail/mail-display.c:102
-# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
-# mail/mail-display.c:101
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2077
-#: mail/mail-display.c:101
-msgid "Overwrite file?"
-msgstr "覆盖文件？"
+# composer/e-msg-composer.c:943
+# composer/e-msg-composer.c:947
+# composer/e-msg-composer.c:912
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+msgid "Save as..."
+msgstr "另存为..."
 
-# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1915
-# mail/mail-display.c:106
-# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:2034
-# mail/mail-display.c:106
-# calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
-# mail/mail-display.c:105
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2084
-#: mail/mail-display.c:105
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
 msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+"Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
-"指定名称的文件已经存在。\n"
-"覆盖它？"
-
-# calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-# widgets/misc/e-filter-bar.h:101
-# calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
-# widgets/misc/e-filter-bar.h:101
-# calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-# widgets/misc/e-filter-bar.h:101
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "另存为..."
 
 # calendar/gui/dialogs/comp-editor.c:1272
 # calendar/gui/dialogs/comp-editor.c:1272
 # calendar/gui/dialogs/comp-editor.c:1277
-#: calendar/gui/dialogs/comp-editor.c:1277
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "无法获取当前版本！"
 
@@ -6994,21 +7784,21 @@ msgstr "输入代表"
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
 # calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "约会"
 
 # calendar/gui/dialogs/event-editor.c:190
 # calendar/gui/dialogs/event-editor.c:190
 # calendar/gui/dialogs/event-editor.c:190
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "提醒"
 
 # calendar/gui/dialogs/event-editor.c:195
 # calendar/gui/dialogs/event-editor.c:195
 # calendar/gui/dialogs/event-editor.c:195
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "再次发生"
 
@@ -7021,9 +7811,9 @@ msgstr "再次发生"
 # calendar/gui/dialogs/event-editor.c:202
 # calendar/gui/dialogs/event-editor.c:260
 # calendar/gui/dialogs/event-editor.c:363
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:363
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 msgid "Scheduling"
 msgstr "正在调度"
 
@@ -7036,9 +7826,9 @@ msgstr "正在调度"
 # calendar/gui/dialogs/event-editor.c:207
 # calendar/gui/dialogs/event-editor.c:263
 # calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:366
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "会见"
 
@@ -7179,28 +7969,28 @@ msgstr "开始时间(_S)："
 # calendar/gui/dialogs/meeting-page.c:425
 # calendar/gui/dialogs/meeting-page.c:425
 # calendar/gui/dialogs/meeting-page.c:425
-#: calendar/gui/dialogs/meeting-page.c:425
+#: calendar/gui/dialogs/meeting-page.c:413
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
 
 # calendar/gui/dialogs/meeting-page.c:446
 # calendar/gui/dialogs/meeting-page.c:446
 # calendar/gui/dialogs/meeting-page.c:446
-#: calendar/gui/dialogs/meeting-page.c:446
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "需要至少一个参加者。"
 
 # calendar/gui/dialogs/meeting-page.c:626
 # calendar/gui/dialogs/meeting-page.c:626
 # calendar/gui/dialogs/meeting-page.c:626
-#: calendar/gui/dialogs/meeting-page.c:626
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "那个人已经参加了会议！"
 
 # calendar/gui/dialogs/meeting-page.c:701
 # calendar/gui/dialogs/meeting-page.c:701
 # calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "授权于(_D)..."
 
@@ -7291,7 +8081,7 @@ msgstr "成员"
 # calendar/gui/e-itip-control.c:809
 # calendar/gui/e-meeting-time-sel.etspec.h:8
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:843
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -7321,8 +8111,8 @@ msgstr "角色"
 # mail/message-list.etspec.h:9
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:47
-#: mail/message-list.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "状态"
 
@@ -7340,7 +8130,7 @@ msgstr "状态"
 # shell/glade/e-active-connection-dialog.glade.h:5
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:95
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "类型"
@@ -7370,56 +8160,158 @@ msgstr "改变组织者(_C)"
 # calendar/gui/dialogs/meeting-page.glade.h:4
 # calendar/gui/e-meeting-time-sel.c:450
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:450
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "邀请其他人(_I)..."
 
-# calendar/gui/dialogs/meeting-page.glade.h:5
-# calendar/gui/dialogs/meeting-page.glade.h:5
-# calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "其他组织者(_O)"
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/gui/dialogs/recurrence-page.c:126
+#: calendar/gui/dialogs/recurrence-page.c:146
+#: calendar/gui/dialogs/recurrence-page.c:156
+#, fuzzy
+msgid "st"
+msgstr "一号"
+
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "二号"
+
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+# calendar/gui/print.c:425
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "三号"
+
+# calendar/gui/dialogs/recurrence-page.c:1096
+# calendar/gui/dialogs/recurrence-page.c:1096
+# calendar/gui/dialogs/recurrence-page.c:1096
+#: calendar/gui/dialogs/recurrence-page.c:129
+#: calendar/gui/dialogs/recurrence-page.c:130
+#: calendar/gui/dialogs/recurrence-page.c:131
+#: calendar/gui/dialogs/recurrence-page.c:132
+#: calendar/gui/dialogs/recurrence-page.c:133
+#: calendar/gui/dialogs/recurrence-page.c:134
+#: calendar/gui/dialogs/recurrence-page.c:135
+#: calendar/gui/dialogs/recurrence-page.c:136
+#: calendar/gui/dialogs/recurrence-page.c:137
+#: calendar/gui/dialogs/recurrence-page.c:138
+#: calendar/gui/dialogs/recurrence-page.c:139
+#: calendar/gui/dialogs/recurrence-page.c:140
+#: calendar/gui/dialogs/recurrence-page.c:141
+#: calendar/gui/dialogs/recurrence-page.c:142
+#: calendar/gui/dialogs/recurrence-page.c:143
+#: calendar/gui/dialogs/recurrence-page.c:144
+#: calendar/gui/dialogs/recurrence-page.c:145
+#: calendar/gui/dialogs/recurrence-page.c:149
+#: calendar/gui/dialogs/recurrence-page.c:150
+#: calendar/gui/dialogs/recurrence-page.c:151
+#: calendar/gui/dialogs/recurrence-page.c:152
+#: calendar/gui/dialogs/recurrence-page.c:153
+#: calendar/gui/dialogs/recurrence-page.c:154
+#: calendar/gui/dialogs/recurrence-page.c:155
+msgid "th"
+msgstr ""
 
 # calendar/gui/dialogs/recurrence-page.c:571
 # calendar/gui/dialogs/recurrence-page.c:571
 # calendar/gui/dialogs/recurrence-page.c:571
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "该约会含有 Evolution 无法编辑的循环。"
 
 # calendar/gui/dialogs/recurrence-page.c:932
 # calendar/gui/dialogs/recurrence-page.c:932
 # calendar/gui/dialogs/recurrence-page.c:932
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "在"
 
+# my-evolution/metar.c:262
+# my-evolution/metar.c:262
+# my-evolution/metar.c:262
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "霭"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "秒"
+
+# addressbook/backend/ebook/e-card-simple.c:79
+# addressbook/backend/ebook/e-card-simple.c:85
+# addressbook/gui/contact-editor/e-contact-editor.c:1656
+# addressbook/gui/contact-editor/e-contact-editor.c:1714
+# mail/mail-config.glade.h:49
+# addressbook/backend/ebook/e-card-simple.c:79
+# addressbook/backend/ebook/e-card-simple.c:85
+# addressbook/gui/contact-editor/e-contact-editor.c:1656
+# addressbook/gui/contact-editor/e-contact-editor.c:1714
+# mail/mail-config.glade.h:49
+# my-evolution/Locations.h:1614
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "其它"
+
+# my-evolution/metar.c:64
+# my-evolution/metar.c:64
+# my-evolution/metar.c:64
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "北"
+
+# addressbook/gui/contact-editor/e-contact-save-as.c:170
+# addressbook/gui/contact-editor/e-contact-save-as.c:170
+# addressbook/gui/contact-editor/e-contact-save-as.c:170
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "列表"
+
+# addressbook/backend/ebook/e-card-simple.c:80
+# addressbook/gui/contact-editor/e-contact-editor.c:1657
+# addressbook/gui/widgets/e-addressbook-view.c:869
+# addressbook/backend/ebook/e-card-simple.c:80
+# addressbook/gui/contact-editor/e-contact-editor.c:1657
+# addressbook/gui/widgets/e-addressbook-view.c:869
+# addressbook/backend/ebook/e-card-simple.c:80
+# addressbook/gui/contact-editor/e-contact-editor.c:1657
+# addressbook/gui/widgets/e-addressbook-view.c:980
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "其它传真"
+
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "天"
 
 # calendar/gui/dialogs/recurrence-page.c:1088
 # calendar/gui/dialogs/recurrence-page.c:1088
 # calendar/gui/dialogs/recurrence-page.c:1088
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "在"
 
-# calendar/gui/dialogs/recurrence-page.c:1096
-# calendar/gui/dialogs/recurrence-page.c:1096
-# calendar/gui/dialogs/recurrence-page.c:1096
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr ""
-
 # calendar/gui/dialogs/recurrence-page.c:1269
 # calendar/gui/dialogs/recurrence-page.c:1269
 # calendar/gui/dialogs/recurrence-page.c:1269
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr "循环"
 
@@ -7589,7 +8481,7 @@ msgstr "进度"
 # calendar/gui/dialogs/task-details-page.glade.h:12
 # my-evolution/e-summary-preferences.c:966
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:966
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "URL："
 
@@ -7607,6 +8499,16 @@ msgstr "优先级(_P)："
 msgid "_Status:"
 msgstr "状态(_S)："
 
+# addressbook/gui/component/addressbook-config.glade.h:7
+# calendar/gui/dialogs/task-editor.c:178
+# addressbook/gui/component/addressbook-config.glade.h:7
+# calendar/gui/dialogs/task-editor.c:178
+# addressbook/gui/component/addressbook-config.glade.h:9
+# calendar/gui/dialogs/task-editor.c:178
+#: calendar/gui/dialogs/task-editor.c:182
+msgid "Basic"
+msgstr "基本"
+
 # calendar/gui/dialogs/task-editor.c:190
 # calendar/gui/dialogs/task-editor.c:227
 # calendar/gui/dialogs/task-editor.c:322
@@ -7616,9 +8518,9 @@ msgstr "状态(_S)："
 # calendar/gui/dialogs/task-editor.c:190
 # calendar/gui/dialogs/task-editor.c:227
 # calendar/gui/dialogs/task-editor.c:322
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:322
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "分派"
 
@@ -7631,9 +8533,9 @@ msgstr "分派"
 # calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:791
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:32
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "描述："
 
@@ -7654,7 +8556,7 @@ msgstr "到期日期(_D)："
 # calendar/gui/e-calendar-table.c:427
 # calendar/gui/e-calendar-table.c:427
 # calendar/gui/e-calendar-table.c:428
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:440
 #, c-format
 msgid "0%"
 msgstr "0%"
@@ -7662,7 +8564,7 @@ msgstr "0%"
 # calendar/gui/e-calendar-table.c:428
 # calendar/gui/e-calendar-table.c:428
 # calendar/gui/e-calendar-table.c:429
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:441
 #, c-format
 msgid "10%"
 msgstr "10%"
@@ -7670,7 +8572,7 @@ msgstr "10%"
 # calendar/gui/e-calendar-table.c:429
 # calendar/gui/e-calendar-table.c:429
 # calendar/gui/e-calendar-table.c:430
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:442
 #, c-format
 msgid "20%"
 msgstr "20%"
@@ -7678,7 +8580,7 @@ msgstr "20%"
 # calendar/gui/e-calendar-table.c:430
 # calendar/gui/e-calendar-table.c:430
 # calendar/gui/e-calendar-table.c:431
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:443
 #, c-format
 msgid "30%"
 msgstr "30%"
@@ -7686,7 +8588,7 @@ msgstr "30%"
 # calendar/gui/e-calendar-table.c:431
 # calendar/gui/e-calendar-table.c:431
 # calendar/gui/e-calendar-table.c:432
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:444
 #, c-format
 msgid "40%"
 msgstr "40%"
@@ -7694,7 +8596,7 @@ msgstr "40%"
 # calendar/gui/e-calendar-table.c:432
 # calendar/gui/e-calendar-table.c:432
 # calendar/gui/e-calendar-table.c:433
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:445
 #, c-format
 msgid "50%"
 msgstr "50%"
@@ -7702,7 +8604,7 @@ msgstr "50%"
 # calendar/gui/e-calendar-table.c:433
 # calendar/gui/e-calendar-table.c:433
 # calendar/gui/e-calendar-table.c:434
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:446
 #, c-format
 msgid "60%"
 msgstr "60%"
@@ -7710,7 +8612,7 @@ msgstr "60%"
 # calendar/gui/e-calendar-table.c:434
 # calendar/gui/e-calendar-table.c:434
 # calendar/gui/e-calendar-table.c:435
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:447
 #, c-format
 msgid "70%"
 msgstr "70%"
@@ -7718,7 +8620,7 @@ msgstr "70%"
 # calendar/gui/e-calendar-table.c:435
 # calendar/gui/e-calendar-table.c:435
 # calendar/gui/e-calendar-table.c:436
-#: calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:448
 #, c-format
 msgid "80%"
 msgstr "80%"
@@ -7726,7 +8628,7 @@ msgstr "80%"
 # calendar/gui/e-calendar-table.c:436
 # calendar/gui/e-calendar-table.c:436
 # calendar/gui/e-calendar-table.c:437
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:449
 #, c-format
 msgid "90%"
 msgstr "90%"
@@ -7734,7 +8636,7 @@ msgstr "90%"
 # calendar/gui/e-calendar-table.c:437
 # calendar/gui/e-calendar-table.c:437
 # calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-calendar-table.c:450
 #, c-format
 msgid "100%"
 msgstr "100%"
@@ -7745,8 +8647,8 @@ msgstr "100%"
 # calendar/gui/e-week-view.c:1824
 # calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
 # calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
-#: calendar/gui/e-week-view.c:1828
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-week-view.c:1853
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
@@ -7759,12 +8661,37 @@ msgstr "删除选中的对象"
 # calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
 # calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1455
 # shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1455
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "打开(_O)"
 
+# composer/e-msg-composer.c:943
+# composer/e-msg-composer.c:947
+# composer/e-msg-composer.c:912
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Save as..."
+msgstr "另存为..."
+
+# ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
+# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
+# ui/my-evolution.xml.h:7
+# ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
+# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
+# ui/my-evolution.xml.h:7
+# ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
+# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:105
+# ui/my-evolution.xml.h:7
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
+#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+msgid "_Print..."
+msgstr "打印(_P)..."
+
 # calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3553
 # calendar/gui/e-week-view.c:3431 ui/evolution-addressbook.xml.h:1
 # ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
@@ -7774,8 +8701,8 @@ msgstr "打开(_O)"
 # calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
 # calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
 # ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪切(_U)"
@@ -7792,10 +8719,10 @@ msgstr "剪切(_U)"
 # calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
 # ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 # ui/evolution-tasks.xml.h:17
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3557
-#: calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "复制(_C)"
 
@@ -7814,39 +8741,49 @@ msgstr "复制(_C)"
 # calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
 # ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 # ui/evolution-tasks.xml.h:21
-#: calendar/gui/e-calendar-table.c:968 calendar/gui/e-day-view.c:3532
-#: calendar/gui/e-day-view.c:3559 calendar/gui/e-week-view.c:3419
-#: calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:21
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
+#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
+# ui/evolution-task-editor.xml.h:1
+# ui/evolution-task-editor.xml.h:1
+# ui/evolution-task-editor.xml.h:1
+#: calendar/gui/e-calendar-table.c:996
+#, fuzzy
+msgid "_Assign Task"
+msgstr "委派任务"
+
+# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
+# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
+# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
+#: calendar/gui/e-calendar-table.c:997
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "作为 iCalendar 转发(_C)"
+
 # calendar/gui/e-calendar-table.c:954
 # calendar/gui/e-calendar-table.c:954
 # calendar/gui/e-calendar-table.c:973
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "标记为完成(_M)"
 
-# calendar/gui/e-calendar-table.c:956
-# calendar/gui/e-calendar-table.c:956
-# calendar/gui/e-calendar-table.c:975
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
-msgstr "删除该任务(_D)"
-
 # calendar/gui/e-calendar-table.c:959
 # calendar/gui/e-calendar-table.c:959
 # calendar/gui/e-calendar-table.c:978
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:999
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "把任务标记为完成(_M)"
 
 # calendar/gui/e-calendar-table.c:961
 # calendar/gui/e-calendar-table.c:961
 # calendar/gui/e-calendar-table.c:980
-#: calendar/gui/e-calendar-table.c:980
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "删除选定的任务(_D)"
 
@@ -7856,8 +8793,8 @@ msgstr "删除选定的任务(_D)"
 # calendar/gui/e-week-view.c:3924
 # calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
 # calendar/gui/e-week-view.c:3928
-#: calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
-#: calendar/gui/e-week-view.c:3928
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr "更新对象"
 
@@ -7867,7 +8804,7 @@ msgstr "更新对象"
 # calendar/gui/e-calendar-table.etspec.h:6
 # calendar/gui/e-calendar-table.c:1247
 # calendar/gui/e-calendar-table.etspec.h:6
-#: calendar/gui/e-calendar-table.c:1247
+#: calendar/gui/e-calendar-table.c:1354
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "点击以添加任务"
@@ -7885,8 +8822,8 @@ msgstr "提醒"
 # camel/camel-filter-driver.c:886
 # calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
 # camel/camel-filter-driver.c:1026
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
-#: camel/camel-filter-driver.c:1026
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "完成"
 
@@ -7944,8 +8881,8 @@ msgstr "开始日期"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "概要"
 
@@ -8017,8 +8954,8 @@ msgstr "%02i 分钟分割"
 # calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 #. 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:284 calendar/gui/e-day-view.c:1389
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%B %d %A"
 
@@ -8030,7 +8967,7 @@ msgstr "%B %d %A"
 # calendar/gui/e-week-view-main-item.c:347
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1416
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1440
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%b %d"
@@ -8042,8 +8979,8 @@ msgstr "%b %d"
 # calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
 # calendar/gui/print.c:768
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:768
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "上午"
 
@@ -8054,131 +8991,225 @@ msgstr "上午"
 # calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
 # calendar/gui/print.c:770
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:770
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "下午"
 
+# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
+# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
+# calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "新建约会(_A)"
+
 # calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
 # calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3410
 # calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
-#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "新建全天事件(_E)"
 
+# calendar/gui/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+# calendar/gui/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+# calendar/gui/dialogs/event-editor.c:207
+# calendar/gui/dialogs/event-editor.c:263
+# calendar/gui/dialogs/event-editor.c:366
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#, fuzzy
+msgid "New Meeting"
+msgstr "会见"
+
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
+# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "新建任务"
+
+# ui/evolution-comp-editor.xml.h:11
+# ui/evolution-comp-editor.xml.h:11
+# ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "打印..."
+
 # calendar/gui/e-day-view.c:3535 calendar/gui/e-week-view.c:3414
 # ui/evolution-calendar.xml.h:17
 # calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3420
 # ui/evolution-calendar.xml.h:17
 # calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
 # ui/evolution-calendar.xml.h:17
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
-#: ui/evolution-calendar.xml.h:17
+#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "转到今天(_T)"
 
 # calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
 # calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3422
 # calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
-#: calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 msgid "_Go to Date..."
 msgstr "转到日期(_G)..."
 
-# calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3430
-# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-msgid "_Delete this Appointment"
-msgstr "删除该约会(_D)"
+# ui/evolution-calendar.xml.h:42
+# ui/evolution-calendar.xml.h:42
+# ui/evolution-calendar.xml.h:42
+#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: ui/evolution-calendar.xml.h:31
+msgid "_Publish Free/Busy Information"
+msgstr "发布忙闲信息(_P)"
+
+# mail/mail-local.c:1416
+# mail/mail-local.c:1416
+# executive-summary/component/e-summary-url.c:80
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:39
+#, fuzzy
+msgid "_Configure..."
+msgstr "配置 %s"
+
+# mail/mail-local.c:1416
+# mail/mail-local.c:1416
+# executive-summary/component/e-summary-url.c:80
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+msgid "_Configure Pilot..."
+msgstr "配置 %s"
+
+# mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
+# mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:105
+# mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+msgid "_Save As..."
+msgstr "另存为(_S)..."
+
+# ui/evolution-event-editor.xml.h:7
+# ui/evolution-event-editor.xml.h:7
+# ui/evolution-event-editor.xml.h:7
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "调度会议(_M)"
+
+# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
+# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
+# ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "作为 iCalendar 转发(_C)"
 
 # calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3455
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "使该事件可移动(_M)"
 
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3457
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "删除该时间(_O)"
 
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
 # calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
 # calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 msgid "Delete _All Occurrences"
 msgstr "删除所有事件(_A)"
 
+# shell/e-shell-view-menu.c:577
+# shell/e-shell-view-menu.c:577
+# shell/e-shell-view-menu.c:577
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:638
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "GNOME Pilot 工具好像并未安装到系统中。"
+
+# shell/e-shell-view-menu.c:585
+# shell/e-shell-view-menu.c:585
+# shell/e-shell-view-menu.c:585
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:646
+#, c-format
+msgid "Error executing %s."
+msgstr "执行 %s 错误。"
+
 # calendar/gui/e-itip-control.c:532
 # calendar/gui/e-itip-control.c:532
 # calendar/gui/e-itip-control.c:535
-#: calendar/gui/e-itip-control.c:535
+#: calendar/gui/e-itip-control.c:678
 msgid "Meeting begins: <b>"
 msgstr "会议开始：<b>"
 
 # calendar/gui/e-itip-control.c:537
 # calendar/gui/e-itip-control.c:537
 # calendar/gui/e-itip-control.c:540
-#: calendar/gui/e-itip-control.c:540
+#: calendar/gui/e-itip-control.c:683
 msgid "Task begins: <b>"
 msgstr "任务开始：<b>"
 
 # calendar/gui/e-itip-control.c:542
 # calendar/gui/e-itip-control.c:542
 # calendar/gui/e-itip-control.c:545
-#: calendar/gui/e-itip-control.c:545
+#: calendar/gui/e-itip-control.c:688
 msgid "Free/Busy info begins: <b>"
 msgstr "忙闲信息开始于：<b>"
 
 # calendar/gui/e-itip-control.c:546
 # calendar/gui/e-itip-control.c:546
 # calendar/gui/e-itip-control.c:549
-#: calendar/gui/e-itip-control.c:549
+#: calendar/gui/e-itip-control.c:692
 msgid "Begins: <b>"
 msgstr "开始时间：<b>"
 
 # calendar/gui/e-itip-control.c:558
 # calendar/gui/e-itip-control.c:558
 # calendar/gui/e-itip-control.c:561
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:704
 msgid "Meeting ends: <b>"
 msgstr "会议结束时间：<b>"
 
 # calendar/gui/e-itip-control.c:561
 # calendar/gui/e-itip-control.c:561
 # calendar/gui/e-itip-control.c:564
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:707
 msgid "Free/Busy info ends: <b>"
 msgstr "忙闲信息结束于：<b>"
 
 # calendar/gui/e-itip-control.c:565
 # calendar/gui/e-itip-control.c:565
 # calendar/gui/e-itip-control.c:568
-#: calendar/gui/e-itip-control.c:568
+#: calendar/gui/e-itip-control.c:711
 msgid "Ends: <b>"
 msgstr "结束于：<b>"
 
 # calendar/gui/e-itip-control.c:579
 # calendar/gui/e-itip-control.c:579
 # calendar/gui/e-itip-control.c:582
-#: calendar/gui/e-itip-control.c:582
+#: calendar/gui/e-itip-control.c:725
 msgid "Task Completed: <b>"
 msgstr "任务完成率：<b>"
 
 # calendar/gui/e-itip-control.c:589
 # calendar/gui/e-itip-control.c:589
 # calendar/gui/e-itip-control.c:592
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:735
 msgid "Task Due: <b>"
 msgstr "任务到期时间：<b>"
 
 # calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
 # calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
 # calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-#: calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
 msgid "iCalendar Information"
 msgstr "iCalendar 信息"
 
@@ -8186,14 +9217,14 @@ msgstr "iCalendar 信息"
 # calendar/gui/e-itip-control.c:641
 # calendar/gui/e-itip-control.c:644
 #. Title
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:787
 msgid "iCalendar Error"
 msgstr "iCalendar 错误"
 
 # calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
 # calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
 # calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-#: calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
 msgid "An unknown person"
 msgstr "未知的人"
 
@@ -8201,7 +9232,7 @@ msgstr "未知的人"
 # calendar/gui/e-itip-control.c:729
 # calendar/gui/e-itip-control.c:732
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:875
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -8210,14 +9241,14 @@ msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作�
 # calendar/gui/e-itip-control.c:745
 # calendar/gui/e-itip-control.c:745
 # calendar/gui/e-itip-control.c:748
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:891
 msgid "<i>None</i>"
 msgstr "<i>无</i>"
 
 # calendar/gui/dialogs/task-details-page.glade.h:15
 # calendar/gui/dialogs/task-details-page.glade.h:15
 # calendar/gui/dialogs/task-details-page.glade.h:15
-#: calendar/gui/e-itip-control.c:760
+#: calendar/gui/e-itip-control.c:903
 msgid "Status:"
 msgstr "状态："
 
@@ -8227,15 +9258,16 @@ msgstr "状态："
 # calendar/gui/e-meeting-model.c:824
 # calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
 # calendar/gui/e-meeting-model.c:824
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-meeting-model.c:321
-#: calendar/gui/e-meeting-model.c:344 calendar/gui/e-meeting-model.c:824
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
 msgid "Accepted"
 msgstr "接受"
 
 # calendar/gui/e-itip-control.c:804
 # calendar/gui/e-itip-control.c:804
 # calendar/gui/e-itip-control.c:807
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
 
@@ -8245,8 +9277,9 @@ msgstr "暂时接受"
 # calendar/gui/e-meeting-model.c:825
 # calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
 # calendar/gui/e-meeting-model.c:825
-#: calendar/gui/e-itip-control.c:773 calendar/gui/e-meeting-model.c:323
-#: calendar/gui/e-meeting-model.c:346 calendar/gui/e-meeting-model.c:825
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
 msgid "Declined"
 msgstr "否决"
 
@@ -8269,13 +9302,14 @@ msgstr "否决"
 # camel/providers/smtp/camel-smtp-transport.c:171
 # camel/providers/smtp/camel-smtp-transport.c:226
 # widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:442
-#: calendar/gui/e-itip-control.c:777 calendar/gui/e-itip-control.c:976
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:357
-#: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-model.c:798
-#: camel/providers/smtp/camel-smtp-transport.c:171
-#: camel/providers/smtp/camel-smtp-transport.c:226
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:442
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "未知"
 
@@ -8288,16 +9322,16 @@ msgstr "未知"
 # calendar/gui/e-itip-control.c:789 calendar/gui/e-itip-control.c:805
 # calendar/gui/e-itip-control.c:821 calendar/gui/e-itip-control.c:834
 # calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:860
-#: calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:839
-#: calendar/gui/e-itip-control.c:855 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:881 calendar/gui/e-itip-control.c:894
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
 msgid "Choose an action:"
 msgstr "选择一项活动："
 
 # calendar/gui/e-itip-control.c:787
 # calendar/gui/e-itip-control.c:787
 # calendar/gui/e-itip-control.c:790
-#: calendar/gui/e-itip-control.c:824
+#: calendar/gui/e-itip-control.c:972
 msgid "Update"
 msgstr "更新"
 
@@ -8313,66 +9347,67 @@ msgstr "更新"
 # calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:836
 # calendar/gui/e-itip-control.c:849 calendar/gui/e-itip-control.c:862
 # shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
-#: calendar/gui/e-itip-control.c:825 calendar/gui/e-itip-control.c:844
-#: calendar/gui/e-itip-control.c:857 calendar/gui/e-itip-control.c:870
-#: calendar/gui/e-itip-control.c:883 calendar/gui/e-itip-control.c:896
-#: shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "确定"
 
 # calendar/gui/e-itip-control.c:803
 # calendar/gui/e-itip-control.c:803
 # calendar/gui/e-itip-control.c:806
-#: calendar/gui/e-itip-control.c:840
+#: calendar/gui/e-itip-control.c:1000
 msgid "Accept"
 msgstr "接受"
 
 # calendar/gui/e-itip-control.c:804
 # calendar/gui/e-itip-control.c:804
 # calendar/gui/e-itip-control.c:807
-#: calendar/gui/e-itip-control.c:841
+#: calendar/gui/e-itip-control.c:1001
 msgid "Tentatively accept"
 msgstr "暂时接受"
 
 # calendar/gui/e-itip-control.c:805
 # calendar/gui/e-itip-control.c:805
 # calendar/gui/e-itip-control.c:808
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1002
 msgid "Decline"
 msgstr "否决"
 
 # calendar/gui/e-itip-control.c:819
 # calendar/gui/e-itip-control.c:819
 # calendar/gui/e-itip-control.c:822
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1026
 msgid "Send Free/Busy Information"
 msgstr "发送忙闲信息"
 
 # calendar/gui/e-itip-control.c:832
 # calendar/gui/e-itip-control.c:832
 # calendar/gui/e-itip-control.c:835
-#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:1039
 msgid "Update respondent status"
 msgstr "更新应答者状态"
 
 # calendar/gui/e-itip-control.c:846
 # calendar/gui/e-itip-control.c:846
 # calendar/gui/e-itip-control.c:848
-#: calendar/gui/e-itip-control.c:882
+#: calendar/gui/e-itip-control.c:1052
 msgid "Send Latest Information"
 msgstr "发送最新的信息"
 
 # calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
 # calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
 # calendar/gui/e-itip-control.c:861 ui/evolution-mail-global.xml.h:1
-#: calendar/gui/e-itip-control.c:895 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
 
 # calendar/gui/e-itip-control.c:875
 # calendar/gui/e-itip-control.c:875
 # calendar/gui/e-itip-control.c:909
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:1117
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 发布了会议信息。"
@@ -8380,14 +9415,14 @@ msgstr "<b>%s</b> 发布了会议信息。"
 # calendar/gui/e-itip-control.c:876
 # calendar/gui/e-itip-control.c:876
 # calendar/gui/e-itip-control.c:910
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:1118
 msgid "Meeting Information"
 msgstr "会议信息"
 
 # calendar/gui/e-itip-control.c:880
 # calendar/gui/e-itip-control.c:880
 # calendar/gui/e-itip-control.c:914
-#: calendar/gui/e-itip-control.c:948
+#: calendar/gui/e-itip-control.c:1122
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 请求您参加一个会议。"
@@ -8395,14 +9430,14 @@ msgstr "<b>%s</b> 请求您参加一个会议。"
 # calendar/gui/e-itip-control.c:881
 # calendar/gui/e-itip-control.c:881
 # calendar/gui/e-itip-control.c:915
-#: calendar/gui/e-itip-control.c:949
+#: calendar/gui/e-itip-control.c:1123
 msgid "Meeting Proposal"
 msgstr "会议建议"
 
 # calendar/gui/e-itip-control.c:885
 # calendar/gui/e-itip-control.c:885
 # calendar/gui/e-itip-control.c:919
-#: calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> 希望加入到已存的会议。"
@@ -8410,14 +9445,14 @@ msgstr "<b>%s</b> 希望加入到已存的会议。"
 # calendar/gui/e-itip-control.c:886
 # calendar/gui/e-itip-control.c:886
 # calendar/gui/e-itip-control.c:920
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Update"
 msgstr "会议更新"
 
 # calendar/gui/e-itip-control.c:890
 # calendar/gui/e-itip-control.c:890
 # calendar/gui/e-itip-control.c:924
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1132
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 想收到最新的会议信息。"
@@ -8425,14 +9460,14 @@ msgstr "<b>%s</b> 想收到最新的会议信息。"
 # calendar/gui/e-itip-control.c:891
 # calendar/gui/e-itip-control.c:891
 # calendar/gui/e-itip-control.c:925
-#: calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:1133
 msgid "Meeting Update Request"
 msgstr "会议更新请求"
 
 # calendar/gui/e-itip-control.c:895
 # calendar/gui/e-itip-control.c:895
 # calendar/gui/e-itip-control.c:948
-#: calendar/gui/e-itip-control.c:982
+#: calendar/gui/e-itip-control.c:1156
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已回复一个会议请求。"
@@ -8440,14 +9475,14 @@ msgstr "<b>%s</b> 已回复一个会议请求。"
 # calendar/gui/e-itip-control.c:896
 # calendar/gui/e-itip-control.c:896
 # calendar/gui/e-itip-control.c:949
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:1157
 msgid "Meeting Reply"
 msgstr "会议答复"
 
 # calendar/gui/e-itip-control.c:900
 # calendar/gui/e-itip-control.c:900
 # calendar/gui/e-itip-control.c:953
-#: calendar/gui/e-itip-control.c:987
+#: calendar/gui/e-itip-control.c:1161
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> 取消了一个会议。"
@@ -8455,7 +9490,7 @@ msgstr "<b>%s</b> 取消了一个会议。"
 # calendar/gui/e-itip-control.c:901
 # calendar/gui/e-itip-control.c:901
 # calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:988
+#: calendar/gui/e-itip-control.c:1162
 msgid "Meeting Cancellation"
 msgstr "会议取消"
 
@@ -8465,8 +9500,8 @@ msgstr "会议取消"
 # calendar/gui/e-itip-control.c:990
 # calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.c:1029
 # calendar/gui/e-itip-control.c:1064
-#: calendar/gui/e-itip-control.c:992 calendar/gui/e-itip-control.c:1063
-#: calendar/gui/e-itip-control.c:1098
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 发送了一个无法理解的信息。"
@@ -8474,14 +9509,14 @@ msgstr "<b>%s</b> 发送了一个无法理解的信息。"
 # calendar/gui/e-itip-control.c:906
 # calendar/gui/e-itip-control.c:906
 # calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1167
 msgid "Bad Meeting Message"
 msgstr "错误的会议信息"
 
 # calendar/gui/e-itip-control.c:925
 # calendar/gui/e-itip-control.c:925
 # calendar/gui/e-itip-control.c:979
-#: calendar/gui/e-itip-control.c:1013
+#: calendar/gui/e-itip-control.c:1189
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 发布了任务信息。"
@@ -8489,14 +9524,14 @@ msgstr "<b>%s</b> 发布了任务信息。"
 # calendar/gui/e-itip-control.c:926
 # calendar/gui/e-itip-control.c:926
 # calendar/gui/e-itip-control.c:980
-#: calendar/gui/e-itip-control.c:1014
+#: calendar/gui/e-itip-control.c:1190
 msgid "Task Information"
 msgstr "任务信息"
 
 # calendar/gui/e-itip-control.c:930
 # calendar/gui/e-itip-control.c:930
 # calendar/gui/e-itip-control.c:984
-#: calendar/gui/e-itip-control.c:1018
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 请求您完成一个任务。"
@@ -8504,14 +9539,14 @@ msgstr "<b>%s</b> 请求您完成一个任务。"
 # calendar/gui/e-itip-control.c:931
 # calendar/gui/e-itip-control.c:931
 # calendar/gui/e-itip-control.c:985
-#: calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Proposal"
 msgstr "任务建议"
 
 # calendar/gui/e-itip-control.c:935
 # calendar/gui/e-itip-control.c:935
 # calendar/gui/e-itip-control.c:989
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s<b> 希望加入到已存在的任务。"
@@ -8519,14 +9554,14 @@ msgstr "<b>%s<b> 希望加入到已存在的任务。"
 # calendar/gui/e-itip-control.c:936
 # calendar/gui/e-itip-control.c:936
 # calendar/gui/e-itip-control.c:990
-#: calendar/gui/e-itip-control.c:1024
+#: calendar/gui/e-itip-control.c:1200
 msgid "Task Update"
 msgstr "任务更新"
 
 # calendar/gui/e-itip-control.c:940
 # calendar/gui/e-itip-control.c:940
 # calendar/gui/e-itip-control.c:994
-#: calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望获取最新的任务信息。"
@@ -8534,14 +9569,14 @@ msgstr "<b>%s</b> 希望获取最新的任务信息。"
 # calendar/gui/e-itip-control.c:941
 # calendar/gui/e-itip-control.c:941
 # calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1029
+#: calendar/gui/e-itip-control.c:1205
 msgid "Task Update Request"
 msgstr "任务更新请求"
 
 # calendar/gui/e-itip-control.c:945
 # calendar/gui/e-itip-control.c:945
 # calendar/gui/e-itip-control.c:1019
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1229
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已经回复了任务委派。"
@@ -8549,14 +9584,14 @@ msgstr "<b>%s</b> 已经回复了任务委派。"
 # calendar/gui/e-itip-control.c:946
 # calendar/gui/e-itip-control.c:946
 # calendar/gui/e-itip-control.c:1020
-#: calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1230
 msgid "Task Reply"
 msgstr "任务回复"
 
 # calendar/gui/e-itip-control.c:950
 # calendar/gui/e-itip-control.c:950
 # calendar/gui/e-itip-control.c:1024
-#: calendar/gui/e-itip-control.c:1058
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> 取消了任务。"
@@ -8564,21 +9599,21 @@ msgstr "<b>%s</b> 取消了任务。"
 # calendar/gui/e-itip-control.c:951
 # calendar/gui/e-itip-control.c:951
 # calendar/gui/e-itip-control.c:1025
-#: calendar/gui/e-itip-control.c:1059
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Cancellation"
 msgstr "任务取消"
 
 # calendar/gui/e-itip-control.c:956
 # calendar/gui/e-itip-control.c:956
 # calendar/gui/e-itip-control.c:1030
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1240
 msgid "Bad Task Message"
 msgstr "错误的任务邮件"
 
 # calendar/gui/e-itip-control.c:975
 # calendar/gui/e-itip-control.c:975
 # calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 发布了忙闲信息。"
@@ -8586,14 +9621,14 @@ msgstr "<b>%s</b> 发布了忙闲信息。"
 # calendar/gui/e-itip-control.c:976
 # calendar/gui/e-itip-control.c:976
 # calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1260
 msgid "Free/Busy Information"
 msgstr "忙闲信息"
 
 # calendar/gui/e-itip-control.c:980
 # calendar/gui/e-itip-control.c:980
 # calendar/gui/e-itip-control.c:1054
-#: calendar/gui/e-itip-control.c:1088
+#: calendar/gui/e-itip-control.c:1264
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 请求您的忙闲信息。"
@@ -8601,14 +9636,14 @@ msgstr "<b>%s</b> 请求您的忙闲信息。"
 # calendar/gui/e-itip-control.c:981
 # calendar/gui/e-itip-control.c:981
 # calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1089
+#: calendar/gui/e-itip-control.c:1265
 msgid "Free/Busy Request"
 msgstr "忙闲请求"
 
 # calendar/gui/e-itip-control.c:985
 # calendar/gui/e-itip-control.c:985
 # calendar/gui/e-itip-control.c:1059
-#: calendar/gui/e-itip-control.c:1093
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 应答了忙闲请求。"
@@ -8616,114 +9651,147 @@ msgstr "<b>%s</b> 应答了忙闲请求。"
 # calendar/gui/e-itip-control.c:986
 # calendar/gui/e-itip-control.c:986
 # calendar/gui/e-itip-control.c:1060
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1270
 msgid "Free/Busy Reply"
 msgstr "忙闲应答"
 
 # calendar/gui/e-itip-control.c:991
 # calendar/gui/e-itip-control.c:991
 # calendar/gui/e-itip-control.c:1065
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1275
 msgid "Bad Free/Busy Message"
 msgstr "错误的忙闲信息"
 
 # calendar/gui/e-itip-control.c:1064
 # calendar/gui/e-itip-control.c:1064
 # calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1354
 msgid "The message does not appear to be properly formed"
 msgstr "邮件的格式可能不正确"
 
 # calendar/gui/e-itip-control.c:1083
 # calendar/gui/e-itip-control.c:1083
 # calendar/gui/e-itip-control.c:1157
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1373
 msgid "The message contains only unsupported requests."
 msgstr "邮件只含有不支持的请求。"
 
 # calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
 # calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
 # calendar/gui/e-itip-control.c:1185 calendar/gui/e-itip-control.c:1191
-#: calendar/gui/e-itip-control.c:1219 calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
 msgid "The attachment does not contain a valid calendar message"
 msgstr "附件中没有有效的日程信息"
 
 # calendar/gui/e-itip-control.c:1142
 # calendar/gui/e-itip-control.c:1142
 # calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1432
 msgid "The attachment has no viewable calendar items"
 msgstr "附件中没有可查看的日程项目"
 
-# calendar/gui/e-itip-control.c:1241
-# calendar/gui/e-itip-control.c:1241
-# calendar/gui/e-itip-control.c:1315
-#: calendar/gui/e-itip-control.c:1349
-msgid "Calendar file could not be updated!\n"
-msgstr "无法更新日历文件！\n"
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+msgid "There was an error on the CORBA system\n"
+msgstr ""
+
+# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
+# calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
+# calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
+msgstr "无法发送项目！\n"
+
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
 
 # calendar/gui/e-itip-control.c:1243
 # calendar/gui/e-itip-control.c:1243
 # calendar/gui/e-itip-control.c:1317
-#: calendar/gui/e-itip-control.c:1351
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
+# calendar/gui/e-itip-control.c:1241
+# calendar/gui/e-itip-control.c:1241
+# calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1582
+msgid "Calendar file could not be updated!\n"
+msgstr "无法更新日历文件！\n"
+
+# calendar/gui/e-itip-control.c:1300
+# calendar/gui/e-itip-control.c:1300
+# calendar/gui/e-itip-control.c:1374
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "由于条目不再存在而无法更新参与者状态"
+
+#: calendar/gui/e-itip-control.c:1632
+msgid "This response is not from a current attendee.  Add as an attendee?"
+msgstr ""
+
 # calendar/gui/e-itip-control.c:1288
 # calendar/gui/e-itip-control.c:1288
 # calendar/gui/e-itip-control.c:1362
-#: calendar/gui/e-itip-control.c:1396
+#: calendar/gui/e-itip-control.c:1644
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "因为无效状态而无法更新参与者状态！\n"
 
-# calendar/gui/e-itip-control.c:1296
-# calendar/gui/e-itip-control.c:1296
-# calendar/gui/e-itip-control.c:1370
-#: calendar/gui/e-itip-control.c:1404
-msgid "Attendee status could not be updated!\n"
-msgstr "无法更新参与者状态！\n"
-
 # calendar/gui/e-itip-control.c:1298
 # calendar/gui/e-itip-control.c:1298
 # calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1671
 msgid "Attendee status updated\n"
 msgstr "更新参与者状态\n"
 
-# calendar/gui/e-itip-control.c:1300
-# calendar/gui/e-itip-control.c:1300
-# calendar/gui/e-itip-control.c:1374
-#: calendar/gui/e-itip-control.c:1408
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "由于条目不再存在而无法更新参与者状态"
+# calendar/gui/e-itip-control.c:1296
+# calendar/gui/e-itip-control.c:1296
+# calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1674
+msgid "Attendee status could not be updated!\n"
+msgstr "无法更新参与者状态！\n"
 
 # calendar/gui/e-itip-control.c:1328
 # calendar/gui/e-itip-control.c:1328
 # calendar/gui/e-itip-control.c:1402
-#: calendar/gui/e-itip-control.c:1436
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "删除完成"
 
 # calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
 # calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
 # calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
-#: calendar/gui/e-itip-control.c:1455 calendar/gui/e-itip-control.c:1505
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "项目已发送！\n"
 
 # calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
-#: calendar/gui/e-itip-control.c:1457 calendar/gui/e-itip-control.c:1509
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "无法发送项目！\n"
 
-# calendar/gui/e-itip-control.c:1581
-# calendar/gui/e-itip-control.c:1581
-# calendar/gui/e-itip-control.c:1648
-#: calendar/gui/e-itip-control.c:1682
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr "无法在参与者列表中找到您的任何身份！\n"
+# mail/mail-account-gui.c:837
+# mail/mail-account-gui.c:837
+# mail/mail-account-gui.c:834
+#: calendar/gui/e-itip-control.c:1896
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "选择文件夹"
+
+# mail/mail-account-gui.c:837
+# mail/mail-account-gui.c:837
+# mail/mail-account-gui.c:834
+#: calendar/gui/e-itip-control.c:1903
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "选择文件夹"
 
 # calendar/gui/e-itip-control.glade.h:2
 # calendar/gui/e-itip-control.glade.h:2
@@ -8792,28 +9860,28 @@ msgstr "日期-开始"
 # calendar/gui/e-meeting-model.c:95
 # calendar/gui/e-meeting-model.c:95
 # calendar/gui/e-meeting-model.c:95
-#: calendar/gui/e-meeting-model.c:95
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "主席人员"
 
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1550
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
-#: calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "必需的参与者"
 
 # calendar/gui/e-meeting-model.c:97
 # calendar/gui/e-meeting-model.c:97
 # calendar/gui/e-meeting-model.c:97
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "可选的参与者"
 
 # calendar/gui/e-meeting-model.c:98
 # calendar/gui/e-meeting-model.c:98
 # calendar/gui/e-meeting-model.c:98
-#: calendar/gui/e-meeting-model.c:98
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "不参加"
 
@@ -8823,8 +9891,8 @@ msgstr "不参加"
 # calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
 # calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
 # calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "个人"
 
@@ -8834,8 +9902,8 @@ msgstr "个人"
 # calendar/gui/e-meeting-model.c:779
 # calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
 # calendar/gui/e-meeting-model.c:779
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:779
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "组"
 
@@ -8845,8 +9913,8 @@ msgstr "组"
 # calendar/gui/e-meeting-model.c:780
 # calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 # calendar/gui/e-meeting-model.c:780
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:780
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "资源"
 
@@ -8856,8 +9924,8 @@ msgstr "资源"
 # calendar/gui/e-meeting-model.c:781
 # calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
 # calendar/gui/e-meeting-model.c:781
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:781
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "房间"
 
@@ -8867,8 +9935,8 @@ msgstr "房间"
 # calendar/gui/e-meeting-model.c:794
 # calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
 # calendar/gui/e-meeting-model.c:794
-#: calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
-#: calendar/gui/e-meeting-model.c:794
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "主席"
 
@@ -8878,8 +9946,8 @@ msgstr "主席"
 # calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
 # calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
 # calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
-#: calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "必需的参与者"
 
@@ -8889,8 +9957,8 @@ msgstr "必需的参与者"
 # calendar/gui/e-meeting-model.c:796
 # calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
 # calendar/gui/e-meeting-model.c:796
-#: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:796
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "可选的参与者"
 
@@ -8900,8 +9968,8 @@ msgstr "可选的参与者"
 # calendar/gui/e-meeting-model.c:797
 # calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
 # calendar/gui/e-meeting-model.c:797
-#: calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
-#: calendar/gui/e-meeting-model.c:797
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "不参加"
 
@@ -8911,8 +9979,8 @@ msgstr "不参加"
 # calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
 # calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
 # calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "需要动作"
 
@@ -8922,8 +9990,8 @@ msgstr "需要动作"
 # calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
 # calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
 # calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
-#: calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
-#: calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "暂时的"
 
@@ -8933,15 +10001,15 @@ msgstr "暂时的"
 # calendar/gui/e-meeting-model.c:827
 # calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
 # calendar/gui/e-meeting-model.c:827
-#: calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
-#: calendar/gui/e-meeting-model.c:827
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "被委任的"
 
 # calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
 # calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
 # calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
-#: calendar/gui/e-meeting-model.c:331 calendar/gui/e-meeting-model.c:354
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "正在处理"
 
@@ -8953,8 +10021,8 @@ msgstr "正在处理"
 # calendar/gui/e-meeting-time-sel.c:2102
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:471
-#: calendar/gui/e-meeting-time-sel.c:2102
+#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%B月%d日 %A"
 
@@ -8969,8 +10037,8 @@ msgstr "%Y年%B月%d日 %A"
 # e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2132 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel-item.c:479
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%Y年%m月%d日 %a"
@@ -8983,7 +10051,7 @@ msgstr "%Y年%m月%d日 %a"
 # e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479 e-util/e-time-utils.c:221
+#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:221
 #: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
 msgid "%m/%d/%Y"
 msgstr "%Y年%m月%d日"
@@ -8991,112 +10059,112 @@ msgstr "%Y年%m月%d日"
 # calendar/gui/e-meeting-time-sel.c:430
 # calendar/gui/e-meeting-time-sel.c:433
 # calendar/gui/e-meeting-time-sel.c:433
-#: calendar/gui/e-meeting-time-sel.c:433
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "办公室以外"
 
 # calendar/gui/e-meeting-time-sel.c:431
 # calendar/gui/e-meeting-time-sel.c:434
 # calendar/gui/e-meeting-time-sel.c:434
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "没有信息"
 
 # calendar/gui/e-meeting-time-sel.c:467
 # calendar/gui/e-meeting-time-sel.c:470
 # calendar/gui/e-meeting-time-sel.c:470
-#: calendar/gui/e-meeting-time-sel.c:470
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "选项(_O)"
 
 # calendar/gui/e-meeting-time-sel.c:484
 # calendar/gui/e-meeting-time-sel.c:487
 # calendar/gui/e-meeting-time-sel.c:487
-#: calendar/gui/e-meeting-time-sel.c:487
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "只显示工作小时(_O)"
 
 # calendar/gui/e-meeting-time-sel.c:497
 # calendar/gui/e-meeting-time-sel.c:500
 # calendar/gui/e-meeting-time-sel.c:500
-#: calendar/gui/e-meeting-time-sel.c:500
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "显示缩放的输出(_Z)"
 
 # calendar/gui/e-meeting-time-sel.c:515
 # calendar/gui/e-meeting-time-sel.c:518
 # calendar/gui/e-meeting-time-sel.c:518
-#: calendar/gui/e-meeting-time-sel.c:518
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "更新忙闲(_U)"
 
 # calendar/gui/e-meeting-time-sel.c:533
 # calendar/gui/e-meeting-time-sel.c:536
 # calendar/gui/e-meeting-time-sel.c:536
-#: calendar/gui/e-meeting-time-sel.c:536
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
 # calendar/gui/e-meeting-time-sel.c:550
 # calendar/gui/e-meeting-time-sel.c:553
 # calendar/gui/e-meeting-time-sel.c:553
-#: calendar/gui/e-meeting-time-sel.c:553
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "自动获取(_A)"
 
 # calendar/gui/e-meeting-time-sel.c:564
 # calendar/gui/e-meeting-time-sel.c:567
 # calendar/gui/e-meeting-time-sel.c:567
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
 # calendar/gui/e-meeting-time-sel.c:581
 # calendar/gui/e-meeting-time-sel.c:584
 # calendar/gui/e-meeting-time-sel.c:584
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "所有人和资源(_A)"
 
 # calendar/gui/e-meeting-time-sel.c:594
 # calendar/gui/e-meeting-time-sel.c:597
 # calendar/gui/e-meeting-time-sel.c:597
-#: calendar/gui/e-meeting-time-sel.c:597
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "所有人和一个资源(_P)"
 
 # calendar/gui/e-meeting-time-sel.c:607
 # calendar/gui/e-meeting-time-sel.c:610
 # calendar/gui/e-meeting-time-sel.c:610
-#: calendar/gui/e-meeting-time-sel.c:610
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "必需的人(_R)"
 
 # calendar/gui/e-meeting-time-sel.c:620
 # calendar/gui/e-meeting-time-sel.c:623
 # calendar/gui/e-meeting-time-sel.c:623
-#: calendar/gui/e-meeting-time-sel.c:623
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "必需的人和一个资源(_O)"
 
 # calendar/gui/e-meeting-time-sel.c:643
 # calendar/gui/e-meeting-time-sel.c:646
 # calendar/gui/e-meeting-time-sel.c:646
-#: calendar/gui/e-meeting-time-sel.c:646
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "会议开始时间(_S)："
 
 # calendar/gui/e-meeting-time-sel.c:662
 # calendar/gui/e-meeting-time-sel.c:665
 # calendar/gui/e-meeting-time-sel.c:665
-#: calendar/gui/e-meeting-time-sel.c:665
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "会议结束时间(_E)："
 
 # calendar/gui/e-tasks.c:328
 # calendar/gui/e-tasks.c:328
 # calendar/gui/e-tasks.c:342
-#: calendar/gui/e-tasks.c:342
+#: calendar/gui/e-tasks.c:362
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "在 %s 打开任务"
@@ -9104,7 +10172,7 @@ msgstr "在 %s 打开任务"
 # calendar/gui/e-tasks.c:355
 # calendar/gui/e-tasks.c:355
 # calendar/gui/e-tasks.c:367
-#: calendar/gui/e-tasks.c:367
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "无法从“%s”中装入任务"
@@ -9112,29 +10180,63 @@ msgstr "无法从“%s”中装入任务"
 # calendar/gui/e-tasks.c:367
 # calendar/gui/e-tasks.c:367
 # calendar/gui/e-tasks.c:379
-#: calendar/gui/e-tasks.c:379
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "不支持装入“%s”必需的方法"
 
+# calendar/gui/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1499
+# calendar/gui/gnome-cal.c:1493
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "无法打开“%s”中的文件夹"
+
+# calendar/gui/e-calendar-table.etspec.h:8
+# calendar/gui/e-calendar-table.etspec.h:8
+# calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-tasks.c:558
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "完成日期"
+
+# calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2724
+# calendar/gui/e-week-view.c:1822
+# calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2726
+# calendar/gui/e-week-view.c:1824
+# calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
+# calendar/gui/e-week-view.c:1828
+#: calendar/gui/e-tasks.c:581
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "删除选中的对象"
+
 # mail/mail-ops.c:1556
 # mail/mail-ops.c:1558
 # calendar/gui/e-tasks.c:629
-#: calendar/gui/e-tasks.c:629
+#: calendar/gui/e-tasks.c:674
 msgid "Expunging"
 msgstr "正在删除"
 
 # calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
 # calendar/gui/e-week-view.c:3408 calendar/gui/e-week-view.c:3446
 # calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
-#: calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
+# calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
+# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3430
+# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "删除该约会(_D)"
+
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1493
-#: calendar/gui/gnome-cal.c:1493
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "无法打开“%s”中的文件夹"
@@ -9142,7 +10244,7 @@ msgstr "无法打开“%s”中的文件夹"
 # calendar/gui/gnome-cal.c:1510
 # calendar/gui/gnome-cal.c:1510
 # calendar/gui/gnome-cal.c:1504
-#: calendar/gui/gnome-cal.c:1504
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "不支持打开“%s”必需的方法"
@@ -9150,7 +10252,7 @@ msgstr "不支持打开“%s”必需的方法"
 # calendar/gui/gnome-cal.c:1865
 # calendar/gui/gnome-cal.c:1865
 # calendar/gui/gnome-cal.c:1859
-#: calendar/gui/gnome-cal.c:1859
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "从 %s 打开日历"
@@ -9256,344 +10358,349 @@ msgstr "九月"
 # calendar/gui/itip-utils.c:243
 # calendar/gui/itip-utils.c:243
 # calendar/gui/itip-utils.c:243
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:280
 msgid "At least one attendee is necessary"
 msgstr "至少需要一个参加者"
 
 # calendar/gui/itip-utils.c:274
 # calendar/gui/itip-utils.c:274
 # calendar/gui/itip-utils.c:274
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "必须设定组织者。"
 
 # calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
 # calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
 # calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
+#: calendar/gui/itip-utils.c:354
 msgid "Event information"
 msgstr "事件信息"
 
 # calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
 # calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
 # calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
+#: calendar/gui/itip-utils.c:356
 msgid "Task information"
 msgstr "任务信息"
 
 # calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
 # calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
 # calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
+#: calendar/gui/itip-utils.c:358
 msgid "Journal information"
 msgstr "日志信息"
 
 # calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
 # calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
 # calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
+#: calendar/gui/itip-utils.c:360
 msgid "Free/Busy information"
 msgstr "忙闲信息"
 
 # calendar/gui/itip-utils.c:321
 # calendar/gui/itip-utils.c:321
 # calendar/gui/itip-utils.c:321
-#: calendar/gui/itip-utils.c:321
+#: calendar/gui/itip-utils.c:362
 msgid "Calendar information"
 msgstr "日历信息"
 
-# calendar/gui/itip-utils.c:370
-# calendar/gui/itip-utils.c:370
-# calendar/gui/itip-utils.c:370
-#: calendar/gui/itip-utils.c:370
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "忙闲信息 (%s 到 %s)"
+# calendar/gui/e-itip-control.c:787
+# calendar/gui/e-itip-control.c:787
+# calendar/gui/e-itip-control.c:790
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "更新"
 
-# calendar/gui/itip-utils.c:382
-# calendar/gui/itip-utils.c:382
-# calendar/gui/itip-utils.c:382
-#: calendar/gui/itip-utils.c:382
-msgid "iCalendar information"
-msgstr "iCalendar 信息"
+# ui/evolution-subscribe.xml.h:3
+# ui/evolution-subscribe.xml.h:3
+# ui/evolution-subscribe.xml.h:3
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "刷新列表"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
 
 # calendar/gui/itip-utils.c:573
 # calendar/gui/itip-utils.c:573
 # calendar/gui/itip-utils.c:581
-#: calendar/gui/itip-utils.c:581
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的参与者。"
 
 # calendar/gui/main.c:91
 # calendar/gui/main.c:91
 # calendar/gui/main.c:91
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "无法创建组件编辑器车间"
 
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr "一号"
 
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr "二号"
 
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr "三号"
 
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr "四号"
 
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
 # calendar/gui/print.c:425
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr "五号"
 
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr "六号"
 
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr "七号"
 
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr "八号"
 
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr "九号"
 
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
 # calendar/gui/print.c:426
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr "十号"
 
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr "十一号"
 
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr "十二号"
 
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr "十三号"
 
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr "十四号"
 
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
 # calendar/gui/print.c:427
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr "十五号"
 
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr "十六号"
 
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr "十七号"
 
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr "十八号"
 
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr "十九号"
 
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
 # calendar/gui/print.c:428
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr "二十号"
 
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr "二十一号"
 
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr "二十二号"
 
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr "二十三号"
 
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr "二十四号"
 
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
 # calendar/gui/print.c:429
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr "二十五号"
 
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr "二十六号"
 
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr "二十七号"
 
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr "二十八号"
 
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr "二十九号"
 
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
 # calendar/gui/print.c:430
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr "三十号"
 
 # calendar/gui/print.c:431
 # calendar/gui/print.c:431
 # calendar/gui/print.c:431
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr "三十一号"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr "日"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "一"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "二"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "三"
 
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "四"
 
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "五"
 
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "六"
 
@@ -9601,21 +10708,21 @@ msgstr "六"
 # calendar/gui/print.c:1819
 # calendar/gui/print.c:1819
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "选中的日期 (%Y年%b月%d日 %a)"
 
 # calendar/gui/print.c:1844 calendar/gui/print.c:1848
 # calendar/gui/print.c:1844 calendar/gui/print.c:1848
 # calendar/gui/print.c:1844 calendar/gui/print.c:1848
-#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
+#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
 msgid "%a %b %d"
 msgstr "%b月%d日 %a"
 
 # calendar/gui/print.c:1845
 # calendar/gui/print.c:1845
 # calendar/gui/print.c:1845
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr "%Y年%d日 %a"
 
@@ -9625,15 +10732,15 @@ msgstr "%Y年%d日 %a"
 # calendar/gui/print.c:1852
 # calendar/gui/print.c:1849 calendar/gui/print.c:1851
 # calendar/gui/print.c:1852
-#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1852
+#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
+#: calendar/gui/print.c:1896
 msgid "%a %b %d %Y"
 msgstr "%Y年%b月%d日 %a"
 
 # calendar/gui/print.c:1856
 # calendar/gui/print.c:1856
 # calendar/gui/print.c:1856
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "选中的周 (%s - %s)"
@@ -9642,7 +10749,7 @@ msgstr "选中的周 (%s - %s)"
 # calendar/gui/print.c:1864
 # calendar/gui/print.c:1864
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "选中的月 (%Y年%b月)"
 
@@ -9650,21 +10757,21 @@ msgstr "选中的月 (%Y年%b月)"
 # calendar/gui/print.c:1871
 # calendar/gui/print.c:1871
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "选中的年 (%Y年)"
 
 # calendar/gui/print.c:2205
 # calendar/gui/print.c:2205
 # calendar/gui/print.c:2205
-#: calendar/gui/print.c:2205
+#: calendar/gui/print.c:2249
 msgid "Task"
 msgstr "任务"
 
 # calendar/gui/print.c:2262
 # calendar/gui/print.c:2262
 # calendar/gui/print.c:2262
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2306
 #, c-format
 msgid "Status: %s"
 msgstr "状态：%s"
@@ -9672,7 +10779,7 @@ msgstr "状态：%s"
 # calendar/gui/print.c:2280
 # calendar/gui/print.c:2280
 # calendar/gui/print.c:2280
-#: calendar/gui/print.c:2280
+#: calendar/gui/print.c:2324
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级：%s"
@@ -9680,7 +10787,7 @@ msgstr "优先级：%s"
 # calendar/gui/print.c:2294
 # calendar/gui/print.c:2294
 # calendar/gui/print.c:2294
-#: calendar/gui/print.c:2294
+#: calendar/gui/print.c:2338
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率：%i"
@@ -9688,7 +10795,7 @@ msgstr "完成率：%i"
 # calendar/gui/print.c:2306
 # calendar/gui/print.c:2306
 # calendar/gui/print.c:2306
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2350
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
@@ -9696,7 +10803,7 @@ msgstr "URL：%s"
 # calendar/gui/print.c:2320
 # calendar/gui/print.c:2320
 # calendar/gui/print.c:2320
-#: calendar/gui/print.c:2320
+#: calendar/gui/print.c:2364
 #, c-format
 msgid "Categories: %s"
 msgstr "类别：%s"
@@ -9704,14 +10811,14 @@ msgstr "类别：%s"
 # calendar/gui/print.c:2331
 # calendar/gui/print.c:2331
 # calendar/gui/print.c:2331
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2375
 msgid "Contacts: "
 msgstr "联系人："
 
 # calendar/gui/print.c:2386
 # calendar/gui/print.c:2386
 # calendar/gui/print.c:2386
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "打印日历"
 
@@ -9724,23 +10831,24 @@ msgstr "打印日历"
 # calendar/gui/print.c:2477 calendar/gui/print.c:2569
 # mail/mail-callbacks.c:2597 my-evolution/e-summary.c:605
 # ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2611 my-evolution/e-summary.c:605
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "打印预览"
 
 # calendar/gui/print.c:2506
 # calendar/gui/print.c:2506
 # calendar/gui/print.c:2506
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "打印项"
 
 # calendar/gui/print.c:2587
 # calendar/gui/print.c:2587
 # calendar/gui/print.c:2587
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "打印设置"
 
@@ -9755,14 +10863,14 @@ msgstr "无法创建任务预览。请检查您的 ORBit 和 OAF 设置。"
 # calendar/gui/tasks-control.c:126
 # calendar/gui/tasks-control.c:126
 # calendar/gui/tasks-control.c:137
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "要显示的任务文件夹的 URI"
 
 # mail/mail-callbacks.c:2135
 # mail/mail-callbacks.c:2254
 # calendar/gui/tasks-control.c:434
-#: calendar/gui/tasks-control.c:434
+#: calendar/gui/tasks-control.c:456
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -9776,10 +10884,19 @@ msgstr ""
 # mail/mail-callbacks.c:2142
 # mail/mail-callbacks.c:2261
 # calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2297
-#: calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2311
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
 msgid "Do not ask me again."
 msgstr "不要再次询问。"
 
+# addressbook/printing/e-contact-print.c:1111
+# addressbook/printing/e-contact-print.c:1111
+# addressbook/printing/e-contact-print.c:1115
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "打印卡片"
+
 # calendar/gui/tasks-migrate.c:105
 # calendar/gui/tasks-migrate.c:105
 # calendar/gui/tasks-migrate.c:105
@@ -9844,136 +10961,183 @@ msgstr "将 iCalendar 文件导入 Evolution 的车间"
 msgid "Imports iCalendar files into Evolution"
 msgstr "将 iCalendar 文件导入 Evolution"
 
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+# calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "将 iCalendar 文件导入 Evolution"
+
+# calendar/gui/dialogs/event-editor.c:190
+# calendar/gui/dialogs/event-editor.c:190
+# calendar/gui/dialogs/event-editor.c:190
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "提醒"
+
+# calendar/gui/e-itip-control.glade.h:4
+# calendar/gui/e-itip-control.glade.h:4
+# calendar/gui/e-itip-control.glade.h:4
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "日历消息"
+
+# importers/pine-importer.c:663
+# importers/pine-importer.c:663
+# importers/pine-importer.c:663
+#: calendar/importers/icalendar-importer.c:663
+#, fuzzy
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution 找到 Pine 邮件文件。\n"
+"您是否原意把它们导入 Evolution？"
+
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "日历"
+
 # calendar/pcs/query.c:246
 # calendar/pcs/query.c:246
 # calendar/pcs/query.c:246
-#: calendar/pcs/query.c:246
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now 需要 0 个参数"
 
 # calendar/pcs/query.c:270
 # calendar/pcs/query.c:270
 # calendar/pcs/query.c:270
-#: calendar/pcs/query.c:270
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time 需要 1 个参数"
 
 # calendar/pcs/query.c:275
 # calendar/pcs/query.c:275
 # calendar/pcs/query.c:275
-#: calendar/pcs/query.c:275
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time 的第一个参数应该是字符串"
 
 # calendar/pcs/query.c:283
 # calendar/pcs/query.c:283
 # calendar/pcs/query.c:283
-#: calendar/pcs/query.c:283
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time 的第一个参数必须是 ISO 8601 日期/时间字符串"
 
 # calendar/pcs/query.c:312
 # calendar/pcs/query.c:312
 # calendar/pcs/query.c:312
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day 需要 2 个参数"
 
 # calendar/pcs/query.c:317
 # calendar/pcs/query.c:317
 # calendar/pcs/query.c:317
-#: calendar/pcs/query.c:317
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:324
 # calendar/pcs/query.c:324
 # calendar/pcs/query.c:324
-#: calendar/pcs/query.c:324
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day 的第二个参数应该是整数"
 
 # calendar/pcs/query.c:351
 # calendar/pcs/query.c:351
 # calendar/pcs/query.c:351
-#: calendar/pcs/query.c:351
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin 需要 1 个参数"
 
 # calendar/pcs/query.c:356
 # calendar/pcs/query.c:356
 # calendar/pcs/query.c:356
-#: calendar/pcs/query.c:356
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:383
 # calendar/pcs/query.c:383
 # calendar/pcs/query.c:383
-#: calendar/pcs/query.c:383
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end 需要一个参数"
 
 # calendar/pcs/query.c:388
 # calendar/pcs/query.c:388
 # calendar/pcs/query.c:388
-#: calendar/pcs/query.c:388
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:424
 # calendar/pcs/query.c:424
 # calendar/pcs/query.c:424
-#: calendar/pcs/query.c:424
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype 需要 0 个参数"
 
 # calendar/pcs/query.c:520
 # calendar/pcs/query.c:520
 # calendar/pcs/query.c:520
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? 需要两个参数"
 
 # calendar/pcs/query.c:525
 # calendar/pcs/query.c:525
 # calendar/pcs/query.c:525
-#: calendar/pcs/query.c:525
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:532
 # calendar/pcs/query.c:532
 # calendar/pcs/query.c:532
-#: calendar/pcs/query.c:532
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-rang? 的第二个参数应该是 time_t"
 
 # calendar/pcs/query.c:662
 # calendar/pcs/query.c:662
 # calendar/pcs/query.c:662
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? 需要 2 个参数"
 
 # calendar/pcs/query.c:667
 # calendar/pcs/query.c:667
 # calendar/pcs/query.c:667
-#: calendar/pcs/query.c:667
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? 的第一个参数应该是字符串"
 
 # calendar/pcs/query.c:674
 # calendar/pcs/query.c:674
 # calendar/pcs/query.c:674
-#: calendar/pcs/query.c:674
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? 的第二个参数应该是字符串"
 
 # calendar/pcs/query.c:691
 # calendar/pcs/query.c:691
 # calendar/pcs/query.c:691
-#: calendar/pcs/query.c:691
+#: calendar/pcs/query.c:693
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -9982,14 +11146,14 @@ msgstr "contains? 的第一个参数必须是“任意”、“概要”、“�
 # calendar/pcs/query.c:733
 # calendar/pcs/query.c:733
 # calendar/pcs/query.c:733
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? 至少需要 1 个参数"
 
 # calendar/pcs/query.c:745
 # calendar/pcs/query.c:745
 # calendar/pcs/query.c:745
-#: calendar/pcs/query.c:745
+#: calendar/pcs/query.c:747
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -9998,21 +11162,21 @@ msgstr "has-categories? 的所有参数都应该为字符串或者它唯一的�
 # calendar/pcs/query.c:833
 # calendar/pcs/query.c:833
 # calendar/pcs/query.c:833
-#: calendar/pcs/query.c:833
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? 需要 0 个参数"
 
 # calendar/pcs/query.c:878
 # calendar/pcs/query.c:878
 # calendar/pcs/query.c:878
-#: calendar/pcs/query.c:878
+#: calendar/pcs/query.c:880
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? 需要 1 个参数"
 
 # calendar/pcs/query.c:883
 # calendar/pcs/query.c:883
 # calendar/pcs/query.c:883
-#: calendar/pcs/query.c:883
+#: calendar/pcs/query.c:885
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? 的第一个参数应该是 time_t"
 
@@ -11441,15 +12605,29 @@ msgstr "亚洲/科威特"
 msgid "Asia/Macao"
 msgstr "亚洲/澳门"
 
+# calendar/zones.h:229
+# calendar/zones.h:229
+#: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "亚洲/澳门"
+
 # calendar/zones.h:230
 # calendar/zones.h:230
-#: calendar/zones.h:230
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
+# calendar/zones.h:223
+# calendar/zones.h:223
+#: calendar/zones.h:232
+#, fuzzy
+msgid "Asia/Makassar"
+msgstr "亚洲/喀什葛尔"
+
 # calendar/zones.h:231
 # calendar/zones.h:231
-#: calendar/zones.h:231
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr "亚洲/马尼拉"
 
@@ -11459,991 +12637,998 @@ msgstr "亚洲/马尼拉"
 # addressbook/gui/widgets/e-addressbook-view.c:883
 # calendar/zones.h:232
 # calendar/zones.h:232
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr "亚洲/马斯喀特"
 
 # calendar/zones.h:233
 # calendar/zones.h:233
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr "亚洲/尼科西亚"
 
 # calendar/zones.h:234
 # calendar/zones.h:234
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr "亚洲/新西伯利亚"
 
 # ui/evolution-task-editor.xml.h:1
 # calendar/zones.h:235
 # calendar/zones.h:235
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr "亚洲/鄂木斯克"
 
+# calendar/zones.h:220
+# calendar/zones.h:220
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "亚洲/喀布尔"
+
 # calendar/zones.h:236
 # calendar/zones.h:236
-#: calendar/zones.h:236
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr "亚洲/金边"
 
 # calendar/zones.h:237
 # calendar/zones.h:237
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr "亚洲/坤甸"
 
 # calendar/zones.h:238
 # calendar/zones.h:238
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr "亚洲/平壤"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:172
 # calendar/zones.h:239
 # calendar/zones.h:239
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr "亚洲/卡塔尔"
 
+# calendar/zones.h:211
+# calendar/zones.h:211
+#: calendar/zones.h:243
+#, fuzzy
+msgid "Asia/Qyzylorda"
+msgstr "亚洲/加沙"
+
 # calendar/zones.h:240
 # calendar/zones.h:240
-#: calendar/zones.h:240
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr "亚洲/仰光"
 
 # calendar/zones.h:241
 # calendar/zones.h:241
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr "亚洲/利雅得"
 
 # calendar/zones.h:242
 # calendar/zones.h:242
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr "亚洲/西贡"
 
 # calendar/zones.h:243
 # calendar/zones.h:243
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr "亚洲/库页岛"
 
 # calendar/zones.h:244
 # calendar/zones.h:244
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr "亚洲/撒马尔罕"
 
 # calendar/zones.h:245
 # calendar/zones.h:245
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr "亚洲/汉城"
 
 # calendar/zones.h:246
 # calendar/zones.h:246
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr "亚洲/上海"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:189
 # calendar/zones.h:247
 # calendar/zones.h:247
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr "亚洲/新加坡"
 
 # calendar/zones.h:248
 # calendar/zones.h:248
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr "亚洲/台北"
 
 # calendar/zones.h:249
 # calendar/zones.h:249
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr "亚洲/塔什干"
 
 # calendar/zones.h:250
 # calendar/zones.h:250
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr "亚洲/第比利斯"
 
 # calendar/zones.h:251
 # calendar/zones.h:251
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr "亚洲/德黑兰"
 
 # calendar/zones.h:252
 # calendar/zones.h:252
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr "亚洲/廷布"
 
 # calendar/zones.h:253
 # calendar/zones.h:253
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr "亚洲/东京"
 
 # calendar/zones.h:254
 # calendar/zones.h:254
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
 # calendar/zones.h:255
 # calendar/zones.h:255
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr "亚洲/乌兰巴托"
 
 # calendar/zones.h:256
 # calendar/zones.h:256
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr "亚洲/乌鲁木齐"
 
 # calendar/zones.h:257
 # calendar/zones.h:257
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr "亚洲/万象"
 
 # calendar/zones.h:258
 # calendar/zones.h:258
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr "亚洲/符拉迪沃斯托克"
 
 # calendar/zones.h:259
 # calendar/zones.h:259
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr "亚洲/雅库茨克"
 
 # calendar/zones.h:260
 # calendar/zones.h:260
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
 # calendar/zones.h:261
 # calendar/zones.h:261
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr "亚洲/耶列万"
 
 # calendar/zones.h:262
 # calendar/zones.h:262
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr "大西洋/亚述尔群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:25
 # calendar/zones.h:263
 # calendar/zones.h:263
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr "大西洋/百慕大"
 
 # calendar/zones.h:264
 # calendar/zones.h:264
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr "大西洋/卡内里"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:41
 # calendar/zones.h:265
 # calendar/zones.h:265
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr "大西洋/佛得角"
 
 # calendar/zones.h:266
 # calendar/zones.h:266
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr "大西洋/法罗"
 
 # calendar/zones.h:267
 # calendar/zones.h:267
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
 # calendar/zones.h:268
 # calendar/zones.h:268
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr "大西洋/马德拉群岛"
 
 # calendar/zones.h:269
 # calendar/zones.h:269
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr "大西洋/雷克雅未克"
 
 # calendar/zones.h:270
 # calendar/zones.h:270
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr "大西洋/南乔治亚"
 
 # calendar/zones.h:271
 # calendar/zones.h:271
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr "大西洋/圣海伦娜"
 
 # calendar/zones.h:272
 # calendar/zones.h:272
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr "大西洋/斯坦利"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # calendar/zones.h:273
 # calendar/zones.h:273
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr "澳大利亚/阿德莱德"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # calendar/zones.h:274
 # calendar/zones.h:274
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr "澳大利亚/布里斯班"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # calendar/zones.h:275
 # calendar/zones.h:275
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # calendar/zones.h:276
 # calendar/zones.h:276
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr "澳大利亚/达尔文"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # calendar/zones.h:277
 # calendar/zones.h:277
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr "澳大利亚/霍巴特"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # calendar/zones.h:278
 # calendar/zones.h:278
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr "澳大利亚/林德曼"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # calendar/zones.h:279
 # calendar/zones.h:279
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # calendar/zones.h:280
 # calendar/zones.h:280
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr "澳洲/墨尔本"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # calendar/zones.h:281
 # calendar/zones.h:281
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr "澳大利亚/珀斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # calendar/zones.h:282
 # calendar/zones.h:282
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr "澳洲/悉尼"
 
 # calendar/zones.h:283
 # calendar/zones.h:283
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr "欧洲/阿姆斯特丹"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:6
 # calendar/zones.h:284
 # calendar/zones.h:284
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr "欧洲/安道尔"
 
 # mail/folder-browser-ui.c:274
 # calendar/zones.h:285
 # calendar/zones.h:285
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr "欧洲/雅典"
 
 # calendar/zones.h:286
 # calendar/zones.h:286
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr "欧洲/贝尔法斯特"
 
 # calendar/zones.h:287
 # calendar/zones.h:287
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "欧洲/贝尔格莱德"
 
 # calendar/zones.h:288
 # calendar/zones.h:288
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "欧洲/柏林"
 
 # calendar/zones.h:289
 # calendar/zones.h:289
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr "欧洲/布拉迪斯拉发"
 
 # calendar/zones.h:290
 # calendar/zones.h:290
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "欧洲/布鲁塞尔"
 
 # calendar/zones.h:291
 # calendar/zones.h:291
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr "欧洲/布加勒斯特"
 
 # calendar/zones.h:292
 # calendar/zones.h:292
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr "欧洲/布达佩斯"
 
 # calendar/zones.h:293
 # calendar/zones.h:293
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
 # calendar/zones.h:294
 # calendar/zones.h:294
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr "欧洲/哥本哈根"
 
 # calendar/zones.h:295
 # calendar/zones.h:295
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr "欧洲/都柏林"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:86
 # calendar/zones.h:296
 # calendar/zones.h:296
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr "欧洲/直布罗陀"
 
 # calendar/zones.h:297
 # calendar/zones.h:297
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr "欧洲/赫尔辛基"
 
 # calendar/zones.h:298
 # calendar/zones.h:298
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr "欧洲/伊斯坦布尔"
 
 # calendar/zones.h:299
 # calendar/zones.h:299
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr "欧洲/加里宁格勒"
 
 # calendar/zones.h:300
 # calendar/zones.h:300
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "欧洲/基辅"
 
 # calendar/zones.h:301
 # calendar/zones.h:301
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "欧洲/里斯本"
 
 # calendar/zones.h:302
 # calendar/zones.h:302
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr "欧洲/卢布尔雅纳"
 
 # calendar/zones.h:303
 # calendar/zones.h:303
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "欧洲/伦敦"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:123
 # calendar/zones.h:304
 # calendar/zones.h:304
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "欧洲/卢森堡"
 
 # calendar/zones.h:305
 # calendar/zones.h:305
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "欧洲/马德里"
 
 # calendar/zones.h:306
 # calendar/zones.h:306
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr "欧洲/马耳他"
 
 # calendar/zones.h:307
 # calendar/zones.h:307
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "欧洲/明斯克"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # calendar/zones.h:308
 # calendar/zones.h:308
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "欧洲/摩纳哥"
 
 # calendar/zones.h:309
 # calendar/zones.h:309
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "欧洲/莫斯科"
 
 # calendar/zones.h:310
 # calendar/zones.h:310
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr "欧洲/尼科西亚"
 
 # calendar/zones.h:311
 # calendar/zones.h:311
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr "欧洲/奥斯路"
 
 # mail/folder-browser-ui.c:274
 # calendar/zones.h:312
 # calendar/zones.h:312
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "欧洲/巴黎"
 
 # calendar/zones.h:313
 # calendar/zones.h:313
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr "欧洲/布拉格"
 
 # calendar/zones.h:314
 # calendar/zones.h:314
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr "欧洲/里加"
 
 # calendar/zones.h:315
 # calendar/zones.h:315
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr "欧洲/罗马"
 
 # calendar/zones.h:316
 # calendar/zones.h:316
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # calendar/zones.h:317
 # calendar/zones.h:317
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr "欧洲/圣马力诺"
 
 # calendar/zones.h:318
 # calendar/zones.h:318
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr "欧洲/萨拉热窝"
 
 # calendar/zones.h:319
 # calendar/zones.h:319
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr "欧洲/辛菲罗波尔"
 
 # calendar/zones.h:320
 # calendar/zones.h:320
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr "欧洲/斯科普里"
 
 # calendar/zones.h:321
 # calendar/zones.h:321
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr "欧洲/索非亚"
 
 # calendar/zones.h:322
 # calendar/zones.h:322
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr "欧洲/斯德哥尔摩"
 
 # calendar/zones.h:323
 # calendar/zones.h:323
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr "欧洲/塔林"
 
 # calendar/zones.h:324
 # calendar/zones.h:324
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr "欧洲/地拉那"
 
 # calendar/zones.h:325
 # calendar/zones.h:325
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
 # calendar/zones.h:326
 # calendar/zones.h:326
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr "欧洲/瓦杜兹"
 
 # calendar/zones.h:327
 # calendar/zones.h:327
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr "欧洲/梵蒂冈"
 
 # calendar/zones.h:328
 # calendar/zones.h:328
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr "欧洲/维也纳"
 
 # calendar/zones.h:329
 # calendar/zones.h:329
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr "欧洲/维尔纽斯"
 
 # calendar/zones.h:330
 # calendar/zones.h:330
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr "欧洲/华沙"
 
 # calendar/zones.h:331
 # calendar/zones.h:331
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr "欧洲/萨格勒布"
 
 # calendar/zones.h:332
 # calendar/zones.h:332
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
 # calendar/zones.h:333
 # calendar/zones.h:333
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr "欧洲/苏黎世"
 
 # calendar/zones.h:334
 # calendar/zones.h:334
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
 # calendar/zones.h:335
 # calendar/zones.h:335
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr "印度洋/查戈斯群岛"
 
 # calendar/zones.h:336
 # calendar/zones.h:336
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr "印度洋/圣诞岛"
 
 # calendar/zones.h:337
 # calendar/zones.h:337
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr "印度洋/科科斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:51
 # calendar/zones.h:338
 # calendar/zones.h:338
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr "印度洋/科摩罗"
 
 # calendar/zones.h:339
 # calendar/zones.h:339
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:103
 # calendar/zones.h:340
 # calendar/zones.h:340
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:129
 # calendar/zones.h:341
 # calendar/zones.h:341
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr "印度洋/马尔代夫"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:135
 # calendar/zones.h:342
 # calendar/zones.h:342
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr "印度洋/毛里求斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:136
 # calendar/zones.h:343
 # calendar/zones.h:343
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr "印度洋/马约特岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:175
 # calendar/zones.h:344
 # calendar/zones.h:344
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr "印度洋/留尼汪"
 
 # calendar/zones.h:345
 # calendar/zones.h:345
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr "太平洋/阿皮亚"
 
 # calendar/zones.h:346
 # calendar/zones.h:346
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr "太平洋/奥克兰"
 
 # calendar/zones.h:347
 # calendar/zones.h:347
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr "太平洋/查塔姆群岛"
 
 # calendar/zones.h:348
 # calendar/zones.h:348
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr "太平洋/复活节岛"
 
 # calendar/zones.h:349
 # calendar/zones.h:349
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr "太平洋/埃法特岛"
 
 # calendar/zones.h:350
 # calendar/zones.h:350
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
 # calendar/zones.h:351
 # calendar/zones.h:351
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
 # calendar/zones.h:352
 # calendar/zones.h:352
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr "太平洋/斐济"
 
 # calendar/zones.h:353
 # calendar/zones.h:353
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr "太平洋/富纳富提"
 
 # calendar/zones.h:354
 # calendar/zones.h:354
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr "太平洋/加拉帕哥斯群岛"
 
 # calendar/zones.h:355
 # calendar/zones.h:355
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
 # calendar/zones.h:356
 # calendar/zones.h:356
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr "太平洋/瓜达卡纳尔岛"
 
 # calendar/zones.h:357
 # calendar/zones.h:357
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr "太平洋/关岛"
 
 # calendar/zones.h:358
 # calendar/zones.h:358
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr "太平洋/火奴鲁鲁"
 
 # calendar/zones.h:359
 # calendar/zones.h:359
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr "太平洋/约翰斯顿"
 
 # calendar/zones.h:360
 # calendar/zones.h:360
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
 # calendar/zones.h:361
 # calendar/zones.h:361
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
 # calendar/zones.h:362
 # calendar/zones.h:362
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr "太平洋/夸贾林环礁"
 
 # calendar/zones.h:363
 # calendar/zones.h:363
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
 # calendar/zones.h:364
 # calendar/zones.h:364
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr "太平洋/马克萨斯群岛"
 
 # calendar/zones.h:365
 # calendar/zones.h:365
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr "太平洋/中途岛"
 
 # calendar/zones.h:366
 # calendar/zones.h:366
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr "太平洋/瑙鲁"
 
 # calendar/zones.h:367
 # calendar/zones.h:367
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr "太平洋/纽埃岛"
 
 # calendar/zones.h:368
 # calendar/zones.h:368
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr "太平洋/诺福克"
 
 # calendar/zones.h:369
 # calendar/zones.h:369
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr "太平洋/努美阿"
 
 # calendar/zones.h:370
 # calendar/zones.h:370
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr "太平洋/帕果-帕果"
 
 # calendar/zones.h:371
 # calendar/zones.h:371
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr "太平洋/帕劳"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:168
 # calendar/zones.h:372
 # calendar/zones.h:372
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr "太平洋/皮特克恩岛"
 
 # calendar/zones.h:373
 # calendar/zones.h:373
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
 # calendar/zones.h:374
 # calendar/zones.h:374
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr "太平洋/莫尔斯比港"
 
 # calendar/zones.h:375
 # calendar/zones.h:375
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr "太平洋/拉罗汤加岛"
 
 # calendar/zones.h:376
 # calendar/zones.h:376
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr "太平洋/塞班岛"
 
 # calendar/zones.h:377
 # calendar/zones.h:377
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr "太平洋/塔希提"
 
 # calendar/zones.h:378
 # calendar/zones.h:378
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr "太平洋/塔拉瓦岛"
 
 # calendar/zones.h:379
 # calendar/zones.h:379
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
 # calendar/zones.h:380
 # calendar/zones.h:380
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr "太平洋/特鲁克"
 
 # calendar/zones.h:381
 # calendar/zones.h:381
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr "太平洋/威克岛"
 
 # calendar/zones.h:382
 # calendar/zones.h:382
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr "太平洋/沃利斯"
 
 # calendar/zones.h:383
 # calendar/zones.h:383
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
 # camel/camel-cipher-context.c:171
 # camel/camel-cipher-context.c:169
 # camel/camel-cipher-context.c:169
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "该密码不支持签名"
 
-# camel/camel-cipher-context.c:211
-# camel/camel-cipher-context.c:209
-# camel/camel-cipher-context.c:209
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr "该密码不支持清晰签名"
-
 # camel/camel-cipher-context.c:251
 # camel/camel-cipher-context.c:249
 # camel/camel-cipher-context.c:249
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "该密码不支持验证"
 
 # camel/camel-cipher-context.c:294
 # camel/camel-cipher-context.c:292
 # camel/camel-cipher-context.c:292
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "该密码不支持加密"
 
 # camel/camel-cipher-context.c:336
 # camel/camel-cipher-context.c:334
 # camel/camel-cipher-context.c:334
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "该密码不支持解密"
 
 # mail/mail-ops.c:1870
 # mail/mail-ops.c:1872
 # camel/camel-data-cache.c:159
-#: camel/camel-data-cache.c:166
+#: camel/camel-data-cache.c:169
 msgid "Unable to create cache path"
 msgstr "无法创建缓冲路径"
 
 # camel/providers/imap/camel-imap-message-cache.c:154
 # camel/providers/imap/camel-imap-message-cache.c:154
 # camel/camel-data-cache.c:426
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:443
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "无法删除缓冲条目：%s：%s"
@@ -12451,7 +13636,7 @@ msgstr "无法删除缓冲条目：%s：%s"
 # camel/camel-disco-diary.c:180
 # camel/camel-disco-diary.c:180
 # camel/camel-disco-diary.c:180
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -12465,7 +13650,7 @@ msgstr ""
 # camel/camel-disco-diary.c:243
 # camel/camel-disco-diary.c:243
 # camel/camel-disco-diary.c:243
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -12479,28 +13664,36 @@ msgstr ""
 # camel/camel-disco-diary.c:277
 # camel/camel-disco-diary.c:277
 # camel/camel-disco-diary.c:277
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "重新与服务器同步"
 
+# mail/mail-ops.c:1469
+# mail/mail-ops.c:1471
+# mail/mail-ops.c:1514
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "正在存储文件夹“%s”"
+
 # camel/camel-disco-store.c:343
 # camel/camel-disco-store.c:343
 # camel/camel-disco-store.c:343
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "您必需在线工作以便完成该操作"
 
 # camel/camel-filter-driver.c:553 camel/camel-filter-driver.c:562
 # camel/camel-filter-driver.c:602 camel/camel-filter-driver.c:611
 # camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
-#: camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
+#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
 msgid "Syncing folders"
 msgstr "同步文件夹"
 
 # camel/camel-filter-driver.c:921
 # camel/camel-filter-driver.c:970
 # camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "解析过滤规则错误： %s： %s"
@@ -12508,7 +13701,7 @@ msgstr "解析过滤规则错误： %s： %s"
 # camel/camel-filter-driver.c:927
 # camel/camel-filter-driver.c:976
 # camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "执行过滤规则错误： %s： %s"
@@ -12516,21 +13709,21 @@ msgstr "执行过滤规则错误： %s： %s"
 # camel/camel-filter-driver.c:664
 # camel/camel-filter-driver.c:713
 # camel/camel-filter-driver.c:865
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "无法打开脱机文件夹"
 
 # camel/camel-filter-driver.c:673
 # camel/camel-filter-driver.c:722
 # camel/camel-filter-driver.c:874
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "无法处理脱机文件夹"
 
 # camel/camel-filter-driver.c:688
 # camel/camel-filter-driver.c:737
 # camel/camel-filter-driver.c:889
-#: camel/camel-filter-driver.c:889
+#: camel/camel-filter-driver.c:908
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "获取邮件 %d (%d%%)"
@@ -12538,14 +13731,14 @@ msgstr "获取邮件 %d (%d%%)"
 # camel/camel-filter-driver.c:692
 # camel/camel-filter-driver.c:741
 # camel/camel-filter-driver.c:893
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "无法打开消息"
 
 # camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
 # camel/camel-filter-driver.c:742 camel/camel-filter-driver.c:754
 # camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "在消息 %d 失败"
@@ -12553,14 +13746,14 @@ msgstr "在消息 %d 失败"
 # camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
 # camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:881
 # camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "正在同步文件夹"
 
 # camel/camel-filter-driver.c:789
 # camel/camel-filter-driver.c:838
 # camel/camel-filter-driver.c:988
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在获取第 %d 个消息，共 %d 个"
@@ -12568,7 +13761,7 @@ msgstr "正在获取第 %d 个消息，共 %d 个"
 # camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
 # camel/camel-filter-driver.c:843 camel/camel-filter-driver.c:861
 # camel/camel-filter-driver.c:1003
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d 个消息失败，共 %d 个"
@@ -12576,14 +13769,48 @@ msgstr "在第 %d 个消息失败，共 %d 个"
 # camel/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
 # camel/camel-filter-search.c:126
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:140
 msgid "Failed to retrieve message"
 msgstr "检索消息失败。"
 
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "缓冲邮件 %s 失败： %s"
+
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "缓冲邮件 %s 失败： %s"
+
 # camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
 # camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
 # camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "执行过滤规则搜索错误： %s： %s"
@@ -12591,7 +13818,7 @@ msgstr "执行过滤规则搜索错误： %s： %s"
 # camel/camel-folder-search.c:332
 # camel/camel-folder-search.c:332
 # camel/camel-folder-search.c:332
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -12603,7 +13830,7 @@ msgstr ""
 # camel/camel-folder-search.c:342
 # camel/camel-folder-search.c:342
 # camel/camel-folder-search.c:342
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:353
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -12615,29 +13842,22 @@ msgstr ""
 # camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 # camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
 # camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
-#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
+#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) 需要一个布尔结果"
 
 # camel/camel-folder-search.c:638
 # camel/camel-folder-search.c:638
 # camel/camel-folder-search.c:638
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:650
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "正在对未知的头进行查询： %s"
 
-# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "邮件体内容中的无效类型，应该是字符串"
-
 # camel/camel-folder.c:471
 # camel/camel-folder.c:471
 # camel/camel-folder.c:471
-#: camel/camel-folder.c:471
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "不支持的操作：附加邮件：附加 %s"
@@ -12645,7 +13865,7 @@ msgstr "不支持的操作：附加邮件：附加 %s"
 # camel/camel-folder.c:1040
 # camel/camel-folder.c:1040
 # camel/camel-folder.c:1040
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1161
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "不支持的操作：按表达式搜索：搜索 %s"
@@ -12653,7 +13873,7 @@ msgstr "不支持的操作：按表达式搜索：搜索 %s"
 # camel/camel-folder.c:1080
 # camel/camel-folder.c:1080
 # camel/camel-folder.c:1080
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "不支持的操作：按 uid 搜索：搜索 %s"
@@ -12661,10 +13881,132 @@ msgstr "不支持的操作：按 uid 搜索：搜索 %s"
 # camel/camel-folder.c:1262
 # camel/camel-folder.c:1262
 # camel/camel-folder.c:1262
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1317
 msgid "Moving messages"
 msgstr "正在移动邮件"
 
+# mail/mail-ops.c:868
+# mail/mail-ops.c:870
+# mail/mail-ops.c:913
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "把邮件复制到 %s"
+
+#: camel/camel-gpg-context.c:696
+#, c-format
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
+#, c-format
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
+msgstr ""
+
+# mail/mail-send-recv.c:533
+# mail/mail-send-recv.c:541
+# mail/mail-send-recv.c:541
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "已取消"
+
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
+
+# camel/providers/pop3/camel-pop3-store.c:563
+# camel/providers/pop3/camel-pop3-store.c:563
+# camel/providers/pop3/camel-pop3-store.c:563
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "来自 POP 服务器的意外应答： %s"
+
+# tools/evolution-addressbook-import.c:80
+# tools/evolution-addressbook-import.c:80
+# tools/evolution-addressbook-import.c:80
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "没有提供文件名。"
+
+# camel/camel-pgp-context.c:1169
+# camel/camel-pgp-context.c:1169
+# camel/camel-pgp-context.c:1169
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "无法加密该邮件： 没有指明收件人"
+
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "缓冲邮件 %s 失败： %s"
+
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+# camel/providers/imap/camel-imap-message-cache.c:256
+# camel/providers/imap/camel-imap-message-cache.c:313
+# camel/providers/imap/camel-imap-message-cache.c:344
+# camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "缓冲邮件 %s 失败： %s"
+
+# camel/camel-smime-context.c:810
+# camel/camel-smime-context.c:810
+# camel/camel-smime-context.c:810
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "解码邮件失败。"
+
+# camel/camel-pgp-context.c:970
+# camel/camel-pgp-context.c:970
+# camel/camel-pgp-context.c:970
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "无法验证该邮件：无法创建临时文件： %s"
+
 # camel/camel-lock-client.c:111
 # camel/camel-lock-client.c:111
 # camel/camel-lock-client.c:111
@@ -12817,209 +14159,34 @@ msgstr "写入邮件临时文件错误： %s"
 msgid "Error copying mail temp file: %s"
 msgstr "复制邮件临时文件错误： %s"
 
-# camel/camel-pgp-context.c:193
-# camel/camel-pgp-context.c:193
-# camel/camel-pgp-context.c:193
-#: camel/camel-pgp-context.c:193
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "请为 %2$s 输入您的 %1$s 密码串"
-
-# camel/camel-pgp-context.c:196
-# camel/camel-pgp-context.c:196
-# camel/camel-pgp-context.c:196
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "请输入您的 %s 密码串"
-
-# camel/camel-pgp-context.c:575
-# camel/camel-pgp-context.c:575
-# camel/camel-pgp-context.c:575
-#: camel/camel-pgp-context.c:575
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "无法签名该邮件：普通文本无法签名"
-
-# camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
-# camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
-# camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
-#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
-msgid "Cannot sign this message: no password provided"
-msgstr "无法签名该邮件：没有提供密码"
-
-# camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
-# camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
-# camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
-#: camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
-#, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "无法签名该邮件：无法创建到 GPG/PGP 的管道： %s"
-
-# camel/camel-pgp-context.c:755
-# camel/camel-pgp-context.c:755
-# camel/camel-pgp-context.c:755
-#: camel/camel-pgp-context.c:755
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "无法签名该邮件：普通文本无法清晰签名"
-
-# camel/camel-pgp-context.c:953
-# camel/camel-pgp-context.c:953
-# camel/camel-pgp-context.c:953
-#: camel/camel-pgp-context.c:953
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "无法验证邮件：普通文本无法验证"
-
-# camel/camel-pgp-context.c:959
-# camel/camel-pgp-context.c:959
-# camel/camel-pgp-context.c:959
-#: camel/camel-pgp-context.c:959
-#, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "无法验证该邮件：无法创建到 GPG/PGP 的管道： %s"
-
-# camel/camel-pgp-context.c:970
-# camel/camel-pgp-context.c:970
-# camel/camel-pgp-context.c:970
-#: camel/camel-pgp-context.c:970
-#, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "无法验证该邮件：无法创建临时文件： %s"
-
-# camel/camel-pgp-context.c:1143
-# camel/camel-pgp-context.c:1143
-# camel/camel-pgp-context.c:1143
-#: camel/camel-pgp-context.c:1143
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "无法加密该邮件： 普通文本无法加密"
-
-# camel/camel-pgp-context.c:1153
-# camel/camel-pgp-context.c:1153
-# camel/camel-pgp-context.c:1153
-#: camel/camel-pgp-context.c:1153
-msgid "Cannot encrypt this message: no password provided"
-msgstr "无法加密该邮件： 没有提供密码"
-
-# camel/camel-pgp-context.c:1160
-# camel/camel-pgp-context.c:1160
-# camel/camel-pgp-context.c:1160
-#: camel/camel-pgp-context.c:1160
-#, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "无法加密该邮件： 无法创建到 GPG/PGP 的管道： %s"
-
-# camel/camel-pgp-context.c:1169
-# camel/camel-pgp-context.c:1169
-# camel/camel-pgp-context.c:1169
-#: camel/camel-pgp-context.c:1169
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "无法加密该邮件： 没有指明收件人"
-
-# camel/camel-pgp-context.c:1337
-# camel/camel-pgp-context.c:1337
-# camel/camel-pgp-context.c:1337
-#: camel/camel-pgp-context.c:1337
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "无法解密该邮件： 没有解密的密码"
-
-# camel/camel-pgp-context.c:1345
-# camel/camel-pgp-context.c:1345
-# camel/camel-pgp-context.c:1345
-#: camel/camel-pgp-context.c:1345
-msgid "Cannot decrypt this message: no password provided"
-msgstr "无法解密该邮件： 没有提供密码"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr ""
 
-# camel/camel-pgp-context.c:1352
-# camel/camel-pgp-context.c:1352
-# camel/camel-pgp-context.c:1352
-#: camel/camel-pgp-context.c:1352
-#, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "无法解密该邮件： 无法创建到 GPG/PGP 的管道： %s"
+# camel/camel-pkcs7-context.c:677
+#: camel/camel-multipart-encrypted.c:325
+#, fuzzy
+msgid "Failed to decrypt MIME part: parse error"
+msgstr "无法解密：未知"
 
 # camel/camel-pgp-mime.c:310
 # camel/camel-pgp-mime.c:310
-#: camel/camel-pgp-mime.c:310
+#: camel/camel-multipart-signed.c:624
 msgid "This is a digitally signed message part"
 msgstr "这是消息的数字签名部分"
 
-# camel/camel-smime-context.c:173
-# camel/camel-smime-context.c:173
-# camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "情您为 %s 输入密码"
-
-# addressbook/gui/widgets/e-addressbook-util.c:76
-# addressbook/gui/widgets/e-addressbook-util.c:76
-# camel/camel-pkcs7-context.c:213
-#: camel/camel-pkcs7-context.c:213
-msgid "Error hashing password."
-msgstr "杂凑口令出错。"
-
-# shell/evolution-shell-component.c:1013
-# shell/evolution-shell-component.c:1013
-# camel/camel-pkcs7-context.c:222
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
-msgstr "非法口令。"
-
-# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
-# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
-# camel/camel-pkcs7-context.c:329
-#: camel/camel-pkcs7-context.c:329
-#, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
-msgstr "无法签名：找不到“%s”的证书。"
-
-# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
-# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
-# camel/camel-pkcs7-context.c:378
-#: camel/camel-pkcs7-context.c:378
-#, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
-msgstr "无法清除签名：找不到“%s”的证书。"
-
-# camel/camel-pkcs7-context.c:567
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
-msgstr "无法加密：创建封装数据失败。"
-
-# mail/mail-crypto.c:113
-# mail/mail-crypto.c:113
-# camel/camel-pkcs7-context.c:590
-#: camel/camel-pkcs7-context.c:590
-msgid "Could not encrypt: failed to create encryption context."
-msgstr "无法加密：创建加密上下文失败。"
-
-# camel/providers/pop3/camel-pop3-store.c:214
-# camel/providers/pop3/camel-pop3-store.c:214
-# camel/camel-pkcs7-context.c:620
-#: camel/camel-pkcs7-context.c:620
-#, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
-msgstr "无法加密数据：非法用户键：“%s”。"
-
-# mail/mail-account-gui.c:962
-# mail/mail-account-gui.c:962
-# camel/camel-pkcs7-context.c:626
-#: camel/camel-pkcs7-context.c:626
-msgid "Could not encrypt: encoding failed."
-msgstr "无法加密：编码失败。"
-
-# camel/camel-pkcs7-context.c:677
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
-msgstr "无法解密：未知"
+# addressbook/gui/widgets/e-addressbook-util.c:41
+# addressbook/gui/widgets/e-addressbook-util.c:41
+# addressbook/gui/widgets/e-addressbook-util.c:41
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "其它错误"
 
 # camel/camel-provider.c:130
 # camel/camel-provider.c:130
 # camel/camel-provider.c:130
-#: camel/camel-provider.c:130
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "无法装入 %s： 本系统不支持模块装入。"
@@ -13027,7 +14194,7 @@ msgstr "无法装入 %s： 本系统不支持模块装入。"
 # camel/camel-provider.c:139
 # camel/camel-provider.c:139
 # camel/camel-provider.c:139
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "无法装入 %s： %s"
@@ -13035,84 +14202,11 @@ msgstr "无法装入 %s： %s"
 # camel/camel-provider.c:147
 # camel/camel-provider.c:147
 # camel/camel-provider.c:147
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "无法装入 %s： 模块中没有初始化代码。"
 
-# camel/camel-remote-store.c:203
-# camel/camel-remote-store.c:203
-# camel/camel-remote-store.c:203
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s server %s"
-msgstr "%s 服务器 %s"
-
-# camel/camel-remote-store.c:207
-# camel/camel-remote-store.c:207
-# camel/camel-remote-store.c:207
-#: camel/camel-remote-store.c:207
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "%s 为 %s 服务，在 %s"
-
-# camel/camel-remote-store.c:264
-# camel/camel-remote-store.c:264
-# camel/camel-remote-store.c:264
-#: camel/camel-remote-store.c:264
-msgid "Connection cancelled"
-msgstr "连接已取消"
-
-# camel/camel-remote-store.c:267
-# camel/providers/smtp/camel-smtp-transport.c:273
-# camel/camel-remote-store.c:267
-# camel/providers/smtp/camel-smtp-transport.c:273
-# camel/camel-remote-store.c:267
-# camel/providers/smtp/camel-smtp-transport.c:276
-#: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "无法连接到 %s (端口 %d)： %s"
-
-# camel/camel-remote-store.c:268
-# camel/camel-remote-store.c:268
-# camel/camel-remote-store.c:268
-#: camel/camel-remote-store.c:268
-msgid "(unknown host)"
-msgstr "(未知的主机)"
-
-# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-# camel/camel-remote-store.c:481
-# camel/providers/imap/camel-imap-command.c:228
-# camel/providers/imap/camel-imap-command.c:409
-# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-# camel/camel-remote-store.c:481
-# camel/providers/imap/camel-imap-command.c:228
-# camel/providers/imap/camel-imap-command.c:409
-# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-# camel/camel-remote-store.c:481
-# camel/providers/imap/camel-imap-command.c:228
-# camel/providers/imap/camel-imap-command.c:409
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "操作已取消"
-
-# camel/camel-remote-store.c:484
-# camel/providers/imap/camel-imap-command.c:274
-# camel/camel-remote-store.c:484
-# camel/providers/imap/camel-imap-command.c:274
-# camel/camel-remote-store.c:484
-# camel/providers/imap/camel-imap-command.c:274
-#: camel/camel-remote-store.c:484
-#: camel/providers/imap/camel-imap-command.c:274
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "服务器意外地中止了连接： %s"
-
 # camel/camel-sasl-anonymous.c:33
 # camel/camel-sasl-anonymous.c:33
 # camel/camel-sasl-anonymous.c:33
@@ -13277,7 +14371,7 @@ msgstr ""
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:495
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "来自服务器的无效认证应答。"
 
@@ -13302,20 +14396,23 @@ msgstr "该选项将以普通密码连接到服务器。"
 msgid "Unknown authentication state."
 msgstr "未知的认证状态。"
 
-# camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:149
-# camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
-# camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:149
-# camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
-# camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:149
-# camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:60
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:61
-msgid "Password"
-msgstr "密码"
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+# camel/camel-sasl-kerberos4.c:42
+# camel/camel-sasl-kerberos4.c:42
+# camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-ntlm.c:33
+#, fuzzy
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr "该选项将用 Kerberos 4 认证连接到服务器。"
+
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 # camel/camel-sasl-popb4smtp.c:34
 # camel/camel-sasl-popb4smtp.c:34
@@ -13363,7 +14460,7 @@ msgstr "常规表达式编译失败： %s： %s"
 # camel/camel-service.c:157
 # camel/camel-service.c:157
 # camel/camel-service.c:157
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL “%s” 需要用户名组件"
@@ -13371,7 +14468,7 @@ msgstr "URL “%s” 需要用户名组件"
 # camel/camel-service.c:165
 # camel/camel-service.c:165
 # camel/camel-service.c:165
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL “%s” 需要主机组件"
@@ -13379,7 +14476,7 @@ msgstr "URL “%s” 需要主机组件"
 # camel/camel-service.c:173
 # camel/camel-service.c:173
 # camel/camel-service.c:173
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL “%s” 需要路径组件"
@@ -13387,7 +14484,7 @@ msgstr "URL “%s” 需要路径组件"
 # camel/camel-service.c:611
 # camel/camel-service.c:614
 # camel/camel-service.c:614
-#: camel/camel-service.c:614
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "正在解析： %s"
@@ -13395,7 +14492,7 @@ msgstr "正在解析： %s"
 # camel/camel-service.c:638
 # camel/camel-service.c:641
 # camel/camel-service.c:641
-#: camel/camel-service.c:641
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "域名寻找失败： %s"
@@ -13403,7 +14500,7 @@ msgstr "域名寻找失败： %s"
 # camel/camel-service.c:663
 # camel/camel-service.c:666
 # camel/camel-service.c:666
-#: camel/camel-service.c:666
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "主机寻找失败： %s： 没有找到主机"
@@ -13411,11 +14508,35 @@ msgstr "主机寻找失败： %s： 没有找到主机"
 # camel/camel-service.c:665
 # camel/camel-service.c:668
 # camel/camel-service.c:668
-#: camel/camel-service.c:668
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "主机寻找失败： %s： 未知的原因"
 
+# camel/camel-service.c:611
+# camel/camel-service.c:614
+# camel/camel-service.c:614
+#: camel/camel-service.c:850
+#, fuzzy
+msgid "Resolving address"
+msgstr "正在解析： %s"
+
+# camel/camel-service.c:663
+# camel/camel-service.c:666
+# camel/camel-service.c:666
+#: camel/camel-service.c:912
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "主机寻找失败： %s： 没有找到主机"
+
+# camel/camel-service.c:665
+# camel/camel-service.c:668
+# camel/camel-service.c:668
+#: camel/camel-service.c:915
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "主机寻找失败： %s： 未知的原因"
+
 # camel/camel-session.c:75
 # camel/camel-session.c:75
 # camel/camel-session.c:75
@@ -13433,7 +14554,7 @@ msgstr "关于将读入邮件作为对另一组文件夹的查询"
 # camel/camel-session.c:346 camel/camel-session.c:415
 # camel/camel-session.c:346 camel/camel-session.c:415
 # camel/camel-session.c:346 camel/camel-session.c:415
-#: camel/camel-session.c:346 camel/camel-session.c:415
+#: camel/camel-session.c:351 camel/camel-session.c:419
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "协议“%s”没有可用的提供者"
@@ -13441,7 +14562,7 @@ msgstr "协议“%s”没有可用的提供者"
 # camel/camel-session.c:532
 # camel/camel-session.c:532
 # camel/camel-session.c:532
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -13450,6 +14571,14 @@ msgstr ""
 "无法创建目录 %s：\n"
 "%s"
 
+# camel/camel-smime-context.c:173
+# camel/camel-smime-context.c:173
+# camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:173
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "情您为 %s 输入密码"
+
 # camel/camel-smime-context.c:203
 # camel/camel-smime-context.c:203
 # camel/camel-smime-context.c:203
@@ -13509,19 +14638,19 @@ msgstr "验证证书失败。"
 # camel/camel-store.c:220
 # camel/camel-store.c:220
 # camel/camel-store.c:220
-#: camel/camel-store.c:220
+#: camel/camel-store.c:241
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "无法获取文件夹： 对该存储的无效操作"
 
 # camel/camel-store.c:282
 # camel/camel-store.c:282
 # camel/camel-store.c:282
-#: camel/camel-store.c:282
+#: camel/camel-store.c:303
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "无法创建文件夹： 对该存储的无效操作"
 
 # camel/camel-tcp-stream-openssl.c:519
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -13533,7 +14662,7 @@ msgstr ""
 # camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
 # camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
 # camel/camel-tcp-stream-openssl.c:524
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -13551,7 +14680,7 @@ msgstr ""
 # camel/camel-tcp-stream-ssl.c:438
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:438
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -13565,12 +14694,12 @@ msgstr ""
 "签名：           %s"
 
 # camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "GOOD"
 msgstr "好"
 
 # camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:501
 msgid "BAD"
 msgstr "坏"
 
@@ -13578,7 +14707,7 @@ msgstr "坏"
 # camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
 # camel/camel-tcp-stream-ssl.c:447
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:504
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -13604,23 +14733,23 @@ msgstr "无法解析 URL “%s”"
 # camel/camel-vee-folder.c:588
 # camel/camel-vee-folder.c:588
 # camel/camel-vee-folder.c:588
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "在 %2$s 中没有消息 %1$s"
 
-# camel/camel-vee-folder.c:749
-# camel/camel-vee-folder.c:749
-# camel/camel-vee-folder.c:749
-#: camel/camel-vee-folder.c:749
-#, c-format
-msgid "No such message: %s"
-msgstr "没有邮件： %s"
+# camel/providers/imap/camel-imap-provider.c:45
+# camel/providers/imap/camel-imap-provider.c:45
+# camel/providers/imap/camel-imap-provider.c:45
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "在所有文件夹中检查新邮件"
 
 # camel/camel-vee-store.c:258
 # camel/camel-vee-store.c:258
 # camel/camel-vee-store.c:258
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "无法删除文件夹： %s： 无效操作"
@@ -13628,7 +14757,7 @@ msgstr "无法删除文件夹： %s： 无效操作"
 # camel/camel-vee-store.c:293
 # camel/camel-vee-store.c:293
 # camel/camel-vee-store.c:293
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "无法删除文件夹： %s： 没有该文件夹"
@@ -13636,7 +14765,7 @@ msgstr "无法删除文件夹： %s： 没有该文件夹"
 # camel/camel-vee-store.c:306
 # camel/camel-vee-store.c:306
 # camel/camel-vee-store.c:306
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "无法重命名文件夹： %s： 无效操作"
@@ -13644,22 +14773,46 @@ msgstr "无法重命名文件夹： %s： 无效操作"
 # camel/camel-vee-store.c:314
 # camel/camel-vee-store.c:314
 # camel/camel-vee-store.c:314
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "无法重命名文件夹： %s： 没有该文件夹"
 
-# camel/camel-vtrash-folder.c:117
-# camel/camel-vtrash-folder.c:117
-# camel/camel-vtrash-folder.c:117
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "您无法从该废件文件夹复制邮件。"
+# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+# camel/camel-remote-store.c:481
+# camel/providers/imap/camel-imap-command.c:228
+# camel/providers/imap/camel-imap-command.c:409
+# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+# camel/camel-remote-store.c:481
+# camel/providers/imap/camel-imap-command.c:228
+# camel/providers/imap/camel-imap-command.c:409
+# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+# camel/camel-remote-store.c:481
+# camel/providers/imap/camel-imap-command.c:228
+# camel/providers/imap/camel-imap-command.c:409
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "操作已取消"
+
+# camel/camel-remote-store.c:484
+# camel/providers/imap/camel-imap-command.c:274
+# camel/camel-remote-store.c:484
+# camel/providers/imap/camel-imap-command.c:274
+# camel/camel-remote-store.c:484
+# camel/providers/imap/camel-imap-command.c:274
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "服务器意外地中止了连接： %s"
 
 # camel/providers/imap/camel-imap-command.c:352
 # camel/providers/imap/camel-imap-command.c:352
 # camel/providers/imap/camel-imap-command.c:352
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "来自 IMAP 服务器的意外应答： %s"
@@ -13667,7 +14820,7 @@ msgstr "来自 IMAP 服务器的意外应答： %s"
 # camel/providers/imap/camel-imap-command.c:362
 # camel/providers/imap/camel-imap-command.c:362
 # camel/providers/imap/camel-imap-command.c:362
-#: camel/providers/imap/camel-imap-command.c:362
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP 命令失败： %s"
@@ -13675,14 +14828,14 @@ msgstr "IMAP 命令失败： %s"
 # camel/providers/imap/camel-imap-command.c:417
 # camel/providers/imap/camel-imap-command.c:417
 # camel/providers/imap/camel-imap-command.c:417
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "服务器应答结束太快。"
 
 # camel/providers/imap/camel-imap-command.c:608
 # camel/providers/imap/camel-imap-command.c:608
 # camel/providers/imap/camel-imap-command.c:610
-#: camel/providers/imap/camel-imap-command.c:610
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP 服务器应答不含有 %s 信息"
@@ -13690,7 +14843,7 @@ msgstr "IMAP 服务器应答不含有 %s 信息"
 # camel/providers/imap/camel-imap-command.c:644
 # camel/providers/imap/camel-imap-command.c:644
 # camel/providers/imap/camel-imap-command.c:646
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "来自 IMAP 服务器意外的 OK 应答： %s"
@@ -13698,7 +14851,7 @@ msgstr "来自 IMAP 服务器意外的 OK 应答： %s"
 # camel/providers/imap/camel-imap-folder.c:194
 # camel/providers/imap/camel-imap-folder.c:194
 # camel/providers/imap/camel-imap-folder.c:197
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "无法创建目录 %s： %s"
@@ -13706,7 +14859,7 @@ msgstr "无法创建目录 %s： %s"
 # camel/providers/imap/camel-imap-folder.c:213
 # camel/providers/imap/camel-imap-folder.c:213
 # camel/providers/imap/camel-imap-folder.c:216
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "无法为 %s 装入概要"
@@ -13714,7 +14867,7 @@ msgstr "无法为 %s 装入概要"
 # camel/providers/imap/camel-imap-folder.c:277
 # camel/providers/imap/camel-imap-folder.c:277
 # camel/providers/imap/camel-imap-folder.c:282
-#: camel/providers/imap/camel-imap-folder.c:282
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "文件夹已被删除并在服务器上重建了。"
 
@@ -13722,7 +14875,7 @@ msgstr "文件夹已被删除并在服务器上重建了。"
 # camel/providers/imap/camel-imap-folder.c:461
 # camel/providers/imap/camel-imap-folder.c:466
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:466
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "正在扫描改变了的邮件"
 
@@ -13732,8 +14885,8 @@ msgstr "正在扫描改变了的邮件"
 # camel/providers/imap/camel-imap-folder.c:2001
 # camel/providers/imap/camel-imap-folder.c:1632
 # camel/providers/imap/camel-imap-folder.c:2108
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "该邮件目前不可用"
 
@@ -13743,29 +14896,29 @@ msgstr "该邮件目前不可用"
 # camel/providers/imap/camel-imap-folder.c:1821
 # camel/providers/imap/camel-imap-folder.c:1787
 # camel/providers/imap/camel-imap-folder.c:1861
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "从新邮件中获取概要信息"
 
 # camel/providers/imap/camel-imap-folder.c:1746
 # camel/providers/imap/camel-imap-folder.c:1746
 # camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "正在扫描新邮件"
 
 # camel/providers/imap/camel-imap-folder.c:2038
 # camel/providers/imap/camel-imap-folder.c:2038
 # camel/providers/imap/camel-imap-folder.c:2145
-#: camel/providers/imap/camel-imap-folder.c:2145
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "无法在 FETCH 应答中找到邮件体。"
 
 # camel/providers/imap/camel-imap-message-cache.c:154
 # camel/providers/imap/camel-imap-message-cache.c:154
 # camel/providers/imap/camel-imap-message-cache.c:154
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "无法打开缓冲器目录： %s"
@@ -13782,10 +14935,10 @@ msgstr "无法打开缓冲器目录： %s"
 # camel/providers/imap/camel-imap-message-cache.c:313
 # camel/providers/imap/camel-imap-message-cache.c:344
 # camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/providers/imap/camel-imap-message-cache.c:256
-#: camel/providers/imap/camel-imap-message-cache.c:313
-#: camel/providers/imap/camel-imap-message-cache.c:344
-#: camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/providers/imap/camel-imap-message-cache.c:257
+#: camel/providers/imap/camel-imap-message-cache.c:314
+#: camel/providers/imap/camel-imap-message-cache.c:345
+#: camel/providers/imap/camel-imap-message-cache.c:377
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "缓冲邮件 %s 失败： %s"
@@ -13807,7 +14960,7 @@ msgstr "在所有文件夹中检查新邮件"
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:832
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:832
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
 msgid "Folders"
 msgstr "文件夹"
 
@@ -13853,6 +15006,21 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP 服务器上的邮件的读写。"
 
+# camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+# camel/providers/nntp/camel-nntp-store.c:149
+# camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+# camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+# camel/providers/nntp/camel-nntp-store.c:149
+# camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
+# camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+# camel/providers/nntp/camel-nntp-store.c:149
+# camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:60
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "密码"
+
 # camel/providers/imap/camel-imap-provider.c:82
 # camel/providers/imap/camel-imap-provider.c:82
 # camel/providers/imap/camel-imap-provider.c:82
@@ -13860,10 +15028,79 @@ msgstr "IMAP 服务器上的邮件的读写。"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
 
+# camel/providers/smtp/camel-smtp-transport.c:554
+# camel/providers/smtp/camel-smtp-transport.c:554
+# camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP 服务器 %s"
+
+# camel/camel-remote-store.c:207
+# camel/camel-remote-store.c:207
+# camel/camel-remote-store.c:207
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s 为 %s 服务，在 %s"
+
+# camel/camel-remote-store.c:264
+# camel/camel-remote-store.c:264
+# camel/camel-remote-store.c:264
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "连接已取消"
+
+# camel/camel-remote-store.c:267
+# camel/providers/smtp/camel-smtp-transport.c:273
+# camel/camel-remote-store.c:267
+# camel/providers/smtp/camel-smtp-transport.c:273
+# camel/camel-remote-store.c:267
+# camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "无法连接到 %s (端口 %d)： %s"
+
+# camel/providers/pop3/camel-pop3-store.c:377
+# camel/providers/pop3/camel-pop3-store.c:377
+# camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"无法连接到 POP 服务器。\n"
+"发送用户名错误： %s"
+
+# shell/e-storage.c:518
+# shell/e-storage.c:518
+# shell/e-storage.c:518
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "不支持的操作"
+
+# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+# camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "认证失败。"
+
 # camel/providers/imap/camel-imap-store.c:518
 # camel/providers/imap/camel-imap-store.c:518
 # camel/providers/imap/camel-imap-store.c:518
-#: camel/providers/imap/camel-imap-store.c:518
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
@@ -13874,8 +15111,8 @@ msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
 # camel/providers/smtp/camel-smtp-transport.c:389
 # camel/providers/imap/camel-imap-store.c:528
 # camel/providers/smtp/camel-smtp-transport.c:393
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:393
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "不支持验证类型 %s"
@@ -13883,7 +15120,7 @@ msgstr "不支持验证类型 %s"
 # camel/providers/imap/camel-imap-store.c:552
 # camel/providers/imap/camel-imap-store.c:552
 # camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:552
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 IMAP 密码"
@@ -13894,15 +15131,15 @@ msgstr "%s请为 %s@%s 输入 IMAP 密码"
 # camel/providers/smtp/camel-smtp-transport.c:430
 # camel/providers/imap/camel-imap-store.c:567
 # camel/providers/smtp/camel-smtp-transport.c:434
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:434
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "您没有输入密码。"
 
 # camel/providers/imap/camel-imap-store.c:596
 # camel/providers/imap/camel-imap-store.c:596
 # camel/providers/imap/camel-imap-store.c:596
-#: camel/providers/imap/camel-imap-store.c:596
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -13916,7 +15153,8 @@ msgstr ""
 # camel/providers/imap/camel-imap-store.c:899
 # camel/providers/imap/camel-imap-store.c:899
 # camel/providers/imap/camel-imap-store.c:900
-#: camel/providers/imap/camel-imap-store.c:900
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "没有文件夹 %s"
@@ -13924,71 +15162,115 @@ msgstr "没有文件夹 %s"
 # camel/providers/imap/camel-imap-store.c:1274
 # camel/providers/imap/camel-imap-store.c:1274
 # camel/providers/imap/camel-imap-store.c:1275
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "父文件夹不允许含有子文件夹"
 
+# shell/e-shell-view.c:1585
+# shell/e-shell-view.c:1585
+# shell/e-shell-view.c:1598
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+# camel/providers/local/camel-mbox-folder.c:208
+# camel/providers/local/camel-spool-folder.c:456
+# camel/providers/local/camel-mbox-folder.c:208
+# camel/providers/local/camel-spool-folder.c:456
+# camel/providers/local/camel-mbox-folder.c:208
+# camel/providers/local/camel-spool-folder.c:456
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "无法打开邮件箱： %s： %s\n"
+
+# shell/e-shell-view.c:1585
+# shell/e-shell-view.c:1585
+# shell/e-shell-view.c:1598
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
 # camel/providers/local/camel-local-provider.c:42
 # camel/providers/local/camel-local-provider.c:42
 # camel/providers/local/camel-local-provider.c:42
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "MH-格式的邮件目录"
 
 # camel/providers/local/camel-local-provider.c:43
 # camel/providers/local/camel-local-provider.c:43
 # camel/providers/local/camel-local-provider.c:43
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "在类似于 MH 的邮件目录中存储本地邮件。"
 
 # camel/providers/local/camel-local-provider.c:52
 # camel/providers/local/camel-local-provider.c:52
 # camel/providers/local/camel-local-provider.c:52
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "本地发送"
 
 # camel/providers/local/camel-local-provider.c:53
 # camel/providers/local/camel-local-provider.c:53
 # camel/providers/local/camel-local-provider.c:53
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "在按照标准邮件箱格式化的脱机文件中检索本地邮件。"
 
 # camel/providers/local/camel-local-provider.c:62
 # camel/providers/local/camel-local-provider.c:62
 # camel/providers/local/camel-local-provider.c:62
-#: camel/providers/local/camel-local-provider.c:62
+#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:94
 msgid "Apply filters to new messages in INBOX"
 msgstr "应用过滤规则到收件箱中的新邮件"
 
 # camel/providers/local/camel-local-provider.c:68
 # camel/providers/local/camel-local-provider.c:68
 # camel/providers/local/camel-local-provider.c:68
-#: camel/providers/local/camel-local-provider.c:68
+#: camel/providers/local/camel-local-provider.c:83
 msgid "Maildir-format mail directories"
 msgstr "Maildir 格式的邮件目录"
 
 # camel/providers/local/camel-local-provider.c:69
 # camel/providers/local/camel-local-provider.c:69
 # camel/providers/local/camel-local-provider.c:69
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:84
 msgid "For storing local mail in maildir directories."
 msgstr "在 maildir 邮件目录中存储本地邮件。"
 
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
+
 # camel/providers/local/camel-local-provider.c:80
 # camel/providers/local/camel-local-provider.c:80
 # camel/providers/local/camel-local-provider.c:80
-#: camel/providers/local/camel-local-provider.c:80
-msgid "Standard Unix mbox spools"
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
 msgstr "标准 Unix 邮件箱"
 
 # camel/providers/local/camel-local-provider.c:81
 # camel/providers/local/camel-local-provider.c:81
 # camel/providers/local/camel-local-provider.c:81
-#: camel/providers/local/camel-local-provider.c:81
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
+msgid ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr "在标准邮件箱文件中读取和存储本地邮件。"
 
 # camel/providers/local/camel-local-store.c:138
@@ -14000,9 +15282,9 @@ msgstr "在标准邮件箱文件中读取和存储本地邮件。"
 # camel/providers/local/camel-local-store.c:138
 # camel/providers/local/camel-local-store.c:227
 # camel/providers/local/camel-spool-store.c:109
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:109
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "存储根目录 %s 不是绝对路径"
@@ -14010,7 +15292,7 @@ msgstr "存储根目录 %s 不是绝对路径"
 # camel/providers/local/camel-local-store.c:145
 # camel/providers/local/camel-local-store.c:145
 # camel/providers/local/camel-local-store.c:145
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "存储根目录 %s 不是普通目录"
@@ -14024,9 +15306,9 @@ msgstr "存储根目录 %s 不是普通目录"
 # camel/providers/local/camel-local-store.c:153
 # camel/providers/local/camel-local-store.c:169
 # camel/providers/local/camel-local-store.c:235
-#: camel/providers/local/camel-local-store.c:153
-#: camel/providers/local/camel-local-store.c:169
-#: camel/providers/local/camel-local-store.c:235
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:236
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "无法获取文件夹： %s： %s"
@@ -14034,14 +15316,14 @@ msgstr "无法获取文件夹： %s： %s"
 # camel/providers/local/camel-local-store.c:184
 # camel/providers/local/camel-local-store.c:184
 # camel/providers/local/camel-local-store.c:184
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 msgid "Local stores do not have an inbox"
 msgstr "本地存储没有收件箱"
 
 # camel/providers/local/camel-local-store.c:196
 # camel/providers/local/camel-local-store.c:196
 # camel/providers/local/camel-local-store.c:196
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地邮件文件 %s"
@@ -14049,15 +15331,23 @@ msgstr "本地邮件文件 %s"
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
-#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "无法将文件夹 %s 改名为 %s： %s"
 
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "无法重命名文件夹： %s"
+
 # camel/providers/local/camel-local-store.c:374
 # camel/providers/local/camel-local-store.c:374
 # camel/providers/local/camel-local-store.c:374
-#: camel/providers/local/camel-local-store.c:374
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "无法删除文件夹概要文件 “%s”： %s"
@@ -14065,7 +15355,7 @@ msgstr "无法删除文件夹概要文件 “%s”： %s"
 # camel/providers/local/camel-local-store.c:384
 # camel/providers/local/camel-local-store.c:384
 # camel/providers/local/camel-local-store.c:384
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:389
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "无法删除文件夹索引文件 “%s”： %s"
@@ -14073,7 +15363,7 @@ msgstr "无法删除文件夹索引文件 “%s”： %s"
 # camel/providers/local/camel-local-summary.c:367
 # camel/providers/local/camel-local-summary.c:367
 # camel/providers/local/camel-local-summary.c:367
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "无法保存概要： %s： %s"
@@ -14084,22 +15374,21 @@ msgstr "无法保存概要： %s： %s"
 # camel/providers/local/camel-spool-summary.c:1157
 # camel/providers/local/camel-local-summary.c:423
 # camel/providers/local/camel-spool-summary.c:1157
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "无法将邮件添加到概要中： 未知的原因"
 
 # camel/providers/local/camel-maildir-folder.c:181
 # camel/providers/local/camel-maildir-folder.c:181
 # camel/providers/local/camel-maildir-folder.c:181
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 msgid "Maildir append message cancelled"
 msgstr "邮件目录附加已放弃"
 
 # camel/providers/local/camel-maildir-folder.c:184
 # camel/providers/local/camel-maildir-folder.c:184
 # camel/providers/local/camel-maildir-folder.c:184
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "无法将邮件附加到邮件目录文件夹： %s： %s"
@@ -14128,14 +15417,13 @@ msgstr "无法将邮件附加到邮件目录文件夹： %s： %s"
 # camel/providers/local/camel-mh-folder.c:207
 # camel/providers/local/camel-mh-folder.c:215
 # camel/providers/local/camel-spool-folder.c:579
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:579
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -14156,10 +15444,9 @@ msgstr ""
 # camel/providers/local/camel-mbox-folder.c:331
 # camel/providers/local/camel-mh-folder.c:198
 # camel/providers/local/camel-spool-folder.c:579
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:579
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "没有该邮件"
 
@@ -14169,8 +15456,8 @@ msgstr "没有该邮件"
 # camel/providers/local/camel-mh-folder.c:216
 # camel/providers/local/camel-maildir-folder.c:231
 # camel/providers/local/camel-mh-folder.c:216
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "无效的邮件内容"
 
@@ -14180,8 +15467,8 @@ msgstr "无效的邮件内容"
 # camel/providers/local/camel-mh-store.c:89
 # camel/providers/local/camel-maildir-store.c:105
 # camel/providers/local/camel-mh-store.c:89
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -14199,9 +15486,9 @@ msgstr ""
 # camel/providers/local/camel-maildir-store.c:109
 # camel/providers/local/camel-mbox-store.c:100
 # camel/providers/local/camel-mh-store.c:96
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "文件夹“%s”不存在。"
@@ -14212,8 +15499,8 @@ msgstr "文件夹“%s”不存在。"
 # camel/providers/local/camel-mh-store.c:102
 # camel/providers/local/camel-maildir-store.c:116
 # camel/providers/local/camel-mh-store.c:102
-#: camel/providers/local/camel-maildir-store.c:116
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-maildir-store.c:117
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -14225,7 +15512,7 @@ msgstr ""
 # camel/providers/local/camel-maildir-store.c:131
 # camel/providers/local/camel-maildir-store.c:131
 # camel/providers/local/camel-maildir-store.c:131
-#: camel/providers/local/camel-maildir-store.c:131
+#: camel/providers/local/camel-maildir-store.c:132
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "“%s”不是邮件目录。"
@@ -14239,9 +15526,9 @@ msgstr "“%s”不是邮件目录。"
 # camel/providers/local/camel-maildir-store.c:166
 # camel/providers/local/camel-maildir-store.c:203
 # camel/providers/local/camel-mh-store.c:126
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "无法删除文件夹“%s”： %s"
@@ -14249,14 +15536,15 @@ msgstr "无法删除文件夹“%s”： %s"
 # camel/providers/local/camel-maildir-store.c:167
 # camel/providers/local/camel-maildir-store.c:167
 # camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "不是邮件目录"
 
 # camel/providers/local/camel-maildir-store.c:331
 # camel/providers/local/camel-maildir-store.c:331
 # camel/providers/local/camel-maildir-store.c:331
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "无法扫描文件夹“%s”： %s"
@@ -14267,20 +15555,62 @@ msgstr "无法扫描文件夹“%s”： %s"
 # camel/providers/local/camel-maildir-summary.c:526
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: camel/providers/local/camel-maildir-summary.c:405
-#: camel/providers/local/camel-maildir-summary.c:526
+#: camel/providers/local/camel-maildir-summary.c:408
+#: camel/providers/local/camel-maildir-summary.c:531
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "无法打开邮件目录路径： %s： %s"
 
+# camel/providers/imap/camel-imap-provider.c:43
+# camel/providers/imap/camel-imap-provider.c:43
+# camel/providers/imap/camel-imap-provider.c:43
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "正在检查新邮件"
+
+# camel/providers/imap/camel-imap-folder.c:1746
+# camel/providers/imap/camel-imap-folder.c:1746
+# camel/providers/imap/camel-imap-folder.c:1793
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+msgid "Checking for new messages"
+msgstr "正在扫描新邮件"
+
+# camel/providers/local/camel-mbox-summary.c:248
+# camel/providers/local/camel-mbox-summary.c:497
+# camel/providers/local/camel-mbox-summary.c:698
+# camel/providers/local/camel-spool-summary.c:378
+# camel/providers/local/camel-spool-summary.c:643
+# camel/providers/local/camel-spool-summary.c:935
+# camel/providers/local/camel-mbox-summary.c:248
+# camel/providers/local/camel-mbox-summary.c:497
+# camel/providers/local/camel-mbox-summary.c:698
+# camel/providers/local/camel-spool-summary.c:378
+# camel/providers/local/camel-spool-summary.c:643
+# camel/providers/local/camel-spool-summary.c:935
+# camel/providers/local/camel-mbox-summary.c:248
+# camel/providers/local/camel-mbox-summary.c:497
+# camel/providers/local/camel-mbox-summary.c:698
+# camel/providers/local/camel-spool-summary.c:378
+# camel/providers/local/camel-spool-summary.c:643
+# camel/providers/local/camel-spool-summary.c:935
+#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
+msgid "Storing folder"
+msgstr "正在存储文件夹"
+
 # camel/providers/local/camel-mbox-folder.c:151
 # camel/providers/local/camel-spool-folder.c:274
 # camel/providers/local/camel-mbox-folder.c:151
 # camel/providers/local/camel-spool-folder.c:274
 # camel/providers/local/camel-mbox-folder.c:151
 # camel/providers/local/camel-spool-folder.c:274
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "无法在 %s 创建文件夹锁： %s"
@@ -14291,8 +15621,7 @@ msgstr "无法在 %s 创建文件夹锁： %s"
 # camel/providers/local/camel-spool-folder.c:456
 # camel/providers/local/camel-mbox-folder.c:208
 # camel/providers/local/camel-spool-folder.c:456
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:456
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "无法打开邮件箱： %s： %s\n"
@@ -14300,14 +15629,14 @@ msgstr "无法打开邮件箱： %s： %s\n"
 # camel/providers/local/camel-mbox-folder.c:265
 # camel/providers/local/camel-mbox-folder.c:265
 # camel/providers/local/camel-mbox-folder.c:265
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 msgid "Mail append cancelled"
 msgstr "邮件附加取消"
 
 # camel/providers/local/camel-mbox-folder.c:268
 # camel/providers/local/camel-mbox-folder.c:268
 # camel/providers/local/camel-mbox-folder.c:268
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "无法将邮件附加到邮件箱文件： %s： %s"
@@ -14330,12 +15659,9 @@ msgstr "无法将邮件附加到邮件箱文件： %s： %s"
 # camel/providers/local/camel-spool-folder.c:595
 # camel/providers/local/camel-spool-folder.c:627
 # camel/providers/local/camel-spool-folder.c:639
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -14350,8 +15676,7 @@ msgstr ""
 # camel/providers/local/camel-spool-folder.c:628
 # camel/providers/local/camel-mbox-folder.c:380
 # camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "文件夹好像已经被不可恢复地破坏了。"
 
@@ -14361,15 +15686,14 @@ msgstr "文件夹好像已经被不可恢复地破坏了。"
 # camel/providers/local/camel-spool-folder.c:640
 # camel/providers/local/camel-mbox-folder.c:392
 # camel/providers/local/camel-spool-folder.c:640
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "邮件构造失败：邮件箱已损坏？"
 
 # camel/providers/local/camel-mbox-store.c:93
 # camel/providers/local/camel-mbox-store.c:93
 # camel/providers/local/camel-mbox-store.c:93
-#: camel/providers/local/camel-mbox-store.c:93
+#: camel/providers/local/camel-mbox-store.c:95
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -14381,7 +15705,7 @@ msgstr ""
 # camel/providers/local/camel-mbox-store.c:109
 # camel/providers/local/camel-mbox-store.c:109
 # camel/providers/local/camel-mbox-store.c:109
-#: camel/providers/local/camel-mbox-store.c:109
+#: camel/providers/local/camel-mbox-store.c:111
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -14396,8 +15720,8 @@ msgstr ""
 # camel/providers/local/camel-mbox-store.c:145
 # camel/providers/local/camel-mbox-store.c:118
 # camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:118
-#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:120
+#: camel/providers/local/camel-mbox-store.c:147
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "“%s”并不是普通文件。"
@@ -14408,8 +15732,8 @@ msgstr "“%s”并不是普通文件。"
 # camel/providers/local/camel-mbox-store.c:160
 # camel/providers/local/camel-mbox-store.c:137
 # camel/providers/local/camel-mbox-store.c:160
-#: camel/providers/local/camel-mbox-store.c:137
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:139
+#: camel/providers/local/camel-mbox-store.c:162
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -14421,48 +15745,18 @@ msgstr ""
 # camel/providers/local/camel-mbox-store.c:152
 # camel/providers/local/camel-mbox-store.c:152
 # camel/providers/local/camel-mbox-store.c:152
-#: camel/providers/local/camel-mbox-store.c:152
+#: camel/providers/local/camel-mbox-store.c:154
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "文件夹“%s”非空。没有删除。"
 
-# camel/providers/local/camel-mbox-summary.c:248
-# camel/providers/local/camel-mbox-summary.c:497
-# camel/providers/local/camel-mbox-summary.c:698
-# camel/providers/local/camel-spool-summary.c:378
-# camel/providers/local/camel-spool-summary.c:643
-# camel/providers/local/camel-spool-summary.c:935
-# camel/providers/local/camel-mbox-summary.c:248
-# camel/providers/local/camel-mbox-summary.c:497
-# camel/providers/local/camel-mbox-summary.c:698
-# camel/providers/local/camel-spool-summary.c:378
-# camel/providers/local/camel-spool-summary.c:643
-# camel/providers/local/camel-spool-summary.c:935
-# camel/providers/local/camel-mbox-summary.c:248
-# camel/providers/local/camel-mbox-summary.c:497
-# camel/providers/local/camel-mbox-summary.c:698
-# camel/providers/local/camel-spool-summary.c:378
-# camel/providers/local/camel-spool-summary.c:643
-# camel/providers/local/camel-spool-summary.c:935
-#. 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:248
-#: camel/providers/local/camel-mbox-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:378
-#: camel/providers/local/camel-spool-summary.c:643
-#: camel/providers/local/camel-spool-summary.c:935
-msgid "Storing folder"
-msgstr "正在存储文件夹"
-
 # camel/providers/local/camel-mbox-summary.c:253
 # camel/providers/local/camel-spool-summary.c:383
 # camel/providers/local/camel-mbox-summary.c:253
 # camel/providers/local/camel-spool-summary.c:383
 # camel/providers/local/camel-mbox-summary.c:253
 # camel/providers/local/camel-spool-summary.c:383
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:350
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "无法打开文件夹： %s： %s"
@@ -14473,8 +15767,7 @@ msgstr "无法打开文件夹： %s： %s"
 # camel/providers/local/camel-spool-summary.c:425
 # camel/providers/local/camel-mbox-summary.c:295
 # camel/providers/local/camel-spool-summary.c:425
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
@@ -14485,8 +15778,7 @@ msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
 # camel/providers/local/camel-spool-summary.c:497
 # camel/providers/local/camel-mbox-summary.c:370
 # camel/providers/local/camel-spool-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:452
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "无法检查文件夹： %s： %s"
@@ -14500,9 +15792,9 @@ msgstr "无法检查文件夹： %s： %s"
 # camel/providers/local/camel-mbox-summary.c:502
 # camel/providers/local/camel-mbox-summary.c:703
 # camel/providers/local/camel-spool-summary.c:648
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:648
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "无法打开文件： %s： %s"
@@ -14513,12 +15805,43 @@ msgstr "无法打开文件： %s： %s"
 # camel/providers/local/camel-spool-summary.c:672
 # camel/providers/local/camel-mbox-summary.c:519
 # camel/providers/local/camel-spool-summary.c:672
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "无法打开临时邮件箱： %s"
 
+# camel/providers/local/camel-mbox-summary.c:630
+# camel/providers/local/camel-mbox-summary.c:799
+# camel/providers/local/camel-spool-summary.c:1036
+# camel/providers/local/camel-mbox-summary.c:630
+# camel/providers/local/camel-mbox-summary.c:799
+# camel/providers/local/camel-spool-summary.c:1036
+# camel/providers/local/camel-mbox-summary.c:630
+# camel/providers/local/camel-mbox-summary.c:799
+# camel/providers/local/camel-spool-summary.c:1036
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
+#, c-format
+msgid "Could not close source folder %s: %s"
+msgstr "无法关闭来源文件夹 %s： %s"
+
+# camel/providers/local/camel-mbox-summary.c:639
+# camel/providers/local/camel-mbox-summary.c:639
+# camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:620
+#, c-format
+msgid "Could not close temp folder: %s"
+msgstr "无法关闭临时文件夹： %s"
+
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:631
+#, c-format
+msgid "Could not rename folder: %s"
+msgstr "无法重命名文件夹： %s"
+
 # camel/providers/local/camel-mbox-summary.c:544
 # camel/providers/local/camel-mbox-summary.c:552
 # camel/providers/local/camel-mbox-summary.c:741
@@ -14543,25 +15866,43 @@ msgstr "无法打开临时邮件箱： %s"
 # camel/providers/local/camel-spool-summary.c:705
 # camel/providers/local/camel-spool-summary.c:978
 # camel/providers/local/camel-spool-summary.c:986
-#: camel/providers/local/camel-mbox-summary.c:544
-#: camel/providers/local/camel-mbox-summary.c:552
-#: camel/providers/local/camel-mbox-summary.c:741
-#: camel/providers/local/camel-mbox-summary.c:749
-#: camel/providers/local/camel-spool-summary.c:697
-#: camel/providers/local/camel-spool-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:978
-#: camel/providers/local/camel-spool-summary.c:986
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "即使同步后，概要和文件夹仍然不匹配"
 
+# camel/providers/local/camel-mbox-summary.c:873
+# camel/providers/local/camel-spool-summary.c:544
+# camel/providers/local/camel-spool-summary.c:1110
+# camel/providers/local/camel-mbox-summary.c:873
+# camel/providers/local/camel-spool-summary.c:544
+# camel/providers/local/camel-spool-summary.c:1110
+# camel/providers/local/camel-mbox-summary.c:873
+# camel/providers/local/camel-spool-summary.c:544
+# camel/providers/local/camel-spool-summary.c:1110
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
+#, c-format
+msgid "Unknown error: %s"
+msgstr "未知的错误： %s"
+
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "无法重命名文件夹： %s"
+
 # camel/providers/local/camel-mbox-summary.c:595
 # camel/providers/local/camel-spool-summary.c:749
 # camel/providers/local/camel-mbox-summary.c:595
 # camel/providers/local/camel-spool-summary.c:749
 # camel/providers/local/camel-mbox-summary.c:595
 # camel/providers/local/camel-spool-summary.c:749
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-spool-summary.c:749
+#: camel/providers/local/camel-mbox-summary.c:973
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "写入临时文件夹错误： %s"
@@ -14572,71 +15913,22 @@ msgstr "写入临时文件夹错误： %s"
 # camel/providers/local/camel-spool-summary.c:771
 # camel/providers/local/camel-mbox-summary.c:612
 # camel/providers/local/camel-spool-summary.c:771
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-spool-summary.c:771
+#: camel/providers/local/camel-mbox-summary.c:990
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "写入临时文件夹失败： %s： %s"
 
-# camel/providers/local/camel-mbox-summary.c:630
-# camel/providers/local/camel-mbox-summary.c:799
-# camel/providers/local/camel-spool-summary.c:1036
-# camel/providers/local/camel-mbox-summary.c:630
-# camel/providers/local/camel-mbox-summary.c:799
-# camel/providers/local/camel-spool-summary.c:1036
-# camel/providers/local/camel-mbox-summary.c:630
-# camel/providers/local/camel-mbox-summary.c:799
-# camel/providers/local/camel-spool-summary.c:1036
-#: camel/providers/local/camel-mbox-summary.c:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "无法关闭来源文件夹 %s： %s"
-
-# camel/providers/local/camel-mbox-summary.c:639
-# camel/providers/local/camel-mbox-summary.c:639
-# camel/providers/local/camel-mbox-summary.c:639
-#: camel/providers/local/camel-mbox-summary.c:639
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "无法关闭临时文件夹： %s"
-
-# camel/providers/local/camel-mbox-summary.c:650
-# camel/providers/local/camel-mbox-summary.c:650
-# camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-mbox-summary.c:650
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "无法重命名文件夹： %s"
-
-# camel/providers/local/camel-mbox-summary.c:873
-# camel/providers/local/camel-spool-summary.c:544
-# camel/providers/local/camel-spool-summary.c:1110
-# camel/providers/local/camel-mbox-summary.c:873
-# camel/providers/local/camel-spool-summary.c:544
-# camel/providers/local/camel-spool-summary.c:1110
-# camel/providers/local/camel-mbox-summary.c:873
-# camel/providers/local/camel-spool-summary.c:544
-# camel/providers/local/camel-spool-summary.c:1110
-#: camel/providers/local/camel-mbox-summary.c:873
-#: camel/providers/local/camel-spool-summary.c:544
-#: camel/providers/local/camel-spool-summary.c:1110
-#, c-format
-msgid "Unknown error: %s"
-msgstr "未知的错误： %s"
-
 # camel/providers/local/camel-mh-folder.c:172
 # camel/providers/local/camel-mh-folder.c:172
 # camel/providers/local/camel-mh-folder.c:172
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "已取消 MH 附件邮件"
 
 # camel/providers/local/camel-mh-folder.c:175
 # camel/providers/local/camel-mh-folder.c:175
 # camel/providers/local/camel-mh-folder.c:175
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "无法将邮件附加到 mh 文件夹： %s： %s"
@@ -14644,7 +15936,7 @@ msgstr "无法将邮件附加到 mh 文件夹： %s： %s"
 # camel/providers/local/camel-mh-store.c:109
 # camel/providers/local/camel-mh-store.c:109
 # camel/providers/local/camel-mh-store.c:109
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "“%s”不是目录"
@@ -14652,39 +15944,43 @@ msgstr "“%s”不是目录"
 # camel/providers/local/camel-mh-summary.c:218
 # camel/providers/local/camel-mh-summary.c:218
 # camel/providers/local/camel-mh-summary.c:218
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "无法打开 MH 目录： %s： %s"
 
-# camel/providers/local/camel-spool-folder.c:512
-# camel/providers/local/camel-spool-folder.c:512
-# camel/providers/local/camel-spool-folder.c:512
-#: camel/providers/local/camel-spool-folder.c:512
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "无法将邮件附加到脱机文件： %s： %s"
+# camel/providers/local/camel-spool-store.c:209
+# camel/providers/local/camel-spool-store.c:209
+# camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "脱机文件夹无法改名"
 
-# camel/providers/local/camel-spool-store.c:115
-# camel/providers/local/camel-spool-store.c:115
-# camel/providers/local/camel-spool-store.c:115
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "脱机文件“%s”不存在或不是普通文件"
+# camel/providers/local/camel-local-store.c:145
+# camel/providers/local/camel-local-store.c:145
+# camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "存储根目录 %s 不是普通目录"
 
 # camel/providers/local/camel-spool-store.c:141
 # camel/providers/local/camel-spool-store.c:141
 # camel/providers/local/camel-spool-store.c:141
-#: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "文件夹“%s/%s”不存在。"
 
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
 # camel/providers/local/camel-spool-store.c:163
 # camel/providers/local/camel-spool-store.c:163
 # camel/providers/local/camel-spool-store.c:163
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "脱机邮件文件 %s"
@@ -14692,14 +15988,22 @@ msgstr "脱机邮件文件 %s"
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
 # camel/providers/local/camel-spool-store.c:209
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "脱机文件夹无法改名"
+
+# camel/providers/local/camel-spool-store.c:209
+# camel/providers/local/camel-spool-store.c:209
+# camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "脱机文件夹无法改名"
 
 # camel/providers/local/camel-spool-store.c:217
 # camel/providers/local/camel-spool-store.c:217
 # camel/providers/local/camel-spool-store.c:217
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "脱机文件夹无法删除"
 
@@ -14712,9 +16016,9 @@ msgstr "脱机文件夹无法删除"
 # camel/providers/local/camel-spool-summary.c:788
 # camel/providers/local/camel-spool-summary.c:797
 # camel/providers/local/camel-spool-summary.c:806
-#: camel/providers/local/camel-spool-summary.c:788
-#: camel/providers/local/camel-spool-summary.c:797
-#: camel/providers/local/camel-spool-summary.c:806
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "无法同步临时文件夹 %s： %s"
@@ -14722,7 +16026,7 @@ msgstr "无法同步临时文件夹 %s： %s"
 # camel/providers/local/camel-spool-summary.c:821
 # camel/providers/local/camel-spool-summary.c:821
 # camel/providers/local/camel-spool-summary.c:821
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "无法同步脱机文件夹 %s： %s"
@@ -14736,9 +16040,9 @@ msgstr "无法同步脱机文件夹 %s： %s"
 # camel/providers/local/camel-spool-summary.c:851
 # camel/providers/local/camel-spool-summary.c:869
 # camel/providers/local/camel-spool-summary.c:881
-#: camel/providers/local/camel-spool-summary.c:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -14747,121 +16051,6 @@ msgstr ""
 "无法同步脱机文件夹 %s： %s\n"
 "文件夹可能已损坏，副本保存在“%s”"
 
-# camel/providers/local/camel-spool-summary.c:940
-# camel/providers/local/camel-spool-summary.c:940
-# camel/providers/local/camel-spool-summary.c:940
-#: camel/providers/local/camel-spool-summary.c:940
-#, c-format
-msgid "Could not file: %s: %s"
-msgstr "无法存档： %s： %s"
-
-# camel/providers/nntp/camel-nntp-auth.c:44
-# camel/providers/nntp/camel-nntp-auth.c:44
-# camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "请为 %s@%s 输入 NNTP 密码"
-
-# camel/providers/nntp/camel-nntp-auth.c:64
-# camel/providers/nntp/camel-nntp-auth.c:64
-# camel/providers/nntp/camel-nntp-auth.c:64
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "服务器拒绝的用户名"
-
-# camel/providers/nntp/camel-nntp-auth.c:70
-# camel/providers/nntp/camel-nntp-auth.c:70
-# camel/providers/nntp/camel-nntp-auth.c:70
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "将用户名发送到服务器失败"
-
-# camel/providers/nntp/camel-nntp-auth.c:79
-# camel/providers/nntp/camel-nntp-auth.c:79
-# camel/providers/nntp/camel-nntp-auth.c:79
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "服务器拒绝的 用户名/密码"
-
-# camel/providers/nntp/camel-nntp-folder.c:112
-#: camel/providers/nntp/camel-nntp-folder.c:112
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "内部错误：非法格式的 uid：%s"
-
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:221
-# camel/providers/local/camel-maildir-folder.c:230
-# camel/providers/local/camel-mbox-folder.c:331
-# camel/providers/local/camel-mh-folder.c:198
-# camel/providers/local/camel-mh-folder.c:207
-# camel/providers/local/camel-mh-folder.c:215
-# camel/providers/local/camel-spool-folder.c:579
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:221
-# camel/providers/local/camel-maildir-folder.c:230
-# camel/providers/local/camel-mbox-folder.c:331
-# camel/providers/local/camel-mh-folder.c:198
-# camel/providers/local/camel-mh-folder.c:207
-# camel/providers/local/camel-mh-folder.c:215
-# camel/providers/local/camel-spool-folder.c:579
-# camel/providers/nntp/camel-nntp-folder.c:153
-# camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/nntp/camel-nntp-folder.c:153
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:439
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:502
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "无法获取消息 %s：%s"
-
-# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-# camel/camel-remote-store.c:481
-# camel/providers/imap/camel-imap-command.c:228
-# camel/providers/imap/camel-imap-command.c:409
-# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-# camel/camel-remote-store.c:481
-# camel/providers/imap/camel-imap-command.c:228
-# camel/providers/imap/camel-imap-command.c:409
-# camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/pop3/camel-pop3-folder.c:278
-#: camel/providers/pop3/camel-pop3-folder.c:437
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:510
-msgid "User cancelled"
-msgstr "用户已取消"
-
-# camel/providers/nntp/camel-nntp-grouplist.c:45
-# camel/providers/nntp/camel-nntp-grouplist.c:45
-# camel/providers/nntp/camel-nntp-grouplist.c:45
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "无法从服务器获取组列表。"
-
-# camel/providers/nntp/camel-nntp-grouplist.c:98
-# camel/providers/nntp/camel-nntp-grouplist.c:107
-# camel/providers/nntp/camel-nntp-grouplist.c:98
-# camel/providers/nntp/camel-nntp-grouplist.c:107
-# camel/providers/nntp/camel-nntp-grouplist.c:98
-# camel/providers/nntp/camel-nntp-grouplist.c:107
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "无法为 %s 装入组列表文件： %s"
-
-# camel/providers/nntp/camel-nntp-grouplist.c:158
-# camel/providers/nntp/camel-nntp-grouplist.c:158
-# camel/providers/nntp/camel-nntp-grouplist.c:158
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "无法为 %s 保存组列表文件： %s"
-
 # camel/providers/nntp/camel-nntp-provider.c:41
 # camel/providers/nntp/camel-nntp-provider.c:41
 # camel/providers/nntp/camel-nntp-provider.c:41
@@ -14876,10 +16065,23 @@ msgstr "USENET 新闻"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "这是一个从 USENET 新闻组和向 USENET 新闻组发布消息的提供者。"
 
+# camel/providers/imap/camel-imap-folder.c:194
+# camel/providers/imap/camel-imap-folder.c:194
+# camel/providers/imap/camel-imap-folder.c:197
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "无法创建目录 %s： %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
+
 # camel/providers/nntp/camel-nntp-store.c:144
 # camel/providers/nntp/camel-nntp-store.c:144
 # camel/providers/nntp/camel-nntp-store.c:144
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET 新闻 %s"
@@ -14887,7 +16089,7 @@ msgstr "USENET 新闻 %s"
 # camel/providers/nntp/camel-nntp-store.c:151
 # camel/providers/nntp/camel-nntp-store.c:151
 # camel/providers/nntp/camel-nntp-store.c:151
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -14963,10 +16165,26 @@ msgstr "操作失败：%s"
 # camel/providers/pop3/camel-pop3-folder.c:175
 # camel/providers/pop3/camel-pop3-folder.c:175
 # camel/providers/pop3/camel-pop3-folder.c:175
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "检索 POP 概要"
 
+# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+# camel/camel-remote-store.c:481
+# camel/providers/imap/camel-imap-command.c:228
+# camel/providers/imap/camel-imap-command.c:409
+# camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+# camel/camel-remote-store.c:481
+# camel/providers/imap/camel-imap-command.c:228
+# camel/providers/imap/camel-imap-command.c:409
+# camel/providers/nntp/camel-nntp-folder.c:157
+#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:446
+#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:522
+msgid "User cancelled"
+msgstr "用户已取消"
+
 # camel/providers/local/camel-maildir-folder.c:209
 # camel/providers/local/camel-maildir-folder.c:221
 # camel/providers/local/camel-maildir-folder.c:230
@@ -14985,7 +16203,7 @@ msgstr "检索 POP 概要"
 # camel/providers/local/camel-spool-folder.c:579
 # camel/providers/nntp/camel-nntp-folder.c:153
 # camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:280
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "无法获取消息 POP 摘要：%s"
@@ -14993,14 +16211,14 @@ msgstr "无法获取消息 POP 摘要：%s"
 # camel/providers/pop3/camel-pop3-folder.c:252
 # camel/providers/pop3/camel-pop3-folder.c:252
 # camel/providers/pop3/camel-pop3-folder.c:252
-#: camel/providers/pop3/camel-pop3-folder.c:316
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "彻底去除已删除的邮件"
 
 # camel/providers/pop3/camel-pop3-folder.c:367
 # camel/providers/pop3/camel-pop3-folder.c:367
 # camel/providers/pop3/camel-pop3-folder.c:367
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, c-format
 msgid "No message with uid %s"
 msgstr "没有 uid 为 %s 的邮件"
@@ -15010,15 +16228,41 @@ msgstr "没有 uid 为 %s 的邮件"
 # camel/providers/pop3/camel-pop3-folder.c:371
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:418
+#: camel/providers/pop3/camel-pop3-folder.c:427
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "检索 POP 邮件 %d"
 
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:221
+# camel/providers/local/camel-maildir-folder.c:230
+# camel/providers/local/camel-mbox-folder.c:331
+# camel/providers/local/camel-mh-folder.c:198
+# camel/providers/local/camel-mh-folder.c:207
+# camel/providers/local/camel-mh-folder.c:215
+# camel/providers/local/camel-spool-folder.c:579
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:221
+# camel/providers/local/camel-maildir-folder.c:230
+# camel/providers/local/camel-mbox-folder.c:331
+# camel/providers/local/camel-mh-folder.c:198
+# camel/providers/local/camel-mh-folder.c:207
+# camel/providers/local/camel-mh-folder.c:215
+# camel/providers/local/camel-spool-folder.c:579
+# camel/providers/nntp/camel-nntp-folder.c:153
+# camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/pop3/camel-pop3-folder.c:448
+#: camel/providers/pop3/camel-pop3-folder.c:507
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:524
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "无法获取消息 %s：%s"
+
 # my-evolution/metar.c:247
 # my-evolution/metar.c:247
 # my-evolution/metar.c:247
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: camel/providers/pop3/camel-pop3-folder.c:514
 msgid "Unknown reason"
 msgstr "未知原因"
 
@@ -15047,7 +16291,7 @@ msgstr "%s 天之后删除"
 # camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 # camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 # camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:59
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:60
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -15081,19 +16325,31 @@ msgstr ""
 "该选项使 Evolution 在连接到 POP 服务器时使用 APOP 协议。即使是声称支持这一功"
 "能的服务器，也不一定能使所有用户工作。"
 
+# camel/providers/pop3/camel-pop3-store.c:377
+# camel/providers/pop3/camel-pop3-store.c:377
+# camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
+msgstr ""
+"无法连接到 POP 服务器。\n"
+"发送用户名错误： %s"
+
 # camel/providers/pop3/camel-pop3-store.c:321
 # camel/providers/pop3/camel-pop3-store.c:321
 # camel/providers/pop3/camel-pop3-store.c:321
-#: camel/providers/pop3/camel-pop3-store.c:172
-#, c-format
-msgid "Could not connect to POP server on %s."
+#: camel/providers/pop3/camel-pop3-store.c:351
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
 msgstr "无法连接到在 %s 的 POP 服务器。"
 
 # camel/providers/pop3/camel-pop3-store.c:407
 # camel/providers/pop3/camel-pop3-store.c:407
 # camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:213
-#: camel/providers/pop3/camel-pop3-store.c:316
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -15104,19 +16360,19 @@ msgstr ""
 # camel/providers/imap/camel-imap-command.c:362
 # camel/providers/imap/camel-imap-command.c:362
 # camel/providers/imap/camel-imap-command.c:362
-#: camel/providers/pop3/camel-pop3-store.c:229
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "SASL“%s”登录失败：%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:240
+#: camel/providers/pop3/camel-pop3-store.c:419
 msgid "SASL Protocol error"
 msgstr "SASL 协议错误"
 
 # shell/e-storage.c:506
 # shell/e-storage.c:506
 # shell/e-storage.c:506
-#: camel/providers/pop3/camel-pop3-store.c:255
+#: camel/providers/pop3/camel-pop3-store.c:434
 #, c-format
 msgid "I/O Error: %s"
 msgstr "输入输出错误：%s"
@@ -15124,7 +16380,7 @@ msgstr "输入输出错误：%s"
 # camel/providers/pop3/camel-pop3-store.c:360
 # camel/providers/pop3/camel-pop3-store.c:360
 # camel/providers/pop3/camel-pop3-store.c:360
-#: camel/providers/pop3/camel-pop3-store.c:276
+#: camel/providers/pop3/camel-pop3-store.c:455
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 POP 密码"
@@ -15132,7 +16388,8 @@ msgstr "%s请为 %s@%s 输入 POP 密码"
 # camel/providers/pop3/camel-pop3-store.c:415
 # camel/providers/pop3/camel-pop3-store.c:415
 # camel/providers/pop3/camel-pop3-store.c:415
-#: camel/providers/pop3/camel-pop3-store.c:327
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -15144,7 +16401,7 @@ msgstr ""
 # camel/providers/pop3/camel-pop3-store.c:480
 # camel/providers/pop3/camel-pop3-store.c:480
 # camel/providers/pop3/camel-pop3-store.c:480
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "没有文件夹“%s”。"
@@ -15156,7 +16413,7 @@ msgstr "没有文件夹“%s”。"
 # camel/providers/sendmail/camel-sendmail-provider.c:36
 # mail/mail-config.glade.h:81
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -15169,10 +16426,17 @@ msgid ""
 "system."
 msgstr "将邮件传递到本地系统的“sendmail”来发送邮件。"
 
+# camel/camel-url.c:288
+# camel/camel-url.c:288
+# camel/providers/sendmail/camel-sendmail-transport.c:226
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+msgid "Could not parse recipient list"
+msgstr "无法解析收件人列表"
+
 # camel/providers/sendmail/camel-sendmail-transport.c:106
 # camel/providers/sendmail/camel-sendmail-transport.c:106
 # camel/providers/sendmail/camel-sendmail-transport.c:107
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "无法创建到 sendmail 的管道： %s： 邮件未发送"
@@ -15180,7 +16444,7 @@ msgstr "无法创建到 sendmail 的管道： %s： 邮件未发送"
 # camel/providers/sendmail/camel-sendmail-transport.c:123
 # camel/providers/sendmail/camel-sendmail-transport.c:123
 # camel/providers/sendmail/camel-sendmail-transport.c:124
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "无法创建 sendmail 进程： %s： 邮件未发送"
@@ -15188,7 +16452,7 @@ msgstr "无法创建 sendmail 进程： %s： 邮件未发送"
 # camel/providers/sendmail/camel-sendmail-transport.c:149
 # camel/providers/sendmail/camel-sendmail-transport.c:149
 # camel/providers/sendmail/camel-sendmail-transport.c:150
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not send message: %s"
 msgstr "无法发送邮件： %s"
@@ -15196,7 +16460,7 @@ msgstr "无法发送邮件： %s"
 # camel/providers/sendmail/camel-sendmail-transport.c:162
 # camel/providers/sendmail/camel-sendmail-transport.c:162
 # camel/providers/sendmail/camel-sendmail-transport.c:163
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
+#: camel/providers/sendmail/camel-sendmail-transport.c:178
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail 以信号 %s 退出： 邮件未发送。"
@@ -15204,7 +16468,7 @@ msgstr "sendmail 以信号 %s 退出： 邮件未发送。"
 # camel/providers/sendmail/camel-sendmail-transport.c:169
 # camel/providers/sendmail/camel-sendmail-transport.c:169
 # camel/providers/sendmail/camel-sendmail-transport.c:170
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
+#: camel/providers/sendmail/camel-sendmail-transport.c:185
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "无法执行 %s： 邮件未发送。"
@@ -15212,43 +16476,29 @@ msgstr "无法执行 %s： 邮件未发送。"
 # camel/providers/sendmail/camel-sendmail-transport.c:174
 # camel/providers/sendmail/camel-sendmail-transport.c:174
 # camel/providers/sendmail/camel-sendmail-transport.c:175
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
+#: camel/providers/sendmail/camel-sendmail-transport.c:190
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail 以状态码 %d 退出： 邮件未发送。"
 
-# camel/providers/sendmail/camel-sendmail-transport.c:193
-# camel/providers/sendmail/camel-sendmail-transport.c:193
-# camel/providers/sendmail/camel-sendmail-transport.c:194
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-msgid "Could not find 'From' address in message"
-msgstr "无法在邮件中找到“收件人”地址"
-
-# camel/camel-url.c:288
-# camel/camel-url.c:288
-# camel/providers/sendmail/camel-sendmail-transport.c:226
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-msgid "Could not parse recipient list"
-msgstr "无法解析收件人列表"
-
 # camel/providers/sendmail/camel-sendmail-transport.c:246
 # camel/providers/sendmail/camel-sendmail-transport.c:246
 # camel/providers/sendmail/camel-sendmail-transport.c:259
-#: camel/providers/sendmail/camel-sendmail-transport.c:259
+#: camel/providers/sendmail/camel-sendmail-transport.c:204
 msgid "sendmail"
 msgstr "sendmail"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:248
 # camel/providers/sendmail/camel-sendmail-transport.c:248
 # camel/providers/sendmail/camel-sendmail-transport.c:261
-#: camel/providers/sendmail/camel-sendmail-transport.c:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr "通过 sendmail 程序发送邮件"
 
 # camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 # camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 # camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:74
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:75
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -15262,198 +16512,233 @@ msgstr "通过SMTP连接到远程邮件服务器来发送邮件。\n"
 # camel/providers/smtp/camel-smtp-transport.c:172
 # camel/providers/smtp/camel-smtp-transport.c:172
 # camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "语法错误，无法识别的命令"
 
 # camel/providers/smtp/camel-smtp-transport.c:174
 # camel/providers/smtp/camel-smtp-transport.c:174
 # camel/providers/smtp/camel-smtp-transport.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "参数语法错误"
 
 # camel/providers/smtp/camel-smtp-transport.c:176
 # camel/providers/smtp/camel-smtp-transport.c:176
 # camel/providers/smtp/camel-smtp-transport.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "命令尚未实现"
 
 # camel/providers/smtp/camel-smtp-transport.c:178
 # camel/providers/smtp/camel-smtp-transport.c:178
 # camel/providers/smtp/camel-smtp-transport.c:179
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "命令参数尚未实现"
 
 # camel/providers/smtp/camel-smtp-transport.c:180
 # camel/providers/smtp/camel-smtp-transport.c:180
 # camel/providers/smtp/camel-smtp-transport.c:181
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "系统状态，或系统求助就绪"
 
 # camel/providers/smtp/camel-smtp-transport.c:182
 # camel/providers/smtp/camel-smtp-transport.c:182
 # camel/providers/smtp/camel-smtp-transport.c:183
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "求助消息"
 
 # camel/providers/smtp/camel-smtp-transport.c:184
 # camel/providers/smtp/camel-smtp-transport.c:184
 # camel/providers/smtp/camel-smtp-transport.c:185
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "服务就绪"
 
 # camel/providers/smtp/camel-smtp-transport.c:186
 # camel/providers/smtp/camel-smtp-transport.c:186
 # camel/providers/smtp/camel-smtp-transport.c:187
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "服务正在关闭传输通道"
 
 # camel/providers/smtp/camel-smtp-transport.c:188
 # camel/providers/smtp/camel-smtp-transport.c:188
 # camel/providers/smtp/camel-smtp-transport.c:189
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "服务不可用，正在关闭传输通道"
 
 # camel/providers/smtp/camel-smtp-transport.c:190
 # camel/providers/smtp/camel-smtp-transport.c:190
 # camel/providers/smtp/camel-smtp-transport.c:191
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "邮件动作请求确认，已完成"
 
 # camel/providers/smtp/camel-smtp-transport.c:192
 # camel/providers/smtp/camel-smtp-transport.c:192
 # camel/providers/smtp/camel-smtp-transport.c:193
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr "用户不在本地；将转发到 <转发路径>"
 
 # camel/providers/smtp/camel-smtp-transport.c:194
 # camel/providers/smtp/camel-smtp-transport.c:194
 # camel/providers/smtp/camel-smtp-transport.c:195
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "邮件动作请求未发生：邮件箱无效"
 
 # camel/providers/smtp/camel-smtp-transport.c:196
 # camel/providers/smtp/camel-smtp-transport.c:196
 # camel/providers/smtp/camel-smtp-transport.c:197
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "动作请求未发生：邮件箱无效"
 
 # camel/providers/smtp/camel-smtp-transport.c:198
 # camel/providers/smtp/camel-smtp-transport.c:198
 # camel/providers/smtp/camel-smtp-transport.c:199
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "动作请求已放弃：处理中出错"
 
 # camel/providers/smtp/camel-smtp-transport.c:200
 # camel/providers/smtp/camel-smtp-transport.c:200
 # camel/providers/smtp/camel-smtp-transport.c:201
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "用户不在本地；请尝试 <转发路径>"
 
 # camel/providers/smtp/camel-smtp-transport.c:202
 # camel/providers/smtp/camel-smtp-transport.c:202
 # camel/providers/smtp/camel-smtp-transport.c:203
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr "动作请求未发生：系统存储空间不足"
 
 # camel/providers/smtp/camel-smtp-transport.c:204
 # camel/providers/smtp/camel-smtp-transport.c:204
 # camel/providers/smtp/camel-smtp-transport.c:205
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "邮件动作请求已放弃：超定额德存储分配"
 
 # camel/providers/smtp/camel-smtp-transport.c:206
 # camel/providers/smtp/camel-smtp-transport.c:206
 # camel/providers/smtp/camel-smtp-transport.c:207
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "动作请求未发生：不允许的邮件箱名称"
 
 # camel/providers/smtp/camel-smtp-transport.c:208
 # camel/providers/smtp/camel-smtp-transport.c:208
 # camel/providers/smtp/camel-smtp-transport.c:209
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "开始输入邮件；以 <CRLF>.<CRLF> 结束"
 
 # camel/providers/smtp/camel-smtp-transport.c:210
 # camel/providers/smtp/camel-smtp-transport.c:210
 # camel/providers/smtp/camel-smtp-transport.c:211
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "事务失败"
 
 # camel/providers/smtp/camel-smtp-transport.c:214
 # camel/providers/smtp/camel-smtp-transport.c:214
 # camel/providers/smtp/camel-smtp-transport.c:215
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "必须传输密码"
 
 # camel/providers/smtp/camel-smtp-transport.c:216
 # camel/providers/smtp/camel-smtp-transport.c:216
 # camel/providers/smtp/camel-smtp-transport.c:217
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "认证机制太弱"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
 # camel/providers/smtp/camel-smtp-transport.c:218
 # camel/providers/smtp/camel-smtp-transport.c:219
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "请求的认证机制必须加密"
 
 # camel/providers/smtp/camel-smtp-transport.c:220
 # camel/providers/smtp/camel-smtp-transport.c:220
 # camel/providers/smtp/camel-smtp-transport.c:221
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "临时认证失败"
 
 # camel/providers/smtp/camel-smtp-transport.c:222
 # camel/providers/smtp/camel-smtp-transport.c:222
 # camel/providers/smtp/camel-smtp-transport.c:223
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "必须认证"
 
 # camel/providers/smtp/camel-smtp-transport.c:317
 # camel/providers/smtp/camel-smtp-transport.c:317
 # camel/providers/smtp/camel-smtp-transport.c:320
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Welcome 应答错误： %s： 可能不致命"
 
+# camel/providers/pop3/camel-pop3-store.c:377
+# camel/providers/pop3/camel-pop3-store.c:377
+# camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
+#, fuzzy, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr ""
+"无法连接到 POP 服务器。\n"
+"发送用户名错误： %s"
+
+# calendar/gui/e-itip-control.c:1064
+# calendar/gui/e-itip-control.c:1064
+# calendar/gui/e-itip-control.c:1138
+#: camel/providers/smtp/camel-smtp-transport.c:338
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "邮件的格式可能不正确"
+
+# camel/providers/smtp/camel-smtp-transport.c:1091
+# camel/providers/smtp/camel-smtp-transport.c:1091
+# camel/providers/smtp/camel-smtp-transport.c:1199
+#: camel/providers/smtp/camel-smtp-transport.c:352
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "RSET 请求超时： %s"
+
+# camel/providers/smtp/camel-smtp-transport.c:1110
+# camel/providers/smtp/camel-smtp-transport.c:1110
+# camel/providers/smtp/camel-smtp-transport.c:1104
+#: camel/providers/smtp/camel-smtp-transport.c:367
+#, fuzzy
+msgid "STARTTLS response error"
+msgstr "DATA 应答错误"
+
 # camel/providers/smtp/camel-smtp-transport.c:379
 # camel/providers/smtp/camel-smtp-transport.c:379
 # camel/providers/smtp/camel-smtp-transport.c:383
-#: camel/providers/smtp/camel-smtp-transport.c:383
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP 服务器 %s 并不支持请求的认证类型 %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:417
 # camel/providers/smtp/camel-smtp-transport.c:417
 # camel/providers/smtp/camel-smtp-transport.c:421
-#: camel/providers/smtp/camel-smtp-transport.c:421
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 SMTP 密码"
@@ -15461,7 +16746,7 @@ msgstr "%s请为 %s@%s 输入 SMTP 密码"
 # camel/providers/smtp/camel-smtp-transport.c:438
 # camel/providers/smtp/camel-smtp-transport.c:438
 # camel/providers/smtp/camel-smtp-transport.c:442
-#: camel/providers/smtp/camel-smtp-transport.c:442
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -15475,7 +16760,7 @@ msgstr ""
 # camel/providers/smtp/camel-smtp-transport.c:554
 # camel/providers/smtp/camel-smtp-transport.c:554
 # camel/providers/smtp/camel-smtp-transport.c:565
-#: camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 服务器 %s"
@@ -15483,57 +16768,50 @@ msgstr "SMTP 服务器 %s"
 # camel/providers/smtp/camel-smtp-transport.c:556
 # camel/providers/smtp/camel-smtp-transport.c:556
 # camel/providers/smtp/camel-smtp-transport.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "通过 %s 发送 SMTP 邮件"
 
-# camel/providers/smtp/camel-smtp-transport.c:581
-# camel/providers/smtp/camel-smtp-transport.c:581
-# camel/providers/smtp/camel-smtp-transport.c:591
-#: camel/providers/smtp/camel-smtp-transport.c:591
-msgid "Cannot send message: sender address not defined."
-msgstr "无法发送邮件： 发件人地址无定义。"
-
 # camel/providers/smtp/camel-smtp-transport.c:588
 # camel/providers/smtp/camel-smtp-transport.c:588
 # camel/providers/smtp/camel-smtp-transport.c:598
-#: camel/providers/smtp/camel-smtp-transport.c:598
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "无法发送邮件： 发件人地址不合法。"
 
 # camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:558
 # camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:560
 # camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
-#: camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "正在发送邮件"
 
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:614
-#: camel/providers/smtp/camel-smtp-transport.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "无法发送邮件： 没有定义收件人。"
 
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:624
-#: camel/providers/smtp/camel-smtp-transport.c:624
+#: camel/providers/smtp/camel-smtp-transport.c:691
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "无法发送消息：一个或多个非法收件人"
 
 # camel/providers/smtp/camel-smtp-transport.c:684
 # camel/providers/smtp/camel-smtp-transport.c:684
 # camel/providers/smtp/camel-smtp-transport.c:798
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "SMTP 欢迎"
 
 # camel/providers/smtp/camel-smtp-transport.c:706
 # camel/providers/smtp/camel-smtp-transport.c:706
 # camel/providers/smtp/camel-smtp-transport.c:820
-#: camel/providers/smtp/camel-smtp-transport.c:820
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELLO 请求超时： %s： 非致命"
@@ -15541,7 +16819,7 @@ msgstr "HELLO 请求超时： %s： 非致命"
 # camel/providers/smtp/camel-smtp-transport.c:726
 # camel/providers/smtp/camel-smtp-transport.c:726
 # camel/providers/smtp/camel-smtp-transport.c:840
-#: camel/providers/smtp/camel-smtp-transport.c:840
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "HELLO 应答错误： %s： 非致命"
@@ -15549,14 +16827,14 @@ msgstr "HELLO 应答错误： %s： 非致命"
 # camel/providers/smtp/camel-smtp-transport.c:758
 # camel/providers/smtp/camel-smtp-transport.c:758
 # camel/providers/smtp/camel-smtp-transport.c:883
-#: camel/providers/smtp/camel-smtp-transport.c:883
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP 认证"
 
 # camel/providers/smtp/camel-smtp-transport.c:764
 # camel/providers/smtp/camel-smtp-transport.c:764
 # camel/providers/smtp/camel-smtp-transport.c:889
-#: camel/providers/smtp/camel-smtp-transport.c:889
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "创建 SASL 认证对象错误。"
 
@@ -15566,8 +16844,8 @@ msgstr "创建 SASL 认证对象错误。"
 # camel/providers/smtp/camel-smtp-transport.c:791
 # camel/providers/smtp/camel-smtp-transport.c:904
 # camel/providers/smtp/camel-smtp-transport.c:916
-#: camel/providers/smtp/camel-smtp-transport.c:904
-#: camel/providers/smtp/camel-smtp-transport.c:916
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH 请求超时： %s"
@@ -15575,21 +16853,21 @@ msgstr "AUTH 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:800
 # camel/providers/smtp/camel-smtp-transport.c:800
 # camel/providers/smtp/camel-smtp-transport.c:925
-#: camel/providers/smtp/camel-smtp-transport.c:925
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH 请求失败。"
 
 # camel/providers/smtp/camel-smtp-transport.c:848
 # camel/providers/smtp/camel-smtp-transport.c:848
 # camel/providers/smtp/camel-smtp-transport.c:973
-#: camel/providers/smtp/camel-smtp-transport.c:973
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "来自服务器的错误认证应答。\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:874
 # camel/providers/smtp/camel-smtp-transport.c:874
 # camel/providers/smtp/camel-smtp-transport.c:999
-#: camel/providers/smtp/camel-smtp-transport.c:999
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM 请求超时： %s： 邮件未发送"
@@ -15597,20 +16875,20 @@ msgstr "MAIL FROM 请求超时： %s： 邮件未发送"
 # camel/providers/smtp/camel-smtp-transport.c:893
 # camel/providers/smtp/camel-smtp-transport.c:893
 # camel/providers/smtp/camel-smtp-transport.c:1013
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM 应答错误"
 
 # camel/providers/smtp/camel-smtp-transport.c:918
 # camel/providers/smtp/camel-smtp-transport.c:918
 # camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO 请求超时： %s： 邮件未发送"
 
 # camel/providers/smtp/camel-smtp-transport.c:1054
-#: camel/providers/smtp/camel-smtp-transport.c:1054
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> 失败"
@@ -15618,7 +16896,7 @@ msgstr "RCPT TO <%s> 失败"
 # camel/providers/smtp/camel-smtp-transport.c:971
 # camel/providers/smtp/camel-smtp-transport.c:971
 # camel/providers/smtp/camel-smtp-transport.c:1090
-#: camel/providers/smtp/camel-smtp-transport.c:1090
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA 请求超时： %s： 邮件未发送"
@@ -15629,7 +16907,7 @@ msgstr "DATA 请求超时： %s： 邮件未发送"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1104
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 msgid "DATA response error"
 msgstr "DATA 应答错误"
 
@@ -15639,8 +16917,8 @@ msgstr "DATA 应答错误"
 # camel/providers/smtp/camel-smtp-transport.c:1048
 # camel/providers/smtp/camel-smtp-transport.c:1144
 # camel/providers/smtp/camel-smtp-transport.c:1162
-#: camel/providers/smtp/camel-smtp-transport.c:1144
-#: camel/providers/smtp/camel-smtp-transport.c:1162
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA 发送超时： 消息终止： %s： 邮件未发送"
@@ -15650,14 +16928,14 @@ msgstr "DATA 发送超时： 消息终止： %s： 邮件未发送"
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:495
 # camel/providers/smtp/camel-smtp-transport.c:1176
-#: camel/providers/smtp/camel-smtp-transport.c:1176
+#: camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "DATA termination response error"
 msgstr "DATA 终止应答错误"
 
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:1199
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET 请求超时： %s"
@@ -15665,14 +16943,14 @@ msgstr "RSET 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1283
 msgid "RSET response error"
 msgstr "RSET 应答错误"
 
 # camel/providers/smtp/camel-smtp-transport.c:1133
 # camel/providers/smtp/camel-smtp-transport.c:1133
 # camel/providers/smtp/camel-smtp-transport.c:1236
-#: camel/providers/smtp/camel-smtp-transport.c:1236
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT 请求超时： %s： 非致命"
@@ -15680,7 +16958,7 @@ msgstr "QUIT 请求超时： %s： 非致命"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1250
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "QUIT response error"
 msgstr "QUIT 应答错误"
 
@@ -15727,7 +17005,7 @@ msgstr "%.1fG"
 # composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:136
 # composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:135
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:135
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
 msgid "attachment"
 msgstr "附件"
 
@@ -15800,14 +17078,14 @@ msgstr "MIME 类型："
 # composer/e-msg-composer-attachment.glade.h:5
 # composer/e-msg-composer-select-file.c:180
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:180
+#: composer/e-msg-composer-select-file.c:156
 msgid "Suggest automatic display of attachment"
 msgstr "建议自动显示附件"
 
 # composer/e-msg-composer-hdrs.c:327
 # composer/e-msg-composer-hdrs.c:327
 # composer/e-msg-composer-hdrs.c:326
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "点击此处以使用地址簿"
 
@@ -15817,7 +17095,7 @@ msgstr "点击此处以使用地址簿"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:356
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "发件人："
 
@@ -15827,7 +17105,7 @@ msgstr "发件人："
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:362
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "回复到："
 
@@ -15837,49 +17115,49 @@ msgstr "回复到："
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "主题："
 
 # composer/e-msg-composer-hdrs.c:389
 # composer/e-msg-composer-hdrs.c:389
 # composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "收信人："
 
 # composer/e-msg-composer-hdrs.c:390
 # composer/e-msg-composer-hdrs.c:390
 # composer/e-msg-composer-hdrs.c:388
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "输入邮件的收件人"
 
 # composer/e-msg-composer-hdrs.c:393
 # composer/e-msg-composer-hdrs.c:393
 # composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "抄送："
 
 # composer/e-msg-composer-hdrs.c:394
 # composer/e-msg-composer-hdrs.c:394
 # composer/e-msg-composer-hdrs.c:392
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "输入将接收该邮件副本的收件人地址"
 
 # composer/e-msg-composer-hdrs.c:397
 # composer/e-msg-composer-hdrs.c:397
 # composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "暗中抄送："
 
 # composer/e-msg-composer-hdrs.c:398
 # composer/e-msg-composer-hdrs.c:398
 # composer/e-msg-composer-hdrs.c:396
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -15891,15 +17169,23 @@ msgstr "输入将接收该邮件副本，但不出现在收件人列表中的收
 # ui/evolution-message-composer.xml.h:2
 # composer/e-msg-composer-select-file.c:291
 # ui/evolution-message-composer.xml.h:2
-#: composer/e-msg-composer-select-file.c:291
+#: composer/e-msg-composer-select-file.c:267
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "附件一个文件"
 
+# mail/mail-crypto.c:59
+# mail/mail-crypto.c:59
+# mail/mail-crypto.c:59
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "无法创建 PGP 签名上下文。"
+
 # composer/e-msg-composer.c:743
 # composer/e-msg-composer.c:747
 # composer/e-msg-composer.c:695
-#: composer/e-msg-composer.c:697
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -15908,31 +17194,24 @@ msgstr ""
 "读入文件 %s 时发声错误：\n"
 "%s"
 
-# composer/e-msg-composer.c:943
-# composer/e-msg-composer.c:947
-# composer/e-msg-composer.c:912
-#: composer/e-msg-composer.c:914
-msgid "Save as..."
-msgstr "另存为..."
-
 # composer/e-msg-composer.c:952
 # composer/e-msg-composer.c:956
 # composer/e-msg-composer.c:921
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "警告！"
 
 # composer/e-msg-composer.c:956
 # composer/e-msg-composer.c:960
 # composer/e-msg-composer.c:925
-#: composer/e-msg-composer.c:927
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "文件存在，覆盖它？"
 
 # composer/e-msg-composer.c:978
 # composer/e-msg-composer.c:982
 # composer/e-msg-composer.c:947
-#: composer/e-msg-composer.c:949
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "保存文件错误： %s"
@@ -15940,7 +17219,7 @@ msgstr "保存文件错误： %s"
 # composer/e-msg-composer.c:997
 # composer/e-msg-composer.c:1001
 # composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:968
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "读入文件错误： %s"
@@ -15948,7 +17227,7 @@ msgstr "读入文件错误： %s"
 # composer/e-msg-composer.c:1118
 # composer/e-msg-composer.c:1032
 # composer/e-msg-composer.c:997
-#: composer/e-msg-composer.c:999
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "访问文件错误： %s"
@@ -15956,14 +17235,14 @@ msgstr "访问文件错误： %s"
 # composer/e-msg-composer.c:1126
 # composer/e-msg-composer.c:1040
 # composer/e-msg-composer.c:1005
-#: composer/e-msg-composer.c:1007
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "无法从编辑器检索邮件"
 
 # composer/e-msg-composer.c:1133
 # composer/e-msg-composer.c:1047
 # composer/e-msg-composer.c:1012
-#: composer/e-msg-composer.c:1014
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -15975,7 +17254,7 @@ msgstr ""
 # composer/e-msg-composer.c:1140
 # composer/e-msg-composer.c:1054
 # composer/e-msg-composer.c:1019
-#: composer/e-msg-composer.c:1021
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -15987,7 +17266,7 @@ msgstr ""
 # composer/e-msg-composer.c:1149
 # composer/e-msg-composer.c:1063
 # composer/e-msg-composer.c:1028
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -15999,7 +17278,7 @@ msgstr ""
 # composer/e-msg-composer.c:1251
 # composer/e-msg-composer.c:1165
 # composer/e-msg-composer.c:1130
-#: composer/e-msg-composer.c:1132
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -16010,7 +17289,7 @@ msgstr ""
 # composer/e-msg-composer.c:1405
 # composer/e-msg-composer.c:1322
 # composer/e-msg-composer.c:1288
-#: composer/e-msg-composer.c:1290
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -16023,35 +17302,61 @@ msgstr ""
 # composer/e-msg-composer.c:1412
 # composer/e-msg-composer.c:1329
 # composer/e-msg-composer.c:1295
-#: composer/e-msg-composer.c:1297
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "警告： 已改动的邮件"
 
 # composer/e-msg-composer.c:1435
 # composer/e-msg-composer.c:1352
 # composer/e-msg-composer.c:1318
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "打开文件"
 
 # composer/e-msg-composer.c:1584
 # composer/e-msg-composer.c:1501
 # composer/e-msg-composer.c:1467
-#: composer/e-msg-composer.c:1469
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "插入文件"
 
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "签名文件："
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+# mail/mail-accounts.c:149
+# mail/mail-accounts.c:149
+# mail/mail-accounts.c:149
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr "(默认)"
+
 # composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
 # composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
 # composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
-#: composer/e-msg-composer.c:1855 composer/e-msg-composer.c:2447
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "撰写邮件"
 
 # composer/e-msg-composer.c:2440
 # composer/e-msg-composer.c:2380
 # composer/e-msg-composer.c:2351
-#: composer/e-msg-composer.c:2464
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -16062,7 +17367,7 @@ msgstr ""
 # composer/e-msg-composer.c:2463 composer/e-msg-composer.c:2518
 # composer/e-msg-composer.c:2403 composer/e-msg-composer.c:2458
 # composer/e-msg-composer.c:2374 composer/e-msg-composer.c:2429
-#: composer/e-msg-composer.c:2487 composer/e-msg-composer.c:2542
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -16070,10 +17375,16 @@ msgstr ""
 "无法创见撰写窗口：\n"
 "无法激活 HTML 编辑器组件。"
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 # composer/evolution-composer.c:367
 # composer/evolution-composer.c:367
 # composer/evolution-composer.c:367
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -16084,7 +17395,7 @@ msgstr ""
 # composer/evolution-composer.c:382
 # composer/evolution-composer.c:382
 # composer/evolution-composer.c:382
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "无法初始化 Evolution 的撰写器。"
 
@@ -16172,18 +17483,33 @@ msgstr "主题含有"
 msgid "Subject does not contain"
 msgstr "主题不含有"
 
+# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:1915
+# mail/mail-display.c:106
+# calendar/gui/dialogs/comp-editor.c:1065 mail/mail-callbacks.c:2034
+# mail/mail-display.c:106
+# calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
+# mail/mail-display.c:105
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"指定名称的文件已经存在。\n"
+"覆盖它？"
+
 # e-util/e-passwords.c:360 mail/mail-session.c:267
 # e-util/e-passwords.c:360 mail/mail-session.c:267
 # e-util/e-passwords.c:360 mail/mail-session.c:269
 #. Remember the password?
-#: e-util/e-passwords.c:360 mail/mail-session.c:269
+#: e-util/e-passwords.c:363 mail/mail-session.c:269
 msgid "Remember this password"
 msgstr "记住该密码"
 
 # e-util/e-passwords.c:362 mail/mail-session.c:268
 # e-util/e-passwords.c:362 mail/mail-session.c:268
 # e-util/e-passwords.c:362 mail/mail-session.c:270
-#: e-util/e-passwords.c:362 mail/mail-session.c:270
+#: e-util/e-passwords.c:365 mail/mail-session.c:270
 msgid "Remember this password for the remainder of this session"
 msgstr "在本会话中记住该密码"
 
@@ -16338,322 +17664,50 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-# executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "进行概括的 Evolution 组件。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-# executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Evolution 实施概要组件车间。"
-
-# my-evolution/component-factory.c:153
-# my-evolution/component-factory.c:153
-# executive-summary/component/component-factory.c:151
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "无法初始化 Evolution 的实施概要组件。"
-
-# shell/e-shell-importer.c:617
-# shell/e-shell-importer.c:617
-# executive-summary/component/e-summary-callbacks.c:125
-#: executive-summary/component/e-summary-callbacks.c:125
-msgid "Select a service"
-msgstr "选择一个服务"
-
-# executive-summary/component/e-summary-callbacks.c:289
-#: executive-summary/component/e-summary-callbacks.c:289
-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 ""
-"您可以为实施概要背景选择一个不同的 HTML 页面。\n"
-"\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
-#: 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 "以默认 GNOME 应用程序打开 %s"
-
-# executive-summary/component/e-summary-url.c:70
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "以默认 GNOME 网络浏览器打开 %s"
-
-# calendar/gui/dialogs/alarm-page.c:381
-# calendar/gui/dialogs/alarm-page.c:381
-# executive-summary/component/e-summary-url.c:71
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "给 %s 发送一封电子邮件"
-
-# ui/evolution.xml.h:3
-# ui/evolution.xml.h:3
-# executive-summary/component/e-summary-url.c:72
-#: executive-summary/component/e-summary-url.c:72
-#, c-format
-msgid "Change the view to %s"
-msgstr "将视图改变为 %s"
-
-# calendar/gui/print.c:2306
-# calendar/gui/print.c:2306
-# executive-summary/component/e-summary-url.c:73
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "运行 %s"
-
-# ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-# ui/evolution-contact-list-editor.xml.h:1
-# ui/evolution-mail-messagedisplay.xml.h:1
-# ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-# ui/evolution.xml.h:4
-# ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-# ui/evolution-contact-list-editor.xml.h:1
-# ui/evolution-mail-messagedisplay.xml.h:1
-# ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-# ui/evolution.xml.h:4
-# executive-summary/component/e-summary-url.c:75
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "关闭 %s"
-
-# ui/evolution.xml.h:17
-# ui/evolution.xml.h:17
-# executive-summary/component/e-summary-url.c:76
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "将 %s 移动到左边"
-
-# executive-summary/component/e-summary-url.c:77
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "将 %s 移动到右边"
-
-# executive-summary/component/e-summary-url.c:78
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "将 %s 移动岛上一行"
-
-# executive-summary/component/e-summary-url.c:79
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "将 %s 移动到下一行"
-
-# mail/mail-local.c:1416
-# mail/mail-local.c:1416
-# executive-summary/component/e-summary-url.c:80
-#: executive-summary/component/e-summary-url.c:80
-#, c-format
-msgid "Configure %s"
-msgstr "配置 %s"
-
-# addressbook/printing/e-contact-print.glade.h:25
-# addressbook/printing/e-contact-print.glade.h:25
-# executive-summary/component/e-summary-url.c:553
-#: executive-summary/component/e-summary-url.c:553
-msgid "page"
-msgstr "页面"
-
-# shell/e-shell-folder-commands.c:488
-# shell/e-shell-folder-commands.c:488
-# executive-summary/component/e-summary.c:925
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"无法打开 HTML 文件：\n"
-"%s"
-
-# shell/e-shell-importer.c:474
-# shell/e-shell-importer.c:474
-# executive-summary/component/e-summary.c:939
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"读入数据错误：\n"
-"%s"
-
-# executive-summary/component/e-summary.c:957
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr "文件中没有服务空间。\n"
-
-# executive-summary/component/main.c:61
-#: executive-summary/component/main.c:61
-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 ""
-"实施概要组件无法初始化 Bonobo。\n"
-"如果出现关于 RootPOA 的警告信息，可能表明\n"
-"您是与 GOAD 而不是 OAF 一起编译的 Bonobo。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr "RDF 概要车间。"
-
-# calendar/gui/e-calendar-table.etspec.h:16
-# my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-# shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
-# calendar/gui/e-calendar-table.etspec.h:16
-# my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-# shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
-# executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
-msgstr "RDF 概要"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
-msgstr "测试 bonobo 组件车间。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# mail/GNOME_Evolution_Mail.oaf.in.h:7
-# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-#: 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
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr "测试 bonobo 服务"
-
-# widgets/misc/e-charset-picker.c:58
-# widgets/misc/e-charset-picker.c:58
-# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr "测试服务"
-
-# widgets/misc/e-messagebox.c:166
-# widgets/misc/e-messagebox.c:166
-# executive-summary/test-service/rdf-summary.c:512
-# executive-summary/test-service/rdf-summary.c:549
-# executive-summary/test-service/rdf-summary.c:594
-# widgets/misc/e-messagebox.c:166
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "错误"
-
-# executive-summary/test-service/rdf-summary.c:775
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "自动更新"
-
-# calendar/gui/e-itip-control.c:787
-# calendar/gui/e-itip-control.c:787
-# executive-summary/test-service/rdf-summary.c:785
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "现在更新"
-
-# calendar/gui/e-meeting-time-sel.c:515
-# calendar/gui/e-meeting-time-sel.c:518
-# executive-summary/test-service/rdf-summary.c:795
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "更新间隔 "
-
-# filter/filter-datespec.c:80
 #: filter/filter-datespec.c:80
 msgid "year"
 msgstr "年"
 
-# filter/filter-datespec.c:80
 #: filter/filter-datespec.c:80
 msgid "years"
 msgstr "年"
 
-# filter/filter-datespec.c:81
 #: filter/filter-datespec.c:81
 msgid "month"
 msgstr "月"
 
-# filter/filter-datespec.c:81
 #: filter/filter-datespec.c:81
 msgid "months"
 msgstr "月"
 
-# filter/filter-datespec.c:82
 #: filter/filter-datespec.c:82
 msgid "week"
 msgstr "周"
 
-# filter/filter-datespec.c:82
 #: filter/filter-datespec.c:82
 msgid "weeks"
 msgstr "周"
 
-# filter/filter-datespec.c:84
 #: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "小时"
 
-# filter/filter-datespec.c:85
 #: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "分钟"
 
-# filter/filter-datespec.c:86
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "秒"
-
-# filter/filter-datespec.c:86
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "秒"
 
-# filter/filter-datespec.c:194
 #: filter/filter-datespec.c:194
 msgid "You have forgotten to choose a date."
 msgstr "您忘记选择日期了。"
 
-# filter/filter-datespec.c:196
 #: filter/filter-datespec.c:196
 msgid "You have chosen an invalid date."
 msgstr "您选择了无效的日期。"
 
-# filter/filter-datespec.c:271
 #: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
@@ -16664,7 +17718,6 @@ msgstr ""
 "日期或者虚拟文件夹打开的\n"
 "日期进行比较。"
 
-# filter/filter-datespec.c:294
 #: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
@@ -16673,7 +17726,6 @@ msgstr ""
 "邮件的日期将与您在这里\n"
 "指定的日期进行比较。"
 
-# filter/filter-datespec.c:334
 #: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
@@ -16684,77 +17736,87 @@ msgstr ""
 "运行的时间进行比较；\n"
 "例如：“一周以前”。"
 
-# filter/filter-datespec.c:369
 #. keep in sync with FilterDatespec_type!
 #: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr "当前时间"
 
-# filter/filter-datespec.c:369
 #: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr "您指定的时间"
 
-# filter/filter-datespec.c:370
 #: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr "相对于当前时间的时间"
 
-# filter/filter-datespec.c:394
 #. The dialog
 #: filter/filter-datespec.c:394
 msgid "Select a time to compare against"
 msgstr "选择用于比较的时间"
 
-# filter/filter-datespec.c:428
 #. The label
 #: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr "比较"
 
-# filter/filter-datespec.c:546 filter/filter-datespec.c:725
 #: filter/filter-datespec.c:546 filter/filter-datespec.c:725
 msgid "now"
 msgstr "现在"
 
-# filter/filter-datespec.c:575
 #: filter/filter-datespec.c:575
 msgid " ago"
 msgstr " 过去"
 
-# filter/filter-datespec.c:621
 #: filter/filter-datespec.c:621
 msgid "ago"
 msgstr "过去"
 
-# filter/filter-datespec.c:711 mail/message-list.c:973
-#: filter/filter-datespec.c:711 mail/message-list.c:973
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-# filter/filter-datespec.c:722
 #: filter/filter-datespec.c:722
 msgid "<click here to select a date>"
 msgstr "<点击这里以选择日期>"
 
-# filter/filter-editor.c:132 filter/filter.glade.h:3
 #: filter/filter-editor.c:132 filter/filter.glade.h:3
 msgid "Filter Rules"
 msgstr "过滤规则"
 
-# filter/filter-filter.c:487
+# addressbook/printing/e-contact-print.glade.h:38
+# addressbook/printing/e-contact-print.glade.h:38
+# mail/mail-config.glade.h:92
+#: filter/filter-file.c:176
+#, fuzzy
+msgid "You must specify a file name"
+msgstr "指定文件名："
+
+# camel/providers/local/camel-spool-store.c:115
+# camel/providers/local/camel-spool-store.c:115
+# camel/providers/local/camel-spool-store.c:115
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "脱机文件“%s”不存在或不是普通文件"
+
+# ui/evolution-message-composer.xml.h:14
+# ui/evolution-message-composer.xml.h:14
+# ui/evolution-message-composer.xml.h:14
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "打开文件"
+
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "则"
 
-# filter/filter-filter.c:501
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "添加动作"
 
-# filter/filter-folder.c:156
-#: filter/filter-folder.c:156
+#: filter/filter-folder.c:147
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -16764,24 +17826,12 @@ msgstr ""
 
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:837
-# filter/filter-folder.c:239 filter/vfolder-rule.c:365
 # mail/mail-account-gui.c:834
-#: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:834
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "选择文件夹"
 
-# filter/filter-folder.c:274
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr "输入文件夹 URI"
-
-# filter/filter-folder.c:321
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr "<点击这里以便选择文件夹>"
-
-# filter/filter-input.c:198
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -16791,380 +17841,364 @@ msgstr ""
 "常规表达式错误 “%s”：\n"
 "%s"
 
-# filter/filter-part.c:488 shell/evolution-test-component.c:41
-#: filter/filter-part.c:488 shell/evolution-test-component.c:41
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "测试"
 
-# filter/filter-rule.c:217
 #: filter/filter-rule.c:217
 msgid "You must name this filter."
 msgstr "您必须为该过滤规则命名。"
 
-# filter/filter-rule.c:720
-#: filter/filter-rule.c:720
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "规则名："
 
-# filter/filter-rule.c:724
-#: filter/filter-rule.c:724
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "无标题"
 
-# filter/filter-rule.c:741
-#: filter/filter-rule.c:741
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "如果"
 
-# filter/filter-rule.c:759
-#: filter/filter-rule.c:759
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "执行动作"
 
-# filter/filter-rule.c:763
-#: filter/filter-rule.c:763
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "如果满足所有条件"
 
-# filter/filter-rule.c:768
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:769
 msgid "if any criteria are met"
 msgstr "如果满足任一条件"
 
-# filter/filter-rule.c:779
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "添加条件"
 
-# filter/filter-rule.c:864
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "接收"
 
-# filter/filter-rule.c:864
-#: filter/filter-rule.c:864
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "发送"
 
-# filter/filter.glade.h:1
 #: filter/filter.glade.h:1
 msgid "Edit Filters"
 msgstr "编辑过滤规则"
 
-# filter/filter.glade.h:2
 #: filter/filter.glade.h:2
 msgid "Edit VFolders"
 msgstr "编辑虚拟文件夹"
 
-# filter/filter.glade.h:4
 #: filter/filter.glade.h:4
 msgid "Incoming"
 msgstr "接收"
 
-# filter/filter.glade.h:5
 #: filter/filter.glade.h:5
 msgid "Outgoing"
 msgstr "发送"
 
-# filter/filter.glade.h:6 filter/vfolder-editor.c:130
 #: filter/filter.glade.h:6 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "虚拟文件夹"
 
-# filter/filter.glade.h:11
 #: filter/filter.glade.h:11
 msgid "specific folders only"
 msgstr "仅指定文件夹"
 
-# filter/filter.glade.h:12
 #: filter/filter.glade.h:12
 msgid "vFolder Sources"
 msgstr "虚拟文件夹来源"
 
-# filter/filter.glade.h:13
 #: filter/filter.glade.h:13
 msgid "with all active remote folders"
 msgstr "以全部活跃远程文件夹"
 
-# filter/filter.glade.h:14
 #: filter/filter.glade.h:14
 msgid "with all local and active remote folders"
 msgstr "以全部本地和活跃远程文件夹"
 
-# filter/filter.glade.h:15
 #: filter/filter.glade.h:15
 msgid "with all local folders"
 msgstr "以所有本地文件夹"
 
-# filter/libfilter-i18n.h:2
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "指定分数"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "指定颜色"
 
-# filter/libfilter-i18n.h:3
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "指定分数"
 
-# filter/libfilter-i18n.h:4
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "附件"
 
-# filter/libfilter-i18n.h:5
-#: filter/libfilter-i18n.h:5
+# addressbook/gui/contact-editor/fulladdr.glade.h:23
+# addressbook/gui/contact-editor/fulladdr.glade.h:23
+# my-evolution/Locations.h:213
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "伯利兹"
+
+# addressbook/backend/ebook/e-card-simple.c:67
+# addressbook/gui/contact-editor/e-contact-editor.c:1650
+# addressbook/backend/ebook/e-card-simple.c:67
+# addressbook/gui/contact-editor/e-contact-editor.c:1650
+# addressbook/backend/ebook/e-card-simple.c:67
+# addressbook/gui/contact-editor/e-contact-editor.c:1650
+#: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "公司"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "含有"
 
-# filter/libfilter-i18n.h:6
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "复制到文件夹"
 
-# filter/libfilter-i18n.h:7
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "接收日期"
 
-# filter/libfilter-i18n.h:8
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "发送日期"
 
-# filter/libfilter-i18n.h:10
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "已删除"
 
-# filter/libfilter-i18n.h:11
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "不含有"
 
-# filter/libfilter-i18n.h:12
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "不以之结尾"
 
-# filter/libfilter-i18n.h:13
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "不存在"
 
-# filter/libfilter-i18n.h:14
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "听起来不像"
 
-# filter/libfilter-i18n.h:15
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "不以之开始"
 
-# filter/libfilter-i18n.h:16
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "不存在"
 
-# filter/libfilter-i18n.h:17
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "草稿"
 
-# filter/libfilter-i18n.h:18
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "以之结束"
 
-# filter/libfilter-i18n.h:19
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:22
 msgid "Execute Shell Command"
 msgstr "执行 Shell 命令"
 
-# filter/libfilter-i18n.h:20
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "存在"
 
-# filter/libfilter-i18n.h:21
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "存在"
 
-# filter/libfilter-i18n.h:22
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "表达式"
 
-# filter/libfilter-i18n.h:23
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:26
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "重要"
 
-# filter/libfilter-i18n.h:24
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "是"
 
-# filter/libfilter-i18n.h:25
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:29
 msgid "is after"
 msgstr "以后"
 
-# filter/libfilter-i18n.h:26
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:30
 msgid "is before"
 msgstr "以前"
 
-# filter/libfilter-i18n.h:27
-#: filter/libfilter-i18n.h:27
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "is Flagged"
+msgstr "已标志"
+
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "大于"
 
-# filter/libfilter-i18n.h:28
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "小于"
 
-# filter/libfilter-i18n.h:29
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "不是"
 
-# filter/libfilter-i18n.h:30
-#: filter/libfilter-i18n.h:30
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+# mail/message-list.etspec.h:2
+#: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "is not Flagged"
+msgstr "已标志"
+
+# ui/evolution-mail-message.xml.h:98
+# ui/evolution-mail-message.xml.h:98
+# my-evolution/Locations.h:1192
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#, fuzzy
+msgid "Label"
+msgstr "劳雷尔"
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "邮件列表"
 
-# filter/libfilter-i18n.h:31
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "邮件体"
 
-# filter/libfilter-i18n.h:32
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "邮件头"
 
-# filter/libfilter-i18n.h:33
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "移动到文件夹"
 
-# calendar/gui/e-itip-control.c:986
-# calendar/gui/e-itip-control.c:986
-# filter/libfilter-i18n.h:34 mail/message-list.c:671
-# mail/message-list.etspec.h:4
-#: filter/libfilter-i18n.h:34 mail/message-list.c:671
-#: mail/message-list.etspec.h:4
-msgid "Needs Reply"
-msgstr "需要回复"
+# calendar/gui/dialogs/alarm-options.glade.h:3
+# calendar/gui/dialogs/alarm-options.glade.h:3
+# calendar/gui/dialogs/alarm-options.glade.h:3
+#: filter/libfilter-i18n.h:41
+#, fuzzy
+msgid "Play Sound"
+msgstr "播放声音："
 
-# filter/libfilter-i18n.h:35
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "已读"
 
-# filter/libfilter-i18n.h:36
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "收件人"
 
-# filter/libfilter-i18n.h:37
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "常规表达式匹配"
 
-# filter/libfilter-i18n.h:38
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "已回复"
 
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:6
-# filter/libfilter-i18n.h:39 filter/score-rule.c:204 filter/score-rule.c:206
 # mail/message-list.etspec.h:6
-#: filter/libfilter-i18n.h:39 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:6
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "分数"
 
-# filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1534
-#: filter/libfilter-i18n.h:40 mail/mail-callbacks.c:1548
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "发件人"
 
-# filter/libfilter-i18n.h:41
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "设置状态"
 
-# filter/libfilter-i18n.h:42
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "大小 (kB)"
 
-# filter/libfilter-i18n.h:43
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "听起来象"
 
-# filter/libfilter-i18n.h:44
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "来源帐号"
 
-# filter/libfilter-i18n.h:45
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "指定邮件头"
 
-# filter/libfilter-i18n.h:46
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "以之开始"
 
-# filter/libfilter-i18n.h:48
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "停止处理"
 
 # mail/message-list.etspec.h:9
 # mail/message-list.etspec.h:10
-# filter/libfilter-i18n.h:49 mail/mail-format.c:932
 # mail/message-list.etspec.h:10
-#: filter/libfilter-i18n.h:49 mail/mail-format.c:932
-#: mail/message-list.etspec.h:10
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "主题"
 
-# filter/rule-editor.c:179
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "规则"
 
-# filter/rule-editor.c:287
-#: filter/rule-editor.c:287
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "添加规则"
 
-# filter/rule-editor.c:360
-#: filter/rule-editor.c:360
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "编辑规则"
 
-# filter/score-editor.c:130
 #: filter/score-editor.c:130
 msgid "Score Rules"
 msgstr "计分规则"
 
-# filter/vfolder-rule.c:204
 #: filter/vfolder-rule.c:204
 msgid "You must name this vfolder."
 msgstr "您必须为该虚拟文件夹命名。"
 
-# filter/vfolder-rule.c:213
 #: filter/vfolder-rule.c:213
 msgid "You need to to specify at least one folder as a source."
 msgstr "您至少需要把一个文件夹指定为源。"
@@ -17182,7 +18216,7 @@ msgstr "Evolution 正在导入您原来的电子邮件"
 # importers/pine-importer.c:101
 # importers/elm-importer.c:96 importers/netscape-importer.c:107
 # importers/pine-importer.c:101
-#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "正在导入..."
@@ -17193,7 +18227,7 @@ msgstr "正在导入..."
 # importers/pine-importer.c:103
 # importers/elm-importer.c:98 importers/netscape-importer.c:109
 # importers/pine-importer.c:103
-#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "请等待"
@@ -17204,7 +18238,7 @@ msgstr "请等待"
 # importers/pine-importer.c:365
 # importers/elm-importer.c:169 importers/netscape-importer.c:689
 # importers/pine-importer.c:365
-#: importers/elm-importer.c:169 importers/netscape-importer.c:689
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
@@ -17216,7 +18250,7 @@ msgstr "正在按 %2$s 导入 %1$s"
 # importers/pine-importer.c:471
 # importers/elm-importer.c:375 importers/netscape-importer.c:782
 # importers/pine-importer.c:471
-#: importers/elm-importer.c:375 importers/netscape-importer.c:782
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
@@ -17228,8 +18262,9 @@ msgstr "正在扫描 %s"
 # importers/pine-importer.c:637 mail/component-factory.c:100
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
-#: importers/elm-importer.c:525 importers/netscape-importer.c:958
-#: importers/pine-importer.c:637 mail/component-factory.c:100
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "邮件"
 
@@ -17251,13 +18286,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-# importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "地址簿"
-
 # importers/evolution-gnomecard-importer.c:246
 # importers/evolution-gnomecard-importer.c:246
 # importers/evolution-gnomecard-importer.c:246
@@ -17269,38 +18297,100 @@ msgstr ""
 "Evolution 找到了 GnomeCard 文件。\n"
 "您是否希望把它们导入 Evolution？"
 
+# calendar/gui/print.c:2280
+# calendar/gui/print.c:2280
+# calendar/gui/print.c:2280
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "优先级：%s"
+
+#: importers/netscape-importer.c:653
+msgid ""
+"Some of your Netscape email filters are based on\n"
+"email priorities, which are not used in Evolution.\n"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
+
+#: importers/netscape-importer.c:677
+msgid ""
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
+msgstr ""
+
+#: importers/netscape-importer.c:694
+msgid ""
+"Some of your Netscape email filters test the\n"
+"body of emails for (in)equality to a given string,\n"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+msgstr ""
+
 # importers/netscape-importer.c:106
 # importers/netscape-importer.c:106
 # importers/netscape-importer.c:106
-#: importers/netscape-importer.c:106
+#: importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在导入您原来的 Netscape 数据"
 
+# mail/mail-ops.c:1058 shell/e-local-storage.c:178
+# mail/mail-ops.c:1060 shell/e-local-storage.c:178
+# mail/mail-ops.c:1103 shell/e-local-storage.c:178
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
+msgid "Trash"
+msgstr "已删除"
+
+# camel/providers/local/camel-local-store.c:196
+# camel/providers/local/camel-local-store.c:196
+# camel/providers/local/camel-local-store.c:196
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "本地邮件文件 %s"
+
 # importers/netscape-importer.c:888 importers/pine-importer.c:570
 # importers/netscape-importer.c:888 importers/pine-importer.c:570
 # importers/netscape-importer.c:888 importers/pine-importer.c:570
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "正在扫描目录"
 
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "开始导入"
 
 # importers/netscape-importer.c:963
 # importers/netscape-importer.c:963
 # importers/netscape-importer.c:963
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "设置"
 
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "编辑过滤规则"
+
 # importers/netscape-importer.c:984
 # importers/netscape-importer.c:984
 # importers/netscape-importer.c:984
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -17333,174 +18423,258 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "Evolution 撰写器车间。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "Evolution 任务控制车间"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "Evolution 撰写器车间。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "Evolution 撰写器车间。"
+
 # mail/GNOME_Evolution_Mail.oaf.in.h:1
 # mail/GNOME_Evolution_Mail.oaf.in.h:1
 # mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "Evolution 处理邮件组件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolution 邮件撰写器。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:3
 # mail/GNOME_Evolution_Mail.oaf.in.h:3
 # mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Evolution 邮件实施概要组件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:4
 # mail/GNOME_Evolution_Mail.oaf.in.h:4
 # mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Evolution 邮件文件夹显示组件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:5
 # mail/GNOME_Evolution_Mail.oaf.in.h:5
 # mail/GNOME_Evolution_Mail.oaf.in.h:5
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Evolution 邮件文件夹车间组件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:6
 # mail/GNOME_Evolution_Mail.oaf.in.h:6
 # mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "Evolution 撰写器车间。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:7
 # mail/GNOME_Evolution_Mail.oaf.in.h:7
 # mail/GNOME_Evolution_Mail.oaf.in.h:7
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "邮件概要组件车间。"
 
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "没有循环(_N)"
+
+# mail/mail-config.glade.h:8
+# mail/mail-config.glade.h:8
+# mail/mail-config.glade.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "帐号"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+msgid "Mail Preferences"
+msgstr ""
+
 # mail/GNOME_Evolution_Mail.oaf.in.h:8
 # mail/GNOME_Evolution_Mail.oaf.in.h:8
 # mail/GNOME_Evolution_Mail.oaf.in.h:8
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "邮件配置界面"
 
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+msgid "This Page can be used to configure the Fonts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+msgid "This page can be used to configure E-Mail Accounts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19
+msgid "This page can be used to configure Mailer preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
+msgid "This page can be used to configure the Composer"
+msgstr ""
+
 # mail/component-factory.c:100
 # mail/component-factory.c:100
 # mail/component-factory.c:100
-#: mail/component-factory.c:100
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "文件夹含有邮件"
 
-# mail/component-factory.c:101
-# mail/component-factory.c:101
-# mail/component-factory.c:101
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr "邮件存储文件夹 (内部)"
-
 # mail/component-factory.c:102
 # mail/component-factory.c:102
 # mail/component-factory.c:102
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "虚拟已删除邮件箱"
 
 # mail/component-factory.c:102
 # mail/component-factory.c:102
 # mail/component-factory.c:102
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "虚拟已删除邮件文件夹"
 
-# mail/component-factory.c:129
-# mail/component-factory.c:129
-# mail/component-factory.c:129
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "无法连接到存储： %s"
-
 # mail/component-factory.c:147
 # mail/component-factory.c:147
 # mail/component-factory.c:147
-#: mail/component-factory.c:147
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "该文件夹不能含有邮件。"
 
 # mail/component-factory.c:432
 # mail/component-factory.c:432
 # mail/component-factory.c:432
-#: mail/component-factory.c:439
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "属性..."
 
 # mail/component-factory.c:432
 # mail/component-factory.c:432
 # mail/component-factory.c:432
-#: mail/component-factory.c:439
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "改变该文件夹的属性"
 
 # mail/component-factory.c:783
 # mail/component-factory.c:783
 # mail/component-factory.c:786
-#: mail/component-factory.c:800
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr "您的某些邮件设置好像已崩溃，请按顺序检查所有内容。"
 
+# mail/mail-callbacks.c:230
+# mail/mail-callbacks.c:230
+# mail/mail-callbacks.c:187
+#: mail/component-factory.c:929
+msgid "You have not set a mail transport method"
+msgstr "您还没有设置邮件传输方法"
+
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+# composer/e-msg-composer.c:1412
+# composer/e-msg-composer.c:1329
+# composer/e-msg-composer.c:1295
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "警告： 已改动的邮件"
+
 # mail/component-factory.c:951
 # mail/component-factory.c:951
 # mail/component-factory.c:955
-#: mail/component-factory.c:969
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "新建邮件"
 
-# mail/component-factory.c:951
-# mail/component-factory.c:951
-# mail/component-factory.c:955
-#: mail/component-factory.c:969
-msgid "New _Mail Message"
-msgstr "新建邮件(_M)"
+# ui/evolution-mail-global.xml.h:20
+# ui/evolution-mail-global.xml.h:20
+# ui/evolution-mail-global.xml.h:20
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "邮件(_M)"
 
 # mail/component-factory.c:975
 # mail/component-factory.c:975
 # mail/component-factory.c:980
-#: mail/component-factory.c:994
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "无法初始化 Evolution 的邮件组件。"
 
 # mail/component-factory.c:984
 # mail/component-factory.c:984
 # mail/component-factory.c:989
-#: mail/component-factory.c:1003
+#: mail/component-factory.c:1034
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "无法初始化 Evolution 的邮件配置组件。"
 
 # mail/component-factory.c:990
 # mail/component-factory.c:990
 # mail/component-factory.c:995
-#: mail/component-factory.c:1009
+#: mail/component-factory.c:1040
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "无法初始化 Evolution 的文件夹信息组件。"
 
+# mail/mail-config.c:2184 mail/mail-config.c:2188
+# mail/mail-config.c:2233 mail/mail-config.c:2237
+# mail/mail-config.c:2326 mail/mail-config.c:2330
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#, fuzzy
+msgid "Connecting..."
+msgstr "正在连接服务器..."
+
 # mail/component-factory.c:1206
 # mail/component-factory.c:1206
 # mail/component-factory.c:1211
-#: mail/component-factory.c:1225
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "无法用 shell 注册存储"
 
 # mail/folder-browser-ui.c:272
 # mail/folder-browser-ui.c:272
 # mail/folder-browser-ui.c:273
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "“%s”的属性"
@@ -17508,14 +18682,14 @@ msgstr "“%s”的属性"
 # mail/folder-browser-ui.c:274
 # mail/folder-browser-ui.c:274
 # mail/folder-browser-ui.c:275
-#: mail/folder-browser-ui.c:275
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "属性"
 
 # mail/folder-browser.c:297 mail/mail-display.c:298
 # mail/folder-browser.c:297 mail/mail-display.c:297
 # mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/folder-browser.c:298 mail/mail-display.c:298
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "无法创建临时目录： %s"
@@ -17523,7 +18697,7 @@ msgstr "无法创建临时目录： %s"
 # mail/folder-browser.c:731
 # mail/folder-browser.c:751
 # mail/folder-browser.c:752
-#: mail/folder-browser.c:752
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d 新"
@@ -17534,21 +18708,21 @@ msgstr "%d 新"
 # mail/folder-browser.c:765
 # mail/folder-browser.c:755 mail/folder-browser.c:763
 # mail/folder-browser.c:766
-#: mail/folder-browser.c:755 mail/folder-browser.c:763
-#: mail/folder-browser.c:766
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr "， "
 
 # mail/folder-browser.c:735
 # mail/folder-browser.c:756
 # mail/folder-browser.c:757
-#: mail/folder-browser.c:757
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "隐藏 %d 个"
 
 # mail/folder-browser.c:759
-#: mail/folder-browser.c:759
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr "%d 个可见"
@@ -17556,7 +18730,7 @@ msgstr "%d 个可见"
 # mail/folder-browser.c:740
 # mail/folder-browser.c:763
 # mail/folder-browser.c:764
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "选择 %d 个"
@@ -17564,7 +18738,7 @@ msgstr "选择 %d 个"
 # mail/folder-browser.c:763
 # mail/folder-browser.c:768
 # mail/folder-browser.c:769
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d 个未发送"
@@ -17572,7 +18746,7 @@ msgstr "%d 个未发送"
 # mail/folder-browser.c:765
 # mail/folder-browser.c:770
 # mail/folder-browser.c:771
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d 个已发送"
@@ -17580,248 +18754,260 @@ msgstr "%d 个已发送"
 # mail/folder-browser.c:767
 # mail/folder-browser.c:772
 # mail/folder-browser.c:773
-#: mail/folder-browser.c:773
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "共 %d 个"
 
-# mail/folder-browser.c:1049
-# mail/folder-browser.c:1054
-# mail/folder-browser.c:1055
-#: mail/folder-browser.c:1055
-msgid "Create vFolder from Search"
-msgstr "根据搜索创建虚拟文件夹"
+# ui/evolution-mail-message.xml.h:8
+# ui/evolution-mail-message.xml.h:8
+# ui/evolution-mail-message.xml.h:8
+#: mail/folder-browser.c:1091
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "从邮件创建虚拟文件夹(_V)"
 
 # mail/folder-browser.c:1430
 # mail/folder-browser.c:1437
 # mail/folder-browser.c:1438
-#: mail/folder-browser.c:1438
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "关于主题的虚拟文件夹(_S)"
 
 # mail/folder-browser.c:1431
 # mail/folder-browser.c:1438
 # mail/folder-browser.c:1439
-#: mail/folder-browser.c:1439
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "关于发件人的虚拟文件夹(_N)"
 
 # mail/folder-browser.c:1432
 # mail/folder-browser.c:1439
 # mail/folder-browser.c:1440
-#: mail/folder-browser.c:1440
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "关于收件人的虚拟文件夹(_R)"
 
 # mail/folder-browser.c:1433
 # mail/folder-browser.c:1440
 # mail/folder-browser.c:1441
-#: mail/folder-browser.c:1441
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "关于邮件列表的虚拟文件夹(_L)"
 
 # mail/folder-browser.c:1437
 # mail/folder-browser.c:1444
 # mail/folder-browser.c:1445
-#: mail/folder-browser.c:1445
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "过滤标题(_J)"
 
 # mail/folder-browser.c:1438
 # mail/folder-browser.c:1445
 # mail/folder-browser.c:1446
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "过滤发件人(_D)"
 
 # mail/folder-browser.c:1439
 # mail/folder-browser.c:1446
 # mail/folder-browser.c:1447
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "过滤收件人(_C)"
 
 # mail/folder-browser.c:1440
 # mail/folder-browser.c:1447
 # mail/folder-browser.c:1448
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "过滤邮件列表(_M)"
 
 # mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:96
 # mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:96
 # mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:98
-#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "作为新邮件进行编辑(_E)..."
 
-# mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
-# mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:105
-# mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
-#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
-msgid "_Save As..."
-msgstr "另存为(_S)..."
-
 # mail/folder-browser.c:1450
 # mail/folder-browser.c:1457
 # mail/folder-browser.c:1458
-#: mail/folder-browser.c:1458
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "打印(_P)"
 
 # mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:104
 # mail/folder-browser.c:1461 ui/evolution-mail-message.xml.h:104
 # mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:106
-#: mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:106
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
 # mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:73
 # mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:73
 # mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:75
-#: mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
 # mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:72
 # mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:72
 # mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:74
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
 # mail/folder-browser.c:1457
 # mail/folder-browser.c:1464
 # mail/folder-browser.c:1465
-#: mail/folder-browser.c:1465
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "转发(_F)"
 
+#: mail/folder-browser.c:1690
+msgid "Follo_w Up..."
+msgstr ""
+
+# calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+# calendar/gui/dialogs/task-details-page.glade.h:4
+# calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:329
+# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+# calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+# calendar/gui/dialogs/task-details-page.glade.h:4
+# calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:329
+# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+# calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+# calendar/gui/dialogs/task-details-page.glade.h:4
+# calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
+# calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
+#: mail/folder-browser.c:1691
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "已完成"
+
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# widgets/misc/e-filter-bar.h:95
+# widgets/misc/e-filter-bar.h:95
+#: mail/folder-browser.c:1692
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "清除"
+
 # mail/folder-browser.c:1459 ui/evolution-mail-message.xml.h:43
 # mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:43
 # mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
-#: mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
+#. separator here?
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
 # mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
 # mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:45
 # mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
-#: mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1697
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "标记为未读(_N)"
 
 # mail/folder-browser.c:1461
 # mail/folder-browser.c:1468
 # mail/folder-browser.c:1469
-#: mail/folder-browser.c:1469
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
-# mail/folder-browser.c:1462
-# mail/folder-browser.c:1469
-# mail/folder-browser.c:1470
-#: mail/folder-browser.c:1470
-msgid "Mark as Unim_portant"
-msgstr "标记为不重要(_P)"
-
-# calendar/gui/e-itip-control.c:896
-# calendar/gui/e-itip-control.c:896
-# mail/folder-browser.c:1471
-#: mail/folder-browser.c:1471
-msgid "Mark as Needing Reply"
-msgstr "标记为需要回复"
+# ui/evolution-mail-message.xml.h:46
+# ui/evolution-mail-message.xml.h:46
+# ui/evolution-mail-message.xml.h:46
+#: mail/folder-browser.c:1699
+#, fuzzy
+msgid "_Mark as Unimportant"
+msgstr "标记为不重要(_O)"
 
-# calendar/gui/e-itip-control.c:896
-# calendar/gui/e-itip-control.c:896
-# mail/folder-browser.c:1472
-#: mail/folder-browser.c:1472
-msgid "Mark as Not Needing Reply"
-msgstr "标记为不需要回复"
+# mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
+# mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
+# mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1704
+#, fuzzy
+msgid "U_ndelete"
+msgstr "反删除(_U)"
 
 # mail/folder-browser.c:1466
 # mail/folder-browser.c:1475
 # mail/folder-browser.c:1476
-#: mail/folder-browser.c:1476
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1708
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "移动到文件夹(_M)..."
 
 # mail/folder-browser.c:1467
 # mail/folder-browser.c:1476
 # mail/folder-browser.c:1477
-#: mail/folder-browser.c:1477
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹..."
 
-# mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
-# mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
-# mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
-#: mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
-msgid "_Undelete"
-msgstr "反删除(_U)"
-
 # mail/folder-browser.c:1473 ui/evolution-mail-message.xml.h:1
 # mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:1
 # mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1717
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "将发件人添加到地址簿"
 
 # mail/folder-browser.c:1476
 # mail/folder-browser.c:1485
 # mail/folder-browser.c:1486
-#: mail/folder-browser.c:1486
-msgid "Apply Filters"
+#: mail/folder-browser.c:1721
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "应用过滤规则"
 
 # mail/folder-browser.c:1478
 # mail/folder-browser.c:1487
 # mail/folder-browser.c:1488
-#: mail/folder-browser.c:1488
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1725
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "从消息创建规则(_L)"
 
-# mail/folder-browser.c:1628
-# mail/folder-browser.c:1656
-# mail/folder-browser.c:1657
-#: mail/folder-browser.c:1657
-msgid "Filter on Mailing List"
-msgstr "过滤邮件列表"
-
 # mail/folder-browser.c:1629
 # mail/folder-browser.c:1657
 # mail/folder-browser.c:1658
-#: mail/folder-browser.c:1658
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1990
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "关于邮件列表的虚拟文件夹"
 
 # mail/folder-browser.c:1631
 # mail/folder-browser.c:1659
 # mail/folder-browser.c:1660
-#: mail/folder-browser.c:1660
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1992
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "过滤邮件列表 (%s)"
 
 # mail/folder-browser.c:1632
 # mail/folder-browser.c:1660
 # mail/folder-browser.c:1661
-#: mail/folder-browser.c:1661
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1993
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "关于邮件列表 (%s) 的虚拟文件夹"
 
 # mail/mail-config.glade.h:23
 # mail/folder-browser.h:26
 # mail/folder-browser.h:26
-#: mail/folder-browser.h:26
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
 msgid "Default"
 msgstr "默认"
 
 # mail/folder-info.c:64
 # mail/folder-info.c:64
 # mail/folder-info.c:64
-#: mail/folder-info.c:64
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "获取文件夹信息"
 
@@ -17853,45 +19039,32 @@ msgstr "将 Outlook Express 4 的邮件导入 Evolution 的车间"
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "将 Outlook Express 4 文件导入到 Evolution"
 
-# mail/local-config.glade.h:1
-# mail/local-config.glade.h:1
-# mail/local-config.glade.h:1
-#: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr "邮件体内容"
-
 # mail/local-config.glade.h:2
 # mail/local-config.glade.h:2
 # mail/local-config.glade.h:2
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "当前存储格式："
 
-# mail/local-config.glade.h:3
-# mail/local-config.glade.h:3
-# mail/local-config.glade.h:3
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr "正在建立索引："
-
-# mail/local-config.glade.h:4
-# mail/local-config.glade.h:4
-# mail/local-config.glade.h:4
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "邮件箱格式"
+# mail/local-config.glade.h:1
+# mail/local-config.glade.h:1
+# mail/local-config.glade.h:1
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "邮件体内容"
 
 # mail/local-config.glade.h:5
 # mail/local-config.glade.h:5
 # mail/local-config.glade.h:5
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "新存储格式："
 
 # mail/local-config.glade.h:6
 # mail/local-config.glade.h:6
 # mail/local-config.glade.h:6
-#: mail/local-config.glade.h:6
+#: 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"
@@ -17904,28 +19077,28 @@ msgstr ""
 # mail/local-config.glade.h:9
 # mail/local-config.glade.h:9
 # mail/local-config.glade.h:9
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "邮件目录"
 
 # mail/local-config.glade.h:10
 # mail/local-config.glade.h:10
 # mail/local-config.glade.h:10
-#: mail/local-config.glade.h:10
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "邮件箱"
 
 # mail/local-config.glade.h:11
 # mail/local-config.glade.h:11
 # mail/local-config.glade.h:11
-#: mail/local-config.glade.h:11
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
 # mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 # mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 # mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "您还没有填写所有必须的信息。"
 
@@ -17941,105 +19114,114 @@ msgstr "Evolution 新闻编辑器"
 # mail/mail-account-editor.c:160
 # mail/mail-account-editor.c:160
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution 帐号编辑器"
 
-# mail/mail-account-gui.c:962
-# mail/mail-account-gui.c:962
-# mail/mail-account-gui.c:959
-#: mail/mail-account-gui.c:959
-msgid "Could not save signature file."
-msgstr "无法保存签名文件。"
+# mail/mail-config.glade.h:104
+# mail/mail-config.glade.h:104
+# mail/mail-config.glade.h:113
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+msgid "_Host:"
+msgstr "主机(_H)："
 
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1039
-# mail/mail-account-gui.c:1036
-#: mail/mail-account-gui.c:1036
-msgid "Save signature"
-msgstr "保存签名"
+# mail/mail-config.glade.h:117
+# mail/mail-config.glade.h:117
+# mail/mail-config.glade.h:126
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#, fuzzy
+msgid "User_name:"
+msgstr "用户名(_U)："
 
-# mail/mail-account-gui.c:1045
-# mail/mail-account-gui.c:1045
-# mail/mail-account-gui.c:1042
-#: mail/mail-account-gui.c:1042
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"该签名已经被改变，但还没有存储。\n"
-"\n"
-"您希望保存改动吗？"
+# mail/mail-config.glade.h:112
+# mail/mail-config.glade.h:112
+# mail/mail-config.glade.h:121
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+msgid "_Path:"
+msgstr "路径(_P)："
 
 # mail/mail-account-gui.c:1654
 # mail/mail-account-gui.c:1654
 # mail/mail-account-gui.c:1665
-#: mail/mail-account-gui.c:1665
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "您不能以相同的名字创建两个帐号。"
 
-# mail/mail-accounts.c:149
-# mail/mail-accounts.c:149
-# mail/mail-accounts.c:149
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr "(默认)"
-
-# mail/mail-accounts.c:194
-# mail/mail-accounts.c:194
-# mail/mail-accounts.c:194
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "禁用"
-
-# mail/mail-accounts.c:196
-# mail/mail-accounts.c:196
-# mail/mail-accounts.c:196
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "启用"
-
 # mail/mail-accounts.c:293
 # mail/mail-accounts.c:293
 # mail/mail-accounts.c:293
-#: mail/mail-accounts.c:292
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "您确信您要删除该帐号？"
 
 # mail/mail-accounts.c:297
 # mail/mail-accounts.c:297
 # mail/mail-accounts.c:297
-#: mail/mail-accounts.c:296
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "不要删除"
 
 # mail/mail-accounts.c:300
 # mail/mail-accounts.c:300
 # mail/mail-accounts.c:300
-#: mail/mail-accounts.c:299
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "确实删除帐号？"
 
+# mail/mail-accounts.c:194
+# mail/mail-accounts.c:194
+# mail/mail-accounts.c:194
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
+msgid "Disable"
+msgstr "禁用"
+
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
+msgid "Enable"
+msgstr "启用"
+
 # mail/mail-accounts.c:532 mail/mail-accounts.c:536
 # mail/mail-accounts.c:532 mail/mail-accounts.c:536
 # mail/mail-accounts.c:532 mail/mail-accounts.c:536
-#: mail/mail-accounts.c:531 mail/mail-accounts.c:535
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "您确信您要删除该邮件帐号？"
 
-# mail/mail-accounts.c:783 mail/mail-config.glade.h:42
-# mail/mail-accounts.c:798 mail/mail-config.glade.h:42
-# mail/mail-accounts.c:824 mail/mail-config.glade.h:49
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:50
-msgid "Mail Settings"
-msgstr "邮件设置"
+# mail/mail-config.glade.h:33
+# mail/mail-config.glade.h:33
+# mail/mail-config.glade.h:39
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
+msgid "Enabled"
+msgstr "已启用"
+
+# addressbook/gui/component/addressbook-config.glade.h:23
+# addressbook/gui/component/addressbook-config.glade.h:23
+# addressbook/gui/component/addressbook-config.glade.h:30
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "帐号名(_A)："
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:171
+# addressbook/gui/contact-editor/fulladdr.glade.h:171
+# addressbook/gui/contact-editor/e-contact-editor-address.c:298
+# my-evolution/Locations.h:1824
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "波多黎各"
 
 # mail/mail-autofilter.c:72
 # mail/mail-autofilter.c:72
 # mail/mail-autofilter.c:72
-#: mail/mail-autofilter.c:72
+#: mail/mail-autofilter.c:78
 #, c-format
 msgid "Mail to %s"
 msgstr "邮寄给 %s"
@@ -18047,7 +19229,7 @@ msgstr "邮寄给 %s"
 # mail/mail-autofilter.c:215
 # mail/mail-autofilter.c:217
 # mail/mail-autofilter.c:217
-#: mail/mail-autofilter.c:217
+#: mail/mail-autofilter.c:223
 #, c-format
 msgid "Subject is %s"
 msgstr "主题是 %s"
@@ -18055,7 +19237,7 @@ msgstr "主题是 %s"
 # mail/mail-autofilter.c:231
 # mail/mail-autofilter.c:233
 # mail/mail-autofilter.c:233
-#: mail/mail-autofilter.c:233
+#: mail/mail-autofilter.c:239
 #, c-format
 msgid "Mail from %s"
 msgstr "邮件来自 %s"
@@ -18063,7 +19245,7 @@ msgstr "邮件来自 %s"
 # mail/mail-autofilter.c:287
 # mail/mail-autofilter.c:289
 # mail/mail-autofilter.c:289
-#: mail/mail-autofilter.c:289
+#: mail/mail-autofilter.c:295
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 邮件列表"
@@ -18071,14 +19253,26 @@ msgstr "%s 邮件列表"
 # mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
 # mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 # mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "添加过滤规则"
 
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
 # mail/mail-callbacks.c:137
 # mail/mail-callbacks.c:137
 # mail/mail-callbacks.c:94
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -18093,7 +19287,7 @@ msgstr ""
 # mail/mail-callbacks.c:186
 # mail/mail-callbacks.c:186
 # mail/mail-callbacks.c:143
-#: mail/mail-callbacks.c:143
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -18104,7 +19298,7 @@ msgstr ""
 # mail/mail-callbacks.c:200
 # mail/mail-callbacks.c:200
 # mail/mail-callbacks.c:157
-#: mail/mail-callbacks.c:157
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -18112,18 +19306,11 @@ msgstr ""
 "在您可以撰写邮件之前，\n"
 "您需要配置一个邮件传输。"
 
-# mail/mail-callbacks.c:230
-# mail/mail-callbacks.c:230
-# mail/mail-callbacks.c:187
-#: mail/mail-callbacks.c:187
-msgid "You have not set a mail transport method"
-msgstr "您还没有设置邮件传输方法"
-
 # mail/mail-callbacks.c:265
 # mail/mail-callbacks.c:265
 # mail/mail-callbacks.c:222
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -18132,14 +19319,14 @@ msgstr "您正在发送 HTML 格式的消息，当以下收件人不希望接收
 # mail/mail-callbacks.c:280
 # mail/mail-callbacks.c:280
 # mail/mail-callbacks.c:237
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:211
 msgid "Send anyway?"
 msgstr "仍然发送？"
 
 # mail/mail-callbacks.c:322
 # mail/mail-callbacks.c:322
 # mail/mail-callbacks.c:279
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -18150,7 +19337,7 @@ msgstr ""
 # mail/mail-callbacks.c:366
 # mail/mail-callbacks.c:366
 # mail/mail-callbacks.c:323
-#: mail/mail-callbacks.c:323
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -18161,14 +19348,14 @@ msgstr ""
 # mail/mail-callbacks.c:370
 # mail/mail-callbacks.c:370
 # mail/mail-callbacks.c:327
-#: mail/mail-callbacks.c:327
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "该邮件只含有密件抄送收件人。"
 
 # mail/mail-callbacks.c:374
 # mail/mail-callbacks.c:374
 # mail/mail-callbacks.c:331
-#: mail/mail-callbacks.c:331
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -18180,14 +19367,14 @@ msgstr ""
 # mail/mail-callbacks.c:504
 # mail/mail-callbacks.c:504
 # mail/mail-callbacks.c:460
-#: mail/mail-callbacks.c:436
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "您必须指定收件人以便发送该消息。"
 
 # mail/mail-callbacks.c:600
 # mail/mail-callbacks.c:600
 # mail/mail-callbacks.c:549
-#: mail/mail-callbacks.c:525
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "在您能够发送该邮件之前您必须配置一个帐号。"
 
@@ -18205,35 +19392,35 @@ msgstr ""
 # mail/mail-callbacks.c:838
 # mail/mail-callbacks.c:928
 # mail/mail-callbacks.c:878
-#: mail/mail-callbacks.c:884
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "未知的发件人"
 
 # mail/mail-callbacks.c:843
 # mail/mail-callbacks.c:933
 # mail/mail-callbacks.c:883
-#: mail/mail-callbacks.c:888
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "在 %Y-%m-%d %a 的 %H:%M， %%s 写道："
 
 # mail/mail-callbacks.c:1281 mail/message-browser.c:130
 # mail/mail-callbacks.c:1376 mail/message-browser.c:130
 # mail/mail-callbacks.c:1411 mail/message-browser.c:130
-#: mail/mail-callbacks.c:1425 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "将消息移动到"
 
 # mail/mail-callbacks.c:1283 mail/message-browser.c:132
 # mail/mail-callbacks.c:1378 mail/message-browser.c:132
 # mail/mail-callbacks.c:1413 mail/message-browser.c:132
-#: mail/mail-callbacks.c:1427 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "将消息复制到"
 
 # mail/mail-callbacks.c:1759
 # mail/mail-callbacks.c:1878
 # mail/mail-callbacks.c:1914
-#: mail/mail-callbacks.c:1928
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "您确信您需要编辑所有的 %d 个消息？"
@@ -18241,7 +19428,7 @@ msgstr "您确信您需要编辑所有的 %d 个消息？"
 # mail/mail-callbacks.c:1784
 # mail/mail-callbacks.c:1903
 # mail/mail-callbacks.c:1939
-#: mail/mail-callbacks.c:1953
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -18252,7 +19439,7 @@ msgstr ""
 # mail/mail-callbacks.c:1823
 # mail/mail-callbacks.c:1942
 # mail/mail-callbacks.c:1978
-#: mail/mail-callbacks.c:1992
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -18263,7 +19450,7 @@ msgstr ""
 # mail/mail-callbacks.c:1837
 # mail/mail-callbacks.c:1956
 # mail/mail-callbacks.c:1992
-#: mail/mail-callbacks.c:2006
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "您确信您希望重新发送所有的 %d 个消息？"
@@ -18271,28 +19458,52 @@ msgstr "您确信您希望重新发送所有的 %d 个消息？"
 # mail/mail-callbacks.c:1863
 # mail/mail-callbacks.c:1982
 # mail/mail-callbacks.c:2018
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "没有选择消息"
 
+# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:1908
+# mail/mail-display.c:102
+# calendar/gui/dialogs/comp-editor.c:1061 mail/mail-callbacks.c:2027
+# mail/mail-display.c:102
+# calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
+# mail/mail-display.c:101
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "覆盖文件？"
+
 # mail/mail-callbacks.c:1962
 # mail/mail-callbacks.c:2081
 # mail/mail-callbacks.c:2117
-#: mail/mail-callbacks.c:2131
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "消息另存为..."
 
 # mail/mail-callbacks.c:1964
 # mail/mail-callbacks.c:2083
 # mail/mail-callbacks.c:2119
-#: mail/mail-callbacks.c:2133
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "消息另存为..."
 
+# ui/evolution-mail-message.xml.h:21
+# ui/evolution-mail-message.xml.h:21
+# ui/evolution-mail-message.xml.h:21
+#: mail/mail-callbacks.c:2415
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "显示下一个未读文件"
+
+#: mail/mail-callbacks.c:2422
+msgid ""
+"There are no more new messages in this folder.\n"
+"Would you like to go to the next folder?"
+msgstr ""
+
 # mail/mail-callbacks.c:2135
 # mail/mail-callbacks.c:2254
 # mail/mail-callbacks.c:2290
-#: mail/mail-callbacks.c:2304
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -18307,7 +19518,7 @@ msgstr ""
 # mail/mail-callbacks.c:2250
 # mail/mail-callbacks.c:2369
 # mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:2419
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -18319,14 +19530,14 @@ msgstr ""
 # mail/mail-callbacks.c:2262
 # mail/mail-callbacks.c:2381
 # mail/mail-callbacks.c:2417
-#: mail/mail-callbacks.c:2431
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "过滤规则"
 
 # camel/camel-filter-driver.c:789
 # camel/camel-filter-driver.c:838
 # mail/mail-callbacks.c:2490
-#: mail/mail-callbacks.c:2504
+#: mail/mail-callbacks.c:2833
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d 页，共 %d 页"
@@ -18334,31 +19545,79 @@ msgstr "第 %d 页，共 %d 页"
 # mail/mail-callbacks.c:2325
 # mail/mail-callbacks.c:2465
 # mail/mail-callbacks.c:2542
-#: mail/mail-callbacks.c:2556
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "打印消息"
 
 # mail/mail-callbacks.c:2492
 # mail/mail-callbacks.c:2569
-#: mail/mail-callbacks.c:2583
+#: mail/mail-callbacks.c:2913
 msgid "US-Letter"
 msgstr "美国信纸"
 
 # mail/mail-callbacks.c:2371
 # mail/mail-callbacks.c:2531
 # mail/mail-callbacks.c:2604
-#: mail/mail-callbacks.c:2618
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "打印消息失败"
 
 # mail/mail-callbacks.c:2473
 # mail/mail-callbacks.c:2697
 # mail/mail-callbacks.c:2770
-#: mail/mail-callbacks.c:2784
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "您确信您希望在单独的窗口中打开所有的 %d 个消息？"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+# mail/mail-config.glade.h:119
+# mail/mail-config.glade.h:119
+# my-evolution/e-summary-calendar.c:395
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "无描述"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+# addressbook/gui/component/select-names/e-select-names-popup.c:506
+# addressbook/gui/component/select-names/e-select-names-popup.c:506
+# addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "未命名的联系人"
+
+# ui/evolution-message-composer.xml.h:27
+# ui/evolution-message-composer.xml.h:27
+# ui/evolution-message-composer.xml.h:27
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "发送"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "添加条件"
+
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1036
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "保存签名"
+
 # mail/mail-config-druid.c:146
 # mail/mail-config-druid.c:146
 # mail/mail-config-druid.c:146
@@ -18424,71 +19683,78 @@ msgstr ""
 # mail/mail-config-druid.c:599
 # mail/mail-config-druid.c:599
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帐号助手"
 
+# my-evolution/Locations.h:508
+#. red
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
+#, fuzzy
+msgid "Work"
+msgstr "科克"
+
+# my-evolution/Locations.h:1795
+#. orange
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Personal"
+msgstr "波纳尔"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:209
+# addressbook/gui/contact-editor/fulladdr.glade.h:209
+# addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#. forest green
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
+#, fuzzy
+msgid "To Do"
+msgstr "多哥"
+
+# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
+# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
+# calendar/gui/dialogs/alarm-page.glade.h:11
+#. blue
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "之后"
+
 # mail/mail-config.c:326
 # mail/mail-config.c:329
 # mail/mail-config.c:354
-#: mail/mail-config.c:354
+#: mail/mail-config.c:625
 #, c-format
 msgid "Account %d"
 msgstr "帐号 %d"
 
-# mail/mail-config.c:1860
-# mail/mail-config.c:1902
-# mail/mail-config.c:1995
-#: mail/mail-config.c:1995
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-"无法为新邮件存储创建收件箱：\n"
-"%s\n"
-"没有创建快捷方式。"
-
-# mail/mail-config.c:1871
-# mail/mail-config.c:1913
-# mail/mail-config.c:2006
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2006
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s：收件箱"
-
 # mail/mail-config.c:2113
 # mail/mail-config.c:2155
 # mail/mail-config.c:2248
-#: mail/mail-config.c:2248
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "正在检查服务"
 
 # mail/mail-config.c:2184 mail/mail-config.c:2188
 # mail/mail-config.c:2233 mail/mail-config.c:2237
 # mail/mail-config.c:2326 mail/mail-config.c:2330
-#: mail/mail-config.c:2326 mail/mail-config.c:2330
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "正在连接服务器..."
 
+# my-evolution/metar.c:29
+# my-evolution/metar.c:29
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " "
+msgstr " 摄氏度"
+
 # mail/mail-config.glade.h:1
 # mail/mail-config.glade.h:1
 # mail/mail-config.glade.h:1
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "检查支持的类型(_C) "
 
-# mail/mail-config.glade.h:2
-# mail/mail-config.glade.h:2
-# mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " 颜色"
-
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
@@ -18510,114 +19776,167 @@ msgstr "(在该版本的 evolution 中不支持SSL)"
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "当发送加密邮件时总是对自身加密(_L)"
 
-# mail/mail-config.glade.h:5
-# mail/mail-config.glade.h:5
-# mail/mail-config.glade.h:5
 #: mail/mail-config.glade.h:6
-msgid "Account"
-msgstr "帐号"
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
+# mail/mail-config.c:326
+# mail/mail-config.c:329
+# mail/mail-config.c:354
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Account Editor"
+msgstr "帐号 %d"
 
 # mail/mail-config.glade.h:6
 # mail/mail-config.glade.h:6
 # mail/mail-config.glade.h:6
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "帐号信息"
 
 # mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 # mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 # mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "帐号管理"
 
-# mail/mail-config.glade.h:8
-# mail/mail-config.glade.h:8
-# mail/mail-config.glade.h:8
-#: mail/mail-config.glade.h:9
-msgid "Accounts"
-msgstr "帐号"
-
 #: mail/mail-config.glade.h:10
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr ""
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "添加条件"
 
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1036
 #: mail/mail-config.glade.h:11
-msgid "Always _carbon-copy (Cc) to:"
-msgstr ""
+#, fuzzy
+msgid "Add new signature..."
+msgstr "保存签名"
 
-# mail/mail-config.glade.h:9
-# mail/mail-config.glade.h:9
-# mail/mail-config.glade.h:9
+# mail/mail-config.glade.h:4
+# mail/mail-config.glade.h:4
+# mail/mail-config.glade.h:4
 #: mail/mail-config.glade.h:12
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr "当发送加密邮件时总是加密到自身(_E)"
+#, fuzzy
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "当发送加密邮件时总是对自身加密(_L)"
 
 # mail/mail-config.glade.h:10
 # mail/mail-config.glade.h:10
 # mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:13
-msgid "Always _sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:14
+#, fuzzy
+msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "当使用该帐号的时候总是签名发送的邮件(_S)"
 
+#: mail/mail-config.glade.h:16
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:17
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+# composer/e-msg-composer-attachment-bar.c:532
+# composer/e-msg-composer-attachment-bar.c:538
+# composer/e-msg-composer-attachment-bar.c:538
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Attach original message"
+msgstr "把文件附件到邮件"
+
 # mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 # mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 # mail/mail-config.glade.h:13 mail/message-list.etspec.h:1
-#: mail/mail-config.glade.h:14 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
 # mail/mail-config.glade.h:12
 # mail/mail-config.glade.h:12
 # mail/mail-config.glade.h:14
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "身份验证"
 
-# mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:16
-msgid "Beep when new mail arrives"
-msgstr "新邮件到达时鸣笛"
+# mail/mail-config.glade.h:94
+# mail/mail-config.glade.h:94
+# mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:22
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "自动检查新邮件(_A)"
+
+#: mail/mail-config.glade.h:23
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+# widgets/misc/e-charset-picker.c:159
+# widgets/misc/e-charset-picker.c:159
+# widgets/misc/e-charset-picker.c:162
+#: mail/mail-config.glade.h:25
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "未知的字符集：%s"
+
+# calendar/gui/alarm-notify/alarm-notify.glade.h:1
+# ui/evolution-comp-editor.xml.h:1
+# calendar/gui/alarm-notify/alarm-notify.glade.h:1
+# ui/evolution-comp-editor.xml.h:1
+# calendar/gui/alarm-notify/alarm-notify.glade.h:1
+# ui/evolution-comp-editor.xml.h:1
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_olors"
+msgstr "关闭(_L)"
+
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
 
 # mail/mail-config.glade.h:13
 # mail/mail-config.glade.h:13
 # mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "正在检查新邮件"
 
-# mail/mail-config.glade.h:14
-# mail/mail-config.glade.h:14
-# mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:18
-msgid "Composer"
-msgstr "撰写器"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "今天到期任务的颜色"
 
 # composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
 # composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
 # mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:30
 msgid "Composing Messages"
 msgstr "正在撰写邮件"
 
 # mail/mail-config.glade.h:15
 # mail/mail-config.glade.h:15
 # mail/mail-config.glade.h:19
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:31
 msgid "Configuration"
 msgstr "配置"
 
-# mail/mail-config.glade.h:16
-# mail/mail-config.glade.h:16
-# mail/mail-config.glade.h:20
-#: mail/mail-config.glade.h:21
-msgid "Confirm when Expunging a folder"
-msgstr "当删除文件夹时进行提示"
-
 # mail/mail-config.glade.h:17
 # mail/mail-config.glade.h:17
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -18636,428 +19955,551 @@ msgstr ""
 # mail/mail-config.glade.h:23
 # mail/mail-config.glade.h:23
 # mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "默认(_F)"
 
-# mail/mail-config.glade.h:24
-# mail/mail-config.glade.h:24
-# mail/mail-config.glade.h:28
-#: mail/mail-config.glade.h:29
-msgid "Default Forward style is: "
-msgstr "默认转发风格为： "
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/folder-browser.h:26
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default Behavior"
+msgstr "默认"
 
 # mail/mail-config.glade.h:25
 # mail/mail-config.glade.h:25
 # mail/mail-config.glade.h:29
-#: mail/mail-config.glade.h:30
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "默认字符编码： "
 
-# mail/mail-config.glade.h:23
-# mail/folder-browser.h:26
-# mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:31
-msgid "Defaults"
-msgstr "默认"
+# mail/mail-ops.c:249
+# mail/mail-ops.c:250
+# mail/mail-ops.c:258
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "正在收取邮件"
 
 # mail/mail-config.glade.h:27
 # mail/mail-config.glade.h:27
 # mail/mail-config.glade.h:32
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "数字标识..."
 
-# mail/mail-config.glade.h:28
-# mail/mail-config.glade.h:28
-# mail/mail-config.glade.h:33
-#: mail/mail-config.glade.h:34
-msgid "Display"
-msgstr "显示"
-
-# mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:35
-msgid "Do not notify me when new mail arrives"
-msgstr "新邮件到达时不要提醒我"
+# camel/camel-filter-driver.c:692
+# camel/camel-filter-driver.c:741
+# camel/camel-filter-driver.c:893
+#: mail/mail-config.glade.h:45
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "无法打开消息"
 
 # mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 # mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 # mail/mail-config.glade.h:35 shell/glade/evolution-startup-wizard.glade.h:2
-#: mail/mail-config.glade.h:36 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "完成"
 
-# mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-# mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-# mail/mail-config.glade.h:36 shell/e-local-storage.c:173
-#: mail/mail-config.glade.h:37 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "草稿"
+# mail/mail-config.glade.h:97
+# mail/mail-config.glade.h:97
+# mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "草稿文件夹(_D)："
 
 # mail/mail-config.glade.h:31
 # mail/mail-config.glade.h:31
 # mail/mail-config.glade.h:37
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "启用(_N)"
 
-# mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:103
-# mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-# widgets/misc/e-filter-bar.h:103
-# mail/mail-config.glade.h:38 widgets/misc/e-filter-bar.h:96
-# widgets/misc/e-filter-bar.h:103
-#: mail/mail-config.glade.h:39 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "编辑..."
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "东"
 
-# mail/mail-config.glade.h:33
-# mail/mail-config.glade.h:33
-# mail/mail-config.glade.h:39
-#: mail/mail-config.glade.h:40
-msgid "Enabled"
-msgstr "已启用"
+# addressbook/gui/component/addressbook.c:805
+# addressbook/gui/component/addressbook.c:805
+# addressbook/gui/component/addressbook.c:838
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "电子邮件含有"
+
+# mail/mail-config.glade.h:99
+# mail/mail-config.glade.h:99
+# addressbook/gui/component/addressbook-config.glade.h:35
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "电子邮件地址(_E)："
+
+# mail/mail-config.glade.h:100
+# mail/mail-config.glade.h:100
+# mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "退出时清空已删除邮件(_E)"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:54
 msgid "Execute Command..."
 msgstr "执行命令..."
 
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "以之结束"
+
+# mail/folder-browser-ui.c:274
+# mail/folder-browser-ui.c:274
+# mail/folder-browser-ui.c:275
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Font Properties"
+msgstr "属性"
+
+# mail/mail-ops.c:1191
+# mail/mail-ops.c:1193
+# mail/mail-ops.c:1236
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "已转发邮件"
+
 # mail/mail-config.glade.h:34
 # mail/mail-config.glade.h:34
 # mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "获取数字标识..."
 
-# mail/mail-config.glade.h:35
-# mail/mail-config.glade.h:35
-# mail/mail-config.glade.h:42
-#: mail/mail-config.glade.h:43
-msgid "HTML signature file:"
-msgstr "HTML 签名文件："
+# mail/mail-config.glade.h:103
+# mail/mail-config.glade.h:103
+# mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "突出显示引文，使用(_H)"
 
 # mail/mail-config.glade.h:36
 # mail/mail-config.glade.h:36
 # mail/mail-config.glade.h:43
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
 # mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 # mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 # mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "标识"
 
-# mail/mail-config.glade.h:38
-# mail/mail-config.glade.h:38
-# mail/mail-config.glade.h:45
-#: mail/mail-config.glade.h:46
-msgid "In HTML mail"
-msgstr "在 HTML 邮件中"
-
 # mail/mail-config.glade.h:39
 # mail/mail-config.glade.h:39
 # mail/mail-config.glade.h:46
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "嵌入"
 
 # mail/mail-config.glade.h:40
 # mail/mail-config.glade.h:40
 # mail/mail-config.glade.h:47
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos"
 
+# ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+# ui/evolution-contact-list-editor.xml.h:6
+# ui/evolution-signature-editor.xml.h:4
+# ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+# ui/evolution-contact-list-editor.xml.h:6
+# ui/evolution-signature-editor.xml.h:4
+# ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+# ui/evolution-contact-list-editor.xml.h:6
+# ui/evolution-signature-editor.xml.h:4
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "保存并关闭"
+
+# ui/evolution-mail-message.xml.h:42
+# ui/evolution-mail-message.xml.h:42
+# ui/evolution-mail-message.xml.h:42
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "装入图像(_I)"
+
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:48
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "邮件配置"
 
 # mail/mail-config.glade.h:43
 # mail/mail-config.glade.h:43
 # mail/mail-config.glade.h:50
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "邮件箱位置"
 
-# mail/mail-config.glade.h:44
-# mail/mail-config.glade.h:44
-# mail/mail-config.glade.h:51
-#: mail/mail-config.glade.h:52
-msgid "Make this my _default account"
-msgstr "设置为我的默认帐号(_D)"
+# views/mail/galview.xml.h:4
+# views/mail/galview.xml.h:4
+# views/mail/galview.xml.h:4
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "邮件"
+
+# ui/evolution-mail-message.xml.h:99
+# ui/evolution-mail-message.xml.h:99
+# ui/evolution-mail-message.xml.h:101
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "邮件显示(_M)"
+
+# addressbook/gui/contact-editor/fulladdr.glade.h:138
+# addressbook/gui/contact-editor/fulladdr.glade.h:138
+# addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "密克罗尼西亚"
 
 # mail/mail-config.glade.h:45
 # mail/mail-config.glade.h:45
 # mail/mail-config.glade.h:52
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP 服务器："
 
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:53
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:78
 msgid "New Mail Notification"
 msgstr "新邮件提醒"
 
-# mail/mail-config.glade.h:46
-# mail/mail-config.glade.h:46
-# mail/mail-config.glade.h:54
-#: mail/mail-config.glade.h:55
-msgid "News"
-msgstr "新闻"
+# my-evolution/my-evolution.glade.h:28
+# my-evolution/my-evolution.glade.h:28
+# my-evolution/my-evolution.glade.h:28
+#: mail/mail-config.glade.h:79
+#, fuzzy
+msgid "News Servers"
+msgstr "新闻来源(_N)"
+
+#: mail/mail-config.glade.h:81
+msgid "On Screen fonts"
+msgstr ""
 
 # mail/mail-config.glade.h:48
 # mail/mail-config.glade.h:48
 # mail/mail-config.glade.h:56
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "可选的信息"
 
+# addressbook/gui/contact-editor/contact-editor.glade.h:23
+# addressbook/gui/contact-editor/contact-editor.glade.h:23
+# addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "组织(_Z)："
+
 # mail/mail-config.glade.h:50
 # mail/mail-config.glade.h:50
 # mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 键标识(_K)："
 
 # mail/mail-config.glade.h:53
 # mail/mail-config.glade.h:53
 # mail/mail-config.glade.h:61
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "选取一个颜色"
 
-# mail/mail-config.glade.h:62
-#: mail/mail-config.glade.h:63
-msgid "Play sound file when new mail arrives"
-msgstr "新邮件到达时播放声音文件"
+# mail/mail-config.glade.h:57
+# mail/mail-config.glade.h:57
+# mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:90
+#, fuzzy
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "在发送只给出了暗送收件人时进行提示(_B)"
 
 # mail/mail-config.glade.h:54
 # mail/mail-config.glade.h:54
 # mail/mail-config.glade.h:63
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-# mail/mail-config.glade.h:55
-# mail/mail-config.glade.h:55
-# mail/mail-config.glade.h:64
-#: mail/mail-config.glade.h:65
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候进行提示"
-
-# mail/mail-config.glade.h:56
-# mail/mail-config.glade.h:56
-# mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:66
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "在发送空标题的消息时进行提示(_E)"
-
-# mail/mail-config.glade.h:57
-# mail/mail-config.glade.h:57
-# mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:67
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "在发送只给出了暗送收件人时进行提示(_B)"
+# ui/evolution-addressbook.xml.h:18
+# ui/evolution-addressbook.xml.h:18
+# ui/evolution-addressbook.xml.h:18
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "打印选中的联系人"
 
 # mail/mail-config.glade.h:58
 # mail/mail-config.glade.h:58
 # mail/mail-config.glade.h:67
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail 邮件目录"
 
+# camel/camel-filter-driver.c:692
+# camel/camel-filter-driver.c:741
+# camel/camel-filter-driver.c:893
+#: mail/mail-config.glade.h:94
+#, fuzzy
+msgid "Quote original message"
+msgstr "无法打开消息"
+
 # mail/mail-config.glade.h:59
 # mail/mail-config.glade.h:59
 # mail/mail-config.glade.h:68
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "已引用"
 
 # mail/mail-config.glade.h:60
 # mail/mail-config.glade.h:60
 # mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "记住该密码(_M)"
 
+# composer/e-msg-composer-hdrs.c:364
+# composer/e-msg-composer-hdrs.c:364
+# composer/e-msg-composer-hdrs.c:362
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "回复到："
+
 # mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 # mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 # mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
-#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "正在接收电子邮件"
 
-# mail/mail-config.glade.h:62
-# mail/mail-config.glade.h:62
-# mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:72
-msgid "Receiving Mail"
-msgstr "正在接收邮件"
-
 # mail/mail-config.glade.h:63
 # mail/mail-config.glade.h:63
 # mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:73
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "接收中选项"
 
+# e-util/e-passwords.c:360 mail/mail-session.c:267
+# e-util/e-passwords.c:360 mail/mail-session.c:267
+# e-util/e-passwords.c:360 mail/mail-session.c:269
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "记住该密码"
+
 # mail/mail-config.glade.h:64
 # mail/mail-config.glade.h:64
 # mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "必需的信息"
 
+# mail/mail-config.glade.h:67
+# mail/mail-config.glade.h:67
+# mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
+msgstr "安全"
+
 # mail/mail-config.glade.h:66
 # mail/mail-config.glade.h:66
 # mail/mail-config.glade.h:75
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "安全 MIME (S/MIME)"
 
-# mail/mail-config.glade.h:67
-# mail/mail-config.glade.h:67
-# mail/mail-config.glade.h:76
-#: mail/mail-config.glade.h:77
-msgid "Security"
-msgstr "安全"
+#: mail/mail-config.glade.h:105
+msgid "Select HTML fixed width font"
+msgstr ""
 
-# mail/mail-config.glade.h:68
-# mail/mail-config.glade.h:68
-# mail/mail-config.glade.h:77
-#: mail/mail-config.glade.h:78
-msgid "Select Filter Log file..."
-msgstr "选择过滤日志文件..."
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font for printing"
+msgstr ""
 
 # mail/mail-config.glade.h:69
 # mail/mail-config.glade.h:69
 # mail/mail-config.glade.h:78
-#: mail/mail-config.glade.h:79
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Select PGP program"
 msgstr "选择 PGP 二进制数"
 
 # mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 # mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 # mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
-#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "正在发送电子邮件"
 
-# mail/mail-config.glade.h:71
-# mail/mail-config.glade.h:71
-# mail/mail-config.glade.h:80
-#: mail/mail-config.glade.h:81
-msgid "Sending Mail"
-msgstr "正在发送邮件"
-
-# mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-# shell/e-local-storage.c:176
-# mail/mail-config.glade.h:73 mail/message-list.etspec.h:7
-# shell/e-local-storage.c:176
-# mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
-# shell/e-local-storage.c:176
-#: mail/mail-config.glade.h:83 mail/message-list.etspec.h:7
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "已发送"
-
 # mail/mail-config.glade.h:74
 # mail/mail-config.glade.h:74
 # mail/mail-config.glade.h:83
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "发送邮件文件夹(_M)："
 
 # mail/mail-config.glade.h:75
 # mail/mail-config.glade.h:75
 # mail/mail-config.glade.h:84
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "已发送和草稿邮件"
 
 # mail/mail-config.glade.h:76
 # mail/mail-config.glade.h:76
 # mail/mail-config.glade.h:85
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "服务器需要认证(_V)"
 
 # mail/mail-config.glade.h:77
 # mail/mail-config.glade.h:77
 # mail/mail-config.glade.h:86
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "服务器配置"
 
 # mail/mail-config.glade.h:78
 # mail/mail-config.glade.h:78
 # mail/mail-config.glade.h:87
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "服务器类型(_T)："
 
+# shell/e-shortcuts.c:1043
+# shell/e-shortcuts.c:1043
+# shell/e-shortcuts.c:1043
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "快捷方式"
+
 # mail/mail-config.glade.h:79
 # mail/mail-config.glade.h:79
 # mail/mail-config.glade.h:88
-#: mail/mail-config.glade.h:89
-msgid "Signature file:"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Signature #1"
+msgstr "签名文件："
+
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
 msgstr "签名文件："
 
 # mail/mail-config.glade.h:80
 # mail/mail-config.glade.h:80
 # mail/mail-config.glade.h:89
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "来源"
 
 # mail/mail-config.glade.h:81
 # mail/mail-config.glade.h:81
 # mail/mail-config.glade.h:90
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "来源信息"
 
-# mail/mail-config.glade.h:82
-# mail/mail-config.glade.h:82
-# mail/mail-config.glade.h:91
-#: mail/mail-config.glade.h:92
-msgid "Sources"
-msgstr "来源"
-
 # addressbook/printing/e-contact-print.glade.h:38
 # addressbook/printing/e-contact-print.glade.h:38
 # mail/mail-config.glade.h:92
-#: mail/mail-config.glade.h:93
-msgid "Specify filename:"
+#: mail/mail-config.glade.h:122
+#, fuzzy
+msgid "Specify _filename:"
 msgstr "指定文件名："
 
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
+msgstr ""
+
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
+
 # mail/mail-config.glade.h:84
 # mail/mail-config.glade.h:84
 # mail/mail-config.glade.h:93
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "标准 Unix mbox"
 
-# mail/mail-config.glade.h:86
-# mail/mail-config.glade.h:86
-# mail/mail-config.glade.h:95
-#: mail/mail-config.glade.h:96
-msgid "Use s_ecure connection (SSL)"
-msgstr "使用安全连接 (SSL)"
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+#: mail/mail-config.glade.h:134
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "不定风"
 
 # mail/mail-config.glade.h:87
 # mail/mail-config.glade.h:87
 # mail/mail-config.glade.h:96
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -19067,304 +20509,396 @@ msgstr ""
 "\n"
 "点击 “下一步” 以便开始。"
 
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+# my-evolution/metar.c:65
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "XEmacs"
+msgstr "东"
+
+# mail/mail-config.glade.h:116
+# mail/mail-config.glade.h:116
+# mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "签名文件(_S)："
+
 # mail/mail-config.glade.h:91
 # mail/mail-config.glade.h:91
 # mail/mail-config.glade.h:100
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "总是离线装入图像(_A)"
 
 # mail/mail-config.glade.h:92
 # mail/mail-config.glade.h:92
 # mail/mail-config.glade.h:101
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:144
 msgid "_Always sign outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名邮件(_A)"
 
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:102
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:145
 msgid "_Authentication Type: "
 msgstr "验证类型(_A)："
 
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:102
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:146
 msgid "_Authentication type: "
 msgstr "验证类型(_A)："
 
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:103
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:147
 msgid "_Automatically check for new mail"
 msgstr "自动检查新邮件(_A)"
 
+# mail/mail-config.glade.h:94
+# mail/mail-config.glade.h:94
+# mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "自动检查新邮件(_A)"
+
+# mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:149
+#, fuzzy
+msgid "_Beep when new mail arrives"
+msgstr "新邮件到达时鸣笛"
+
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:104
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:150
 msgid "_Certificate ID:"
 msgstr "证书 ID(_C)："
 
-# mail/mail-config.glade.h:97
-# mail/mail-config.glade.h:97
-# mail/mail-config.glade.h:106
-#: mail/mail-config.glade.h:108
-msgid "_Drafts folder:"
-msgstr "草稿文件夹(_D)："
+# mail/mail-config.glade.h:16
+# mail/mail-config.glade.h:16
+# mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:151
+#, fuzzy
+msgid "_Confirm when expunging a folder"
+msgstr "当删除文件夹时进行提示"
 
-# mail/mail-config.glade.h:100
-# mail/mail-config.glade.h:100
-# mail/mail-config.glade.h:109
-#: mail/mail-config.glade.h:111
-msgid "_Empty trash folders on exit"
-msgstr "退出时清空已删除邮件(_E)"
+# ui/evolution-message-composer.xml.h:5
+# ui/evolution-message-composer.xml.h:5
+# ui/evolution-message-composer.xml.h:5
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "删除签名以外的所有内容"
+
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:153
+#, fuzzy
+msgid "_Defaults"
+msgstr "默认"
+
+# mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Do not notify me when new mail arrives"
+msgstr "新邮件到达时不要提醒我"
+
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+# mail/mail-accounts.c:196
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Enable"
+msgstr "启用"
+
+#: mail/mail-config.glade.h:158
+msgid "_Fixed-width:"
+msgstr ""
+
+# ui/evolution-mail-message.xml.h:32
+# ui/evolution-mail-message.xml.h:32
+# ui/evolution-mail-message.xml.h:32
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_Forward style:"
+msgstr "转发方式"
 
 # mail/mail-config.glade.h:101
 # mail/mail-config.glade.h:101
 # mail/mail-config.glade.h:110
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:160
 msgid "_Full name:"
 msgstr "全名(_F)："
 
-# mail/mail-config.glade.h:102
-# mail/mail-config.glade.h:102
-# mail/mail-config.glade.h:111
-#: mail/mail-config.glade.h:113
-msgid "_HTML signature:"
-msgstr "HTML 签名(_H)："
-
-# mail/mail-config.glade.h:103
-# mail/mail-config.glade.h:103
-# mail/mail-config.glade.h:112
-#: mail/mail-config.glade.h:114
-msgid "_Highlight citations with"
-msgstr "突出显示引文，使用(_H)"
+# mail/mail-config.glade.h:38
+# mail/mail-config.glade.h:38
+# mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "在 HTML 邮件中"
 
-# mail/mail-config.glade.h:104
-# mail/mail-config.glade.h:104
-# mail/mail-config.glade.h:113
-#: mail/mail-config.glade.h:115
-msgid "_Host:"
-msgstr "主机(_H)："
+# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+# mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+# mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:164
+#, fuzzy
+msgid "_Identity"
+msgstr "标识"
 
 # mail/mail-config.glade.h:105
 # mail/mail-config.glade.h:105
 # mail/mail-config.glade.h:114
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "如果发件人在地址簿中就装入图像(_L)"
 
-# mail/mail-config.glade.h:106
-# mail/mail-config.glade.h:106
-# mail/mail-config.glade.h:115
-#: mail/mail-config.glade.h:117
-msgid "_Log filter actions to:"
-msgstr "将过滤动作记录到(_L)："
+# mail/mail-config.glade.h:44
+# mail/mail-config.glade.h:44
+# mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "设置为我的默认帐号(_D)"
 
 # mail/mail-config.glade.h:107
 # mail/mail-config.glade.h:107
 # mail/mail-config.glade.h:116
-#: mail/mail-config.glade.h:118
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:167
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "阅读时将邮件标记为已读，延时(_M)"
 
 # mail/mail-config.glade.h:108
 # mail/mail-config.glade.h:108
 # mail/mail-config.glade.h:117
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "名称(_N)："
 
 # mail/mail-config.glade.h:109
 # mail/mail-config.glade.h:109
 # mail/mail-config.glade.h:118
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "从不装入图像"
 
-# mail/mail-config.glade.h:110
-# mail/mail-config.glade.h:110
-# mail/mail-config.glade.h:119
-#: mail/mail-config.glade.h:121
-msgid "_Organization:"
-msgstr "组织(_O)："
-
 # mail/mail-config.glade.h:111
 # mail/mail-config.glade.h:111
 # mail/mail-config.glade.h:120
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "PGP 二进制路径(_P)："
 
-# mail/mail-config.glade.h:112
-# mail/mail-config.glade.h:112
-# mail/mail-config.glade.h:121
-#: mail/mail-config.glade.h:123
-msgid "_Path:"
-msgstr "路径(_P)："
+# mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:172
+#, fuzzy
+msgid "_Play sound file when new mail arrives"
+msgstr "新邮件到达时播放声音文件"
 
-# mail/mail-config.glade.h:113
-# mail/mail-config.glade.h:113
-# mail/mail-config.glade.h:122
-#: mail/mail-config.glade.h:124
-msgid "_Remember this password"
-msgstr "记住该密码(_R)"
+# mail/mail-config.glade.h:55
+# mail/mail-config.glade.h:55
+# mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候进行提示"
 
-# mail/mail-config.glade.h:114
-# mail/mail-config.glade.h:114
-# mail/mail-config.glade.h:123
-#: mail/mail-config.glade.h:125
-msgid "_Send mail in HTML format by default."
-msgstr "默认按 HTML 格式发送邮件。(_S)"
+# mail/mail-config.glade.h:56
+# mail/mail-config.glade.h:56
+# mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "在发送空标题的消息时进行提示(_E)"
 
-# mail/mail-config.glade.h:115
-# mail/mail-config.glade.h:115
-# mail/mail-config.glade.h:124
-#: mail/mail-config.glade.h:126
-msgid "_Server type: "
-msgstr "服务器类型(_S)："
+# mail/mail-config.glade.h:62
+# mail/mail-config.glade.h:62
+# mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Receiving Mail"
+msgstr "正在接收邮件"
+
+# ui/evolution-mail-message.xml.h:71
+# ui/evolution-mail-message.xml.h:71
+# ui/evolution-mail-message.xml.h:73
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "全部回复"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:54
+# ui/evolution-message-composer.xml.h:54
+# ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "安全(_S)"
+
+# ui/evolution-message-composer.xml.h:54
+# ui/evolution-message-composer.xml.h:54
+# ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "安全(_S)"
+
+# mail/mail-config.glade.h:71
+# mail/mail-config.glade.h:71
+# mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "正在发送邮件"
+
+# calendar/gui/dialogs/event-page.glade.h:11
+# calendar/gui/e-calendar-table.etspec.h:13
+# calendar/gui/dialogs/event-page.glade.h:11
+# calendar/gui/e-calendar-table.etspec.h:13
+# calendar/gui/dialogs/event-page.glade.h:11
+# calendar/gui/e-calendar-table.etspec.h:13
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "按其显示时间"
 
 # mail/mail-config.glade.h:116
 # mail/mail-config.glade.h:116
 # mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:127
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
 msgstr "签名文件(_S)："
 
-# mail/mail-config.glade.h:117
-# mail/mail-config.glade.h:117
-# mail/mail-config.glade.h:126
-#: mail/mail-config.glade.h:128
-msgid "_Username:"
-msgstr "用户名(_U)："
+# mail/mail-config.glade.h:86
+# mail/mail-config.glade.h:86
+# mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "使用安全连接 (SSL)"
+
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+# my-evolution/metar.c:63
+#: mail/mail-config.glade.h:184
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "不定风"
 
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:127
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:185
 msgid "_every"
 msgstr "每(_E)"
 
+# mail/mail-config.glade.h:2
+# mail/mail-config.glade.h:2
+# mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:186
+#, fuzzy
+msgid "color"
+msgstr " 颜色"
+
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:128
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "描述"
 
 # mail/mail-config.glade.h:121
 # mail/mail-config.glade.h:121
 # mail/mail-config.glade.h:130
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "新闻窗口1"
 
-# mail/mail-config.glade.h:122
-# mail/mail-config.glade.h:122
-# mail/mail-config.glade.h:131
-#: mail/mail-config.glade.h:133
-msgid "placeholder"
-msgstr "位置记录器"
-
-# mail/mail-config.glade.h:123
-# mail/mail-config.glade.h:123
-# mail/mail-config.glade.h:132
-#: mail/mail-config.glade.h:134
-msgid "seconds."
-msgstr "秒。"
-
-# mail/mail-crypto.c:59
-# mail/mail-crypto.c:59
-# mail/mail-crypto.c:59
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "无法创建 PGP 签名上下文。"
-
-# mail/mail-crypto.c:84
-# mail/mail-crypto.c:84
-# mail/mail-crypto.c:84
-#: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "无法创建 PGP 验证上下文。"
-
-# mail/mail-crypto.c:113
-# mail/mail-crypto.c:113
-# mail/mail-crypto.c:113
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "无法创建 PGP 加密上下文。"
-
-# mail/mail-crypto.c:138
-# mail/mail-crypto.c:138
-# mail/mail-crypto.c:138
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "无法创建 PGP 解密上下文。"
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 # mail/mail-crypto.c:173
 # mail/mail-crypto.c:173
 # mail/mail-crypto.c:173
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "无法创建 S/MIME 签名上下文。"
 
 # mail/mail-crypto.c:205
 # mail/mail-crypto.c:205
 # mail/mail-crypto.c:205
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
 # mail/mail-crypto.c:236
 # mail/mail-crypto.c:236
 # mail/mail-crypto.c:236
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "无法创建 S/MIME 加密上下文。"
 
 # mail/mail-crypto.c:267
 # mail/mail-crypto.c:267
 # mail/mail-crypto.c:267
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "无法创建 S/MIME 信封上下文。"
 
 # mail/mail-crypto.c:297
 # mail/mail-crypto.c:297
 # mail/mail-crypto.c:297
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "无法创建 S/MIME 解码上下文。"
 
 # mail/mail-display.c:243
 # mail/mail-display.c:242
 # mail/mail-display.c:243
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "保存附件"
 
+# mail/folder-browser.c:297 mail/mail-display.c:298
+# mail/folder-browser.c:297 mail/mail-display.c:297
+# mail/folder-browser.c:298 mail/mail-display.c:298
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "无法创建临时目录： %s"
+
 # mail/mail-display.c:350
 # mail/mail-display.c:349
 # mail/mail-display.c:350
-#: mail/mail-display.c:350
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "保存到磁盘..."
 
 # mail/mail-display.c:352
 # mail/mail-display.c:351
 # mail/mail-display.c:352
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "嵌入视图"
 
 # mail/mail-display.c:354
 # mail/mail-display.c:353
 # mail/mail-display.c:354
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 中打开..."
@@ -19372,7 +20906,7 @@ msgstr "在 %s 中打开..."
 # mail/mail-display.c:415
 # mail/mail-display.c:414
 # mail/mail-display.c:415
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "嵌入视图 (通过 %s)"
@@ -19380,56 +20914,64 @@ msgstr "嵌入视图 (通过 %s)"
 # mail/mail-display.c:419
 # mail/mail-display.c:418
 # mail/mail-display.c:419
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "隐藏"
 
 # mail/mail-display.c:440
 # mail/mail-display.c:439
 # mail/mail-display.c:440
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "外部视图"
 
 # mail/mail-display.c:1133
 # mail/mail-display.c:1136
 # mail/mail-display.c:1162
-#: mail/mail-display.c:1162
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "装入邮件内容"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "被延误的任务(_V)："
+
 # mail/mail-display.c:1602
 # mail/mail-display.c:1628
 # mail/mail-display.c:1657
-#: mail/mail-display.c:1657
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "在浏览器中打开连接"
 
 # mail/mail-display.c:1604
 # mail/mail-display.c:1630
 # mail/mail-display.c:1659
-#: mail/mail-display.c:1659
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "复制连接位置"
 
 # mail/mail-display.c:1607
 # mail/mail-display.c:1633
 # mail/mail-display.c:1662
-#: mail/mail-display.c:1662
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "连接保存为 (FIXME)"
 
 # mail/mail-display.c:1610
 # mail/mail-display.c:1636
 # mail/mail-display.c:1665
-#: mail/mail-display.c:1665
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "图像保存为..."
 
 # mail/mail-format.c:635
 # mail/mail-format.c:640
 # mail/mail-format.c:646
-#: mail/mail-format.c:646
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
@@ -19437,92 +20979,112 @@ msgstr "%s 附件"
 # mail/mail-format.c:680
 # mail/mail-format.c:686
 # mail/mail-format.c:692
-#: mail/mail-format.c:692
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "无法解析 MIME 邮件。显示源文本。"
 
 # mail/mail-format.c:763
 # mail/mail-format.c:769
 # mail/mail-format.c:775
-#: mail/mail-format.c:775
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日期"
 
 # mail/mail-format.c:846
 # mail/mail-format.c:861
 # mail/mail-format.c:867
-#: mail/mail-format.c:867
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "无效地址"
 
 # mail/mail-format.c:886 mail/message-list.etspec.h:3
 # mail/mail-format.c:904 mail/message-list.etspec.h:3
 # mail/mail-format.c:910 mail/message-list.etspec.h:3
-#: mail/mail-format.c:910 mail/message-list.etspec.h:3
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "发件人"
 
 # mail/mail-format.c:889
 # mail/mail-format.c:908
 # mail/mail-format.c:914
-#: mail/mail-format.c:914
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "回复至"
 
 # mail/mail-format.c:893 mail/message-list.etspec.h:10
 # mail/mail-format.c:913 mail/message-list.etspec.h:11
 # mail/mail-format.c:919 mail/message-list.etspec.h:11
-#: mail/mail-format.c:919 mail/message-list.etspec.h:11
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "收件人"
 
 # mail/mail-format.c:897
 # mail/mail-format.c:918
 # mail/mail-format.c:924
-#: mail/mail-format.c:924
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "抄送"
 
 # mail/mail-format.c:901
 # mail/mail-format.c:923
 # mail/mail-format.c:929
-#: mail/mail-format.c:929
+#: mail/mail-format.c:914
 msgid "Bcc"
 msgstr "密件抄送"
 
+# importers/elm-importer.c:525 importers/netscape-importer.c:958
+# importers/pine-importer.c:637 mail/component-factory.c:100
+# importers/elm-importer.c:525 importers/netscape-importer.c:958
+# importers/pine-importer.c:637 mail/component-factory.c:100
+# importers/elm-importer.c:525 importers/netscape-importer.c:958
+# importers/pine-importer.c:637 mail/component-factory.c:100
+#: mail/mail-format.c:945
+#, fuzzy
+msgid "Mailer"
+msgstr "邮件"
+
+# mail/mail-callbacks.c:1962
+# mail/mail-callbacks.c:2081
+# mail/mail-callbacks.c:2117
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "消息另存为..."
+
 # mail/mail-format.c:1813
 # mail/mail-format.c:1749
 # mail/mail-format.c:1768
-#: mail/mail-format.c:1767
+#: mail/mail-format.c:1832
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
 
-# mail/mail-format.c:1836
-# mail/mail-format.c:1772
-# mail/mail-format.c:1791
-#: mail/mail-format.c:1790
-msgid "Evolution does not recognize this type of signed message."
-msgstr "Evolution 无法识别该类型的带签名邮件。"
+# mail/mail-crypto.c:84
+# mail/mail-crypto.c:84
+# mail/mail-crypto.c:84
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "无法创建 PGP 验证上下文。"
 
 # mail/mail-format.c:1844
 # mail/mail-format.c:1780
 # mail/mail-format.c:1799
-#: mail/mail-format.c:1798
+#: mail/mail-format.c:1868
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "该邮件有数字签名，并被证实为可信。"
 
 # mail/mail-format.c:1852
 # mail/mail-format.c:1788
 # mail/mail-format.c:1807
-#: mail/mail-format.c:1806
+#: mail/mail-format.c:1876
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "该邮件有数字签名，但不能证实是可信的。"
 
 # mail/mail-format.c:2068
 # mail/mail-format.c:2003
 # mail/mail-format.c:2022
-#: mail/mail-format.c:2021
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
@@ -19530,7 +21092,7 @@ msgstr "指向 FTP 站点 (%s)"
 # mail/mail-format.c:2082
 # mail/mail-format.c:2017
 # mail/mail-format.c:2036
-#: mail/mail-format.c:2035
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
@@ -19538,7 +21100,7 @@ msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
 # mail/mail-format.c:2087
 # mail/mail-format.c:2022
 # mail/mail-format.c:2041
-#: mail/mail-format.c:2040
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
@@ -19546,7 +21108,7 @@ msgstr "指向本地文件 (%s)"
 # mail/mail-format.c:2116
 # mail/mail-format.c:2051
 # mail/mail-format.c:2070
-#: mail/mail-format.c:2069
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
@@ -19554,7 +21116,7 @@ msgstr "指向远程数据 (%s)"
 # mail/mail-format.c:2124
 # mail/mail-format.c:2059
 # mail/mail-format.c:2078
-#: mail/mail-format.c:2077
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
@@ -19562,21 +21124,29 @@ msgstr "指向未知的外部数据 (“%s”类型)"
 # mail/mail-format.c:2129
 # mail/mail-format.c:2064
 # mail/mail-format.c:2083
-#: mail/mail-format.c:2082
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
 
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "本地文件夹"
+
 # mail/mail-local.c:626
 # mail/mail-local.c:626
 # mail/mail-local.c:626
-#: mail/mail-local.c:626
+#: mail/mail-local.c:670
 msgid "Reconfiguring folder"
 msgstr "正在重新配置文件夹"
 
 # mail/mail-local.c:707
 # mail/mail-local.c:707
 # mail/mail-local.c:707
-#: mail/mail-local.c:707
+#: mail/mail-local.c:751
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -19588,7 +21158,7 @@ msgstr ""
 # mail/mail-local.c:763
 # mail/mail-local.c:763
 # mail/mail-local.c:763
-#: mail/mail-local.c:763
+#: mail/mail-local.c:807
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "无法把文件夹元信息保存到 %s： %s"
@@ -19596,7 +21166,7 @@ msgstr "无法把文件夹元信息保存到 %s： %s"
 # mail/mail-local.c:815
 # mail/mail-local.c:815
 # mail/mail-local.c:815
-#: mail/mail-local.c:815
+#: mail/mail-local.c:859
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "无法删除文件夹元信息 %s： %s"
@@ -19604,7 +21174,7 @@ msgstr "无法删除文件夹元信息 %s： %s"
 # mail/mail-local.c:1281
 # mail/mail-local.c:1281
 # mail/mail-local.c:1281
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "将文件夹格式从“%s”改为“%s”"
@@ -19612,7 +21182,7 @@ msgstr "将文件夹格式从“%s”改为“%s”"
 # mail/mail-local.c:1296
 # mail/mail-local.c:1296
 # mail/mail-local.c:1296
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "由于 %s 不是本地文件夹，因此不能重新配置"
@@ -19620,7 +21190,7 @@ msgstr "由于 %s 不是本地文件夹，因此不能重新配置"
 # mail/mail-local.c:1318
 # mail/mail-local.c:1318
 # mail/mail-local.c:1318
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -19631,14 +21201,14 @@ msgstr ""
 # mail/mail-local.c:1407
 # mail/mail-local.c:1407
 # mail/mail-local.c:1407
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "您不能改变远程文件夹的格式。"
 
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1459
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "重新配置 /%s"
@@ -19677,28 +21247,28 @@ msgstr "正在工作"
 # mail/mail-ops.c:86
 # mail/mail-ops.c:87
 # mail/mail-ops.c:87
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "正在过滤文件夹"
 
 # mail/mail-ops.c:249
 # mail/mail-ops.c:250
 # mail/mail-ops.c:258
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "正在收取邮件"
 
 # mail/mail-ops.c:489 mail/mail-ops.c:518
 # mail/mail-ops.c:491 mail/mail-ops.c:520
 # mail/mail-ops.c:534 mail/mail-ops.c:563
-#: mail/mail-ops.c:534 mail/mail-ops.c:563
+#: mail/mail-ops.c:538 mail/mail-ops.c:567
 msgid "However, the message was successfully sent."
 msgstr "可是，邮件已经成功发送。"
 
 # mail/mail-ops.c:554
 # mail/mail-ops.c:556
 # mail/mail-ops.c:599
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "正在发送“%s”"
@@ -19706,7 +21276,7 @@ msgstr "正在发送“%s”"
 # mail/mail-ops.c:674
 # mail/mail-ops.c:676
 # mail/mail-ops.c:719
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "发送第 %d 个邮件，共 %d 个"
@@ -19714,7 +21284,7 @@ msgstr "发送第 %d 个邮件，共 %d 个"
 # mail/mail-ops.c:693
 # mail/mail-ops.c:695
 # mail/mail-ops.c:738
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "在第 %d 个邮件失败，共 %d 个"
@@ -19722,21 +21292,21 @@ msgstr "在第 %d 个邮件失败，共 %d 个"
 # mail/mail-ops.c:695 mail/mail-send-recv.c:537
 # mail/mail-ops.c:697 mail/mail-send-recv.c:545
 # mail/mail-ops.c:740 mail/mail-send-recv.c:545
-#: mail/mail-ops.c:740 mail/mail-send-recv.c:545
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "完成。"
 
 # mail/mail-ops.c:788
 # mail/mail-ops.c:790
 # mail/mail-ops.c:833
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "把邮件保存到文件夹中"
 
 # mail/mail-ops.c:868
 # mail/mail-ops.c:870
 # mail/mail-ops.c:913
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "把邮件移动到 %s"
@@ -19744,52 +21314,30 @@ msgstr "把邮件移动到 %s"
 # mail/mail-ops.c:868
 # mail/mail-ops.c:870
 # mail/mail-ops.c:913
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "把邮件复制到 %s"
 
-# mail/mail-ops.c:895
-# mail/mail-ops.c:897
-# mail/mail-ops.c:940
-#: mail/mail-ops.c:940
-msgid "Moving"
-msgstr "正在移动"
-
-# mail/mail-ops.c:898
-# mail/mail-ops.c:900
-# mail/mail-ops.c:943
-#: mail/mail-ops.c:943
-msgid "Copying"
-msgstr "正在复制"
-
 # mail/mail-ops.c:1008
 # mail/mail-ops.c:1010
 # mail/mail-ops.c:1053
-#: mail/mail-ops.c:1053
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "正在“%s”中扫描文件夹"
 
-# mail/mail-ops.c:1058 shell/e-local-storage.c:178
-# mail/mail-ops.c:1060 shell/e-local-storage.c:178
-# mail/mail-ops.c:1103 shell/e-local-storage.c:178
-#. Fill in the new fields
-#: mail/mail-ops.c:1103 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "已删除"
-
 # mail/mail-ops.c:1191
 # mail/mail-ops.c:1193
 # mail/mail-ops.c:1236
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "已转发邮件"
 
 # mail/mail-ops.c:1234
 # mail/mail-ops.c:1236
 # mail/mail-ops.c:1279
-#: mail/mail-ops.c:1279
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "正在打开文件夹 %s"
@@ -19797,7 +21345,7 @@ msgstr "正在打开文件夹 %s"
 # mail/mail-ops.c:1306
 # mail/mail-ops.c:1308
 # mail/mail-ops.c:1351
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "正在打开存储 %s"
@@ -19805,7 +21353,7 @@ msgstr "正在打开存储 %s"
 # mail/mail-ops.c:1375
 # mail/mail-ops.c:1377
 # mail/mail-ops.c:1420
-#: mail/mail-ops.c:1420
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "正在删除文件夹“%s”"
@@ -19813,7 +21361,7 @@ msgstr "正在删除文件夹“%s”"
 # mail/mail-ops.c:1469
 # mail/mail-ops.c:1471
 # mail/mail-ops.c:1514
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1486
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "正在存储文件夹“%s”"
@@ -19821,21 +21369,21 @@ msgstr "正在存储文件夹“%s”"
 # mail/mail-ops.c:1520
 # mail/mail-ops.c:1522
 # mail/mail-ops.c:1565
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "正在刷新文件夹"
 
 # mail/mail-ops.c:1556
 # mail/mail-ops.c:1558
 # mail/mail-ops.c:1601
-#: mail/mail-ops.c:1601
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "正在删除文件夹"
 
 # mail/mail-ops.c:1605
 # mail/mail-ops.c:1607
 # mail/mail-ops.c:1650
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "正在检索邮件 %s"
@@ -19843,7 +21391,7 @@ msgstr "正在检索邮件 %s"
 # mail/mail-ops.c:1672
 # mail/mail-ops.c:1674
 # mail/mail-ops.c:1717
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "正在检索 %d 个邮件"
@@ -19851,7 +21399,7 @@ msgstr "正在检索 %d 个邮件"
 # mail/mail-ops.c:1758
 # mail/mail-ops.c:1760
 # mail/mail-ops.c:1803
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "正在保存 %d 个邮件"
@@ -19859,7 +21407,7 @@ msgstr "正在保存 %d 个邮件"
 # mail/mail-ops.c:1870
 # mail/mail-ops.c:1872
 # mail/mail-ops.c:1915
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -19871,7 +21419,7 @@ msgstr ""
 # mail/mail-ops.c:1898
 # mail/mail-ops.c:1900
 # mail/mail-ops.c:1943
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -19883,14 +21431,14 @@ msgstr ""
 # mail/mail-ops.c:1972
 # mail/mail-ops.c:1974
 # mail/mail-ops.c:2017
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "正在保存附件"
 
 # mail/mail-ops.c:1988
 # mail/mail-ops.c:1990
 # mail/mail-ops.c:2033
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -19902,7 +21450,7 @@ msgstr ""
 # mail/mail-ops.c:2019
 # mail/mail-ops.c:2021
 # mail/mail-ops.c:2064
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "无法写数据： %s"
@@ -19910,7 +21458,7 @@ msgstr "无法写数据： %s"
 # mail/mail-ops.c:2088
 # mail/mail-ops.c:2090
 # mail/mail-ops.c:2133
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "断开与 %s 的连接"
@@ -19918,13 +21466,13 @@ msgstr "断开与 %s 的连接"
 # mail/mail-ops.c:2089
 # mail/mail-ops.c:2091
 # mail/mail-ops.c:2134
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新与 %s 连接"
 
 # mail/mail-ops.c:2233
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2265
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "正在执行 shell 命令：%s"
@@ -19932,7 +21480,7 @@ msgstr "正在执行 shell 命令：%s"
 # mail/mail-search-dialogue.c:113
 # mail/mail-search-dialogue.c:113
 # mail/mail-search-dialogue.c:113
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "搜索(_S)"
 
@@ -19995,14 +21543,14 @@ msgstr "匹配："
 # mail/mail-send-recv.c:141
 # mail/mail-send-recv.c:143
 # mail/mail-send-recv.c:143
-#: mail/mail-send-recv.c:143
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "正在取消..."
 
 # mail/mail-send-recv.c:245
 # mail/mail-send-recv.c:251
 # mail/mail-send-recv.c:251
-#: mail/mail-send-recv.c:251
+#: mail/mail-send-recv.c:246
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "服务器： %s，类型： %s"
@@ -20010,7 +21558,7 @@ msgstr "服务器： %s，类型： %s"
 # mail/mail-send-recv.c:247
 # mail/mail-send-recv.c:253
 # mail/mail-send-recv.c:253
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "路径： %s，类型： %s"
@@ -20018,7 +21566,7 @@ msgstr "路径： %s，类型： %s"
 # mail/mail-send-recv.c:249
 # mail/mail-send-recv.c:255
 # mail/mail-send-recv.c:255
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Type: %s"
 msgstr "类型： %s"
@@ -20026,38 +21574,31 @@ msgstr "类型： %s"
 # mail/mail-send-recv.c:286
 # mail/mail-send-recv.c:292
 # mail/mail-send-recv.c:292
-#: mail/mail-send-recv.c:292
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "发送和接收邮件"
 
 # mail/mail-send-recv.c:288
 # mail/mail-send-recv.c:294
 # mail/mail-send-recv.c:294
-#: mail/mail-send-recv.c:294
+#: mail/mail-send-recv.c:289
 msgid "Cancel All"
 msgstr "全部取消"
 
 # mail/mail-send-recv.c:348
 # mail/mail-send-recv.c:354
 # mail/mail-send-recv.c:354
-#: mail/mail-send-recv.c:354
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "正在更新..."
 
 # mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 # mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
 # mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
-#: mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
+#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
 msgid "Waiting..."
 msgstr "正在等待..."
 
-# mail/mail-send-recv.c:533
-# mail/mail-send-recv.c:541
-# mail/mail-send-recv.c:541
-#: mail/mail-send-recv.c:541
-msgid "Cancelled."
-msgstr "已取消"
-
 # mail/mail-session.c:220
 # mail/mail-session.c:220
 # mail/mail-session.c:222
@@ -20080,22 +21621,72 @@ msgstr "为 %s 输入密码"
 msgid "Enter Password"
 msgstr "输入密码"
 
-# mail/mail-summary.c:109
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr "不完整的消息被写入管道！"
+# mail/mail-account-gui.c:962
+# mail/mail-account-gui.c:962
+# mail/mail-account-gui.c:959
+#: mail/mail-signature-editor.c:81
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "无法保存签名文件。"
 
-# my-evolution/e-summary-mail.c:129
-# my-evolution/e-summary-mail.c:129
-# mail/mail-summary.c:467
-#: mail/mail-summary.c:467
-msgid "Mail Summary"
-msgstr "邮件概要"
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1039
+# mail/mail-account-gui.c:1036
+#: mail/mail-signature-editor.c:174
+msgid "Save signature"
+msgstr "保存签名"
+
+# mail/mail-account-gui.c:1045
+# mail/mail-account-gui.c:1045
+# mail/mail-account-gui.c:1042
+#: mail/mail-signature-editor.c:180
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"该签名已经被改变，但还没有存储。\n"
+"\n"
+"您希望保存改动吗？"
+
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+# my-evolution/e-summary-preferences.c:956
+# my-evolution/e-summary-preferences.c:956
+# my-evolution/e-summary-preferences.c:958
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "名称："
+
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "签名文件："
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+# mail/mail-config.glade.h:35
+# mail/mail-config.glade.h:35
+# mail/mail-config.glade.h:42
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "HTML 签名文件："
 
 # mail/mail-tools.c:255
 # mail/mail-tools.c:255
 # mail/mail-tools.c:256
-#: mail/mail-tools.c:256
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "已转发邮件 - %s"
@@ -20103,21 +21694,21 @@ msgstr "已转发邮件 - %s"
 # mail/mail-tools.c:259
 # mail/mail-tools.c:259
 # mail/mail-tools.c:260
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "已转发邮件"
 
 # mail/mail-tools.c:393
 # mail/mail-tools.c:393
 # mail/mail-tools.c:394
-#: mail/mail-tools.c:394
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "已转发邮件"
 
 # mail/mail-vfolder.c:85
 # mail/mail-vfolder.c:85
 # mail/mail-vfolder.c:85
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "设置虚拟文件夹： %s"
@@ -20125,7 +21716,7 @@ msgstr "设置虚拟文件夹： %s"
 # mail/mail-vfolder.c:203
 # mail/mail-vfolder.c:203
 # mail/mail-vfolder.c:203
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "为 uri 更新虚拟文件夹： %s"
@@ -20133,7 +21724,7 @@ msgstr "为 uri 更新虚拟文件夹： %s"
 # mail/mail-vfolder.c:419
 # mail/mail-vfolder.c:419
 # mail/mail-vfolder.c:419
-#: mail/mail-vfolder.c:419
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -20145,28 +21736,29 @@ msgstr ""
 # mail/mail-vfolder.c:728
 # mail/mail-vfolder.c:728
 # mail/mail-vfolder.c:728
-#: mail/mail-vfolder.c:728
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
 msgid "VFolders"
 msgstr "虚拟文件夹"
 
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # mail/mail-vfolder.c:785
 # mail/mail-vfolder.c:785
-#: mail/mail-vfolder.c:785
+#: mail/mail-vfolder.c:784
 msgid "vFolders"
 msgstr "虚拟文件夹"
 
 # mail/mail-vfolder.c:824
 # mail/mail-vfolder.c:825
 # mail/mail-vfolder.c:825
-#: mail/mail-vfolder.c:825
+#: mail/mail-vfolder.c:824
 msgid "Edit VFolder"
 msgstr "编辑虚拟文件夹"
 
 # mail/mail-vfolder.c:840
 # mail/mail-vfolder.c:841
 # mail/mail-vfolder.c:841
-#: mail/mail-vfolder.c:841
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
@@ -20174,21 +21766,21 @@ msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
 # mail/mail-vfolder.c:894
 # mail/mail-vfolder.c:895
 # mail/mail-vfolder.c:895
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "新建虚拟文件夹"
 
 # mail/message-browser.c:212
 # mail/message-browser.c:212
 # mail/message-browser.c:212
-#: mail/message-browser.c:212
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(没有主题)"
 
 # mail/message-browser.c:214
 # mail/message-browser.c:214
 # mail/message-browser.c:214
-#: mail/message-browser.c:214
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - 邮件"
@@ -20196,129 +21788,233 @@ msgstr "%s - 邮件"
 # mail/message-list.c:639
 # mail/message-list.c:645
 # mail/message-list.c:662
-#: mail/message-list.c:662
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "不可见"
 
 # mail/message-list.c:640
 # mail/message-list.c:646
 # mail/message-list.c:663
-#: mail/message-list.c:663
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "可见"
 
 # mail/message-list.c:641
 # mail/message-list.c:647
 # mail/message-list.c:664
-#: mail/message-list.c:664
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "已应答"
 
 # mail/message-list.c:642
 # mail/message-list.c:648
 # mail/message-list.c:665
-#: mail/message-list.c:665
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "多个不可见邮件"
 
 # mail/message-list.c:643
 # mail/message-list.c:649
 # mail/message-list.c:666
-#: mail/message-list.c:666
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "多个邮件"
 
 # mail/message-list.c:647
 # mail/message-list.c:658
 # mail/message-list.c:675
-#: mail/message-list.c:675
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "最低"
 
 # mail/message-list.c:648
 # mail/message-list.c:659
 # mail/message-list.c:676
-#: mail/message-list.c:676
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "较低"
 
 # mail/message-list.c:652
 # mail/message-list.c:663
 # mail/message-list.c:680
-#: mail/message-list.c:680
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "较高"
 
 # mail/message-list.c:653
 # mail/message-list.c:664
 # mail/message-list.c:681
-#: mail/message-list.c:681
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:903
 # mail/message-list.c:920
 # mail/message-list.c:937
-#: mail/message-list.c:937
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
 # mail/message-list.c:910
 # mail/message-list.c:927
 # mail/message-list.c:944
-#: mail/message-list.c:944
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:919
 # mail/message-list.c:936
 # mail/message-list.c:953
-#: mail/message-list.c:953
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:931
 # mail/message-list.c:948
 # mail/message-list.c:965
-#: mail/message-list.c:965
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%m %p"
 
 # mail/message-list.c:941
 # mail/message-list.c:958
 # mail/message-list.c:975
-#: mail/message-list.c:975
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
 # mail/message-list.c:2334
 # mail/message-list.c:2358
 # mail/message-list.c:2387
-#: mail/message-list.c:2387
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "正在生成邮件列表"
 
+# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+# calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "预定 "
+
+# calendar/gui/dialogs/meeting-page.etspec.h:10
+# calendar/gui/e-calendar-table.etspec.h:15
+# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
+# mail/message-list.etspec.h:8
+# calendar/gui/dialogs/meeting-page.etspec.h:10
+# calendar/gui/e-calendar-table.etspec.h:15
+# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
+# mail/message-list.etspec.h:9
+# calendar/gui/dialogs/meeting-page.etspec.h:10
+# calendar/gui/e-calendar-table.etspec.h:15
+# calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:47
+# mail/message-list.etspec.h:9
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "状态"
+
 # mail/message-list.etspec.h:2
 # mail/message-list.etspec.h:2
 # mail/message-list.etspec.h:2
-#: mail/message-list.etspec.h:2
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "已标志"
 
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+# addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "原联系人："
+
 # mail/message-list.etspec.h:4
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:5
-#: mail/message-list.etspec.h:5
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "已接收"
 
 # mail/message-list.etspec.h:7
 # mail/message-list.etspec.h:8
 # mail/message-list.etspec.h:8
-#: mail/message-list.etspec.h:8
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "大小"
 
+# importers/elm-importer.c:525 importers/netscape-importer.c:958
+# importers/pine-importer.c:637 mail/component-factory.c:100
+# importers/elm-importer.c:525 importers/netscape-importer.c:958
+# importers/pine-importer.c:637 mail/component-factory.c:100
+# my-evolution/Locations.h:1355
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "邮件"
+
+# ui/evolution-mail-message.xml.h:31
+# ui/evolution-mail-message.xml.h:31
+# ui/evolution-mail-message.xml.h:31
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "转发"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+# mail/mail-config.glade.h:81
+# mail/mail-config.glade.h:81
+# mail/mail-config.glade.h:90
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "来源信息"
+
+# ui/evolution-mail-message.xml.h:31
+# ui/evolution-mail-message.xml.h:31
+# ui/evolution-mail-message.xml.h:31
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "转发"
+
+#: mail/message-tag-followup.c:62
+msgid "No Response Necessary"
+msgstr ""
+
+# ui/evolution-mail-message.xml.h:70
+# ui/evolution-mail-message.xml.h:70
+# ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr "回复"
+
+# ui/evolution-mail-message.xml.h:71
+# ui/evolution-mail-message.xml.h:71
+# ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "全部回复"
+
+# calendar/gui/dialogs/recurrence-page.glade.h:6
+# calendar/gui/dialogs/recurrence-page.glade.h:6
+# calendar/gui/dialogs/recurrence-page.glade.h:6
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "预览"
+
+#: mail/message-tag-followup.c:315
+msgid "Flag to Follow Up"
+msgstr ""
+
 # mail/subscribe-dialog.c:219
 # mail/subscribe-dialog.c:219
 # mail/subscribe-dialog.c:219
@@ -20358,7 +22054,7 @@ msgstr "取消到文件夹“%s”的订阅"
 # mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 # shell/e-storage-set-view.etspec.h:1
 #: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "文件夹"
 
@@ -20432,6 +22128,50 @@ msgstr "订阅(_S)"
 msgid "_Unsubscribe"
 msgstr "退订(_U)"
 
+# my-evolution/component-factory.c:44
+# my-evolution/component-factory.c:44
+# my-evolution/component-factory.c:44
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
+msgstr "含有 Evolution 概要的文件夹"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Evolution Summary component."
+msgstr "Evolution 邮件撰写器。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Evolution 任务控制车间"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+# executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "Evolution 实施概要组件车间。"
+
+# my-evolution/e-summary-preferences.c:1502
+# my-evolution/e-summary-preferences.c:1502
+# my-evolution/e-summary-preferences.c:1504
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "概要设置"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+msgid "This page can be used to customize the appearance of the Summary page."
+msgstr ""
+
 # calendar/gui/e-calendar-table.etspec.h:3
 # calendar/gui/e-calendar-table.etspec.h:3
 # my-evolution/Locations.h:1
@@ -27558,93 +29298,93 @@ msgid "Latrobe"
 msgstr ""
 
 # my-evolution/Locations.h:1191
-#: my-evolution/Locations.h:1191
+#: my-evolution/Locations.h:1190
 msgid "Laughlin"
 msgstr ""
 
 # ui/evolution-mail-message.xml.h:98
 # ui/evolution-mail-message.xml.h:98
 # my-evolution/Locations.h:1192
-#: my-evolution/Locations.h:1192
+#: my-evolution/Locations.h:1191
 msgid "Laurel"
 msgstr "劳雷尔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:41
 # addressbook/gui/contact-editor/fulladdr.glade.h:41
 # my-evolution/Locations.h:1193
-#: my-evolution/Locations.h:1193
+#: my-evolution/Locations.h:1192
 #, fuzzy
 msgid "La Verne"
 msgstr "佛得角"
 
 # my-evolution/Locations.h:1194
-#: my-evolution/Locations.h:1194
+#: my-evolution/Locations.h:1193
 msgid "Lawrence"
 msgstr "劳伦斯"
 
 # calendar/gui/dialogs/event-page.glade.h:8
 # calendar/gui/dialogs/event-page.glade.h:8
 # my-evolution/Locations.h:1195
-#: my-evolution/Locations.h:1195
+#: my-evolution/Locations.h:1194
 #, fuzzy
 msgid "Lawton"
 msgstr "地理位置(_O)："
 
 # my-evolution/Locations.h:1196
-#: my-evolution/Locations.h:1196
+#: my-evolution/Locations.h:1195
 msgid "Leadville"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:119
 # addressbook/gui/contact-editor/fulladdr.glade.h:119
 # my-evolution/Locations.h:1197
-#: my-evolution/Locations.h:1197
+#: my-evolution/Locations.h:1196
 #, fuzzy
 msgid "Learmouth"
 msgstr "莱索托"
 
 # my-evolution/Locations.h:1199
-#: my-evolution/Locations.h:1199
+#: my-evolution/Locations.h:1198
 msgid "Lecce"
 msgstr ""
 
 # my-evolution/Locations.h:1200
-#: my-evolution/Locations.h:1200
+#: my-evolution/Locations.h:1199
 msgid "Leeds and Bradford"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:123
 # addressbook/gui/contact-editor/fulladdr.glade.h:123
 # my-evolution/Locations.h:1201
-#: my-evolution/Locations.h:1201
+#: my-evolution/Locations.h:1200
 #, fuzzy
 msgid "Leesburg"
 msgstr "卢森堡"
 
 # my-evolution/Locations.h:1202
-#: my-evolution/Locations.h:1202
+#: my-evolution/Locations.h:1201
 msgid "Leeuwarden"
 msgstr ""
 
 # my-evolution/Locations.h:1203
-#: my-evolution/Locations.h:1203
+#: my-evolution/Locations.h:1202
 msgid "Le Havre-Octeville"
 msgstr "勒阿弗尔-Octeville"
 
 # my-evolution/Locations.h:1204
-#: my-evolution/Locations.h:1204
+#: my-evolution/Locations.h:1203
 msgid "Leipzig-Schkeuditz"
 msgstr "莱比锡-Schkeuditz"
 
 # my-evolution/Locations.h:1205
-#: my-evolution/Locations.h:1205
+#: my-evolution/Locations.h:1204
 msgid "Leknes"
 msgstr ""
 
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/backend/ebook/e-card-simple.c:93
 # my-evolution/Locations.h:1206
-#: my-evolution/Locations.h:1206
+#: my-evolution/Locations.h:1205
 #, fuzzy
 msgid "Le Mans"
 msgstr "经理"
@@ -27652,7 +29392,7 @@ msgstr "经理"
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1207
-#: my-evolution/Locations.h:1207
+#: my-evolution/Locations.h:1206
 #, fuzzy
 msgid "Le Marine"
 msgstr "圣马力诺"
@@ -27660,7 +29400,7 @@ msgstr "圣马力诺"
 # addressbook/gui/contact-editor/fulladdr.glade.h:118
 # addressbook/gui/contact-editor/fulladdr.glade.h:118
 # my-evolution/Locations.h:1208
-#: my-evolution/Locations.h:1208
+#: my-evolution/Locations.h:1207
 #, fuzzy
 msgid "Lemmon"
 msgstr "黎巴嫩"
@@ -27672,23 +29412,23 @@ msgstr "黎巴嫩"
 # addressbook/gui/component/select-names/e-select-names.c:777
 # composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
 # my-evolution/Locations.h:1209
-#: my-evolution/Locations.h:1209
+#: my-evolution/Locations.h:1208
 #, fuzzy
 msgid "Lemoore"
 msgstr "删除"
 
 # my-evolution/Locations.h:1210
-#: my-evolution/Locations.h:1210
+#: my-evolution/Locations.h:1209
 msgid "Leticia/Vasquez Cobo"
 msgstr ""
 
 # my-evolution/Locations.h:1211
-#: my-evolution/Locations.h:1211
+#: my-evolution/Locations.h:1210
 msgid "Le Touquet"
 msgstr ""
 
 # my-evolution/Locations.h:1212
-#: my-evolution/Locations.h:1212
+#: my-evolution/Locations.h:1211
 #, fuzzy
 msgid "Leuchars"
 msgstr "年"
@@ -27696,7 +29436,7 @@ msgstr "年"
 # addressbook/gui/contact-editor/fulladdr.glade.h:123
 # addressbook/gui/contact-editor/fulladdr.glade.h:123
 # my-evolution/Locations.h:1213
-#: my-evolution/Locations.h:1213
+#: my-evolution/Locations.h:1212
 #, fuzzy
 msgid "Lewisburg"
 msgstr "卢森堡"
@@ -27704,7 +29444,7 @@ msgstr "卢森堡"
 # addressbook/gui/contact-editor/fulladdr.glade.h:119
 # addressbook/gui/contact-editor/fulladdr.glade.h:119
 # my-evolution/Locations.h:1214
-#: my-evolution/Locations.h:1214
+#: my-evolution/Locations.h:1213
 #, fuzzy
 msgid "Lewiston"
 msgstr "莱索托"
@@ -27712,7 +29452,7 @@ msgstr "莱索托"
 # addressbook/gui/contact-editor/fulladdr.glade.h:119
 # addressbook/gui/contact-editor/fulladdr.glade.h:119
 # my-evolution/Locations.h:1215
-#: my-evolution/Locations.h:1215
+#: my-evolution/Locations.h:1214
 #, fuzzy
 msgid "Lewistown"
 msgstr "莱索托"
@@ -27720,14 +29460,14 @@ msgstr "莱索托"
 # addressbook/gui/contact-editor/fulladdr.glade.h:118
 # addressbook/gui/contact-editor/fulladdr.glade.h:118
 # my-evolution/Locations.h:1216
-#: my-evolution/Locations.h:1216
+#: my-evolution/Locations.h:1215
 msgid "Lexington"
 msgstr "列克星敦"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # my-evolution/Locations.h:1217
-#: my-evolution/Locations.h:1217
+#: my-evolution/Locations.h:1216
 #, fuzzy
 msgid "Liberal"
 msgstr "利比里亚"
@@ -27735,24 +29475,24 @@ msgstr "利比里亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # my-evolution/Locations.h:1219
-#: my-evolution/Locations.h:1219
+#: my-evolution/Locations.h:1218
 msgid "Libya"
 msgstr "利比亚"
 
 # my-evolution/Locations.h:1220
-#: my-evolution/Locations.h:1220
+#: my-evolution/Locations.h:1219
 msgid "Lichtenburg"
 msgstr ""
 
 # my-evolution/Locations.h:1221
-#: my-evolution/Locations.h:1221
+#: my-evolution/Locations.h:1220
 msgid "Lidgerwood"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:153
 # addressbook/gui/contact-editor/fulladdr.glade.h:153
 # my-evolution/Locations.h:1222
-#: my-evolution/Locations.h:1222
+#: my-evolution/Locations.h:1221
 #, fuzzy
 msgid "Liege"
 msgstr "尼日尔"
@@ -27760,25 +29500,25 @@ msgstr "尼日尔"
 # addressbook/gui/contact-editor/fulladdr.glade.h:155
 # addressbook/gui/contact-editor/fulladdr.glade.h:155
 # my-evolution/Locations.h:1223
-#: my-evolution/Locations.h:1223
+#: my-evolution/Locations.h:1222
 #, fuzzy
 msgid "Lihue"
 msgstr "纽埃岛"
 
 # my-evolution/Locations.h:1224
-#: my-evolution/Locations.h:1224
+#: my-evolution/Locations.h:1223
 msgid "Lille-Lesquin"
 msgstr "里尔-Lesquin"
 
 # my-evolution/Locations.h:1225
-#: my-evolution/Locations.h:1225
+#: my-evolution/Locations.h:1224
 msgid "Lima-Callao"
 msgstr "利马-卡亚俄"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # my-evolution/Locations.h:1226
-#: my-evolution/Locations.h:1226
+#: my-evolution/Locations.h:1225
 #, fuzzy
 msgid "Limnos"
 msgstr "老挝"
@@ -27786,30 +29526,30 @@ msgstr "老挝"
 # mail/message-list.c:647
 # mail/message-list.c:658
 # my-evolution/Locations.h:1227
-#: my-evolution/Locations.h:1227
+#: my-evolution/Locations.h:1226
 msgid "Limoges"
 msgstr "里摩日"
 
 # my-evolution/Locations.h:1228
-#: my-evolution/Locations.h:1228
+#: my-evolution/Locations.h:1227
 #, fuzzy
 msgid "Limon"
 msgstr "月"
 
 # my-evolution/Locations.h:1229
-#: my-evolution/Locations.h:1229
+#: my-evolution/Locations.h:1228
 msgid "Lincoln"
 msgstr "林肯"
 
 # my-evolution/Locations.h:1230
-#: my-evolution/Locations.h:1230
+#: my-evolution/Locations.h:1229
 msgid "Linz"
 msgstr "林茨"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # my-evolution/Locations.h:1231
-#: my-evolution/Locations.h:1231
+#: my-evolution/Locations.h:1230
 #, fuzzy
 msgid "Lisboa"
 msgstr "利比里亚"
@@ -27817,7 +29557,7 @@ msgstr "利比里亚"
 # my-evolution/metar.c:262
 # my-evolution/metar.c:262
 # my-evolution/Locations.h:1232
-#: my-evolution/Locations.h:1232
+#: my-evolution/Locations.h:1231
 #, fuzzy
 msgid "Lista"
 msgstr "霭"
@@ -27825,204 +29565,204 @@ msgstr "霭"
 # my-evolution/metar.c:219 my-evolution/metar.c:234
 # my-evolution/metar.c:219 my-evolution/metar.c:234
 # my-evolution/Locations.h:1233
-#: my-evolution/Locations.h:1233
+#: my-evolution/Locations.h:1232
 #, fuzzy
 msgid "Litchfield"
 msgstr "小冰雹"
 
 # my-evolution/Locations.h:1235
-#: my-evolution/Locations.h:1235
+#: my-evolution/Locations.h:1234
 msgid "Little Rock"
 msgstr "小石城"
 
 # my-evolution/Locations.h:1236
-#: my-evolution/Locations.h:1236
+#: my-evolution/Locations.h:1235
 msgid "Little Rock AFB"
 msgstr "小石城空军基地"
 
 # my-evolution/Locations.h:1237
-#: my-evolution/Locations.h:1237
+#: my-evolution/Locations.h:1236
 msgid "Livermore"
 msgstr ""
 
 # my-evolution/Locations.h:1238
-#: my-evolution/Locations.h:1238
+#: my-evolution/Locations.h:1237
 msgid "Liverpool"
 msgstr "利物浦"
 
 # my-evolution/Locations.h:1239
-#: my-evolution/Locations.h:1239
+#: my-evolution/Locations.h:1238
 msgid "Livingston"
 msgstr "利文斯敦"
 
 # calendar/zones.h:302
 # my-evolution/Locations.h:1240
-#: my-evolution/Locations.h:1240
+#: my-evolution/Locations.h:1239
 msgid "Ljubljana"
 msgstr "卢布尔雅纳"
 
 # camel/camel-sasl-login.c:32
 # camel/camel-sasl-login.c:32
 # my-evolution/Locations.h:1241
-#: my-evolution/Locations.h:1241
+#: my-evolution/Locations.h:1240
 msgid "Logan"
 msgstr "洛根"
 
 # my-evolution/Locations.h:1242
-#: my-evolution/Locations.h:1242
+#: my-evolution/Locations.h:1241
 msgid "Lolland Falster"
 msgstr "洛兰岛 Falster"
 
 # addressbook/backend/ebook/e-card-simple.c:67
 # addressbook/backend/ebook/e-card-simple.c:67
 # my-evolution/Locations.h:1243
-#: my-evolution/Locations.h:1243
+#: my-evolution/Locations.h:1242
 #, fuzzy
 msgid "Lompoc"
 msgstr "公司"
 
 # calendar/zones.h:303
 # my-evolution/Locations.h:1244
-#: my-evolution/Locations.h:1244
+#: my-evolution/Locations.h:1243
 msgid "London"
 msgstr "伦敦"
 
 # my-evolution/Locations.h:1245
-#: my-evolution/Locations.h:1245
+#: my-evolution/Locations.h:1244
 msgid "London/City"
 msgstr "伦敦/城"
 
 # my-evolution/Locations.h:1246
-#: my-evolution/Locations.h:1246
+#: my-evolution/Locations.h:1245
 msgid "London/Gatwick"
 msgstr "伦敦/Gatwick"
 
 # my-evolution/Locations.h:1247
-#: my-evolution/Locations.h:1247
+#: my-evolution/Locations.h:1246
 msgid "London/Heathrow"
 msgstr "伦敦/Heathrow"
 
 # my-evolution/Locations.h:1248
-#: my-evolution/Locations.h:1248
+#: my-evolution/Locations.h:1247
 msgid "London/Stansted"
 msgstr "伦敦/Stansted"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:99
 # addressbook/gui/contact-editor/fulladdr.glade.h:99
 # my-evolution/Locations.h:1249
-#: my-evolution/Locations.h:1249
+#: my-evolution/Locations.h:1248
 #, fuzzy
 msgid "Londrina"
 msgstr "洪都拉斯"
 
 # my-evolution/Locations.h:1250
-#: my-evolution/Locations.h:1250
+#: my-evolution/Locations.h:1249
 msgid "Lone Rock"
 msgstr ""
 
 # my-evolution/Locations.h:1251
-#: my-evolution/Locations.h:1251
+#: my-evolution/Locations.h:1250
 msgid "Long Beach"
 msgstr ""
 
 # my-evolution/Locations.h:1252
-#: my-evolution/Locations.h:1252
+#: my-evolution/Locations.h:1251
 msgid "Longview"
 msgstr ""
 
 # my-evolution/Locations.h:1253
-#: my-evolution/Locations.h:1253
+#: my-evolution/Locations.h:1252
 msgid "Lorient-Lann-Bihoue"
 msgstr ""
 
 # calendar/gui/e-calendar-table.etspec.h:3
 # calendar/gui/e-calendar-table.etspec.h:3
 # my-evolution/Locations.h:1254
-#: my-evolution/Locations.h:1254
+#: my-evolution/Locations.h:1253
 msgid "Los Alamos"
 msgstr "洛斯阿拉莫斯"
 
 # calendar/zones.h:121
 # my-evolution/Locations.h:1255
-#: my-evolution/Locations.h:1255
+#: my-evolution/Locations.h:1254
 msgid "Los Angeles"
 msgstr "洛杉矶"
 
 # my-evolution/Locations.h:1256
-#: my-evolution/Locations.h:1256
+#: my-evolution/Locations.h:1255
 msgid "Los Mochis"
 msgstr ""
 
 # my-evolution/Locations.h:1257
-#: my-evolution/Locations.h:1257
+#: my-evolution/Locations.h:1256
 msgid "Lossiemouth"
 msgstr ""
 
 # my-evolution/Locations.h:1258
-#: my-evolution/Locations.h:1258
+#: my-evolution/Locations.h:1257
 msgid "Louisville"
 msgstr "路易斯维尔"
 
 # my-evolution/Locations.h:1259
-#: my-evolution/Locations.h:1259
+#: my-evolution/Locations.h:1258
 msgid "Louisville-Standiford Field"
 msgstr "路易斯维尔-Standiford Field"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:29
 # addressbook/gui/contact-editor/fulladdr.glade.h:29
 # my-evolution/Locations.h:1260
-#: my-evolution/Locations.h:1260
+#: my-evolution/Locations.h:1259
 #, fuzzy
 msgid "Lousiana"
 msgstr "博茨瓦纳"
 
 # my-evolution/Locations.h:1261
-#: my-evolution/Locations.h:1261
+#: my-evolution/Locations.h:1260
 msgid "Lovelock"
 msgstr ""
 
 # my-evolution/Locations.h:1262
-#: my-evolution/Locations.h:1262
+#: my-evolution/Locations.h:1261
 msgid "Lubbock"
 msgstr ""
 
 # my-evolution/Locations.h:1263
-#: my-evolution/Locations.h:1263
+#: my-evolution/Locations.h:1262
 msgid "Lubeck-Blankensee"
 msgstr ""
 
 # my-evolution/Locations.h:1264
-#: my-evolution/Locations.h:1264
+#: my-evolution/Locations.h:1263
 msgid "Lufkin"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:118
 # addressbook/gui/contact-editor/fulladdr.glade.h:118
 # my-evolution/Locations.h:1265
-#: my-evolution/Locations.h:1265
+#: my-evolution/Locations.h:1264
 #, fuzzy
 msgid "Lugano"
 msgstr "黎巴嫩"
 
 # my-evolution/Locations.h:1266
-#: my-evolution/Locations.h:1266
+#: my-evolution/Locations.h:1265
 msgid "Luqa"
 msgstr ""
 
 # my-evolution/Locations.h:1267
-#: my-evolution/Locations.h:1267
+#: my-evolution/Locations.h:1266
 msgid "Luton"
 msgstr "卢顿"
 
 # my-evolution/Locations.h:1269
-#: my-evolution/Locations.h:1269
+#: my-evolution/Locations.h:1268
 msgid "Luxeuil"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:123
 # addressbook/gui/contact-editor/fulladdr.glade.h:123
 # my-evolution/Locations.h:1270
-#: my-evolution/Locations.h:1270
+#: my-evolution/Locations.h:1269
 #, fuzzy
 msgid "Luxor"
 msgstr "卢森堡"
@@ -28030,35 +29770,35 @@ msgstr "卢森堡"
 # addressbook/gui/contact-editor/fulladdr.glade.h:117
 # addressbook/gui/contact-editor/fulladdr.glade.h:117
 # my-evolution/Locations.h:1271
-#: my-evolution/Locations.h:1271
+#: my-evolution/Locations.h:1270
 #, fuzzy
 msgid "Lviv"
 msgstr "拉脱维亚"
 
 # my-evolution/Locations.h:1272
-#: my-evolution/Locations.h:1272
+#: my-evolution/Locations.h:1271
 msgid "Lynchburg"
 msgstr ""
 
 # my-evolution/Locations.h:1273
-#: my-evolution/Locations.h:1273
+#: my-evolution/Locations.h:1272
 msgid "Lyneham"
 msgstr ""
 
 # my-evolution/Locations.h:1274
-#: my-evolution/Locations.h:1274
+#: my-evolution/Locations.h:1273
 msgid "Lyon-Bron"
 msgstr "里昂-Bron"
 
 # my-evolution/Locations.h:1275
-#: my-evolution/Locations.h:1275
+#: my-evolution/Locations.h:1274
 msgid "Lyon-Satolas"
 msgstr "里昂-Satolas"
 
 # calendar/gui/goto-dialog.glade.h:10
 # calendar/gui/goto-dialog.glade.h:10
 # my-evolution/Locations.h:1276
-#: my-evolution/Locations.h:1276
+#: my-evolution/Locations.h:1275
 #, fuzzy
 msgid "Maastricht"
 msgstr "三月"
@@ -28066,7 +29806,7 @@ msgstr "三月"
 # addressbook/gui/contact-editor/fulladdr.glade.h:124
 # addressbook/gui/contact-editor/fulladdr.glade.h:124
 # my-evolution/Locations.h:1277
-#: my-evolution/Locations.h:1277
+#: my-evolution/Locations.h:1276
 #, fuzzy
 msgid "Macae"
 msgstr "澳门"
@@ -28074,7 +29814,7 @@ msgstr "澳门"
 # addressbook/gui/contact-editor/fulladdr.glade.h:124
 # addressbook/gui/contact-editor/fulladdr.glade.h:124
 # my-evolution/Locations.h:1278
-#: my-evolution/Locations.h:1278
+#: my-evolution/Locations.h:1277
 #, fuzzy
 msgid "Macapa"
 msgstr "澳门"
@@ -28082,7 +29822,7 @@ msgstr "澳门"
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # my-evolution/Locations.h:1279
-#: my-evolution/Locations.h:1279
+#: my-evolution/Locations.h:1278
 #, fuzzy
 msgid "Maceio"
 msgstr "摩纳哥"
@@ -28090,14 +29830,14 @@ msgstr "摩纳哥"
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/backend/ebook/e-card-simple.c:93
 # my-evolution/Locations.h:1280
-#: my-evolution/Locations.h:1280
+#: my-evolution/Locations.h:1279
 msgid "Macon"
 msgstr "梅肯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:125
 # addressbook/gui/contact-editor/fulladdr.glade.h:125
 # my-evolution/Locations.h:1281
-#: my-evolution/Locations.h:1281
+#: my-evolution/Locations.h:1280
 #, fuzzy
 msgid "Madinah"
 msgstr "马其顿"
@@ -28105,59 +29845,59 @@ msgstr "马其顿"
 # addressbook/gui/contact-editor/fulladdr.glade.h:129
 # addressbook/gui/contact-editor/fulladdr.glade.h:129
 # my-evolution/Locations.h:1282
-#: my-evolution/Locations.h:1282
+#: my-evolution/Locations.h:1281
 msgid "Madison"
 msgstr "麦迪逊"
 
 # my-evolution/Locations.h:1283
-#: my-evolution/Locations.h:1283
+#: my-evolution/Locations.h:1282
 msgid "Madras/Minambakkam"
 msgstr "马德拉斯/Minambakkam"
 
 # my-evolution/Locations.h:1284
-#: my-evolution/Locations.h:1284
+#: my-evolution/Locations.h:1283
 msgid "Madrid (Barajas)"
 msgstr "马德里 (Barajas)"
 
 # my-evolution/Locations.h:1285
-#: my-evolution/Locations.h:1285
+#: my-evolution/Locations.h:1284
 msgid "Madrid (Cuatro Vientos)"
 msgstr "马德里 (Cuatro Vientos)"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:40
 # addressbook/gui/contact-editor/fulladdr.glade.h:40
 # my-evolution/Locations.h:1286
-#: my-evolution/Locations.h:1286
+#: my-evolution/Locations.h:1285
 #, fuzzy
 msgid "Magadan"
 msgstr "加拿大"
 
 # my-evolution/Locations.h:1287
-#: my-evolution/Locations.h:1287
+#: my-evolution/Locations.h:1286
 msgid "Magdalena"
 msgstr "马各达林"
 
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/backend/ebook/e-card-simple.c:93
 # my-evolution/Locations.h:1288
-#: my-evolution/Locations.h:1288
+#: my-evolution/Locations.h:1287
 msgid "Maine"
 msgstr "缅因州"
 
 # my-evolution/Locations.h:1289
-#: my-evolution/Locations.h:1289
+#: my-evolution/Locations.h:1288
 msgid "Makhachkala"
 msgstr "马哈奇卡拉"
 
 # my-evolution/Locations.h:1290
-#: my-evolution/Locations.h:1290
+#: my-evolution/Locations.h:1289
 msgid "Makkah"
 msgstr "麦加"
 
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/backend/ebook/e-card-simple.c:93
 # my-evolution/Locations.h:1291
-#: my-evolution/Locations.h:1291
+#: my-evolution/Locations.h:1290
 #, fuzzy
 msgid "Makung"
 msgstr "经理"
@@ -28165,7 +29905,7 @@ msgstr "经理"
 # addressbook/gui/contact-editor/fulladdr.glade.h:127
 # addressbook/gui/contact-editor/fulladdr.glade.h:127
 # my-evolution/Locations.h:1292
-#: my-evolution/Locations.h:1292
+#: my-evolution/Locations.h:1291
 #, fuzzy
 msgid "Malad City"
 msgstr "马拉维"
@@ -28173,7 +29913,7 @@ msgstr "马拉维"
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # my-evolution/Locations.h:1293
-#: my-evolution/Locations.h:1293
+#: my-evolution/Locations.h:1292
 #, fuzzy
 msgid "Malaga"
 msgstr "马耳他"
@@ -28181,23 +29921,23 @@ msgstr "马耳他"
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # my-evolution/Locations.h:1294
-#: my-evolution/Locations.h:1294
+#: my-evolution/Locations.h:1293
 #, fuzzy
 msgid "Malatya"
 msgstr "马耳他"
 
 # my-evolution/Locations.h:1295
-#: my-evolution/Locations.h:1295
+#: my-evolution/Locations.h:1294
 msgid "Maldonado/Punta Est"
 msgstr ""
 
 # my-evolution/Locations.h:1296
-#: my-evolution/Locations.h:1296
+#: my-evolution/Locations.h:1295
 msgid "Malmo/Sturup"
 msgstr ""
 
 # my-evolution/Locations.h:1298
-#: my-evolution/Locations.h:1298
+#: my-evolution/Locations.h:1297
 msgid "Mammoth Lakes"
 msgstr ""
 
@@ -28206,52 +29946,52 @@ msgstr ""
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/gui/widgets/e-addressbook-view.c:882
 # my-evolution/Locations.h:1299
-#: my-evolution/Locations.h:1299
+#: my-evolution/Locations.h:1298
 msgid "Managua"
 msgstr "马那瓜"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:128
 # addressbook/gui/contact-editor/fulladdr.glade.h:128
 # my-evolution/Locations.h:1300
-#: my-evolution/Locations.h:1300
+#: my-evolution/Locations.h:1299
 msgid "Manassas"
 msgstr "马那萨斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:124
 # addressbook/gui/contact-editor/fulladdr.glade.h:124
 # my-evolution/Locations.h:1301
-#: my-evolution/Locations.h:1301
+#: my-evolution/Locations.h:1300
 msgid "Manaus"
 msgstr "马瑙斯"
 
 # mail/mail-search.c:346
 # mail/mail-search.c:346
 # my-evolution/Locations.h:1302
-#: my-evolution/Locations.h:1302
+#: my-evolution/Locations.h:1301
 msgid "Manchester"
 msgstr "曼彻斯特"
 
 # my-evolution/Locations.h:1303
-#: my-evolution/Locations.h:1303
+#: my-evolution/Locations.h:1302
 msgid "Mangilsan Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1304
-#: my-evolution/Locations.h:1304
+#: my-evolution/Locations.h:1303
 msgid "Manhattan"
 msgstr "曼哈顿"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:125
 # addressbook/gui/contact-editor/fulladdr.glade.h:125
 # my-evolution/Locations.h:1305
-#: my-evolution/Locations.h:1305
+#: my-evolution/Locations.h:1304
 msgid "Manisa"
 msgstr "马尼萨"
 
 # my-evolution/metar.c:262
 # my-evolution/metar.c:262
 # my-evolution/Locations.h:1306
-#: my-evolution/Locations.h:1306
+#: my-evolution/Locations.h:1305
 #, fuzzy
 msgid "Manistee"
 msgstr "霭"
@@ -28261,19 +30001,19 @@ msgstr "霭"
 # ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
 # ui/evolution.xml.h:16
 # my-evolution/Locations.h:1307
-#: my-evolution/Locations.h:1307
+#: my-evolution/Locations.h:1306
 msgid "Manitoba"
 msgstr "马尼托巴"
 
 # my-evolution/Locations.h:1308
-#: my-evolution/Locations.h:1308
+#: my-evolution/Locations.h:1307
 msgid "Manitowoc"
 msgstr "马尼托沃克"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # my-evolution/Locations.h:1309
-#: my-evolution/Locations.h:1309
+#: my-evolution/Locations.h:1308
 msgid "Mankato"
 msgstr "曼凯托"
 
@@ -28282,64 +30022,64 @@ msgstr "曼凯托"
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
 # my-evolution/Locations.h:1310
-#: my-evolution/Locations.h:1310
+#: my-evolution/Locations.h:1309
 msgid "Mansfield"
 msgstr "曼斯菲尔德"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # my-evolution/Locations.h:1311
-#: my-evolution/Locations.h:1311
+#: my-evolution/Locations.h:1310
 #, fuzzy
 msgid "Manta"
 msgstr "马耳他"
 
 # my-evolution/Locations.h:1312
-#: my-evolution/Locations.h:1312
+#: my-evolution/Locations.h:1311
 msgid "Manzanillo"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # my-evolution/Locations.h:1313
-#: my-evolution/Locations.h:1313
+#: my-evolution/Locations.h:1312
 #, fuzzy
 msgid "Maraba"
 msgstr "毛里塔尼亚"
 
 # my-evolution/Locations.h:1314
-#: my-evolution/Locations.h:1314
+#: my-evolution/Locations.h:1313
 msgid "Maracaibo-La Chinita"
 msgstr "马拉开波-La Chinita"
 
 # my-evolution/Locations.h:1315
-#: my-evolution/Locations.h:1315
+#: my-evolution/Locations.h:1314
 msgid "Maracay-B.A.Sucre"
 msgstr "马拉凯-B.A.Sucre"
 
 # calendar/gui/goto-dialog.glade.h:10
 # calendar/gui/goto-dialog.glade.h:10
 # my-evolution/Locations.h:1316
-#: my-evolution/Locations.h:1316
+#: my-evolution/Locations.h:1315
 msgid "Marathon"
 msgstr "马拉松"
 
 # my-evolution/Locations.h:1317
-#: my-evolution/Locations.h:1317
+#: my-evolution/Locations.h:1316
 msgid "Mar Del Plata"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # my-evolution/Locations.h:1318
-#: my-evolution/Locations.h:1318
+#: my-evolution/Locations.h:1317
 msgid "Margarita"
 msgstr "玛格丽塔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # my-evolution/Locations.h:1319
-#: my-evolution/Locations.h:1319
+#: my-evolution/Locations.h:1318
 msgid "Marianna"
 msgstr "马里亚纳群岛"
 
@@ -28348,82 +30088,82 @@ msgstr "马里亚纳群岛"
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
 # my-evolution/Locations.h:1320
-#: my-evolution/Locations.h:1320
+#: my-evolution/Locations.h:1319
 #, fuzzy
 msgid "Marib"
 msgstr "邮件"
 
 # my-evolution/Locations.h:1321
-#: my-evolution/Locations.h:1321
+#: my-evolution/Locations.h:1320
 msgid "Maribor"
 msgstr "马里博尔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # my-evolution/Locations.h:1322
-#: my-evolution/Locations.h:1322
+#: my-evolution/Locations.h:1321
 msgid "Marietta"
 msgstr "玛丽埃塔"
 
 # my-evolution/Locations.h:1323
-#: my-evolution/Locations.h:1323
+#: my-evolution/Locations.h:1322
 msgid "Marino di Ravenna"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:21
 # addressbook/printing/e-contact-print.glade.h:21
 # my-evolution/Locations.h:1324
-#: my-evolution/Locations.h:1324
+#: my-evolution/Locations.h:1323
 msgid "Marion"
 msgstr "马里恩"
 
 # my-evolution/Locations.h:1325
-#: my-evolution/Locations.h:1325
+#: my-evolution/Locations.h:1324
 msgid "Marion-Wytheville"
 msgstr "马里恩-Wytheville"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:133
 # addressbook/gui/contact-editor/fulladdr.glade.h:133
 # my-evolution/Locations.h:1326
-#: my-evolution/Locations.h:1326
+#: my-evolution/Locations.h:1325
 #, fuzzy
 msgid "Marquette"
 msgstr "马提尼可岛"
 
 # my-evolution/Locations.h:1327
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "马赛-普罗旺斯"
 
 # my-evolution/Locations.h:1328
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marseilles"
 msgstr "马赛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # my-evolution/Locations.h:1329
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshall"
 msgstr "马绍尔群岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # my-evolution/Locations.h:1330
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 #, fuzzy
 msgid "Marshalltown"
 msgstr "马绍尔群岛"
 
 # my-evolution/Locations.h:1331
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marshfield"
 msgstr ""
 
 # mail/mail-format.c:763
 # mail/mail-format.c:769
 # my-evolution/Locations.h:1332
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 #, fuzzy
 msgid "Marte"
 msgstr "日期"
@@ -28431,7 +30171,7 @@ msgstr "日期"
 # mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
 # mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:45
 # my-evolution/Locations.h:1333
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 #, fuzzy
 msgid "Marthas Vineyard"
 msgstr "标记为未读(_N)"
@@ -28439,7 +30179,7 @@ msgstr "标记为未读(_N)"
 # addressbook/printing/e-contact-print.glade.h:21
 # addressbook/printing/e-contact-print.glade.h:21
 # my-evolution/Locations.h:1334
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 #, fuzzy
 msgid "Martinsburg"
 msgstr "边界"
@@ -28447,7 +30187,7 @@ msgstr "边界"
 # addressbook/gui/contact-editor/fulladdr.glade.h:133
 # addressbook/gui/contact-editor/fulladdr.glade.h:133
 # my-evolution/Locations.h:1335
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 #, fuzzy
 msgid "Martinsville"
 msgstr "马提尼可岛"
@@ -28455,47 +30195,47 @@ msgstr "马提尼可岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # my-evolution/Locations.h:1336
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Maryland"
 msgstr "马里兰"
 
 # my-evolution/Locations.h:1337
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville"
 msgstr ""
 
 # my-evolution/Locations.h:1338
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Marysville-Beale AFB"
 msgstr ""
 
 # my-evolution/Locations.h:1339
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Mashhad"
 msgstr "马什哈德"
 
 # calendar/gui/goto-dialog.glade.h:10
 # calendar/gui/goto-dialog.glade.h:10
 # my-evolution/Locations.h:1340
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 #, fuzzy
 msgid "Masirah"
 msgstr "三月"
 
 # my-evolution/Locations.h:1341
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Mason City"
 msgstr "梅森城"
 
 # my-evolution/Locations.h:1342
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massachusetts"
 msgstr "麻萨诸塞州"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:125
 # addressbook/gui/contact-editor/fulladdr.glade.h:125
 # my-evolution/Locations.h:1343
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 #, fuzzy
 msgid "Massena"
 msgstr "马其顿"
@@ -28503,29 +30243,29 @@ msgstr "马其顿"
 # addressbook/gui/contact-editor/fulladdr.glade.h:51
 # addressbook/gui/contact-editor/fulladdr.glade.h:51
 # my-evolution/Locations.h:1344
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matamoros"
 msgstr "马塔莫罗斯"
 
 # my-evolution/Locations.h:1345
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsumoto Airport"
 msgstr "松本机场"
 
 # my-evolution/Locations.h:1346
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsushima Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1347
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Matsuyama Airport"
 msgstr "松山机场"
 
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/backend/ebook/e-card-simple.c:93
 # my-evolution/Locations.h:1348
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 #, fuzzy
 msgid "Mattoon"
 msgstr "经理"
@@ -28535,7 +30275,7 @@ msgstr "经理"
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/gui/widgets/e-addressbook-view.c:882
 # my-evolution/Locations.h:1349
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 #, fuzzy
 msgid "Mayaguez"
 msgstr "经理"
@@ -28543,7 +30283,7 @@ msgstr "经理"
 # addressbook/gui/contact-editor/fulladdr.glade.h:136
 # addressbook/gui/contact-editor/fulladdr.glade.h:136
 # my-evolution/Locations.h:1350
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 #, fuzzy
 msgid "Mayport"
 msgstr "马约特岛"
@@ -28551,7 +30291,7 @@ msgstr "马约特岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # calendar/zones.h:127
 # my-evolution/Locations.h:1351
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 #, fuzzy
 msgid "Mazatlan"
 msgstr "美洲萨摩亚"
@@ -28559,17 +30299,17 @@ msgstr "美洲萨摩亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:124
 # addressbook/gui/contact-editor/fulladdr.glade.h:124
 # my-evolution/Locations.h:1352
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "Mazu"
 msgstr "马祖"
 
 # my-evolution/Locations.h:1353
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAlester"
 msgstr ""
 
 # my-evolution/Locations.h:1354
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McAllen"
 msgstr "麦卡伦"
 
@@ -28578,7 +30318,7 @@ msgstr "麦卡伦"
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
 # my-evolution/Locations.h:1355
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 #, fuzzy
 msgid "McCall"
 msgstr "邮件"
@@ -28586,7 +30326,7 @@ msgstr "邮件"
 # calendar/gui/goto-dialog.glade.h:10
 # calendar/gui/goto-dialog.glade.h:10
 # my-evolution/Locations.h:1356
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 #, fuzzy
 msgid "McCarthy"
 msgstr "三月"
@@ -28594,37 +30334,37 @@ msgstr "三月"
 # addressbook/gui/contact-editor/fulladdr.glade.h:102
 # addressbook/gui/contact-editor/fulladdr.glade.h:102
 # my-evolution/Locations.h:1357
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McClellan"
 msgstr "麦克莱伦"
 
 # addressbook/backend/ebook/e-card-simple.c:67
 # addressbook/backend/ebook/e-card-simple.c:67
 # my-evolution/Locations.h:1358
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 #, fuzzy
 msgid "McComb"
 msgstr "公司"
 
 # my-evolution/Locations.h:1359
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McCook"
 msgstr ""
 
 # my-evolution/Locations.h:1360
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "McGrath"
 msgstr ""
 
 # my-evolution/Locations.h:1361
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Mc Gregor"
 msgstr ""
 
 # calendar/gui/goto-dialog.glade.h:10
 # calendar/gui/goto-dialog.glade.h:10
 # my-evolution/Locations.h:1362
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 #, fuzzy
 msgid "Meacham"
 msgstr "三月"
@@ -28632,89 +30372,89 @@ msgstr "三月"
 # calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
 # calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
 # my-evolution/Locations.h:1363
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 #, fuzzy
 msgid "Medford"
 msgstr "之前"
 
 # my-evolution/Locations.h:1364
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Medicine Lodge"
 msgstr ""
 
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/backend/ebook/e-card-simple.c:93
 # my-evolution/Locations.h:1365
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 #, fuzzy
 msgid "Mehamn"
 msgstr "经理"
 
 # my-evolution/Locations.h:1366
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Mekoryuk"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # calendar/zones.h:280
 # my-evolution/Locations.h:1367
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melbourne"
 msgstr "墨尔本"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # my-evolution/Locations.h:1368
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 #, fuzzy
 msgid "Melfa"
 msgstr "马耳他"
 
 # my-evolution/Locations.h:1369
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Melilla"
 msgstr "梅利利亚"
 
 # my-evolution/Locations.h:1370
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memambetsu Airport"
 msgstr ""
 
 # my-evolution/Locations.h:1371
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis"
 msgstr "孟斐斯"
 
 # my-evolution/Locations.h:1372
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Memphis-NAS"
 msgstr "孟斐斯-国家科学院"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # calendar/zones.h:128
 # my-evolution/Locations.h:1373
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 #, fuzzy
 msgid "Mendoza"
 msgstr "美洲萨摩亚"
 
 # my-evolution/Locations.h:1374
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Mene Grande"
 msgstr ""
 
 # my-evolution/Locations.h:1375
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menominee"
 msgstr ""
 
 # my-evolution/Locations.h:1376
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Menorca"
 msgstr "米诺卡"
 
 # my-evolution/Locations.h:1377
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merced"
 msgstr ""
 
@@ -28723,53 +30463,53 @@ msgstr ""
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 # calendar/gui/dialogs/recurrence-page.c:963
 # my-evolution/Locations.h:1378
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 #, fuzzy
 msgid "Merida"
 msgstr "星期五"
 
 # my-evolution/Locations.h:1379
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian"
 msgstr ""
 
 # my-evolution/Locations.h:1380
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Meridian-Lauderdale"
 msgstr ""
 
 # ui/evolution-message-composer.xml.h:49
 # ui/evolution-message-composer.xml.h:49
 # my-evolution/Locations.h:1381
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 #, fuzzy
 msgid "Merril Field"
 msgstr "发件人域(_F)"
 
 # my-evolution/Locations.h:1382
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mersa Matruh"
 msgstr ""
 
 # my-evolution/Locations.h:1383
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Mesa-Falcon Field"
 msgstr ""
 
 # my-evolution/Locations.h:1384
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metabaru Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1385
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Metz-Frescaty"
 msgstr "梅斯-Frescaty"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:137
 # addressbook/gui/contact-editor/fulladdr.glade.h:137
 # my-evolution/Locations.h:1386
-#: my-evolution/Locations.h:1386
+#: my-evolution/Locations.h:1385
 msgid "Mexicali"
 msgstr "墨西卡利"
 
@@ -28778,43 +30518,43 @@ msgstr "墨西卡利"
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
 # my-evolution/Locations.h:1388
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami"
 msgstr "迈阿密"
 
 # my-evolution/Locations.h:1389
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Kendall"
 msgstr "迈阿密-肯德尔"
 
 # my-evolution/Locations.h:1390
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Miami-Opa Locka"
 msgstr "迈阿密-Opa Locka"
 
 # my-evolution/Locations.h:1391
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Michigan"
 msgstr "密歇根州"
 
 # addressbook/gui/contact-editor/fullname.glade.h:15
 # addressbook/gui/contact-editor/fullname.glade.h:15
 # my-evolution/Locations.h:1392
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middle East"
 msgstr "中东"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:192
 # addressbook/gui/contact-editor/fulladdr.glade.h:192
 # my-evolution/Locations.h:1393
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middleton Island"
 msgstr "米德尔顿岛"
 
 # addressbook/gui/contact-editor/fullname.glade.h:15
 # addressbook/gui/contact-editor/fullname.glade.h:15
 # my-evolution/Locations.h:1394
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 #, fuzzy
 msgid "Middletown"
 msgstr "中间名(_M)："
@@ -28822,146 +30562,146 @@ msgstr "中间名(_M)："
 # addressbook/gui/contact-editor/fulladdr.glade.h:76
 # addressbook/gui/contact-editor/fulladdr.glade.h:76
 # my-evolution/Locations.h:1395
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Midland"
 msgstr ""
 
 # my-evolution/Locations.h:1396
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Miho Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1397
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Linate"
 msgstr "米兰/Linate"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:129
 # calendar/zones.h:341
 # my-evolution/Locations.h:1398
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Milano/Malpensa"
 msgstr "米兰/Malpensa"
 
 # shell/e-shell-importer.c:627
 # shell/e-shell-importer.c:627
 # my-evolution/Locations.h:1399
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Miles City"
 msgstr "迈尔斯城"
 
 # my-evolution/Locations.h:1400
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Milford"
 msgstr "米尔福德"
 
 # my-evolution/Locations.h:1401
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millinocket"
 msgstr ""
 
 # my-evolution/Locations.h:1402
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Millville"
 msgstr ""
 
 # mail/mail-autofilter.c:72
 # mail/mail-autofilter.c:72
 # my-evolution/Locations.h:1403
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milton"
 msgstr "米尔顿"
 
 # my-evolution/Locations.h:1404
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee"
 msgstr "密尔沃基"
 
 # my-evolution/Locations.h:1405
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Milwaukee-Timmerman"
 msgstr "密尔沃基-Timmerman"
 
 # my-evolution/Locations.h:1406
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minamitorishima"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # my-evolution/Locations.h:1407
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 #, fuzzy
 msgid "Minatitlan"
 msgstr "毛里塔尼亚"
 
 # my-evolution/Locations.h:1408
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 #, fuzzy
 msgid "Minchumina"
 msgstr "接收"
 
 # my-evolution/Locations.h:1409
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineralnye Vody"
 msgstr ""
 
 # my-evolution/Locations.h:1410
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Mineral Wells"
 msgstr ""
 
 # my-evolution/Locations.h:1411
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis"
 msgstr "明尼阿波利斯"
 
 # my-evolution/Locations.h:1412
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [2]"
 msgstr "明尼阿波利斯 [2]"
 
 # my-evolution/Locations.h:1413
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minneapolis [3]"
 msgstr "明尼阿波利斯 [3]"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # my-evolution/Locations.h:1414
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minnesota"
 msgstr "明尼苏达州"
 
 # my-evolution/Locations.h:1415
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minocqua"
 msgstr ""
 
 # my-evolution/Locations.h:1416
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot"
 msgstr "迈诺特"
 
 # my-evolution/Locations.h:1417
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Minot AFB"
 msgstr "迈诺特空军基地"
 
 # my-evolution/Locations.h:1418
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Misawa Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1419
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Mississippi"
 msgstr "密西西比"
 
 # addressbook/gui/contact-editor/fullname.glade.h:8
 # addressbook/gui/contact-editor/fullname.glade.h:8
 # my-evolution/Locations.h:1420
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 #, fuzzy
 msgid "Missoula"
 msgstr "小姐"
@@ -28969,37 +30709,37 @@ msgstr "小姐"
 # addressbook/gui/contact-editor/fullname.glade.h:8
 # addressbook/gui/contact-editor/fullname.glade.h:8
 # my-evolution/Locations.h:1421
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Missouri"
 msgstr "密苏里州"
 
 # mail/mail-search.c:346
 # mail/mail-search.c:346
 # my-evolution/Locations.h:1422
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitchell"
 msgstr "米切尔"
 
 # my-evolution/Locations.h:1423
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 #, fuzzy
 msgid "Mitilini"
 msgstr "邮件列表"
 
 # my-evolution/Locations.h:1424
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyakejima Airport"
 msgstr ""
 
 # my-evolution/Locations.h:1425
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Miyazaki Airport"
 msgstr "宫崎机场"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # my-evolution/Locations.h:1426
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 #, fuzzy
 msgid "Moa"
 msgstr "一"
@@ -29007,13 +30747,13 @@ msgstr "一"
 # addressbook/gui/widgets/e-addressbook-view.c:861
 # addressbook/gui/widgets/e-addressbook-view.c:861
 # my-evolution/Locations.h:1427
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 #, fuzzy
 msgid "Mobile Downtown"
 msgstr "手机"
 
 # my-evolution/Locations.h:1428
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobile Regional Airport"
 msgstr ""
 
@@ -29024,7 +30764,7 @@ msgstr ""
 # addressbook/gui/contact-editor/contact-editor.glade.h:20
 # addressbook/gui/contact-editor/e-contact-editor.c:1655
 # my-evolution/Locations.h:1429
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 #, fuzzy
 msgid "Mobridge"
 msgstr "手机"
@@ -29032,20 +30772,20 @@ msgstr "手机"
 # my-evolution/metar.c:280
 # my-evolution/metar.c:280
 # my-evolution/Locations.h:1430
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 #, fuzzy
 msgid "Modesto"
 msgstr "中雾"
 
 # my-evolution/Locations.h:1431
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mo I Rana"
 msgstr ""
 
 # ui/evolution-mail-message.xml.h:52
 # ui/evolution-mail-message.xml.h:52
 # my-evolution/Locations.h:1432
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Mojave"
 msgstr "莫哈韦"
 
@@ -29056,7 +30796,7 @@ msgstr "莫哈韦"
 # addressbook/gui/contact-editor/contact-editor.glade.h:20
 # addressbook/gui/contact-editor/e-contact-editor.c:1655
 # my-evolution/Locations.h:1433
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 #, fuzzy
 msgid "Molde"
 msgstr "手机"
@@ -29066,36 +30806,36 @@ msgstr "手机"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 # calendar/gui/dialogs/recurrence-page.c:959
 # my-evolution/Locations.h:1434
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moldova"
 msgstr "摩尔多瓦"
 
 # my-evolution/Locations.h:1435
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Moline-Quad Cities"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:127
 # addressbook/gui/contact-editor/fulladdr.glade.h:127
 # my-evolution/Locations.h:1436
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Molokai"
 msgstr "莫洛凯岛"
 
 # my-evolution/Locations.h:1437
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Mombetsu Airport"
 msgstr ""
 
 # my-evolution/Locations.h:1438
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monchengladbach"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # my-evolution/Locations.h:1439
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 #, fuzzy
 msgid "Monclova"
 msgstr "摩纳哥"
@@ -29103,7 +30843,7 @@ msgstr "摩纳哥"
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # my-evolution/Locations.h:1440
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 #, fuzzy
 msgid "Moncton"
 msgstr "摩纳哥"
@@ -29113,20 +30853,20 @@ msgstr "摩纳哥"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 # calendar/gui/dialogs/recurrence-page.c:959
 # my-evolution/Locations.h:1441
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 #, fuzzy
 msgid "Monida"
 msgstr "星期一"
 
 # my-evolution/Locations.h:1442
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-地中海"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # my-evolution/Locations.h:1443
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Monroe"
 msgstr "门罗"
 
@@ -29135,7 +30875,7 @@ msgstr "门罗"
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/gui/widgets/e-addressbook-view.c:882
 # my-evolution/Locations.h:1444
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 #, fuzzy
 msgid "Montague"
 msgstr "经理"
@@ -29143,37 +30883,37 @@ msgstr "经理"
 # ui/evolution-calendar.xml.h:20
 # ui/evolution-calendar.xml.h:20
 # my-evolution/Locations.h:1445
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Montana"
 msgstr "蒙大拿"
 
 # my-evolution/Locations.h:1446
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Mont-de-Marsan"
 msgstr ""
 
 # my-evolution/Locations.h:1447
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Argentario"
 msgstr ""
 
 # my-evolution/metar.c:160
 # my-evolution/metar.c:160
 # my-evolution/Locations.h:1448
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 #, fuzzy
 msgid "Monte Bisbino"
 msgstr "中雪"
 
 # my-evolution/Locations.h:1449
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Calamita"
 msgstr ""
 
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # my-evolution/Locations.h:1450
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 #, fuzzy
 msgid "Monte Cimone"
 msgstr "月视图"
@@ -29181,20 +30921,20 @@ msgstr "月视图"
 # addressbook/gui/contact-editor/fulladdr.glade.h:140
 # addressbook/gui/contact-editor/fulladdr.glade.h:140
 # my-evolution/Locations.h:1451
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 #, fuzzy
 msgid "Montego Bay"
 msgstr "蒙古"
 
 # my-evolution/Locations.h:1452
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monte Malanotte"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # my-evolution/Locations.h:1453
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 #, fuzzy
 msgid "Monterey"
 msgstr "蒙特塞拉特群岛"
@@ -29202,43 +30942,43 @@ msgstr "蒙特塞拉特群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # my-evolution/Locations.h:1454
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 #, fuzzy
 msgid "Monterrey"
 msgstr "蒙特塞拉特群岛"
 
 # my-evolution/Locations.h:1455
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Scuro"
 msgstr ""
 
 # my-evolution/Locations.h:1456
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Monte Terminillo"
 msgstr ""
 
 # my-evolution/Locations.h:1457
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montevideo/Carrasco"
 msgstr "蒙德维的亚/Carrasco"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # my-evolution/Locations.h:1458
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 #, fuzzy
 msgid "Montgomery"
 msgstr "蒙特塞拉特群岛"
 
 # my-evolution/Locations.h:1459
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Montgomery-Maxwell AFB"
 msgstr "蒙哥马利-麦克斯维尔空军基地"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # my-evolution/Locations.h:1460
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 #, fuzzy
 msgid "Monticello"
 msgstr "摩纳哥"
@@ -29246,42 +30986,42 @@ msgstr "摩纳哥"
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # my-evolution/Locations.h:1461
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montpelier"
 msgstr "蒙比利埃"
 
 # my-evolution/Locations.h:1462
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Dorval"
 msgstr "蒙特利尔 Dorval"
 
 # my-evolution/Locations.h:1463
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Mirabel"
 msgstr "蒙特利尔 米拉贝尔"
 
 # my-evolution/Locations.h:1464
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montreal Saint-Hubert"
 msgstr "蒙特利尔 圣休伯特"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # addressbook/gui/contact-editor/fulladdr.glade.h:141
 # my-evolution/Locations.h:1465
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 #, fuzzy
 msgid "Montrose"
 msgstr "蒙特塞拉特群岛"
 
 # my-evolution/Locations.h:1466
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Montrose (2)"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:140
 # addressbook/gui/contact-editor/fulladdr.glade.h:140
 # my-evolution/Locations.h:1467
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morelia"
 msgstr "莫雷利亚"
 
@@ -29290,7 +31030,7 @@ msgstr "莫雷利亚"
 # addressbook/backend/ebook/e-card-simple.c:69
 # addressbook/gui/widgets/e-addressbook-view.c:858
 # my-evolution/Locations.h:1468
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 #, fuzzy
 msgid "Morgantown"
 msgstr "组织"
@@ -29300,28 +31040,28 @@ msgstr "组织"
 # addressbook/backend/ebook/e-card-simple.c:63
 # addressbook/gui/contact-editor/e-contact-editor.c:1659
 # my-evolution/Locations.h:1469
-#: my-evolution/Locations.h:1469
+#: my-evolution/Locations.h:1468
 #, fuzzy
 msgid "Moriarty"
 msgstr "主要"
 
 # my-evolution/Locations.h:1471
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Morristown"
 msgstr ""
 
 # my-evolution/Locations.h:1472
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Domodedovo"
 msgstr "莫斯科 Domodedovo"
 
 # my-evolution/Locations.h:1473
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moscow Sheremetyevo"
 msgstr "莫斯科 Sheremetyevo"
 
 # my-evolution/Locations.h:1474
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Moses Lake"
 msgstr "摩西湖"
 
@@ -29332,48 +31072,48 @@ msgstr "摩西湖"
 # addressbook/gui/contact-editor/contact-editor.glade.h:20
 # addressbook/gui/contact-editor/e-contact-editor.c:1655
 # my-evolution/Locations.h:1475
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 #, fuzzy
 msgid "Mosinee"
 msgstr "手机"
 
 # my-evolution/Locations.h:1476
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Mosjoen"
 msgstr ""
 
 # my-evolution/Locations.h:1477
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Moultrie"
 msgstr ""
 
 # my-evolution/Locations.h:1478
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain Home"
 msgstr ""
 
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # my-evolution/Locations.h:1479
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 #, fuzzy
 msgid "Mountain View"
 msgstr "月视图"
 
 # my-evolution/Locations.h:1480
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Clemens"
 msgstr ""
 
 # my-evolution/Locations.h:1481
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Holly"
 msgstr ""
 
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
 # my-evolution/Locations.h:1482
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 #, fuzzy
 msgid "Mount Shasta"
 msgstr "东南"
@@ -29381,79 +31121,79 @@ msgstr "东南"
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # my-evolution/Locations.h:1483
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 #, fuzzy
 msgid "Mount Vernon"
 msgstr "月视图"
 
 # my-evolution/Locations.h:1484
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mount Wilson"
 msgstr ""
 
 # my-evolution/Locations.h:1485
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mt Washington"
 msgstr "Mt 华盛顿"
 
 # my-evolution/Locations.h:1486
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Mugla/Dalaman"
 msgstr ""
 
 # my-evolution/Locations.h:1487
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Muir"
 msgstr ""
 
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/backend/ebook/e-card-simple.c:93
 # my-evolution/Locations.h:1488
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 #, fuzzy
 msgid "Mullan"
 msgstr "经理"
 
 # my-evolution/Locations.h:1489
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Mullen"
 msgstr ""
 
 # my-evolution/Locations.h:1490
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Munchen"
 msgstr ""
 
 # calendar/gui/goto-dialog.glade.h:9
 # calendar/gui/goto-dialog.glade.h:9
 # my-evolution/Locations.h:1491
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 #, fuzzy
 msgid "Muncie"
 msgstr "六月"
 
 # my-evolution/Locations.h:1492
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Munster/Osnabruck"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # addressbook/gui/contact-editor/fulladdr.glade.h:134
 # my-evolution/Locations.h:1493
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 #, fuzzy
 msgid "Murcia"
 msgstr "毛里塔尼亚"
 
 # my-evolution/Locations.h:1494
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Murmansk"
 msgstr "摩尔曼斯克"
 
 # addressbook/gui/contact-editor/fullname.glade.h:11
 # addressbook/gui/contact-editor/fullname.glade.h:11
 # my-evolution/Locations.h:1495
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 #, fuzzy
 msgid "Mus"
 msgstr "女士"
@@ -29461,126 +31201,126 @@ msgstr "女士"
 # addressbook/gui/contact-editor/fulladdr.glade.h:133
 # addressbook/gui/contact-editor/fulladdr.glade.h:133
 # my-evolution/Locations.h:1496
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 #, fuzzy
 msgid "Muscatine"
 msgstr "马提尼可岛"
 
 # my-evolution/Locations.h:1497
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muscle Shoals"
 msgstr ""
 
 # my-evolution/Locations.h:1498
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Muskegon"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:8
 # my-evolution/metar.c:33
 # my-evolution/Locations.h:1499
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 #, fuzzy
 msgid "Mykonos"
 msgstr "节"
 
 # my-evolution/Locations.h:1500
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Myrtle Beach"
 msgstr ""
 
 # my-evolution/Locations.h:1501
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nabesna/Devil Mt."
 msgstr ""
 
 # my-evolution/Locations.h:1502
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nacogdoches"
 msgstr ""
 
 # my-evolution/Locations.h:1503
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagasaki Airport"
 msgstr "长崎机场"
 
 # my-evolution/Locations.h:1504
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagoya Airport"
 msgstr "名古屋机场"
 
 # my-evolution/Locations.h:1505
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Nagpur Sonegaon"
 msgstr "那格浦尔 Sonegaon"
 
 # my-evolution/Locations.h:1506
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Naha Airport"
 msgstr "那霸机场"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:18
 # addressbook/gui/contact-editor/fulladdr.glade.h:18
 # my-evolution/Locations.h:1507
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 #, fuzzy
 msgid "Najran"
 msgstr "巴林岛"
 
 # my-evolution/Locations.h:1508
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nakashibetsu Airport"
 msgstr ""
 
 # my-evolution/Locations.h:1509
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Nalchik"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # my-evolution/Locations.h:1510
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 #, fuzzy
 msgid "Namsos"
 msgstr "老挝"
 
 # my-evolution/Locations.h:1511
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Essey"
 msgstr ""
 
 # my-evolution/Locations.h:1512
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nancy-Ochey"
 msgstr ""
 
 # my-evolution/Locations.h:1513
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nankishirahama Airport"
 msgstr ""
 
 # mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
 # mail/mail-callbacks.c:2247 widgets/misc/e-messagebox.c:159
 # my-evolution/Locations.h:1514
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nanning"
 msgstr "南宁"
 
 # my-evolution/Locations.h:1515
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantes Adlantique"
 msgstr "南特 Adlantique"
 
 # my-evolution/Locations.h:1516
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Nantucket"
 msgstr "楠塔基特"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:147
 # addressbook/gui/contact-editor/fulladdr.glade.h:147
 # my-evolution/Locations.h:1517
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 #, fuzzy
 msgid "Napa"
 msgstr "尼泊尔"
@@ -29588,163 +31328,163 @@ msgstr "尼泊尔"
 # mail/mail-config.glade.h:46
 # mail/mail-config.glade.h:46
 # my-evolution/Locations.h:1518
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Naples"
 msgstr "那不勒斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:130
 # addressbook/gui/contact-editor/fulladdr.glade.h:130
 # my-evolution/Locations.h:1519
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Napoli"
 msgstr "那不勒斯"
 
 # addressbook/backend/ebook/e-card-simple.c:95
 # addressbook/backend/ebook/e-card-simple.c:95
 # my-evolution/Locations.h:1520
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Narvik"
 msgstr "纳尔维克"
 
 # my-evolution/Locations.h:1521
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nasa Shuttle"
 msgstr ""
 
 # my-evolution/Locations.h:1522
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashua"
 msgstr ""
 
 # my-evolution/Locations.h:1523
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nashville"
 msgstr "纳什维尔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # calendar/zones.h:137
 # my-evolution/Locations.h:1524
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Nassau"
 msgstr "拿骚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:172
 # addressbook/gui/contact-editor/fulladdr.glade.h:172
 # my-evolution/Locations.h:1525
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natal"
 msgstr "纳塔耳"
 
 # mail/mail-search.c:346
 # mail/mail-search.c:346
 # my-evolution/Locations.h:1526
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Natchez"
 msgstr "纳齐兹"
 
 # my-evolution/Locations.h:1527
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nawabshah"
 msgstr ""
 
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # my-evolution/Locations.h:1528
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Nebraska"
 msgstr "内布拉斯加州"
 
 # my-evolution/Locations.h:1529
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Needles"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:89
 # addressbook/gui/contact-editor/fulladdr.glade.h:89
 # my-evolution/Locations.h:1530
-#: my-evolution/Locations.h:1530
+#: my-evolution/Locations.h:1529
 #, fuzzy
 msgid "Nenana"
 msgstr "格林纳达"
 
 # my-evolution/Locations.h:1532
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Neuquen"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:89
 # addressbook/gui/contact-editor/fulladdr.glade.h:89
 # my-evolution/Locations.h:1533
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Nevada"
 msgstr "内华达州"
 
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # my-evolution/Locations.h:1534
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "Newark"
 msgstr "内瓦克"
 
 # my-evolution/e-summary-rdf.c:528
 # my-evolution/e-summary-rdf.c:528
 # my-evolution/Locations.h:1535
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bedford"
 msgstr "新贝德福德"
 
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
 # my-evolution/Locations.h:1536
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Bern"
 msgstr "新伯尔尼"
 
 # my-evolution/Locations.h:1537
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Braunfels"
 msgstr ""
 
 # my-evolution/Locations.h:1538
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "New Brunswick"
 msgstr ""
 
 # my-evolution/Locations.h:1539
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newburgh"
 msgstr ""
 
 # mail/mail-config.glade.h:46
 # mail/mail-config.glade.h:46
 # my-evolution/Locations.h:1540
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "Newcastle"
 msgstr "纽卡斯尔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:151
 # addressbook/gui/contact-editor/fulladdr.glade.h:151
 # my-evolution/Locations.h:1541
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "New Delhi/Palam"
 msgstr "新德里/Palam"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:151
 # addressbook/gui/contact-editor/fulladdr.glade.h:151
 # my-evolution/Locations.h:1542
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "Newfoundland"
 msgstr "纽芬兰"
 
 # my-evolution/Locations.h:1543
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Hampshire"
 msgstr "新汉普郡"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:150
 # addressbook/gui/contact-editor/fulladdr.glade.h:150
 # my-evolution/Locations.h:1544
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 #, fuzzy
 msgid "New Haven"
 msgstr "新喀里多尼亚"
@@ -29752,144 +31492,144 @@ msgstr "新喀里多尼亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:150
 # addressbook/gui/contact-editor/fulladdr.glade.h:150
 # my-evolution/Locations.h:1545
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Iberia"
 msgstr "新伊比利亚"
 
 # ui/evolution-mail-global.xml.h:10
 # ui/evolution-mail-global.xml.h:10
 # my-evolution/Locations.h:1546
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Jersey"
 msgstr "新泽西州"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:137
 # addressbook/gui/contact-editor/fulladdr.glade.h:137
 # my-evolution/Locations.h:1547
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Mexico"
 msgstr "新墨西哥州"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:151
 # addressbook/gui/contact-editor/fulladdr.glade.h:151
 # my-evolution/Locations.h:1548
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans"
 msgstr "新奥尔良"
 
 # my-evolution/Locations.h:1549
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans-Lakefront"
 msgstr "新奥尔良-Lakefront"
 
 # my-evolution/Locations.h:1550
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "New Orleans NAS"
 msgstr "新奥尔良国家科学院"
 
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/Locations.h:1551
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 #, fuzzy
 msgid "Newport"
 msgstr "北"
 
 # my-evolution/Locations.h:1552
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "Newport News"
 msgstr ""
 
 # my-evolution/Locations.h:1553
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New Port Richey"
 msgstr ""
 
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
 # my-evolution/Locations.h:1554
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 #, fuzzy
 msgid "New River"
 msgstr "新建文件夹(_N)"
 
 # my-evolution/Locations.h:1555
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "New Tokyo International Airport"
 msgstr "东京新国际机场"
 
 # widgets/misc/e-charset-picker.c:101
 # widgets/misc/e-charset-picker.c:101
 # my-evolution/Locations.h:1556
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "Newton"
 msgstr "牛顿"
 
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
 # my-evolution/Locations.h:1557
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York"
 msgstr "纽约"
 
 # my-evolution/Locations.h:1558
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-JFK Arpt"
 msgstr "纽约-JFK Arpt"
 
 # my-evolution/Locations.h:1559
-#: my-evolution/Locations.h:1559
+#: my-evolution/Locations.h:1558
 msgid "New York-La Guardia"
 msgstr "纽约-La Guardia"
 
 # my-evolution/Locations.h:1561
-#: my-evolution/Locations.h:1561
+#: my-evolution/Locations.h:1560
 msgid "Niagara Falls"
 msgstr "尼亚加拉瀑布"
 
 # my-evolution/Locations.h:1563
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Nice-Cote d'Azur"
 msgstr ""
 
 # my-evolution/Locations.h:1564
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Niigata Airport"
 msgstr "新滹机场"
 
 # addressbook/printing/e-contact-print.glade.h:6
 # addressbook/printing/e-contact-print.glade.h:6
 # my-evolution/Locations.h:1565
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nimes-Garons"
 msgstr "尼姆-Garons"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:196
 # addressbook/gui/contact-editor/fulladdr.glade.h:196
 # my-evolution/Locations.h:1566
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 #, fuzzy
 msgid "Nipawin"
 msgstr "西班牙"
 
 # my-evolution/Locations.h:1567
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 #, fuzzy
 msgid "Nis"
 msgstr "是"
 
 # my-evolution/Locations.h:1568
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "Nizhny Novgorod"
 msgstr ""
 
 # my-evolution/Locations.h:1569
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Las Vegas"
 msgstr ""
 
 # my-evolution/Locations.h:1570
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "N Myrtle Beach"
 msgstr ""
 
@@ -29902,7 +31642,7 @@ msgstr ""
 # calendar/gui/dialogs/task-details-page.glade.h:9
 # calendar/gui/e-calendar-table.c:406 mail/message-list.c:661
 # my-evolution/Locations.h:1571
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 #, fuzzy
 msgid "Nogales"
 msgstr "中"
@@ -29910,28 +31650,28 @@ msgstr "中"
 # addressbook/backend/ebook/e-card-simple.c:61
 # addressbook/backend/ebook/e-card-simple.c:61
 # my-evolution/Locations.h:1572
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Nome"
 msgstr "诺母"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:156
 # addressbook/gui/contact-editor/fulladdr.glade.h:156
 # my-evolution/Locations.h:1573
-#: my-evolution/Locations.h:1573
+#: my-evolution/Locations.h:1572
 msgid "Norfolk"
 msgstr "诺福克"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:156
 # addressbook/gui/contact-editor/fulladdr.glade.h:156
 # my-evolution/Locations.h:1575
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norfolk NAS"
 msgstr "诺福克国家科学院"
 
 # mail/mail-mt.c:901
 # mail/mail-mt.c:901
 # my-evolution/Locations.h:1576
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 #, fuzzy
 msgid "Norrkoping"
 msgstr "正在工作"
@@ -29939,27 +31679,27 @@ msgstr "正在工作"
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/Locations.h:1577
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Adams"
 msgstr "北亚当斯"
 
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/Locations.h:1578
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 #, fuzzy
 msgid "North Bend"
 msgstr "北"
 
 # my-evolution/Locations.h:1579
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Carolina"
 msgstr "北卡罗莱纳州"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # my-evolution/Locations.h:1580
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 #, fuzzy
 msgid "North Conway"
 msgstr "挪威"
@@ -29967,31 +31707,31 @@ msgstr "挪威"
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/Locations.h:1581
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "North Dakota"
 msgstr "北达科他"
 
 # my-evolution/Locations.h:1582
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "Northeast Philadelphia"
 msgstr "东北费城"
 
 # my-evolution/Locations.h:1583
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Kingstown"
 msgstr "北金斯敦"
 
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/Locations.h:1584
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "North Platte"
 msgstr "北普拉特"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # my-evolution/Locations.h:1585
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 #, fuzzy
 msgid "Northway"
 msgstr "挪威"
@@ -29999,7 +31739,7 @@ msgstr "挪威"
 # addressbook/gui/contact-editor/fulladdr.glade.h:80
 # addressbook/gui/contact-editor/fulladdr.glade.h:80
 # my-evolution/Locations.h:1586
-#: my-evolution/Locations.h:1586
+#: my-evolution/Locations.h:1585
 #, fuzzy
 msgid "Northwest Territories"
 msgstr "法属南部地区"
@@ -30007,7 +31747,7 @@ msgstr "法属南部地区"
 # my-evolution/metar.c:64
 # my-evolution/metar.c:64
 # my-evolution/Locations.h:1588
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 #, fuzzy
 msgid "Norwich"
 msgstr "北"
@@ -30015,7 +31755,7 @@ msgstr "北"
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # my-evolution/Locations.h:1589
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 #, fuzzy
 msgid "Norwood"
 msgstr "挪威"
@@ -30025,33 +31765,33 @@ msgstr "挪威"
 # addressbook/backend/ebook/e-card-simple.c:97
 # addressbook/gui/widgets/e-addressbook-view.c:886
 # my-evolution/Locations.h:1590
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 #, fuzzy
 msgid "Notodden"
 msgstr "注释"
 
 # my-evolution/Locations.h:1591
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Novara/Cameri"
 msgstr "诺瓦蜡/Cameri"
 
 # my-evolution/Locations.h:1592
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Nova Scotia"
 msgstr "新斯科舍"
 
 # my-evolution/Locations.h:1593
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Novosibirsk"
 msgstr "新西伯利亚"
 
 # my-evolution/Locations.h:1594
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Gerona"
 msgstr ""
 
 # my-evolution/Locations.h:1595
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nueva Ocotepeque"
 msgstr ""
 
@@ -30062,60 +31802,60 @@ msgstr ""
 # calendar/gui/dialogs/task-details-page.glade.h:10
 # calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
 # my-evolution/Locations.h:1596
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 #, fuzzy
 msgid "Nuevo Laredo"
 msgstr "尚未开始"
 
 # my-evolution/Locations.h:1597
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nurnberg"
 msgstr ""
 
 # my-evolution/Locations.h:1598
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Nyutabaru Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1599
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oahu"
 msgstr "瓦胡岛"
 
 # my-evolution/Locations.h:1600
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oak Harbor"
 msgstr "橡树湾"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:208
 # addressbook/gui/contact-editor/fulladdr.glade.h:208
 # my-evolution/Locations.h:1601
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oakland"
 msgstr "奥克兰"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:108
 # addressbook/gui/contact-editor/fulladdr.glade.h:108
 # my-evolution/Locations.h:1602
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 #, fuzzy
 msgid "Oaxaca"
 msgstr "牙买加"
 
 # my-evolution/Locations.h:1603
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Oberpfaffenhofen"
 msgstr ""
 
 # my-evolution/Locations.h:1604
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Obihiro Airport"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # my-evolution/Locations.h:1605
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 #, fuzzy
 msgid "Ocala"
 msgstr "帕劳群岛"
@@ -30123,7 +31863,7 @@ msgstr "帕劳群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:102
 # addressbook/gui/contact-editor/fulladdr.glade.h:102
 # my-evolution/Locations.h:1606
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 #, fuzzy
 msgid "Oceanside"
 msgstr "冰岛"
@@ -30133,7 +31873,7 @@ msgstr "冰岛"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 # ui/evolution-message-composer.xml.h:13
 # my-evolution/Locations.h:1607
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odense"
 msgstr "欧登塞"
 
@@ -30142,7 +31882,7 @@ msgstr "欧登塞"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 # ui/evolution-message-composer.xml.h:13
 # my-evolution/Locations.h:1608
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 #, fuzzy
 msgid "Odesa"
 msgstr "打开"
@@ -30150,7 +31890,7 @@ msgstr "打开"
 # mail/message-list.c:640
 # mail/message-list.c:646
 # my-evolution/Locations.h:1609
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 #, fuzzy
 msgid "Oelwen"
 msgstr "可见"
@@ -30160,22 +31900,22 @@ msgstr "可见"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 # ui/evolution-message-composer.xml.h:13
 # my-evolution/Locations.h:1610
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden"
 msgstr "奥格登"
 
 # my-evolution/Locations.h:1611
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogden-Hill AFB"
 msgstr "奥格登山空军基地"
 
 # my-evolution/Locations.h:1612
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ogdensburg"
 msgstr ""
 
 # my-evolution/Locations.h:1613
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohio"
 msgstr "俄亥俄州"
 
@@ -30190,63 +31930,63 @@ msgstr "俄亥俄州"
 # addressbook/gui/contact-editor/e-contact-editor.c:1714
 # mail/mail-config.glade.h:49
 # my-evolution/Locations.h:1614
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 #, fuzzy
 msgid "Ohrid"
 msgstr "其它"
 
 # my-evolution/Locations.h:1615
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Oita Airport"
 msgstr "大分机场"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:53
 # addressbook/gui/contact-editor/fulladdr.glade.h:53
 # my-evolution/Locations.h:1616
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 #, fuzzy
 msgid "Ojika Island"
 msgstr "库克群岛"
 
 # my-evolution/Locations.h:1617
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Okayama Airport"
 msgstr "冈山机场"
 
 # my-evolution/Locations.h:1618
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Oki Airport"
 msgstr ""
 
 # my-evolution/Locations.h:1619
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Okinoerabu"
 msgstr ""
 
 # my-evolution/Locations.h:1620
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma"
 msgstr "俄克拉荷马州"
 
 # my-evolution/Locations.h:1621
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City"
 msgstr "俄克拉荷马城"
 
 # my-evolution/Locations.h:1622
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Bethany"
 msgstr "俄克拉荷马城-Bethany"
 
 # my-evolution/Locations.h:1623
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Oklahoma City-Midwest City"
 msgstr "俄克拉荷马城-中西部城市"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:33
 # addressbook/gui/contact-editor/fulladdr.glade.h:33
 # my-evolution/Locations.h:1624
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 #, fuzzy
 msgid "Okushiri Island"
 msgstr "不列颠处女群岛"
@@ -30262,68 +32002,68 @@ msgstr "不列颠处女群岛"
 # addressbook/gui/contact-editor/e-contact-editor.c:1714
 # mail/mail-config.glade.h:49
 # my-evolution/Locations.h:1625
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 #, fuzzy
 msgid "Olathe"
 msgstr "其它"
 
 # my-evolution/Locations.h:1626
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olathe/Ind."
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:3
 # addressbook/gui/contact-editor/fulladdr.glade.h:3
 # my-evolution/Locations.h:1627
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 #, fuzzy
 msgid "Olbia"
 msgstr "阿尔巴尼亚"
 
 # my-evolution/Locations.h:1628
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Olympia"
 msgstr "奥林匹亚"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:159
 # addressbook/gui/contact-editor/fulladdr.glade.h:159
 # my-evolution/Locations.h:1629
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha"
 msgstr "奥马哈"
 
 # my-evolution/Locations.h:1630
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omaha-Bellevue"
 msgstr "奥马哈-Bellevue"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:159
 # addressbook/gui/contact-editor/fulladdr.glade.h:159
 # my-evolution/Locations.h:1631
-#: my-evolution/Locations.h:1631
+#: my-evolution/Locations.h:1630
 #, fuzzy
 msgid "Omak"
 msgstr "阿曼"
 
 # my-evolution/Locations.h:1633
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Ominato Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1634
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "Omsk"
 msgstr "鄂木斯克"
 
 # my-evolution/Locations.h:1635
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "O'Neill"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:24
 # addressbook/printing/e-contact-print.glade.h:24
 # my-evolution/Locations.h:1636
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Ontario"
 msgstr "安大略"
 
@@ -30332,55 +32072,55 @@ msgstr "安大略"
 # calendar/gui/dialogs/meeting-page.etspec.h:1
 # calendar/gui/e-meeting-time-sel.etspec.h:1
 # my-evolution/Locations.h:1637
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oostende"
 msgstr "奥斯坦德"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:159
 # addressbook/gui/contact-editor/fulladdr.glade.h:159
 # my-evolution/Locations.h:1638
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran"
 msgstr "奥兰"
 
 # my-evolution/Locations.h:1639
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Oran/Es Senia"
 msgstr "奥兰/Es Senia"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:77
 # addressbook/gui/contact-editor/fulladdr.glade.h:77
 # my-evolution/Locations.h:1640
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange"
 msgstr "奥林奇"
 
 # my-evolution/Locations.h:1641
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Orange City"
 msgstr "奥林奇城"
 
 # my-evolution/Locations.h:1642
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Ord-Sharp"
 msgstr ""
 
 # addressbook/backend/ebook/e-card-simple.c:69
 # addressbook/backend/ebook/e-card-simple.c:69
 # my-evolution/Locations.h:1643
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Oregon"
 msgstr "俄勒冈州"
 
 # my-evolution/Locations.h:1644
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orenburg"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # my-evolution/Locations.h:1645
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 #, fuzzy
 msgid "Orland"
 msgstr "爱尔兰"
@@ -30388,153 +32128,153 @@ msgstr "爱尔兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # my-evolution/Locations.h:1646
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando"
 msgstr "奥兰多"
 
 # my-evolution/Locations.h:1647
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orlando (Orlando International)"
 msgstr "奥兰多 (奥兰多国际)"
 
 # my-evolution/Locations.h:1648
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Orsta-Volda"
 msgstr ""
 
 # widgets/misc/e-messagebox.c:166
 # widgets/misc/e-messagebox.c:166
 # my-evolution/Locations.h:1649
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Oruro"
 msgstr "奥鲁罗"
 
 # my-evolution/Locations.h:1650
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osaka International Airport"
 msgstr "大阪国际机场"
 
 # my-evolution/Locations.h:1651
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Osan Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1652
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 #, fuzzy
 msgid "Oscoda"
 msgstr "秒"
 
 # my-evolution/Locations.h:1653
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oseberg A"
 msgstr ""
 
 # my-evolution/Locations.h:1654
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshima Airport"
 msgstr ""
 
 # my-evolution/Locations.h:1655
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oshkosh"
 msgstr ""
 
 # my-evolution/Locations.h:1656
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Oslo/Gardenmoen"
 msgstr "奥斯陆/Gardenmoen"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # my-evolution/Locations.h:1657
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ostrava"
 msgstr "俄斯特拉发"
 
 # my-evolution/Locations.h:1658
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottawa"
 msgstr "渥太华"
 
 # my-evolution/Locations.h:1659
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Ottumwa"
 msgstr ""
 
 # my-evolution/Locations.h:1660
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owensboro"
 msgstr ""
 
 # my-evolution/Locations.h:1661
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 #, fuzzy
 msgid "Owyhee"
 msgstr "周"
 
 # my-evolution/Locations.h:1662
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxford"
 msgstr "牛津"
 
 # my-evolution/Locations.h:1663
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Oxnard"
 msgstr ""
 
 # my-evolution/Locations.h:1664
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozark"
 msgstr "奥扎克"
 
 # my-evolution/Locations.h:1665
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Ozuki Ab"
 msgstr ""
 
 # my-evolution/Locations.h:1666
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Paderborn-Haxterberg"
 msgstr "帕德伯恩-Haxterberg"
 
 # my-evolution/Locations.h:1667
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Padova"
 msgstr "帕多瓦"
 
 # my-evolution/Locations.h:1668
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paducah"
 msgstr ""
 
 # my-evolution/Locations.h:1669
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paekado"
 msgstr ""
 
 # my-evolution/Locations.h:1670
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paengnyongdo Ab"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:25
 # addressbook/printing/e-contact-print.glade.h:25
 # my-evolution/Locations.h:1671
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 #, fuzzy
 msgid "Paganella"
 msgstr "页面"
 
 # my-evolution/Locations.h:1674
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Pa Kuei/Bakuai"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # my-evolution/Locations.h:1675
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 #, fuzzy
 msgid "Palacios"
 msgstr "帕劳群岛"
@@ -30542,19 +32282,19 @@ msgstr "帕劳群岛"
 # addressbook/printing/e-contact-print.glade.h:27
 # addressbook/printing/e-contact-print.glade.h:27
 # my-evolution/Locations.h:1676
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palermo"
 msgstr "巴勒莫"
 
 # my-evolution/Locations.h:1677
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palma de Mallorca"
 msgstr "帕尔马 德 马略卡"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # my-evolution/Locations.h:1678
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 #, fuzzy
 msgid "Palmdale"
 msgstr "帕劳群岛"
@@ -30566,27 +32306,27 @@ msgstr "帕劳群岛"
 # addressbook/gui/contact-editor/e-contact-editor.c:1658
 # addressbook/gui/widgets/e-addressbook-view.c:870
 # my-evolution/Locations.h:1679
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palmer"
 msgstr "帕默"
 
 # mail/mail-accounts.c:783 mail/mail-config.glade.h:42
 # mail/mail-accounts.c:798 mail/mail-config.glade.h:42
 # my-evolution/Locations.h:1680
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 #, fuzzy
 msgid "Palm Springs"
 msgstr "邮件设置"
 
 # my-evolution/Locations.h:1681
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Palo Alto"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # my-evolution/Locations.h:1682
-#: my-evolution/Locations.h:1682
+#: my-evolution/Locations.h:1681
 #, fuzzy
 msgid "Pamplona"
 msgstr "帕劳群岛"
@@ -30594,7 +32334,7 @@ msgstr "帕劳群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:163
 # addressbook/gui/contact-editor/fulladdr.glade.h:163
 # my-evolution/Locations.h:1684
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Panama City"
 msgstr "巴拿马城"
 
@@ -30609,7 +32349,7 @@ msgstr "巴拿马城"
 # calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
 # camel/camel-service.c:610 camel/camel-service.c:646
 # my-evolution/Locations.h:1685
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 #, fuzzy
 msgid "Pantelleria"
 msgstr "已经取消"
@@ -30617,7 +32357,7 @@ msgstr "已经取消"
 # addressbook/printing/e-contact-print.glade.h:27
 # addressbook/printing/e-contact-print.glade.h:27
 # my-evolution/Locations.h:1686
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 #, fuzzy
 msgid "Papa"
 msgstr "纸张"
@@ -30625,7 +32365,7 @@ msgstr "纸张"
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # my-evolution/Locations.h:1687
-#: my-evolution/Locations.h:1687
+#: my-evolution/Locations.h:1686
 #, fuzzy
 msgid "Paphos"
 msgstr "老挝"
@@ -30633,29 +32373,29 @@ msgstr "老挝"
 # addressbook/printing/e-contact-print.glade.h:21
 # addressbook/printing/e-contact-print.glade.h:21
 # my-evolution/Locations.h:1689
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris"
 msgstr "巴黎"
 
 # my-evolution/Locations.h:1690
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Charles De Gaulle"
 msgstr "巴黎/Charles De Gaulle"
 
 # my-evolution/Locations.h:1691
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Le Bourget"
 msgstr "巴黎/Le Bourget"
 
 # my-evolution/metar.c:359
 # my-evolution/metar.c:359
 # my-evolution/Locations.h:1692
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Paris/Orly"
 msgstr "巴黎/Orly"
 
 # my-evolution/Locations.h:1693
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Parkersburg"
 msgstr ""
 
@@ -30666,72 +32406,72 @@ msgstr ""
 # camel/providers/nntp/camel-nntp-store.c:149
 # camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
 # my-evolution/Locations.h:1694
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 #, fuzzy
 msgid "Pasco"
 msgstr "密码"
 
 # my-evolution/Locations.h:1695
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso De Los Libres"
 msgstr ""
 
 # my-evolution/Locations.h:1696
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Paso Robles"
 msgstr ""
 
 # my-evolution/Locations.h:1697
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo dei Giovi"
 msgstr ""
 
 # my-evolution/Locations.h:1698
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo della Cisa"
 msgstr ""
 
 # my-evolution/Locations.h:1699
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Resia"
 msgstr ""
 
 # my-evolution/Locations.h:1700
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Passo Rolle"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:163
 # addressbook/gui/contact-editor/fulladdr.glade.h:163
 # my-evolution/Locations.h:1701
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patna"
 msgstr "巴特纳"
 
 # my-evolution/Locations.h:1702
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patterson"
 msgstr "帕特森"
 
 # my-evolution/Locations.h:1703
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Patuxent River"
 msgstr ""
 
 # my-evolution/Locations.h:1704
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Pau/Pyrenees"
 msgstr "Pau/比利牛斯山脉"
 
 # my-evolution/Locations.h:1705
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paxson"
 msgstr ""
 
 # my-evolution/metar.c:326
 # my-evolution/metar.c:326
 # my-evolution/Locations.h:1706
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 #, fuzzy
 msgid "Paysandu"
 msgstr "重沙尘"
@@ -30739,7 +32479,7 @@ msgstr "重沙尘"
 # calendar/gui/dialogs/alarm-options.glade.h:3
 # calendar/gui/dialogs/alarm-options.glade.h:3
 # my-evolution/Locations.h:1707
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 #, fuzzy
 msgid "Payson"
 msgstr "播放声音："
@@ -30747,7 +32487,7 @@ msgstr "播放声音："
 # widgets/misc/e-messagebox.c:173
 # widgets/misc/e-messagebox.c:173
 # my-evolution/Locations.h:1708
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 #, fuzzy
 msgid "Pellston"
 msgstr "问题"
@@ -30755,7 +32495,7 @@ msgstr "问题"
 # ui/my-evolution.xml.h:5
 # ui/my-evolution.xml.h:5
 # my-evolution/Locations.h:1709
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 #, fuzzy
 msgid "Pelotas"
 msgstr "重新载入"
@@ -30763,124 +32503,124 @@ msgstr "重新载入"
 # widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 # widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 # my-evolution/Locations.h:1710
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 #, fuzzy
 msgid "Pendleton"
 msgstr "选择："
 
 # my-evolution/Locations.h:1711
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Pennsylvania"
 msgstr "宾西法尼亚州"
 
 # my-evolution/Locations.h:1712
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Penn Yan"
 msgstr "佩恩 Yan"
 
 # my-evolution/Locations.h:1713
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola"
 msgstr ""
 
 # my-evolution/Locations.h:1714
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "Pensacola NAS"
 msgstr ""
 
 # my-evolution/Locations.h:1715
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "People's Republic of China"
 msgstr "中华人民共和国"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:83
 # addressbook/gui/contact-editor/fulladdr.glade.h:83
 # my-evolution/Locations.h:1716
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 #, fuzzy
 msgid "Peoria"
 msgstr "格鲁吉亚"
 
 # my-evolution/Locations.h:1717
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pequot Lakes"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # calendar/zones.h:127
 # my-evolution/Locations.h:1718
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Pereira/Matecana"
 msgstr "佩雷拉/Matecana"
 
 # addressbook/backend/ebook/e-card-simple.c:63
 # addressbook/backend/ebook/e-card-simple.c:63
 # my-evolution/Locations.h:1719
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 #, fuzzy
 msgid "Perm"
 msgstr "主要"
 
 # my-evolution/Locations.h:1720
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perpignan-Rivesaltes"
 msgstr ""
 
 # my-evolution/Locations.h:1721
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perry-Foley"
 msgstr "佩里-福利"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:166
 # addressbook/gui/contact-editor/fulladdr.glade.h:166
 # my-evolution/Locations.h:1722
-#: my-evolution/Locations.h:1722
+#: my-evolution/Locations.h:1721
 msgid "Perth"
 msgstr "珀斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:166
 # addressbook/gui/contact-editor/fulladdr.glade.h:166
 # my-evolution/Locations.h:1724
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Perugia"
 msgstr "佩鲁贾"
 
 # my-evolution/Locations.h:1725
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Pescara"
 msgstr "佩斯卡拉"
 
 # my-evolution/Locations.h:1726
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petersburg"
 msgstr "彼得斯堡"
 
 # my-evolution/Locations.h:1727
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
 # my-evolution/Locations.h:1728
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Petrozavodsk"
 msgstr "彼得罗扎沃茨克"
 
 # my-evolution/Locations.h:1729
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philadelphia"
 msgstr "费城"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # my-evolution/Locations.h:1730
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philip"
 msgstr "菲利普"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # my-evolution/Locations.h:1731
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 #, fuzzy
 msgid "Philipsburg"
 msgstr "菲利宾"
@@ -30888,145 +32628,145 @@ msgstr "菲利宾"
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # addressbook/gui/contact-editor/fulladdr.glade.h:167
 # my-evolution/Locations.h:1732
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phillips"
 msgstr "菲利普"
 
 # calendar/zones.h:146
 # my-evolution/Locations.h:1733
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix"
 msgstr "凤凰城"
 
 # my-evolution/Locations.h:1734
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Deer Valley"
 msgstr "凤凰城-鹿谷"
 
 # my-evolution/Locations.h:1735
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Goodyear"
 msgstr "凤凰城-古德伊尔"
 
 # my-evolution/Locations.h:1736
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Phoenix-Luke AFB"
 msgstr "凤凰城-卢克空军基地"
 
 # my-evolution/Locations.h:1737
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Piacenza"
 msgstr ""
 
 # my-evolution/Locations.h:1738
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Pian Rosa"
 msgstr ""
 
 # my-evolution/Locations.h:1739
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Piedras Negras"
 msgstr ""
 
 # importers/pine-importer.c:691
 # importers/pine-importer.c:691
 # my-evolution/Locations.h:1740
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pierre"
 msgstr "皮埃尔"
 
 # my-evolution/Locations.h:1741
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pietersburg"
 msgstr ""
 
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # my-evolution/Locations.h:1742
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 #, fuzzy
 msgid "Pikeville"
 msgstr "预览"
 
 # my-evolution/Locations.h:1743
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pine Bluff"
 msgstr ""
 
 # my-evolution/Locations.h:1744
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung North"
 msgstr ""
 
 # my-evolution/Locations.h:1745
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pingtung South"
 msgstr ""
 
 # my-evolution/Locations.h:1746
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pirassununga"
 msgstr ""
 
 # my-evolution/Locations.h:1747
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisa"
 msgstr "比萨"
 
 # my-evolution/Locations.h:1748
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pisco"
 msgstr "皮斯科"
 
 # my-evolution/Locations.h:1749
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh"
 msgstr "匹兹堡"
 
 # my-evolution/Locations.h:1750
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Pittsburgh-West Mifflin"
 msgstr "匹兹堡-West Mifflin"
 
 # my-evolution/Locations.h:1751
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plattsburg"
 msgstr ""
 
 # my-evolution/Locations.h:1752
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plovdiv"
 msgstr "普罗夫迪夫"
 
 # my-evolution/Locations.h:1753
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Plymouth"
 msgstr "普利茅斯"
 
 # my-evolution/Locations.h:1754
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocatello"
 msgstr ""
 
 # my-evolution/Locations.h:1755
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Pocos De Caldas"
 msgstr ""
 
 # my-evolution/Locations.h:1756
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica"
 msgstr "波德戈里查"
 
 # my-evolution/metar.c:449
 # my-evolution/metar.c:449
 # my-evolution/Locations.h:1757
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Podgorica Titograd"
 msgstr "波德戈里查 铁托格勒"
 
 # my-evolution/Locations.h:1758
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Pohang Ab"
 msgstr ""
 
@@ -31035,7 +32775,7 @@ msgstr ""
 # addressbook/printing/e-contact-print-envelope.c:215
 # addressbook/printing/e-contact-print-envelope.c:236
 # my-evolution/Locations.h:1759
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 #, fuzzy
 msgid "Point Hope"
 msgstr "打印信封"
@@ -31043,7 +32783,7 @@ msgstr "打印信封"
 # ui/my-evolution.xml.h:4
 # ui/my-evolution.xml.h:4
 # my-evolution/Locations.h:1760
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 #, fuzzy
 msgid "Point Lay"
 msgstr "打印概要"
@@ -31051,70 +32791,70 @@ msgstr "打印概要"
 # mail/mail-callbacks.c:2325
 # mail/mail-callbacks.c:2465
 # my-evolution/Locations.h:1761
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 #, fuzzy
 msgid "Point Mugu"
 msgstr "打印消息"
 
 # my-evolution/Locations.h:1762
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Point Piedras Blanca"
 msgstr ""
 
 # mail/mail-callbacks.c:2262
 # mail/mail-callbacks.c:2381
 # my-evolution/Locations.h:1763
-#: my-evolution/Locations.h:1763
+#: my-evolution/Locations.h:1762
 #, fuzzy
 msgid "Poitiers"
 msgstr "过滤规则"
 
 # my-evolution/Locations.h:1765
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Pompano Beach"
 msgstr ""
 
 # views/addressbook/galview.xml.h:3
 # views/addressbook/galview.xml.h:3
 # my-evolution/Locations.h:1766
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponca City"
 msgstr "彭加城"
 
 # mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 # mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 # my-evolution/Locations.h:1767
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponce"
 msgstr "庞塞"
 
 # my-evolution/Locations.h:1768
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Ponta Pora"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:31
 # ui/evolution-addressbook.xml.h:31
 # my-evolution/Locations.h:1769
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 #, fuzzy
 msgid "Pontiac"
 msgstr "联系人(_C)"
 
 # my-evolution/Locations.h:1770
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Pope AFB"
 msgstr ""
 
 # my-evolution/Locations.h:1771
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poplar Bluff"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:1772
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 #, fuzzy
 msgid "Poprad"
 msgstr "波兰"
@@ -31122,12 +32862,12 @@ msgstr "波兰"
 # calendar/gui/print.c:2386
 # calendar/gui/print.c:2386
 # my-evolution/Locations.h:1773
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alexander"
 msgstr "亚历山大港"
 
 # my-evolution/Locations.h:1774
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Alsworth"
 msgstr ""
 
@@ -31136,26 +32876,26 @@ msgstr ""
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
 # addressbook/gui/widgets/e-addressbook-view.c:738
 # my-evolution/Locations.h:1775
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 #, fuzzy
 msgid "Port Angeles"
 msgstr "打印信封"
 
 # calendar/zones.h:147
 # my-evolution/Locations.h:1776
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port-Au-Prince"
 msgstr "太子港"
 
 # my-evolution/Locations.h:1777
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Port Elizabeth"
 msgstr "伊丽莎白港"
 
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # my-evolution/Locations.h:1778
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 #, fuzzy
 msgid "Porterville"
 msgstr "预览"
@@ -31165,54 +32905,54 @@ msgstr "预览"
 # addressbook/printing/e-contact-print.c:1171
 # addressbook/printing/e-contact-print.c:1193
 # my-evolution/Locations.h:1779
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hardy"
 msgstr "哈代港"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:1780
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 #, fuzzy
 msgid "Port Hedland"
 msgstr "波兰"
 
 # my-evolution/Locations.h:1781
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Port Heiden"
 msgstr "海顿港"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:1782
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Portland"
 msgstr "波特兰"
 
 # addressbook/gui/component/addressbook-config.glade.h:27
 # addressbook/gui/component/addressbook-config.glade.h:27
 # my-evolution/Locations.h:1783
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto"
 msgstr "波尔图"
 
 # calendar/gui/dialogs/task-details-page.glade.h:11
 # calendar/gui/dialogs/task-details-page.glade.h:11
 # my-evolution/Locations.h:1784
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 #, fuzzy
 msgid "Porto Alegre"
 msgstr "进度"
 
 # my-evolution/Locations.h:1785
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Porto Alegre Apt"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:29
 # addressbook/printing/e-contact-print.glade.h:29
 # my-evolution/Locations.h:1786
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 #, fuzzy
 msgid "Portoroz"
 msgstr "纵向"
@@ -31220,56 +32960,56 @@ msgstr "纵向"
 # addressbook/printing/e-contact-print.glade.h:29
 # addressbook/printing/e-contact-print.glade.h:29
 # my-evolution/Locations.h:1787
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 #, fuzzy
 msgid "Porto Santo"
 msgstr "纵向"
 
 # my-evolution/Locations.h:1788
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Porto Velho"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:29
 # addressbook/printing/e-contact-print.glade.h:29
 # my-evolution/Locations.h:1789
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 #, fuzzy
 msgid "Port Said"
 msgstr "纵向"
 
 # my-evolution/Locations.h:1790
-#: my-evolution/Locations.h:1790
+#: my-evolution/Locations.h:1789
 msgid "Portsmouth"
 msgstr "朴次茅斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:1792
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 #, fuzzy
 msgid "Posadas"
 msgstr "波兰"
 
 # my-evolution/Locations.h:1793
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Potosi"
 msgstr ""
 
 # my-evolution/Locations.h:1794
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Poughkeepsie"
 msgstr ""
 
 # my-evolution/Locations.h:1795
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Pownal"
 msgstr "波纳尔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:54
 # addressbook/gui/contact-editor/fulladdr.glade.h:54
 # my-evolution/Locations.h:1796
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 #, fuzzy
 msgid "Poza Rica"
 msgstr "哥斯达黎加"
@@ -31277,14 +33017,14 @@ msgstr "哥斯达黎加"
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:1797
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Poznan"
 msgstr "波兹南"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:165
 # addressbook/gui/contact-editor/fulladdr.glade.h:165
 # my-evolution/Locations.h:1798
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 #, fuzzy
 msgid "Praha"
 msgstr "巴拉圭"
@@ -31292,13 +33032,13 @@ msgstr "巴拉圭"
 # my-evolution/metar.c:134
 # my-evolution/metar.c:134
 # my-evolution/Locations.h:1799
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 #, fuzzy
 msgid "Pratica di Mare"
 msgstr "部分细雨"
 
 # my-evolution/Locations.h:1800
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Prescott"
 msgstr "普雷斯科特"
 
@@ -31309,31 +33049,31 @@ msgstr "普雷斯科特"
 # mail/mail-callbacks.c:2524 my-evolution/e-summary.c:619
 # ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
 # my-evolution/Locations.h:1801
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presidente Prudente"
 msgstr "Presidente 普鲁登斯"
 
 # my-evolution/Locations.h:1802
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Presque Isle"
 msgstr ""
 
 # my-evolution/Locations.h:1803
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Prestwick"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:83
 # addressbook/gui/contact-editor/fulladdr.glade.h:83
 # my-evolution/Locations.h:1804
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Pretoria"
 msgstr "比勒陀利亚"
 
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # my-evolution/Locations.h:1805
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 #, fuzzy
 msgid "Preveza"
 msgstr "预览"
@@ -31341,7 +33081,7 @@ msgstr "预览"
 # addressbook/gui/contact-editor/fulladdr.glade.h:168
 # addressbook/gui/contact-editor/fulladdr.glade.h:168
 # my-evolution/Locations.h:1806
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 #, fuzzy
 msgid "Price-Carbon"
 msgstr "皮特克恩岛"
@@ -31349,7 +33089,7 @@ msgstr "皮特克恩岛"
 # widgets/misc/e-charset-picker.c:84
 # widgets/misc/e-charset-picker.c:84
 # my-evolution/Locations.h:1807
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 #, fuzzy
 msgid "Pristina"
 msgstr "繁体"
@@ -31357,14 +33097,14 @@ msgstr "繁体"
 # addressbook/gui/contact-editor/fulladdr.glade.h:240
 # addressbook/gui/contact-editor/fulladdr.glade.h:240
 # my-evolution/Locations.h:1808
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Providence"
 msgstr "普罗维登斯"
 
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # my-evolution/Locations.h:1809
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 #, fuzzy
 msgid "Provincetown"
 msgstr "预览"
@@ -31372,33 +33112,33 @@ msgstr "预览"
 # addressbook/backend/ebook/e-card-simple.c:92
 # addressbook/backend/ebook/e-card-simple.c:92
 # my-evolution/Locations.h:1810
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 #, fuzzy
 msgid "Provo"
 msgstr "职业"
 
 # my-evolution/Locations.h:1811
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pskov"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # my-evolution/Locations.h:1812
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 #, fuzzy
 msgid "Pucallpa"
 msgstr "帕劳群岛"
 
 # my-evolution/Locations.h:1813
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Pudahuel"
 msgstr ""
 
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # my-evolution/Locations.h:1814
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 #, fuzzy
 msgid "Puebla"
 msgstr "公开"
@@ -31406,27 +33146,27 @@ msgstr "公开"
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
 # my-evolution/Locations.h:1815
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Pueblo"
 msgstr "普韦布洛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # my-evolution/Locations.h:1816
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 #, fuzzy
 msgid "Puerto Barrios"
 msgstr "波多黎各"
 
 # my-evolution/Locations.h:1817
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Cabezas"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # my-evolution/Locations.h:1818
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 #, fuzzy
 msgid "Puerto Escondido"
 msgstr "波多黎各"
@@ -31434,7 +33174,7 @@ msgstr "波多黎各"
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # my-evolution/Locations.h:1819
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 #, fuzzy
 msgid "Puerto Lempira"
 msgstr "波多黎各"
@@ -31442,7 +33182,7 @@ msgstr "波多黎各"
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # my-evolution/Locations.h:1820
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 #, fuzzy
 msgid "Puerto Limon"
 msgstr "波多黎各"
@@ -31450,7 +33190,7 @@ msgstr "波多黎各"
 # my-evolution/metar.c:449
 # my-evolution/metar.c:449
 # my-evolution/Locations.h:1821
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 #, fuzzy
 msgid "Puerto Maldonado"
 msgstr "局部地区性龙卷风"
@@ -31458,7 +33198,7 @@ msgstr "局部地区性龙卷风"
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # my-evolution/Locations.h:1822
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 #, fuzzy
 msgid "Puerto Montt"
 msgstr "波多黎各"
@@ -31466,7 +33206,7 @@ msgstr "波多黎各"
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # my-evolution/Locations.h:1823
-#: my-evolution/Locations.h:1823
+#: my-evolution/Locations.h:1822
 #, fuzzy
 msgid "Puerto Plata"
 msgstr "波多黎各"
@@ -31474,74 +33214,74 @@ msgstr "波多黎各"
 # my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
 # my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
 # my-evolution/Locations.h:1825
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 #, fuzzy
 msgid "Puerto Suarez"
 msgstr "打印概要"
 
 # my-evolution/Locations.h:1826
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Puerto Vallarta"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # addressbook/gui/contact-editor/fulladdr.glade.h:161
 # my-evolution/Locations.h:1827
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pula"
 msgstr "普拉"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:1828
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 #, fuzzy
 msgid "Pullman"
 msgstr "波兰"
 
 # my-evolution/Locations.h:1829
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Arenas"
 msgstr ""
 
 # calendar/gui/print.c:2386
 # calendar/gui/print.c:2386
 # my-evolution/Locations.h:1830
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 #, fuzzy
 msgid "Punta Cana"
 msgstr "打印日历"
 
 # my-evolution/Locations.h:1831
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Punta Gorda"
 msgstr ""
 
 # my-evolution/Locations.h:1832
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Puntilla Lake"
 msgstr ""
 
 # my-evolution/Locations.h:1833
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pusan/Kimhae"
 msgstr "釜山/Kimhae"
 
 # my-evolution/Locations.h:1834
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongtaek Ab"
 msgstr ""
 
 # calendar/zones.h:238
 # my-evolution/Locations.h:1835
-#: my-evolution/Locations.h:1835
+#: my-evolution/Locations.h:1834
 msgid "Pyongyang"
 msgstr "平壤"
 
 # widgets/misc/e-messagebox.c:173
 # widgets/misc/e-messagebox.c:173
 # my-evolution/Locations.h:1837
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 #, fuzzy
 msgid "Quantico"
 msgstr "问题"
@@ -31549,85 +33289,85 @@ msgstr "问题"
 # mail/message-list.etspec.h:9
 # mail/message-list.etspec.h:10
 # my-evolution/Locations.h:1838
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec"
 msgstr "魁北克"
 
 # my-evolution/Locations.h:1839
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Quebec City"
 msgstr "魁北克城"
 
 # my-evolution/Locations.h:1840
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Queretaro"
 msgstr ""
 
 # my-evolution/Locations.h:1841
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quillayute"
 msgstr ""
 
 # my-evolution/Locations.h:1842
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quimper"
 msgstr ""
 
 # my-evolution/Locations.h:1843
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quincy"
 msgstr "昆西"
 
 # my-evolution/Locations.h:1844
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Quito/Mariscal Sucre"
 msgstr "基多/Mariscal Sucre"
 
 # my-evolution/Locations.h:1845
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Rabat"
 msgstr "拉巴特"
 
 # my-evolution/Locations.h:1846
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Raduzhny"
 msgstr ""
 
 # my-evolution/Locations.h:1847
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Rafha"
 msgstr ""
 
 # my-evolution/Locations.h:1848
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Raleigh-Durham"
 msgstr "Raleigh-德拉谟"
 
 # my-evolution/Locations.h:1849
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Randolph AFB"
 msgstr "伦道夫空军基地"
 
 # my-evolution/Locations.h:1850
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 #, fuzzy
 msgid "Rapid City"
 msgstr "已回复"
 
 # my-evolution/Locations.h:1851
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Rapid City-Ellsworth AFB"
 msgstr ""
 
 # my-evolution/Locations.h:1852
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Ras Al Khaimah"
 msgstr ""
 
 # my-evolution/metar.c:142
 # my-evolution/metar.c:142
 # my-evolution/Locations.h:1853
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 #, fuzzy
 msgid "Rawlins"
 msgstr "雨"
@@ -31635,14 +33375,14 @@ msgstr "雨"
 # addressbook/printing/e-contact-print.glade.h:13
 # addressbook/printing/e-contact-print.glade.h:13
 # my-evolution/Locations.h:1854
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Reading"
 msgstr "雷丁"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:30
 # addressbook/gui/contact-editor/fulladdr.glade.h:30
 # my-evolution/Locations.h:1855
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 #, fuzzy
 msgid "Rebun Island"
 msgstr "布维岛"
@@ -31650,25 +33390,25 @@ msgstr "布维岛"
 # mail/message-list.etspec.h:4
 # mail/message-list.etspec.h:5
 # my-evolution/Locations.h:1856
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Recife"
 msgstr "累西腓"
 
 # my-evolution/Locations.h:1857
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Red Bluff"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:13
 # addressbook/printing/e-contact-print.glade.h:13
 # my-evolution/Locations.h:1858
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 #, fuzzy
 msgid "Redding"
 msgstr "标题"
 
 # my-evolution/Locations.h:1859
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 #, fuzzy
 msgid "Redig"
 msgstr "已读"
@@ -31676,67 +33416,67 @@ msgstr "已读"
 # calendar/gui/dialogs/event-editor.c:190
 # calendar/gui/dialogs/event-editor.c:190
 # my-evolution/Locations.h:1860
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Redmond"
 msgstr "雷德蒙"
 
 # my-evolution/Locations.h:1861
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Red Oak"
 msgstr ""
 
 # my-evolution/Locations.h:1862
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Redwood Falls"
 msgstr ""
 
 # my-evolution/Locations.h:1863
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Reggio Calabria"
 msgstr "勒佐卡拉布里亚"
 
 # my-evolution/e-summary-weather.c:722
 # my-evolution/e-summary-weather.c:722
 # my-evolution/Locations.h:1864
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 #, fuzzy
 msgid "Regina"
 msgstr "区域"
 
 # my-evolution/Locations.h:1865
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Reims-Champagne"
 msgstr "兰斯-Champagne"
 
 # calendar/gui/dialogs/alarm-page.glade.h:5
 # calendar/gui/dialogs/alarm-page.glade.h:5
 # my-evolution/Locations.h:1866
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Rennes"
 msgstr "雷恩"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:175
 # addressbook/gui/contact-editor/fulladdr.glade.h:175
 # my-evolution/Locations.h:1867
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Reno"
 msgstr "里诺"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:175
 # addressbook/gui/contact-editor/fulladdr.glade.h:175
 # my-evolution/Locations.h:1868
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 #, fuzzy
 msgid "Renton"
 msgstr "留尼汪"
 
 # my-evolution/Locations.h:1869
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Resistencia"
 msgstr "雷西斯膝西亚"
 
 # my-evolution/Locations.h:1870
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 #, fuzzy
 msgid "Reus"
 msgstr "规则"
@@ -31744,28 +33484,28 @@ msgstr "规则"
 # ui/evolution-mail-message.xml.h:70
 # ui/evolution-mail-message.xml.h:70
 # my-evolution/Locations.h:1871
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 #, fuzzy
 msgid "Reyes"
 msgstr "回复"
 
 # calendar/zones.h:269
 # my-evolution/Locations.h:1872
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reykjavik"
 msgstr "雷克雅未克"
 
 # ui/my-evolution.xml.h:5
 # ui/my-evolution.xml.h:5
 # my-evolution/Locations.h:1873
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Reynosa"
 msgstr "雷萨诺"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:76
 # addressbook/gui/contact-editor/fulladdr.glade.h:76
 # my-evolution/Locations.h:1874
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 #, fuzzy
 msgid "Rhinelander"
 msgstr "芬兰"
@@ -31773,20 +33513,20 @@ msgstr "芬兰"
 # addressbook/gui/contact-editor/fulladdr.glade.h:74
 # addressbook/gui/contact-editor/fulladdr.glade.h:74
 # my-evolution/Locations.h:1875
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Rhode Island"
 msgstr "罗得岛州"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:86
 # addressbook/gui/contact-editor/fulladdr.glade.h:86
 # my-evolution/Locations.h:1876
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 #, fuzzy
 msgid "Riberalta"
 msgstr "直布罗陀"
 
 # my-evolution/Locations.h:1877
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Richmond"
 msgstr ""
 
@@ -31795,7 +33535,7 @@ msgstr ""
 # addressbook/backend/ebook/e-card-simple.c:95
 # addressbook/gui/widgets/e-addressbook-view.c:884
 # my-evolution/Locations.h:1878
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 #, fuzzy
 msgid "Rickenbacker"
 msgstr "绰号"
@@ -31803,7 +33543,7 @@ msgstr "绰号"
 # addressbook/gui/contact-editor/fulladdr.glade.h:96
 # addressbook/gui/contact-editor/fulladdr.glade.h:96
 # my-evolution/Locations.h:1879
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 #, fuzzy
 msgid "Rieti"
 msgstr "海地"
@@ -31813,42 +33553,35 @@ msgstr "海地"
 # calendar/gui/dialogs/meeting-page.etspec.h:9
 # calendar/gui/e-meeting-time-sel.etspec.h:9
 # my-evolution/Locations.h:1880
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 #, fuzzy
 msgid "Rifle"
 msgstr "角色"
 
-# addressbook/printing/e-contact-print.glade.h:33
-# addressbook/printing/e-contact-print.glade.h:33
-# my-evolution/Locations.h:1881
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr "里加"
-
 # my-evolution/Locations.h:1882
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1880
 msgid "Rijeka"
 msgstr "里耶卡"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:176
 # addressbook/gui/contact-editor/fulladdr.glade.h:176
 # my-evolution/Locations.h:1883
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1881
 msgid "Rimini"
 msgstr "里米尼"
 
 # my-evolution/Locations.h:1884
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1882
 msgid "Rio De Janeiro"
 msgstr "里约热内卢"
 
 # my-evolution/Locations.h:1885
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1883
 msgid "Rio Gallegos"
 msgstr ""
 
 # my-evolution/Locations.h:1886
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1884
 msgid "Rio Grande"
 msgstr "格兰德河"
 
@@ -31859,63 +33592,63 @@ msgstr "格兰德河"
 # addressbook/gui/contact-editor/e-contact-editor.c:1660
 # addressbook/gui/widgets/e-addressbook-view.c:871
 # my-evolution/Locations.h:1887
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1885
 msgid "Rioja"
 msgstr "里奥哈"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:152
 # addressbook/gui/contact-editor/fulladdr.glade.h:152
 # my-evolution/Locations.h:1888
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1886
 #, fuzzy
 msgid "Rio / Jacarepagua"
 msgstr "尼加拉瓜"
 
 # my-evolution/Locations.h:1889
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1887
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M. 科尔多瓦"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:33
 # addressbook/gui/contact-editor/fulladdr.glade.h:33
 # my-evolution/Locations.h:1890
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1888
 #, fuzzy
 msgid "Rishiri Island"
 msgstr "不列颠处女群岛"
 
 # my-evolution/Locations.h:1891
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1889
 msgid "Rivas"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # my-evolution/Locations.h:1892
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1890
 #, fuzzy
 msgid "Rivera"
 msgstr "利比里亚"
 
 # my-evolution/Locations.h:1893
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1891
 msgid "Riverside"
 msgstr ""
 
 # my-evolution/Locations.h:1894
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1892
 msgid "Riverside/March AFB"
 msgstr ""
 
 # my-evolution/Locations.h:1895
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1893
 msgid "Riverton"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # addressbook/gui/contact-editor/fulladdr.glade.h:120
 # my-evolution/Locations.h:1896
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1894
 #, fuzzy
 msgid "Rivne"
 msgstr "利比里亚"
@@ -31923,26 +33656,26 @@ msgstr "利比里亚"
 # data/evolution.desktop.in.h:1 shell/main.c:83
 # shell/main.c:83
 # my-evolution/Locations.h:1897
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1895
 #, fuzzy
 msgid "Rivolto"
 msgstr "Evolution"
 
 # calendar/zones.h:241
 # my-evolution/Locations.h:1898
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1896
 msgid "Riyadh"
 msgstr "利雅得"
 
 # my-evolution/Locations.h:1899
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1897
 msgid "Roanoke"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:57
 # addressbook/gui/contact-editor/fulladdr.glade.h:57
 # my-evolution/Locations.h:1900
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1898
 #, fuzzy
 msgid "Roatan"
 msgstr "克罗地亚"
@@ -31950,41 +33683,41 @@ msgstr "克罗地亚"
 # calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
 # calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:35
 # my-evolution/Locations.h:1901
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1899
 #, fuzzy
 msgid "Robore"
 msgstr "之前"
 
 # my-evolution/Locations.h:1902
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1900
 msgid "Rochester"
 msgstr ""
 
 # my-evolution/Locations.h:1903
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1901
 msgid "Rockford"
 msgstr "罗克福德"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:1904
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1902
 #, fuzzy
 msgid "Rockland"
 msgstr "波兰"
 
 # my-evolution/Locations.h:1905
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1903
 msgid "Rockport"
 msgstr ""
 
 # my-evolution/Locations.h:1906
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1904
 msgid "Rock Springs"
 msgstr ""
 
 # my-evolution/Locations.h:1907
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1905
 msgid "Rocky Mount"
 msgstr ""
 
@@ -31993,7 +33726,7 @@ msgstr ""
 # calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
 # calendar/gui/e-meeting-model.c:781
 # my-evolution/Locations.h:1908
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1906
 #, fuzzy
 msgid "Rodos"
 msgstr "房间"
@@ -32001,44 +33734,44 @@ msgstr "房间"
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # my-evolution/Locations.h:1909
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1907
 msgid "Rogers"
 msgstr "罗杰斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:176
 # addressbook/gui/contact-editor/fulladdr.glade.h:176
 # my-evolution/Locations.h:1910
-#: my-evolution/Locations.h:1910
+#: my-evolution/Locations.h:1908
 msgid "Roma/Ciampino"
 msgstr "罗马/Ciampino"
 
 # my-evolution/Locations.h:1911
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1909
 msgid "Roma/Fiumicino"
 msgstr "罗马/Fiumicino"
 
 # my-evolution/Locations.h:1913
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1911
 msgid "Roma/Urbe"
 msgstr "罗马/Urbe"
 
 # my-evolution/Locations.h:1914
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1912
 msgid "Rome-Russell"
 msgstr "罗马-拉塞尔"
 
 # my-evolution/Locations.h:1915
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1913
 msgid "Ronchi de' Legionari"
 msgstr ""
 
 # my-evolution/Locations.h:1916
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1914
 msgid "Ronneby"
 msgstr ""
 
 # my-evolution/Locations.h:1917
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1915
 msgid "Roosevelt"
 msgstr "罗斯福"
 
@@ -32047,13 +33780,13 @@ msgstr "罗斯福"
 # calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
 # calendar/gui/e-meeting-model.c:781
 # my-evolution/Locations.h:1918
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1916
 #, fuzzy
 msgid "Roros"
 msgstr "房间"
 
 # my-evolution/Locations.h:1919
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1917
 msgid "Rorvik/Ryum"
 msgstr ""
 
@@ -32064,12 +33797,12 @@ msgstr ""
 # addressbook/gui/contact-editor/e-contact-editor.c:1660
 # addressbook/gui/widgets/e-addressbook-view.c:871
 # my-evolution/Locations.h:1920
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1918
 msgid "Rosario"
 msgstr "罗萨里奥"
 
 # my-evolution/Locations.h:1921
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1919
 msgid "Roseburg"
 msgstr ""
 
@@ -32078,7 +33811,7 @@ msgstr ""
 # calendar/gui/dialogs/meeting-page.etspec.h:9
 # calendar/gui/e-meeting-time-sel.etspec.h:9
 # my-evolution/Locations.h:1922
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1920
 #, fuzzy
 msgid "Roseglen"
 msgstr "角色"
@@ -32086,131 +33819,131 @@ msgstr "角色"
 # shell/glade/e-active-connection-dialog.glade.h:3
 # shell/glade/e-active-connection-dialog.glade.h:3
 # my-evolution/Locations.h:1923
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1921
 #, fuzzy
 msgid "Rost"
 msgstr "主机"
 
 # my-evolution/Locations.h:1924
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1922
 msgid "Rostov-Na-Donu"
 msgstr "罗斯托夫-Na-Donu"
 
 # my-evolution/Locations.h:1925
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1923
 msgid "Roswell"
 msgstr ""
 
 # my-evolution/Locations.h:1926
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1924
 msgid "Rotterdam"
 msgstr "鹿特丹"
 
 # my-evolution/Locations.h:1927
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1925
 msgid "Rouen-Valle de Seine"
 msgstr "鲁昂-Valle de Seine"
 
 # my-evolution/Locations.h:1928
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1926
 msgid "Ruidoso-Sierra Blanca"
 msgstr ""
 
 # calendar/gui/dialogs/event-editor.c:195
 # calendar/gui/dialogs/event-editor.c:195
 # my-evolution/Locations.h:1929
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1927
 #, fuzzy
 msgid "Rurrenabaque"
 msgstr "再次发生"
 
 # my-evolution/Locations.h:1930
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1928
 msgid "Russell"
 msgstr "拉塞尔"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:15
 # addressbook/gui/contact-editor/fulladdr.glade.h:15
 # my-evolution/Locations.h:1931
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1929
 msgid "Russia"
 msgstr "俄罗斯"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:26
 # addressbook/gui/contact-editor/fulladdr.glade.h:26
 # my-evolution/Locations.h:1932
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1930
 msgid "Rutland"
 msgstr "拉特兰郡"
 
 # my-evolution/Locations.h:1933
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1931
 msgid "Rygge"
 msgstr ""
 
 # my-evolution/Locations.h:1934
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1932
 msgid "Rzeszow"
 msgstr ""
 
 # my-evolution/Locations.h:1935
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1933
 msgid "Saarbrucken"
 msgstr ""
 
 # my-evolution/Locations.h:1936
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1934
 msgid "Sabine Pass"
 msgstr ""
 
 # mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 # mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 # my-evolution/Locations.h:1937
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1935
 msgid "Sacramento"
 msgstr "萨克拉曼多"
 
 # my-evolution/Locations.h:1938
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1936
 msgid "Sacramento-Woodland"
 msgstr "萨克拉曼多-Woodland"
 
 # my-evolution/Locations.h:1939
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1937
 msgid "Safford-Municipal Airport"
 msgstr "萨克拉曼多-市政机场"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:196
 # addressbook/gui/contact-editor/fulladdr.glade.h:196
 # my-evolution/Locations.h:1940
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1938
 msgid "Saginaw"
 msgstr "萨吉诺"
 
 # my-evolution/Locations.h:1941
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1939
 msgid "Saint Anthony"
 msgstr "圣安东尼"
 
 # my-evolution/Locations.h:1942
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1940
 msgid "Saint-Brieuc-Armor"
 msgstr ""
 
 # my-evolution/Locations.h:1943
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1941
 msgid "Saint-Dizier-Robinson"
 msgstr ""
 
 # my-evolution/Locations.h:1944
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1942
 msgid "Saint-Etienne-Boutheon"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1945
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1943
 #, fuzzy
 msgid "Saint Mary's"
 msgstr "圣马力诺"
@@ -32218,20 +33951,20 @@ msgstr "圣马力诺"
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1946
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1944
 #, fuzzy
 msgid "Saint Mawgan"
 msgstr "圣马力诺"
 
 # my-evolution/Locations.h:1947
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1945
 msgid "Saint-Nazaire-Montoir"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # my-evolution/Locations.h:1948
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1946
 #, fuzzy
 msgid "Saint Paul"
 msgstr "圣卢西亚岛"
@@ -32239,7 +33972,7 @@ msgstr "圣卢西亚岛"
 # calendar/gui/print.c:499
 # calendar/gui/print.c:499
 # my-evolution/Locations.h:1949
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1947
 #, fuzzy
 msgid "Saiq"
 msgstr "六"
@@ -32247,7 +33980,7 @@ msgstr "六"
 # my-evolution/metar.c:382
 # my-evolution/metar.c:382
 # my-evolution/Locations.h:1950
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1948
 #, fuzzy
 msgid "Salalah"
 msgstr "暴风"
@@ -32257,27 +33990,27 @@ msgstr "暴风"
 # ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
 # ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
 # my-evolution/Locations.h:1951
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1949
 msgid "Salem"
 msgstr "赛伦"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # my-evolution/Locations.h:1952
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1950
 #, fuzzy
 msgid "Salida"
 msgstr "索马里"
 
 # my-evolution/Locations.h:1953
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1951
 msgid "Salida-Harriet"
 msgstr "Salida-哈里特"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # my-evolution/Locations.h:1954
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1952
 #, fuzzy
 msgid "Salina"
 msgstr "索马里"
@@ -32285,75 +34018,75 @@ msgstr "索马里"
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # my-evolution/Locations.h:1955
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1953
 #, fuzzy
 msgid "Salinas"
 msgstr "索马里"
 
 # my-evolution/Locations.h:1956
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1954
 msgid "Salisbury"
 msgstr "索尔兹伯里"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # my-evolution/Locations.h:1957
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1955
 #, fuzzy
 msgid "Salmon"
 msgstr "萨摩亚"
 
 # my-evolution/Locations.h:1958
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1956
 msgid "Salmon (2)"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # my-evolution/Locations.h:1959
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1957
 msgid "Salta"
 msgstr "萨尔塔"
 
 # my-evolution/Locations.h:1960
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1958
 msgid "Saltillo"
 msgstr "萨尔提略"
 
 # my-evolution/Locations.h:1961
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1959
 msgid "Salt Lake City"
 msgstr "盐湖城"
 
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
 # my-evolution/Locations.h:1962
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1960
 #, fuzzy
 msgid "Salto"
 msgstr "停止"
 
 # my-evolution/Locations.h:1963
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1961
 msgid "Salt point"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:68
 # addressbook/gui/contact-editor/fulladdr.glade.h:68
 # my-evolution/Locations.h:1964
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1962
 msgid "Salvador"
 msgstr "萨尔瓦多"
 
 # my-evolution/Locations.h:1965
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1963
 msgid "Salzburg"
 msgstr "萨尔茨堡"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # my-evolution/Locations.h:1966
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1964
 #, fuzzy
 msgid "Samara"
 msgstr "萨摩亚"
@@ -32361,14 +34094,14 @@ msgstr "萨摩亚"
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # my-evolution/Locations.h:1967
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1965
 msgid "Samos"
 msgstr "萨摩斯"
 
 # my-evolution/metar.c:322
 # my-evolution/metar.c:322
 # my-evolution/Locations.h:1968
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1966
 #, fuzzy
 msgid "Samsun"
 msgstr "沙尘"
@@ -32376,60 +34109,60 @@ msgstr "沙尘"
 # my-evolution/metar.c:322
 # my-evolution/metar.c:322
 # my-evolution/Locations.h:1969
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1967
 #, fuzzy
 msgid "Sana'A"
 msgstr "沙尘"
 
 # my-evolution/Locations.h:1970
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1968
 msgid "San Andres Isla/Sesquicentenario"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1971
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1969
 msgid "San Angelo"
 msgstr "圣安吉罗"
 
 # my-evolution/Locations.h:1972
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1970
 msgid "San Antonio"
 msgstr "圣安东妮亚"
 
 # my-evolution/Locations.h:1973
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1971
 msgid "San Antonio Del Tachira"
 msgstr ""
 
 # my-evolution/Locations.h:1974
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Kelly AFB"
 msgstr "圣安东妮亚-凯利空军基地"
 
 # my-evolution/Locations.h:1975
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1973
 msgid "San Antonio-Stinson"
 msgstr "圣安东妮亚-Stinson"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1976
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1974
 msgid "San Carlos"
 msgstr "圣卡洛斯"
 
 # my-evolution/metar.c:322
 # my-evolution/metar.c:322
 # my-evolution/Locations.h:1977
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1975
 #, fuzzy
 msgid "Sandane"
 msgstr "沙尘"
 
 # my-evolution/Locations.h:1978
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1976
 #, fuzzy
 msgid "Sandberg"
 msgstr "发件人"
@@ -32437,7 +34170,7 @@ msgstr "发件人"
 # my-evolution/metar.c:397
 # my-evolution/metar.c:397
 # my-evolution/Locations.h:1979
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1977
 #, fuzzy
 msgid "Sanderson"
 msgstr "沙暴"
@@ -32445,84 +34178,84 @@ msgstr "沙暴"
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1980
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1978
 msgid "San Diego"
 msgstr "圣迭哥"
 
 # my-evolution/Locations.h:1981
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Brown"
 msgstr "圣迭哥-Brown"
 
 # my-evolution/Locations.h:1982
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Miramar"
 msgstr "圣迭哥-Miramar"
 
 # my-evolution/Locations.h:1983
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1981
 msgid "San Diego-Montgomery"
 msgstr "圣迭哥-Montgomery"
 
 # my-evolution/Locations.h:1984
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1982
 msgid "San Diego-North Island"
 msgstr "圣迭哥-北岛"
 
 # my-evolution/Locations.h:1985
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1983
 msgid "San Diego-Santee"
 msgstr "圣迭哥-Santee"
 
 # my-evolution/Locations.h:1986
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1984
 msgid "Sandnessjoen/Stokka"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1987
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1985
 #, fuzzy
 msgid "Sand Point"
 msgstr "圣马力诺"
 
 # my-evolution/Locations.h:1988
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1986
 msgid "San Fernando De Apure"
 msgstr ""
 
 # my-evolution/metar.c:322
 # my-evolution/metar.c:322
 # my-evolution/Locations.h:1989
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1987
 msgid "Sanford"
 msgstr "桑福德"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1990
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1988
 msgid "San Francisco"
 msgstr "旧金山"
 
 # addressbook/printing/e-contact-print.glade.h:35
 # addressbook/printing/e-contact-print.glade.h:35
 # my-evolution/Locations.h:1991
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1989
 #, fuzzy
 msgid "Sangju"
 msgstr "阴影"
 
 # my-evolution/Locations.h:1992
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1990
 msgid "San Ignacio De Velasco"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1993
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1991
 #, fuzzy
 msgid "San Joaquin"
 msgstr "圣马力诺"
@@ -32534,60 +34267,60 @@ msgstr "圣马力诺"
 # ui/evolution-contact-list-editor.xml.h:6
 # ui/evolution-signature-editor.xml.h:4
 # my-evolution/Locations.h:1994
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1992
 #, fuzzy
 msgid "San Jose"
 msgstr "保存并关闭"
 
 # my-evolution/Locations.h:1995
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1993
 msgid "San Jose De Chiquitos"
 msgstr ""
 
 # my-evolution/Locations.h:1996
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1994
 msgid "San Jose del Cabo"
 msgstr ""
 
 # my-evolution/Locations.h:1997
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1995
 msgid "San Jose-Santa Clara"
 msgstr "圣何塞-Santa Clara"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:1998
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1996
 msgid "San Juan"
 msgstr "圣胡安"
 
 # my-evolution/Locations.h:1999
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1997
 msgid "Sankt-Peterburg"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # my-evolution/Locations.h:2000
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1998
 #, fuzzy
 msgid "Sanliurfa"
 msgstr "索马里"
 
 # my-evolution/Locations.h:2001
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:1999
 msgid "San Luis Obispo"
 msgstr ""
 
 # my-evolution/Locations.h:2002
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2000
 msgid "San Luis Potosi"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:2003
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2001
 #, fuzzy
 msgid "San Miguel"
 msgstr "圣马力诺"
@@ -32595,69 +34328,69 @@ msgstr "圣马力诺"
 # addressbook/gui/contact-editor/fulladdr.glade.h:156
 # addressbook/gui/contact-editor/fulladdr.glade.h:156
 # my-evolution/Locations.h:2004
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2002
 msgid "San Nicholas Island"
 msgstr "圣尼古拉斯岛"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:68
 # addressbook/gui/contact-editor/fulladdr.glade.h:68
 # my-evolution/Locations.h:2005
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2003
 msgid "San Salvador"
 msgstr "圣萨尔瓦多"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:2006
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2004
 msgid "San Sebastian"
 msgstr "圣塞巴斯蒂安"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # my-evolution/Locations.h:2007
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2005
 #, fuzzy
 msgid "Santa Ana"
 msgstr "圣卢西亚岛"
 
 # my-evolution/Locations.h:2008
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2006
 msgid "Santa Barbara"
 msgstr ""
 
 # my-evolution/Locations.h:2009
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2007
 msgid "Santa Cruz"
 msgstr ""
 
 # my-evolution/Locations.h:2010
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2008
 msgid "Santa Fe"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # addressbook/gui/contact-editor/fulladdr.glade.h:183
 # my-evolution/Locations.h:2011
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2009
 msgid "Santa Maria"
 msgstr "圣玛丽亚"
 
 # my-evolution/Locations.h:2012
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2010
 msgid "Santa Marta/Simon Bolivar"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # my-evolution/Locations.h:2013
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2011
 #, fuzzy
 msgid "Santa Monica"
 msgstr "圣卢西亚岛"
 
 # my-evolution/Locations.h:2014
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2012
 #, fuzzy
 msgid "Santander"
 msgstr "发件人"
@@ -32665,42 +34398,42 @@ msgstr "发件人"
 # my-evolution/metar.c:397
 # my-evolution/metar.c:397
 # my-evolution/Locations.h:2015
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2013
 #, fuzzy
 msgid "Santarem"
 msgstr "沙暴"
 
 # my-evolution/Locations.h:2016
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa"
 msgstr ""
 
 # my-evolution/Locations.h:2017
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2015
 msgid "Santa Rosa de Copan"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # calendar/zones.h:157
 # my-evolution/Locations.h:2018
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2016
 msgid "Santiago"
 msgstr "圣地亚哥"
 
 # my-evolution/Locations.h:2019
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2017
 msgid "Santiago de Cuba"
 msgstr ""
 
 # my-evolution/Locations.h:2020
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2018
 msgid "Santiago Del Estero"
 msgstr ""
 
 # my-evolution/metar.c:397
 # my-evolution/metar.c:397
 # my-evolution/Locations.h:2021
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2019
 #, fuzzy
 msgid "Santorini"
 msgstr "沙暴"
@@ -32708,19 +34441,19 @@ msgstr "沙暴"
 # my-evolution/metar.c:397
 # my-evolution/metar.c:397
 # my-evolution/Locations.h:2022
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2020
 msgid "Santos"
 msgstr "桑托斯"
 
 # my-evolution/Locations.h:2023
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2021
 msgid "Sao Jose Dos Campo"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # my-evolution/Locations.h:2024
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2022
 #, fuzzy
 msgid "Sao Luiz"
 msgstr "圣卢西亚岛"
@@ -32728,86 +34461,86 @@ msgstr "圣卢西亚岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # calendar/zones.h:159
 # my-evolution/Locations.h:2025
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2023
 #, fuzzy
 msgid "Sao Paulo"
 msgstr "美洲萨摩亚"
 
 # my-evolution/Locations.h:2026
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2024
 msgid "Sapporo Ab"
 msgstr "札幌 Ab"
 
 # calendar/zones.h:318
 # my-evolution/Locations.h:2027
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2025
 msgid "Sarajevo"
 msgstr "萨拉热窝"
 
 # my-evolution/Locations.h:2028
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2026
 msgid "Saranac Lake"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # my-evolution/Locations.h:2029
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2027
 msgid "Sarasota"
 msgstr "萨拉索塔"
 
 # my-evolution/Locations.h:2030
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2028
 msgid "Saratov"
 msgstr "萨拉托夫"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:197
 # addressbook/gui/contact-editor/fulladdr.glade.h:197
 # my-evolution/Locations.h:2031
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2029
 #, fuzzy
 msgid "Sarzana"
 msgstr "斯里兰卡"
 
 # my-evolution/Locations.h:2032
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2030
 msgid "Saskatchewan"
 msgstr "萨斯喀彻温省"
 
 # my-evolution/Locations.h:2033
-#: my-evolution/Locations.h:2033
+#: my-evolution/Locations.h:2031
 msgid "Saskatoon"
 msgstr ""
 
 # my-evolution/Locations.h:2034
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2032
 msgid "Sauce Viejo"
 msgstr ""
 
 # my-evolution/Locations.h:2036
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2034
 msgid "Sault Ste Marie"
 msgstr ""
 
 # my-evolution/Locations.h:2037
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2035
 msgid "Savannah"
 msgstr ""
 
 # my-evolution/Locations.h:2038
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2036
 msgid "Savannah-Hunter AAF"
 msgstr ""
 
 # my-evolution/Locations.h:2039
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2037
 msgid "Sawyer AFB"
 msgstr ""
 
 # my-evolution/metar.c:322
 # my-evolution/metar.c:322
 # my-evolution/Locations.h:2040
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2038
 #, fuzzy
 msgid "Sayun"
 msgstr "沙尘"
@@ -32821,33 +34554,33 @@ msgstr "沙尘"
 # calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
 # mail/message-list.etspec.h:9
 # my-evolution/Locations.h:2041
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2039
 #, fuzzy
 msgid "Scatsta"
 msgstr "状态"
 
 # my-evolution/Locations.h:2042
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2040
 msgid "Schaffen"
 msgstr ""
 
 # my-evolution/Locations.h:2043
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2041
 msgid "Schenectady"
 msgstr ""
 
 # my-evolution/Locations.h:2044
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2042
 msgid "Scilly Isles"
 msgstr ""
 
 # my-evolution/Locations.h:2045
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2043
 msgid "Scottsbluff"
 msgstr ""
 
 # my-evolution/Locations.h:2046
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2044
 msgid "Scottsdale"
 msgstr ""
 
@@ -32856,27 +34589,27 @@ msgstr ""
 # addressbook/backend/ebook/e-card-simple.c:69
 # addressbook/gui/widgets/e-addressbook-view.c:858
 # my-evolution/Locations.h:2047
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2045
 msgid "Scranton"
 msgstr "斯克兰顿"
 
 # mail/mail-callbacks.c:2492
 # my-evolution/Locations.h:2048
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2046
 msgid "Seattle"
 msgstr "西雅图"
 
 # importers/netscape-importer.c:963
 # importers/netscape-importer.c:963
 # my-evolution/Locations.h:2049
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2047
 msgid "Seattle-Boeing"
 msgstr "西雅图-Boeing"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # my-evolution/Locations.h:2050
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2048
 #, fuzzy
 msgid "Sedalia"
 msgstr "索马里"
@@ -32884,50 +34617,50 @@ msgstr "索马里"
 # mail/message-list.c:640
 # mail/message-list.c:646
 # my-evolution/Locations.h:2051
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2049
 #, fuzzy
 msgid "Seeb"
 msgstr "可见"
 
 # my-evolution/Locations.h:2052
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2050
 msgid "Selanik"
 msgstr ""
 
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
 # my-evolution/Locations.h:2053
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2051
 msgid "Sendai Airport"
 msgstr "仙台机场"
 
 # my-evolution/Locations.h:2054
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2052
 msgid "Seoul E Ab"
 msgstr "汉城 E Ab"
 
 # my-evolution/Locations.h:2055
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Kimp'O International Airport"
 msgstr "汉城/Kimp'O 国际机场"
 
 # my-evolution/Locations.h:2056
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2054
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "汉城/Yongdungp'O Rokaf Wc"
 
 # my-evolution/Locations.h:2057
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2055
 msgid "Sept-Iles"
 msgstr ""
 
 # my-evolution/Locations.h:2058
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2056
 msgid "Seul Choix Pt"
 msgstr ""
 
 # my-evolution/Locations.h:2059
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2057
 msgid "Sevilla"
 msgstr ""
 
@@ -32936,23 +34669,23 @@ msgstr ""
 # addressbook/gui/search/e-addressbook-search-dialog.c:151
 # mail/mail-search.c:263
 # my-evolution/Locations.h:2060
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2058
 msgid "Seward"
 msgstr "苏厄德"
 
 # my-evolution/Locations.h:2061
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2059
 msgid "Sexton Summit"
 msgstr ""
 
 # calendar/zones.h:246
 # my-evolution/Locations.h:2062
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2060
 msgid "Shanghai"
 msgstr "上海"
 
 # my-evolution/Locations.h:2063
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2061
 msgid "Shannon"
 msgstr "香农"
 
@@ -32961,13 +34694,13 @@ msgstr "香农"
 # addressbook/gui/search/e-addressbook-search-dialog.c:151
 # mail/mail-search.c:263
 # my-evolution/Locations.h:2064
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2062
 #, fuzzy
 msgid "Sharjah"
 msgstr "搜索"
 
 # my-evolution/Locations.h:2065
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2063
 msgid "Sharm El Sheikhintl"
 msgstr ""
 
@@ -32976,7 +34709,7 @@ msgstr ""
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 # calendar/gui/dialogs/recurrence-page.c:964
 # my-evolution/Locations.h:2066
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2064
 #, fuzzy
 msgid "Sharurah"
 msgstr "星期六"
@@ -32986,7 +34719,7 @@ msgstr "星期六"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 # calendar/gui/dialogs/recurrence-page.c:964
 # my-evolution/Locations.h:2067
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2065
 #, fuzzy
 msgid "Shawbury"
 msgstr "星期六"
@@ -32994,83 +34727,83 @@ msgstr "星期六"
 # calendar/gui/e-calendar-table.etspec.h:14
 # calendar/gui/e-calendar-table.etspec.h:14
 # my-evolution/Locations.h:2068
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2066
 #, fuzzy
 msgid "Shearwater"
 msgstr "开始日期"
 
 # my-evolution/Locations.h:2069
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2067
 msgid "Sheboygan"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:204
 # addressbook/gui/contact-editor/fulladdr.glade.h:204
 # my-evolution/Locations.h:2070
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2068
 msgid "Sheldon"
 msgstr "谢尔登"
 
 # my-evolution/Locations.h:2071
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2069
 msgid "Shelter Cove"
 msgstr ""
 
 # widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 # widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 # my-evolution/Locations.h:2072
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2070
 msgid "Shelton"
 msgstr "谢尔顿"
 
 # my-evolution/Locations.h:2073
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2071
 msgid "Shenandoah"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:200
 # addressbook/gui/contact-editor/fulladdr.glade.h:200
 # my-evolution/Locations.h:2074
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2072
 msgid "Sheridan"
 msgstr "谢里丹"
 
 # my-evolution/Locations.h:2075
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2073
 msgid "Sherman-Denison"
 msgstr "谢尔曼-Denison"
 
 # my-evolution/Locations.h:2076
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2074
 msgid "Shimofusa Ab"
 msgstr ""
 
 # my-evolution/Locations.h:2077
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2075
 msgid "Shingle Point"
 msgstr ""
 
 # mail/message-list.etspec.h:7
 # mail/message-list.etspec.h:8
 # my-evolution/Locations.h:2078
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2076
 msgid "Shiraz"
 msgstr "设拉子"
 
 # my-evolution/Locations.h:2079
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2077
 msgid "Shishmaref"
 msgstr ""
 
 # my-evolution/Locations.h:2080
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2078
 msgid "Shizuhama Ab"
 msgstr ""
 
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:6
 # my-evolution/Locations.h:2081
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2079
 #, fuzzy
 msgid "Shoreham"
 msgstr "分数"
@@ -33078,42 +34811,42 @@ msgstr "分数"
 # my-evolution/metar.c:162
 # my-evolution/metar.c:162
 # my-evolution/Locations.h:2082
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2080
 #, fuzzy
 msgid "Show Low"
 msgstr "微雪"
 
 # my-evolution/Locations.h:2083
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Downtown"
 msgstr "什里夫波特市区"
 
 # my-evolution/Locations.h:2084
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2082
 msgid "Shreveport Regional"
 msgstr "什里夫波特地区"
 
 # mail/message-list.etspec.h:7
 # mail/message-list.etspec.h:8
 # my-evolution/Locations.h:2085
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2083
 msgid "Sidney"
 msgstr "西德尼"
 
 # my-evolution/Locations.h:2086
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2084
 msgid "Sigonella"
 msgstr ""
 
 # my-evolution/Locations.h:2087
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2085
 msgid "Siloam Springs"
 msgstr ""
 
 # mail/mail-config.glade.h:67
 # mail/mail-config.glade.h:67
 # my-evolution/Locations.h:2088
-#: my-evolution/Locations.h:2088
+#: my-evolution/Locations.h:2086
 #, fuzzy
 msgid "Silver City"
 msgstr "安全"
@@ -33123,48 +34856,48 @@ msgstr "安全"
 # camel/providers/sendmail/camel-sendmail-provider.c:36
 # mail/mail-config.glade.h:72
 # my-evolution/Locations.h:2089
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2087
 #, fuzzy
 msgid "Sindal"
 msgstr "Sendmail"
 
 # my-evolution/Locations.h:2091
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2089
 msgid "Sioux City"
 msgstr ""
 
 # my-evolution/Locations.h:2092
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2090
 msgid "Sioux Falls"
 msgstr ""
 
 # my-evolution/Locations.h:2093
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2091
 msgid "Sitka"
 msgstr ""
 
 # my-evolution/Locations.h:2094
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2092
 msgid "Sivas"
 msgstr ""
 
 # my-evolution/Locations.h:2095
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2093
 msgid "Sivrihisar"
 msgstr ""
 
 # my-evolution/Locations.h:2096
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2094
 msgid "Skagway"
 msgstr ""
 
 # my-evolution/Locations.h:2097
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2095
 msgid "Skiathos"
 msgstr ""
 
 # my-evolution/Locations.h:2098
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2096
 msgid "Skien/Geiteryggen"
 msgstr ""
 
@@ -33173,14 +34906,14 @@ msgstr ""
 # ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
 # ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
 # my-evolution/Locations.h:2099
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2097
 #, fuzzy
 msgid "Skive"
 msgstr "保存"
 
 # calendar/zones.h:320
 # my-evolution/Locations.h:2100
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2098
 msgid "Skopje"
 msgstr "斯科普里"
 
@@ -33189,7 +34922,7 @@ msgstr "斯科普里"
 # mail/mail-config.glade.h:73 mail/message-list.etspec.h:7
 # shell/e-local-storage.c:176
 # my-evolution/Locations.h:2101
-#: my-evolution/Locations.h:2101
+#: my-evolution/Locations.h:2099
 #, fuzzy
 msgid "Skwentna"
 msgstr "已发送"
@@ -33197,7 +34930,7 @@ msgstr "已发送"
 # my-evolution/metar.c:322
 # my-evolution/metar.c:322
 # my-evolution/Locations.h:2102
-#: my-evolution/Locations.h:2102
+#: my-evolution/Locations.h:2100
 #, fuzzy
 msgid "Slana"
 msgstr "沙尘"
@@ -33205,20 +34938,20 @@ msgstr "沙尘"
 # my-evolution/metar.c:137
 # my-evolution/metar.c:137
 # my-evolution/Locations.h:2105
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2103
 #, fuzzy
 msgid "Smithers"
 msgstr "骤雨"
 
 # my-evolution/Locations.h:2106
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2104
 msgid "Smyrna"
 msgstr "士麦纳"
 
 # my-evolution/metar.c:167
 # my-evolution/metar.c:167
 # my-evolution/Locations.h:2107
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2105
 #, fuzzy
 msgid "Snowshoe Lake"
 msgstr "骤雪"
@@ -33226,14 +34959,14 @@ msgstr "骤雪"
 # my-evolution/metar.c:66
 # my-evolution/metar.c:66
 # my-evolution/Locations.h:2108
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2106
 msgid "Sochi"
 msgstr "索契"
 
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:6
 # my-evolution/Locations.h:2109
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2107
 #, fuzzy
 msgid "Socorro"
 msgstr "分数"
@@ -33241,14 +34974,14 @@ msgstr "分数"
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:6
 # my-evolution/Locations.h:2110
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2108
 msgid "Socotra"
 msgstr "索科特拉岛"
 
 # my-evolution/metar.c:172
 # my-evolution/metar.c:172
 # my-evolution/Locations.h:2111
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2109
 #, fuzzy
 msgid "Soda Springs"
 msgstr "冰雪"
@@ -33256,7 +34989,7 @@ msgstr "冰雪"
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # addressbook/gui/contact-editor/fulladdr.glade.h:193
 # my-evolution/Locations.h:2112
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2110
 msgid "Sofia"
 msgstr "索非亚"
 
@@ -33265,7 +34998,7 @@ msgstr "索非亚"
 # camel/providers/sendmail/camel-sendmail-provider.c:36
 # mail/mail-config.glade.h:72
 # my-evolution/Locations.h:2113
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2111
 #, fuzzy
 msgid "Sogndal"
 msgstr "Sendmail"
@@ -33273,7 +35006,7 @@ msgstr "Sendmail"
 # addressbook/gui/contact-editor/fulladdr.glade.h:191
 # addressbook/gui/contact-editor/fulladdr.glade.h:191
 # my-evolution/Locations.h:2114
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2112
 #, fuzzy
 msgid "Soldotna"
 msgstr "斯洛文尼亚"
@@ -33281,38 +35014,38 @@ msgstr "斯洛文尼亚"
 # my-evolution/metar.c:137
 # my-evolution/metar.c:137
 # my-evolution/Locations.h:2115
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2113
 #, fuzzy
 msgid "Somerset"
 msgstr "骤雨"
 
 # my-evolution/Locations.h:2116
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2114
 #, fuzzy
 msgid "Sonderborg"
 msgstr "发件人"
 
 # my-evolution/Locations.h:2117
-#: my-evolution/Locations.h:2117
+#: my-evolution/Locations.h:2115
 msgid "Songmu Ab"
 msgstr ""
 
 # my-evolution/Locations.h:2118
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2116
 msgid "Sorkjosen"
 msgstr ""
 
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
 # my-evolution/Locations.h:2120
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2118
 msgid "Southampton"
 msgstr "南安普敦"
 
 # my-evolution/metar.c:66
 # my-evolution/metar.c:66
 # my-evolution/Locations.h:2121
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2119
 #, fuzzy
 msgid "South Bend"
 msgstr "南"
@@ -33320,21 +35053,21 @@ msgstr "南"
 # addressbook/gui/contact-editor/fulladdr.glade.h:194
 # addressbook/gui/contact-editor/fulladdr.glade.h:194
 # my-evolution/Locations.h:2122
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2120
 msgid "South Carolina"
 msgstr "南卡罗莱纳州"
 
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
 # my-evolution/Locations.h:2123
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2121
 msgid "South Dakota"
 msgstr "南达科塔"
 
 # my-evolution/metar.c:66
 # my-evolution/metar.c:66
 # my-evolution/Locations.h:2124
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2122
 #, fuzzy
 msgid "Southend"
 msgstr "南"
@@ -33342,98 +35075,98 @@ msgstr "南"
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # my-evolution/Locations.h:2125
-#: my-evolution/Locations.h:2125
+#: my-evolution/Locations.h:2123
 #, fuzzy
 msgid "South Marsh Island"
 msgstr "马绍尔群岛"
 
 # my-evolution/Locations.h:2126
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2124
 msgid "South Timbalier"
 msgstr ""
 
 # my-evolution/Locations.h:2128
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2126
 msgid "Sparrevohn"
 msgstr ""
 
 # my-evolution/Locations.h:2129
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2127
 msgid "Spencer"
 msgstr "斯宾塞"
 
 # my-evolution/Locations.h:2130
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2128
 msgid "Spickard"
 msgstr ""
 
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # my-evolution/Locations.h:2131
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2129
 msgid "Split"
 msgstr "斯普利特"
 
 # my-evolution/metar.c:292
 # my-evolution/metar.c:292
 # my-evolution/Locations.h:2132
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2130
 #, fuzzy
 msgid "Spokane"
 msgstr "烟霞"
 
 # my-evolution/Locations.h:2133
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2131
 msgid "Spokane-Parkwater"
 msgstr ""
 
 # my-evolution/Locations.h:2134
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2132
 msgid "Springbok"
 msgstr ""
 
 # widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 # widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
 # my-evolution/Locations.h:2135
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2133
 #, fuzzy
 msgid "Springfield"
 msgstr "简体"
 
 # my-evolution/Locations.h:2136
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2134
 msgid "Stampede Pass"
 msgstr ""
 
 # calendar/gui/dialogs/task-details-page.glade.h:5
 # calendar/gui/dialogs/task-details-page.glade.h:5
 # my-evolution/Locations.h:2137
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2135
 msgid "State College"
 msgstr "州立学院"
 
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 # my-evolution/Locations.h:2138
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2136
 #, fuzzy
 msgid "Stauning"
 msgstr "开始："
 
 # my-evolution/Locations.h:2139
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2137
 msgid "Staunton"
 msgstr "斯托顿"
 
 # my-evolution/Locations.h:2140
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2138
 msgid "Stavanger/Sola"
 msgstr "斯塔万格/Sola"
 
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 # calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 # my-evolution/Locations.h:2141
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2139
 #, fuzzy
 msgid "Staverton"
 msgstr "开始："
@@ -33441,25 +35174,25 @@ msgstr "开始："
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
 # my-evolution/Locations.h:2142
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2140
 #, fuzzy
 msgid "Stavropol"
 msgstr "停止"
 
 # my-evolution/Locations.h:2143
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2141
 msgid "St Cloud"
 msgstr ""
 
 # my-evolution/Locations.h:2144
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2142
 msgid "Steamboat Springs"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:187
 # addressbook/gui/contact-editor/fulladdr.glade.h:187
 # my-evolution/Locations.h:2145
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2143
 #, fuzzy
 msgid "Stephenville"
 msgstr "塞舌尔"
@@ -33467,30 +35200,30 @@ msgstr "塞舌尔"
 # addressbook/gui/contact-editor/fulladdr.glade.h:198
 # addressbook/gui/contact-editor/fulladdr.glade.h:198
 # my-evolution/Locations.h:2146
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2144
 #, fuzzy
 msgid "St. George"
 msgstr "圣赫勒拿岛"
 
 # my-evolution/Locations.h:2147
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2145
 msgid "Stillwater"
 msgstr ""
 
 # my-evolution/Locations.h:2148
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2146
 msgid "St. John's"
 msgstr ""
 
 # my-evolution/Locations.h:2149
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2147
 msgid "St Johnsbury"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
 # my-evolution/Locations.h:2150
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2148
 #, fuzzy
 msgid "St Joseph"
 msgstr "停止"
@@ -33498,44 +35231,44 @@ msgstr "停止"
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # addressbook/gui/contact-editor/fulladdr.glade.h:180
 # my-evolution/Locations.h:2151
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2149
 msgid "St Louis"
 msgstr "圣路易斯"
 
 # my-evolution/Locations.h:2152
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2150
 msgid "St Louis-Spirit"
 msgstr "圣路易斯-Spirit"
 
 # my-evolution/Locations.h:2153
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Arlanda)"
 msgstr "斯德哥尔摩 (Arlanda)"
 
 # my-evolution/Locations.h:2154
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2152
 msgid "Stockholm (Bromma)"
 msgstr "斯德哥尔摩 (Bromma)"
 
 # my-evolution/Locations.h:2155
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2153
 msgid "Stockton"
 msgstr ""
 
 # my-evolution/Locations.h:2156
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2154
 msgid "Stokmarknes/Skagen"
 msgstr ""
 
 # my-evolution/Locations.h:2157
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2155
 msgid "Stord/Sorstokken"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:197
 # addressbook/gui/contact-editor/fulladdr.glade.h:197
 # my-evolution/Locations.h:2158
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2156
 #, fuzzy
 msgid "Storm Lake"
 msgstr "斯里兰卡"
@@ -33543,7 +35276,7 @@ msgstr "斯里兰卡"
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # addressbook/gui/contact-editor/fulladdr.glade.h:158
 # my-evolution/Locations.h:2159
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2157
 #, fuzzy
 msgid "Stornoway"
 msgstr "挪威"
@@ -33557,39 +35290,39 @@ msgstr "挪威"
 # calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
 # mail/message-list.etspec.h:9
 # my-evolution/Locations.h:2160
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2158
 msgid "St Paul"
 msgstr "圣保罗"
 
 # my-evolution/Locations.h:2161
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg"
 msgstr "圣彼得堡"
 
 # my-evolution/Locations.h:2162
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2160
 msgid "St Petersburg / Clearwater"
 msgstr "圣彼得堡 / Clearwater"
 
 # my-evolution/Locations.h:2163
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2161
 msgid "Strasbourg"
 msgstr "斯特拉斯堡"
 
 # my-evolution/Locations.h:2164
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2162
 msgid "Strevell"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:192
 # addressbook/gui/contact-editor/fulladdr.glade.h:192
 # my-evolution/Locations.h:2165
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2163
 msgid "St Simon's Island"
 msgstr "圣西蒙岛"
 
 # my-evolution/Locations.h:2166
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2164
 msgid "Stumpy Point"
 msgstr ""
 
@@ -33598,26 +35331,26 @@ msgstr ""
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 # calendar/gui/dialogs/recurrence-page.c:964
 # my-evolution/Locations.h:2167
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2165
 msgid "Sturgeon Bay"
 msgstr "鲟鱼湾"
 
 # my-evolution/Locations.h:2168
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2166
 msgid "Stuttgart"
 msgstr "斯图加特"
 
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:6
 # my-evolution/Locations.h:2169
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2167
 msgid "Sucre"
 msgstr "苏克雷"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:123
 # addressbook/gui/contact-editor/fulladdr.glade.h:123
 # my-evolution/Locations.h:2170
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2168
 #, fuzzy
 msgid "Sumburgh"
 msgstr "卢森堡"
@@ -33629,170 +35362,170 @@ msgstr "卢森堡"
 # my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
 # shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
 # my-evolution/Locations.h:2171
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2169
 #, fuzzy
 msgid "Sumter"
 msgstr "概要"
 
 # my-evolution/Locations.h:2172
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2170
 msgid "Sumter (2)"
 msgstr ""
 
 # my-evolution/Locations.h:2173
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2171
 msgid "Sundsvall-Harnosand"
 msgstr "松兹瓦尔-Harnosand"
 
 # calendar/zones.h:248
 # my-evolution/Locations.h:2174
-#: my-evolution/Locations.h:2174
+#: my-evolution/Locations.h:2172
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/台北"
 
 # my-evolution/Locations.h:2175
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2173
 msgid "Superior"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
 # my-evolution/Locations.h:2177
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2175
 msgid "Sutton"
 msgstr "萨顿"
 
 # my-evolution/Locations.h:2178
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2176
 msgid "Suwon Ab"
 msgstr ""
 
 # my-evolution/Locations.h:2179
-#: my-evolution/Locations.h:2179
+#: my-evolution/Locations.h:2177
 msgid "Svalbard"
 msgstr "斯瓦尔巴特"
 
 # my-evolution/Locations.h:2180
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2178
 msgid "Svolvaer/Helle"
 msgstr ""
 
 # my-evolution/Locations.h:2182
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2180
 msgid "Swift Current"
 msgstr ""
 
 # my-evolution/Locations.h:2184
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2182
 msgid "Sydney"
 msgstr "悉尼"
 
 # my-evolution/Locations.h:2185
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2183
 msgid "Syktyvkar"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
 # my-evolution/Locations.h:2186
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2184
 #, fuzzy
 msgid "Sympheropol"
 msgstr "停止"
 
 # my-evolution/Locations.h:2187
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2185
 msgid "Syracuse"
 msgstr "锡拉库扎"
 
 # my-evolution/Locations.h:2188
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2186
 msgid "Szczecin"
 msgstr "什切青"
 
 # my-evolution/Locations.h:2189
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2187
 msgid "Szombathely"
 msgstr ""
 
 # widgets/misc/e-charset-picker.c:84
 # widgets/misc/e-charset-picker.c:84
 # my-evolution/Locations.h:2190
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2188
 #, fuzzy
 msgid "Tabatinga"
 msgstr "繁体"
 
 # my-evolution/Locations.h:2191
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2189
 msgid "Tabriz"
 msgstr "大不里士"
 
 # calendar/gui/print.c:2205
 # calendar/gui/print.c:2205
 # my-evolution/Locations.h:2192
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2190
 #, fuzzy
 msgid "Tabuk"
 msgstr "任务"
 
 # my-evolution/Locations.h:2193
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2191
 msgid "Tachikawa Ab"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:211
 # addressbook/gui/contact-editor/fulladdr.glade.h:211
 # my-evolution/Locations.h:2194
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2192
 #, fuzzy
 msgid "Tacna"
 msgstr "汤加"
 
 # my-evolution/Locations.h:2195
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2193
 msgid "Tacoma"
 msgstr "塔科马"
 
 # my-evolution/Locations.h:2196
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2194
 msgid "Tacoma-Lakewood"
 msgstr "塔科马-Lakewood"
 
 # my-evolution/Locations.h:2197
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2195
 msgid "Tacuarembo"
 msgstr ""
 
 # my-evolution/Locations.h:2198
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2196
 msgid "Taegu"
 msgstr "大丘"
 
 # my-evolution/Locations.h:2199
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2197
 msgid "Taegu Ab"
 msgstr "大丘 Ab"
 
 # my-evolution/Locations.h:2200
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2198
 msgid "Taejon"
 msgstr "大田"
 
 # my-evolution/Locations.h:2201
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2199
 msgid "Tahoe Valley"
 msgstr "塔霍谷"
 
 # my-evolution/Locations.h:2202
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2200
 msgid "Taichung"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2203
-#: my-evolution/Locations.h:2203
+#: my-evolution/Locations.h:2201
 #, fuzzy
 msgid "Taif"
 msgstr "台湾"
@@ -33800,111 +35533,111 @@ msgstr "台湾"
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2204
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2202
 msgid "Tainan"
 msgstr "台南"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2206
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2204
 msgid "Taiyuan"
 msgstr "太原"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2207
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2205
 msgid "Taiz"
 msgstr "塔伊兹"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2208
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2206
 #, fuzzy
 msgid "Tajima"
 msgstr "台湾"
 
 # my-evolution/Locations.h:2209
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2207
 msgid "Takamatsu Airport"
 msgstr "高松机场"
 
 # my-evolution/Locations.h:2210
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2208
 msgid "Talara"
 msgstr ""
 
-# addressbook/gui/contact-editor/fulladdr.glade.h:206
-# addressbook/gui/contact-editor/fulladdr.glade.h:206
-# my-evolution/Locations.h:2211
-#: my-evolution/Locations.h:2211
-#, fuzzy
-msgid "Talinn"
-msgstr "台湾"
-
 # my-evolution/Locations.h:2212
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2209
 msgid "Talkeetna"
 msgstr ""
 
 # my-evolution/Locations.h:2213
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2210
 msgid "Tallahassee"
 msgstr "塔拉哈西"
 
+# addressbook/gui/contact-editor/fulladdr.glade.h:206
+# addressbook/gui/contact-editor/fulladdr.glade.h:206
+# my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "台湾"
+
 # my-evolution/Locations.h:2214
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset"
 msgstr ""
 
 # my-evolution/Locations.h:2215
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2213
 msgid "Tamanrasset/Aguenna"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # addressbook/gui/contact-editor/fulladdr.glade.h:182
 # my-evolution/Locations.h:2216
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2214
 msgid "Tampa"
 msgstr "坦帕"
 
 # my-evolution/Locations.h:2217
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2215
 msgid "Tampa-Macdill AFB"
 msgstr "坦帕-Macdill 空军基地"
 
 # addressbook/printing/e-contact-print.glade.h:27
 # addressbook/printing/e-contact-print.glade.h:27
 # my-evolution/Locations.h:2218
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2216
 msgid "Tampere"
 msgstr "坦佩雷"
 
 # my-evolution/Locations.h:2219
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2217
 msgid "Tampico"
 msgstr "坦皮科"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2220
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2218
 #, fuzzy
 msgid "Tanana"
 msgstr "台湾"
 
 # my-evolution/Locations.h:2221
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2219
 msgid "Tanegashima Airport"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # addressbook/gui/contact-editor/fulladdr.glade.h:116
 # my-evolution/Locations.h:2222
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2220
 #, fuzzy
 msgid "Taos"
 msgstr "老挝"
@@ -33912,24 +35645,24 @@ msgstr "老挝"
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2223
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2221
 msgid "Taoyuan"
 msgstr ""
 
 # my-evolution/Locations.h:2224
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2222
 msgid "Tapachula"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2225
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2223
 msgid "Taranto"
 msgstr "塔兰托"
 
 # my-evolution/Locations.h:2226
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2224
 #, fuzzy
 msgid "Tarbes"
 msgstr "测试"
@@ -33937,59 +35670,59 @@ msgstr "测试"
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2227
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2225
 #, fuzzy
 msgid "Tarija"
 msgstr "台湾"
 
 # my-evolution/Locations.h:2228
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2226
 msgid "Tarvisio"
 msgstr ""
 
 # widgets/misc/e-charset-picker.c:84
 # widgets/misc/e-charset-picker.c:84
 # my-evolution/Locations.h:2229
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2227
 #, fuzzy
 msgid "Tatalina"
 msgstr "繁体"
 
 # my-evolution/Locations.h:2230
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2228
 msgid "Tateyama Ab"
 msgstr ""
 
 # my-evolution/Locations.h:2231
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2229
 msgid "Taunton"
 msgstr ""
 
 # my-evolution/Locations.h:2232
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2230
 msgid "Tebessa"
 msgstr ""
 
 # my-evolution/Locations.h:2233
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2231
 msgid "Tees-Side"
 msgstr ""
 
 # calendar/zones.h:168
 # my-evolution/Locations.h:2234
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2232
 msgid "Tegucigalpa"
 msgstr "特古西加尔巴"
 
 # my-evolution/Locations.h:2235
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2233
 msgid "Tehran-Mehrabad"
 msgstr "德黑兰-Mehrabad"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # my-evolution/Locations.h:2236
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2234
 #, fuzzy
 msgid "Tela"
 msgstr "托克劳群岛"
@@ -34001,70 +35734,70 @@ msgstr "托克劳群岛"
 # addressbook/gui/contact-editor/e-contact-editor.c:1661
 # addressbook/gui/widgets/e-addressbook-view.c:872
 # my-evolution/Locations.h:2237
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2235
 msgid "Temple"
 msgstr "坦普尔"
 
 # my-evolution/Locations.h:2238
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2236
 msgid "Tennessee"
 msgstr "田纳西"
 
 # my-evolution/Locations.h:2239
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2237
 msgid "Tepic"
 msgstr "特皮克"
 
 # my-evolution/Locations.h:2240
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2238
 msgid "Teresina"
 msgstr "特雷西纳"
 
 # my-evolution/Locations.h:2241
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2239
 msgid "Terre Haute"
 msgstr ""
 
 # my-evolution/Locations.h:2242
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2240
 msgid "Terrell"
 msgstr "特雷尔"
 
 # my-evolution/Locations.h:2243
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2241
 msgid "Teterboro"
 msgstr ""
 
 # my-evolution/Locations.h:2244
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2242
 msgid "Texarkana"
 msgstr ""
 
 # my-evolution/Locations.h:2245
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2243
 msgid "Texas"
 msgstr "德克萨斯州"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:187
 # addressbook/gui/contact-editor/fulladdr.glade.h:187
 # my-evolution/Locations.h:2246
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2244
 #, fuzzy
 msgid "The Dalles"
 msgstr "塞舌尔"
 
 # my-evolution/Locations.h:2247
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2245
 msgid "Thessaloniki"
 msgstr "萨洛尼卡"
 
 # my-evolution/Locations.h:2248
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2246
 msgid "Thief River Falls"
 msgstr ""
 
 # my-evolution/Locations.h:2249
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2247
 msgid "Thiruvananthapuram"
 msgstr ""
 
@@ -34073,13 +35806,13 @@ msgstr ""
 # addressbook/backend/ebook/e-card-simple.c:91
 # addressbook/gui/widgets/e-addressbook-view.c:880
 # my-evolution/Locations.h:2250
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2248
 #, fuzzy
 msgid "Thisted"
 msgstr "头衔"
 
 # my-evolution/Locations.h:2251
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2249
 msgid "Thompson Falls"
 msgstr "汤普森瀑布"
 
@@ -34088,7 +35821,7 @@ msgstr "汤普森瀑布"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 # calendar/gui/dialogs/recurrence-page.c:962
 # my-evolution/Locations.h:2252
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2250
 #, fuzzy
 msgid "Thumrait"
 msgstr "星期四"
@@ -34096,31 +35829,31 @@ msgstr "星期四"
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2253
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2251
 msgid "Tianjin"
 msgstr "天津"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:16
 # calendar/zones.h:171
 # my-evolution/Locations.h:2254
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2252
 msgid "Tijuana"
 msgstr "提华纳"
 
 # my-evolution/Locations.h:2255
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2253
 msgid "Timisoara"
 msgstr ""
 
 # my-evolution/Locations.h:2256
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2254
 msgid "Tin City"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # addressbook/gui/contact-editor/fulladdr.glade.h:206
 # my-evolution/Locations.h:2257
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2255
 #, fuzzy
 msgid "Tirana"
 msgstr "台湾"
@@ -34128,18 +35861,18 @@ msgstr "台湾"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 # my-evolution/Locations.h:2258
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2256
 #, fuzzy
 msgid "Tiree"
 msgstr "时间"
 
 # my-evolution/Locations.h:2259
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2257
 msgid "Tirgu Mures"
 msgstr ""
 
 # my-evolution/Locations.h:2260
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2258
 msgid "Tiruchchirapalli"
 msgstr ""
 
@@ -34148,7 +35881,7 @@ msgstr ""
 # addressbook/backend/ebook/e-card-simple.c:91
 # addressbook/gui/widgets/e-addressbook-view.c:880
 # my-evolution/Locations.h:2261
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2259
 #, fuzzy
 msgid "Titusville"
 msgstr "头衔"
@@ -34158,81 +35891,81 @@ msgstr "头衔"
 # calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
 # calendar/gui/e-calendar-table.c:384
 # my-evolution/Locations.h:2262
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2260
 #, fuzzy
 msgid "Tivat"
 msgstr "保密"
 
 # my-evolution/Locations.h:2263
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2261
 msgid "Tlemcen Zenata"
 msgstr ""
 
 # my-evolution/Locations.h:2264
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2262
 msgid "Tobias Bolanos"
 msgstr "托拜厄斯 Bolanos"
 
 # my-evolution/Locations.h:2265
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2263
 msgid "Tocumen"
 msgstr ""
 
 # my-evolution/Locations.h:2266
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2264
 msgid "Togiak Village"
 msgstr ""
 
 # my-evolution/Locations.h:2267
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2265
 msgid "Tokachi GSDF"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:48
 # addressbook/gui/contact-editor/fulladdr.glade.h:48
 # my-evolution/Locations.h:2268
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2266
 msgid "Tokunoshima Island"
 msgstr ""
 
 # my-evolution/Locations.h:2269
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2267
 msgid "Tokushima Ab"
 msgstr "德岛 Ab"
 
 # my-evolution/Locations.h:2270
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2268
 msgid "Tokyo Heliport"
 msgstr "东京直升机场"
 
 # my-evolution/Locations.h:2271
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2269
 msgid "Tokyo International Airport"
 msgstr "东京国际机场"
 
 # my-evolution/Locations.h:2272
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2270
 msgid "Tokyo New International Airport"
 msgstr "东京新机场"
 
 # ui/evolution.xml.h:25
 # ui/evolution.xml.h:25
 # my-evolution/Locations.h:2273
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2271
 msgid "Toledo"
 msgstr "托莱多"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # my-evolution/Locations.h:2274
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2272
 msgid "Toluca"
 msgstr "托卢卡"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:211
 # addressbook/gui/contact-editor/fulladdr.glade.h:211
 # my-evolution/Locations.h:2275
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2273
 #, fuzzy
 msgid "Tonopah"
 msgstr "汤加"
@@ -34240,36 +35973,36 @@ msgstr "汤加"
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # my-evolution/Locations.h:2276
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2274
 msgid "Topeka"
 msgstr "托皮卡"
 
 # my-evolution/Locations.h:2277
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2275
 msgid "Topeka-Forbes Field"
 msgstr "托皮卡-Forbes Field"
 
 # my-evolution/Locations.h:2278
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2276
 msgid "Torino/Bric Della Croce"
 msgstr "托里诺/Bric Della Croce"
 
 # my-evolution/Locations.h:2279
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2277
 msgid "Torino/Caselle"
 msgstr "托里诺/Caselle"
 
 # my-evolution/metar.c:442 my-evolution/metar.c:451
 # my-evolution/metar.c:442 my-evolution/metar.c:451
 # my-evolution/Locations.h:2280
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2278
 msgid "Toronto"
 msgstr "多伦多"
 
 # addressbook/printing/e-contact-print.glade.h:39
 # addressbook/printing/e-contact-print.glade.h:39
 # my-evolution/Locations.h:2281
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2279
 #, fuzzy
 msgid "Torp"
 msgstr "顶部："
@@ -34277,14 +36010,14 @@ msgstr "顶部："
 # addressbook/gui/contact-editor/fulladdr.glade.h:77
 # addressbook/gui/contact-editor/fulladdr.glade.h:77
 # my-evolution/Locations.h:2282
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2280
 msgid "Torrance"
 msgstr "托兰斯"
 
 # widgets/misc/e-charset-picker.c:64
 # widgets/misc/e-charset-picker.c:64
 # my-evolution/Locations.h:2283
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2281
 #, fuzzy
 msgid "Torreon"
 msgstr "韩语"
@@ -34292,7 +36025,7 @@ msgstr "韩语"
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
 # my-evolution/Locations.h:2284
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2282
 #, fuzzy
 msgid "Tottori Airport"
 msgstr "开始导入"
@@ -34308,39 +36041,39 @@ msgstr "开始导入"
 # ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 # ui/evolution.xml.h:4
 # my-evolution/Locations.h:2285
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2283
 msgid "Toulouse"
 msgstr "图鲁兹"
 
 # my-evolution/Locations.h:2286
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2284
 msgid "Toul-Rosieres"
 msgstr ""
 
 # my-evolution/Locations.h:2287
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2285
 msgid "Tours-St-Symphorien"
 msgstr "图尔斯-St-Symphorien"
 
 # my-evolution/Locations.h:2288
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2286
 msgid "Toussus-Le Noble"
 msgstr ""
 
 # my-evolution/Locations.h:2289
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2287
 msgid "Townsville"
 msgstr "汤斯维尔"
 
 # my-evolution/Locations.h:2290
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2288
 msgid "Toyama Airport"
 msgstr "富山机场"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:81
 # addressbook/gui/contact-editor/fulladdr.glade.h:81
 # my-evolution/Locations.h:2291
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2289
 #, fuzzy
 msgid "Trabzon"
 msgstr "加蓬"
@@ -34348,12 +36081,12 @@ msgstr "加蓬"
 # addressbook/gui/contact-editor/fulladdr.glade.h:109
 # addressbook/gui/contact-editor/fulladdr.glade.h:109
 # my-evolution/Locations.h:2292
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2290
 msgid "Trapani"
 msgstr "特拉帕尼"
 
 # my-evolution/Locations.h:2293
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2291
 msgid "Traverse City"
 msgstr ""
 
@@ -34364,7 +36097,7 @@ msgstr ""
 # addressbook/gui/contact-editor/e-contact-editor.c:1661
 # addressbook/gui/widgets/e-addressbook-view.c:872
 # my-evolution/Locations.h:2294
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2292
 #, fuzzy
 msgid "Trelew"
 msgstr "电传"
@@ -34372,116 +36105,116 @@ msgstr "电传"
 # addressbook/printing/e-contact-print.glade.h:24
 # addressbook/printing/e-contact-print.glade.h:24
 # my-evolution/Locations.h:2295
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2293
 msgid "Trenton"
 msgstr "特伦顿"
 
 # ui/evolution-mail-message.xml.h:63
 # ui/evolution-mail-message.xml.h:63
 # my-evolution/Locations.h:2296
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2294
 #, fuzzy
 msgid "Trevico"
 msgstr "上一个"
 
 # my-evolution/Locations.h:2297
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2295
 msgid "Treviso/Istrana"
 msgstr ""
 
 # my-evolution/Locations.h:2298
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2296
 msgid "Treviso/S.Angelo"
 msgstr ""
 
 # my-evolution/Locations.h:2299
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2297
 msgid "Trieste"
 msgstr "的里雅斯特"
 
 # my-evolution/metar.c:442 my-evolution/metar.c:451
 # my-evolution/metar.c:442 my-evolution/metar.c:451
 # my-evolution/Locations.h:2300
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2298
 msgid "Trinidad"
 msgstr "特立尼达"
 
 # calendar/zones.h:56
 # my-evolution/Locations.h:2301
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2299
 msgid "Tripoli"
 msgstr "的黎波里"
 
 # my-evolution/Locations.h:2302
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2300
 msgid "Tromso/Langnes"
 msgstr "特罗姆兹/Langnes"
 
 # my-evolution/Locations.h:2303
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2301
 msgid "Trondheim/Vaernes"
 msgstr "特隆赫姆/Vaernes"
 
 # my-evolution/Locations.h:2304
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2302
 msgid "Troutdale"
 msgstr ""
 
 # my-evolution/Locations.h:2305
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2303
 msgid "Troyes/Barberey"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:214
 # addressbook/gui/contact-editor/fulladdr.glade.h:214
 # my-evolution/Locations.h:2306
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2304
 #, fuzzy
 msgid "Truckee"
 msgstr "土耳其"
 
 # my-evolution/Locations.h:2307
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2305
 msgid "Truth or Consequences"
 msgstr ""
 
 # my-evolution/Locations.h:2308
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2306
 msgid "Tsuiki Ab"
 msgstr ""
 
 # my-evolution/Locations.h:2309
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2307
 msgid "Tsushima Airport"
 msgstr "对马机场"
 
 # my-evolution/Locations.h:2310
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2308
 msgid "Tucson"
 msgstr "图森"
 
 # my-evolution/Locations.h:2311
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2309
 msgid "Tucson-Davis AFB"
 msgstr "图森-戴维斯空军基地"
 
 # my-evolution/Locations.h:2312
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2310
 msgid "Tucuman"
 msgstr ""
 
 # my-evolution/Locations.h:2313
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2311
 msgid "Tucumcari"
 msgstr ""
 
 # my-evolution/Locations.h:2314
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2312
 msgid "Tucurui"
 msgstr ""
 
 # my-evolution/Locations.h:2315
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2313
 msgid "Tulancingo"
 msgstr ""
 
@@ -34490,7 +36223,7 @@ msgstr ""
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 # calendar/gui/dialogs/recurrence-page.c:960
 # my-evolution/Locations.h:2316
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2314
 #, fuzzy
 msgid "Tulcea"
 msgstr "星期二"
@@ -34500,7 +36233,7 @@ msgstr "星期二"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 # calendar/gui/dialogs/recurrence-page.c:960
 # my-evolution/Locations.h:2317
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2315
 msgid "Tulsa"
 msgstr "塔尔萨"
 
@@ -34513,7 +36246,7 @@ msgstr "塔尔萨"
 # calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
 # shell/glade/e-active-connection-dialog.glade.h:5
 # my-evolution/Locations.h:2318
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2316
 #, fuzzy
 msgid "Tupelo"
 msgstr "类型"
@@ -34521,7 +36254,7 @@ msgstr "类型"
 # widgets/misc/e-charset-picker.c:65
 # widgets/misc/e-charset-picker.c:65
 # my-evolution/Locations.h:2319
-#: my-evolution/Locations.h:2319
+#: my-evolution/Locations.h:2317
 #, fuzzy
 msgid "Turaif"
 msgstr "土耳其语"
@@ -34529,24 +36262,24 @@ msgstr "土耳其语"
 # widgets/misc/e-charset-picker.c:65
 # widgets/misc/e-charset-picker.c:65
 # my-evolution/Locations.h:2320
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2318
 msgid "Turin"
 msgstr "都灵"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:214
 # addressbook/gui/contact-editor/fulladdr.glade.h:214
 # my-evolution/Locations.h:2322
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2320
 msgid "Turku"
 msgstr "土尔库"
 
 # my-evolution/Locations.h:2323
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2321
 msgid "Tuscaloosa"
 msgstr ""
 
 # my-evolution/Locations.h:2324
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2322
 msgid "Tuxtla Gutierrez"
 msgstr ""
 
@@ -34555,105 +36288,105 @@ msgstr ""
 # calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
 # calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
 # my-evolution/Locations.h:2325
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2323
 #, fuzzy
 msgid "Twenthe"
 msgstr "暂时的"
 
 # my-evolution/Locations.h:2326
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2324
 msgid "Twentynine Palms"
 msgstr ""
 
 # my-evolution/Locations.h:2327
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2325
 msgid "Twin Falls"
 msgstr ""
 
 # my-evolution/Locations.h:2328
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2326
 msgid "Tyler"
 msgstr "泰勒"
 
 # my-evolution/Locations.h:2329
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2327
 msgid "Tyndall AFB"
 msgstr "廷德尔空军基地"
 
 # my-evolution/Locations.h:2330
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2328
 msgid "Tyumen"
 msgstr "秋明"
 
 # my-evolution/Locations.h:2331
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2329
 msgid "Uberaba"
 msgstr ""
 
 # my-evolution/Locations.h:2332
-#: my-evolution/Locations.h:2332
+#: my-evolution/Locations.h:2330
 msgid "Ufa"
 msgstr ""
 
 # my-evolution/Locations.h:2333
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2331
 msgid "Ukiah"
 msgstr ""
 
 # my-evolution/Locations.h:2335
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2333
 msgid "Ulan-Ude"
 msgstr ""
 
 # my-evolution/Locations.h:2336
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2334
 msgid "Ulsan"
 msgstr ""
 
 # my-evolution/Locations.h:2337
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2335
 msgid "Ulyanovsk"
 msgstr "乌里扬诺夫斯克"
 
 # my-evolution/Locations.h:2338
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2336
 msgid "Umea"
 msgstr ""
 
 # my-evolution/Locations.h:2339
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2337
 msgid "Umiat"
 msgstr ""
 
 # my-evolution/Locations.h:2340
-#: my-evolution/Locations.h:2340
+#: my-evolution/Locations.h:2338
 msgid "Unalakleet"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:221
 # addressbook/gui/contact-editor/fulladdr.glade.h:221
 # my-evolution/Locations.h:2341
-#: my-evolution/Locations.h:2341
+#: my-evolution/Locations.h:2339
 msgid "United Arab Emirates "
 msgstr "阿拉伯联合酋长国 "
 
 # mail/message-list.c:639
 # mail/message-list.c:645
 # my-evolution/Locations.h:2344
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2342
 #, fuzzy
 msgid "Unst"
 msgstr "不可见"
 
 # my-evolution/Locations.h:2345
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2343
 msgid "Upington"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:109
 # addressbook/gui/contact-editor/fulladdr.glade.h:109
 # my-evolution/Locations.h:2346
-#: my-evolution/Locations.h:2346
+#: my-evolution/Locations.h:2344
 #, fuzzy
 msgid "Uruapan"
 msgstr "日本"
@@ -34661,39 +36394,39 @@ msgstr "日本"
 # addressbook/gui/contact-editor/fulladdr.glade.h:226
 # addressbook/gui/contact-editor/fulladdr.glade.h:226
 # my-evolution/Locations.h:2347
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2345
 msgid "Uruguaiana"
 msgstr "乌拉圭亚纳"
 
 # my-evolution/Locations.h:2349
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2347
 msgid "Urumqi"
 msgstr ""
 
 # ui/evolution-message-composer.xml.h:1
 # ui/evolution-message-composer.xml.h:1
 # my-evolution/Locations.h:2350
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2348
 msgid "Utah"
 msgstr "犹他州"
 
 # my-evolution/Locations.h:2351
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2349
 msgid "Utica"
 msgstr "尤蒂卡"
 
 # my-evolution/Locations.h:2352
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2350
 msgid "Utrecht/Soesterberg"
 msgstr "乌德勒支/Soesterberg"
 
 # my-evolution/Locations.h:2353
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2351
 msgid "Utsunomiya Ab"
 msgstr "宇都宫 Ab"
 
 # my-evolution/Locations.h:2354
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2352
 msgid "Uzhgorod"
 msgstr ""
 
@@ -34704,7 +36437,7 @@ msgstr ""
 # addressbook/gui/contact-editor/e-contact-editor.c:1660
 # addressbook/gui/widgets/e-addressbook-view.c:871
 # my-evolution/Locations.h:2355
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2353
 #, fuzzy
 msgid "Vadso"
 msgstr "收音机"
@@ -34712,7 +36445,7 @@ msgstr "收音机"
 # my-evolution/metar.c:63
 # my-evolution/metar.c:63
 # my-evolution/Locations.h:2356
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2354
 #, fuzzy
 msgid "Vaerlose"
 msgstr "不定风"
@@ -34720,139 +36453,139 @@ msgstr "不定风"
 # addressbook/gui/contact-editor/fulladdr.glade.h:172
 # addressbook/gui/contact-editor/fulladdr.glade.h:172
 # my-evolution/Locations.h:2357
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2355
 msgid "Vagar"
 msgstr "瓦尔迪兹"
 
 # my-evolution/Locations.h:2358
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2356
 msgid "Valdez 2"
 msgstr "瓦尔迪兹 2"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # addressbook/gui/contact-editor/fulladdr.glade.h:131
 # my-evolution/Locations.h:2359
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2357
 #, fuzzy
 msgid "Valdosta"
 msgstr "马耳他"
 
 # my-evolution/Locations.h:2360
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2358
 msgid "Valdosta-Moody AFB"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:191
 # addressbook/gui/contact-editor/fulladdr.glade.h:191
 # my-evolution/Locations.h:2361
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2359
 msgid "Valencia"
 msgstr "巴伦西亚"
 
 # calendar/zones.h:257
 # my-evolution/Locations.h:2362
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2360
 msgid "Valentine"
 msgstr "瓦伦丁"
 
 # my-evolution/Locations.h:2363
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2361
 msgid "Valera*"
 msgstr "瓦勒拉"
 
 # my-evolution/Locations.h:2364
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2362
 msgid "Valkenburg"
 msgstr ""
 
 # my-evolution/Locations.h:2365
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2363
 msgid "Valley"
 msgstr ""
 
 # my-evolution/Locations.h:2366
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso"
 msgstr "瓦尔帕莱索"
 
 # my-evolution/Locations.h:2367
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2365
 msgid "Valparaiso-Eglin AFB"
 msgstr "瓦尔帕莱索-Eglin 空军基地"
 
 # addressbook/backend/ebook/e-card-simple.c:93
 # addressbook/backend/ebook/e-card-simple.c:93
 # my-evolution/Locations.h:2368
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2366
 #, fuzzy
 msgid "Van"
 msgstr "经理"
 
 # my-evolution/Locations.h:2369
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2367
 msgid "Vancouver"
 msgstr "范库弗峰"
 
 # calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
 # calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
 # my-evolution/Locations.h:2370
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2368
 #, fuzzy
 msgid "Vandel"
 msgstr "取消"
 
 # my-evolution/Locations.h:2371
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg AFB"
 msgstr "范登堡空军基地"
 
 # my-evolution/Locations.h:2372
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2370
 msgid "Vandenberg Range"
 msgstr "范登堡山脉"
 
 # my-evolution/Locations.h:2373
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2371
 msgid "Van Nuys"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:20
 # addressbook/gui/contact-editor/fulladdr.glade.h:20
 # my-evolution/Locations.h:2374
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2372
 #, fuzzy
 msgid "Varadero"
 msgstr "巴巴多斯岛"
 
 # my-evolution/Locations.h:2375
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2373
 msgid "Varanasi/Babatpur"
 msgstr "瓦蜡纳西/Babatpur"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:228
 # addressbook/gui/contact-editor/fulladdr.glade.h:228
 # my-evolution/Locations.h:2376
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2374
 msgid "Varna"
 msgstr "瓦尔纳"
 
 # calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
 # calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
 # my-evolution/Locations.h:2377
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2375
 #, fuzzy
 msgid "Vasteras"
 msgstr "之后"
 
 # my-evolution/Locations.h:2378
-#: my-evolution/Locations.h:2378
+#: my-evolution/Locations.h:2376
 msgid "Vaxjo"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:229
 # addressbook/gui/contact-editor/fulladdr.glade.h:229
 # my-evolution/Locations.h:2379
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2377
 #, fuzzy
 msgid "Venezia"
 msgstr "委内瑞拉"
@@ -34860,186 +36593,186 @@ msgstr "委内瑞拉"
 # widgets/misc/e-charset-picker.c:66
 # widgets/misc/e-charset-picker.c:66
 # my-evolution/Locations.h:2381
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2379
 #, fuzzy
 msgid "Venice"
 msgstr "Unicode"
 
 # my-evolution/Locations.h:2382
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2380
 msgid "Veracruz"
 msgstr "韦拉克鲁斯"
 
 # my-evolution/Locations.h:2383
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2381
 msgid "Vermillion"
 msgstr ""
 
 # my-evolution/Locations.h:2384
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2382
 msgid "Vermont"
 msgstr "佛蒙特州"
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:16
 # addressbook/gui/contact-editor/contact-editor.glade.h:16
 # my-evolution/Locations.h:2385
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2383
 #, fuzzy
 msgid "Vernal"
 msgstr "常规"
 
 # my-evolution/Locations.h:2386
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2384
 msgid "Vero Beach"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:229
 # addressbook/gui/contact-editor/fulladdr.glade.h:229
 # my-evolution/Locations.h:2387
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2385
 msgid "Vicenza"
 msgstr "维琴察"
 
 # my-evolution/Locations.h:2388
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Charmeil"
 msgstr "维希-Charmeil"
 
 # my-evolution/Locations.h:2389
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2387
 msgid "Vichy-Rolla"
 msgstr "维希-Rolla"
 
 # my-evolution/Locations.h:2390
-#: my-evolution/Locations.h:2390
+#: my-evolution/Locations.h:2388
 msgid "Vicksburg"
 msgstr ""
 
 # my-evolution/Locations.h:2391
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2389
 msgid "Victoria"
 msgstr "维多利亚"
 
 # my-evolution/Locations.h:2393
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2391
 msgid "Vigo"
 msgstr "比戈"
 
 # shell/e-shell-importer.c:612
 # shell/e-shell-importer.c:612
 # my-evolution/Locations.h:2394
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2392
 #, fuzzy
 msgid "Vilhena"
 msgstr "文件名："
 
 # my-evolution/Locations.h:2395
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2393
 msgid "Villacoublay"
 msgstr ""
 
 # my-evolution/Locations.h:2396
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2394
 msgid "Villafranca"
 msgstr ""
 
 # my-evolution/Locations.h:2397
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2395
 msgid "Villahermosa"
 msgstr ""
 
 # my-evolution/Locations.h:2398
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2396
 msgid "Villamontes"
 msgstr ""
 
 # my-evolution/Locations.h:2399
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2397
 msgid "Villa Reynolds"
 msgstr ""
 
 # calendar/zones.h:329
 # my-evolution/Locations.h:2400
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2398
 msgid "Vilnius"
 msgstr "维尔纽斯"
 
 # my-evolution/Locations.h:2401
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2399
 msgid "Virginia"
 msgstr "维吉尼亚"
 
 # my-evolution/Locations.h:2402
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2400
 msgid "Virginia Beach"
 msgstr "维吉尼亚海岸"
 
 # my-evolution/Locations.h:2403
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2401
 msgid "Virginia Tech Airport"
 msgstr "维吉尼亚 Tech 机场"
 
 # my-evolution/Locations.h:2404
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2402
 msgid "Viru-Viru"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # addressbook/gui/contact-editor/fulladdr.glade.h:14
 # my-evolution/Locations.h:2405
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2403
 #, fuzzy
 msgid "Visalia"
 msgstr "澳大利亚"
 
 # my-evolution/Locations.h:2406
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2404
 msgid "Visby"
 msgstr "维斯比"
 
 # my-evolution/Locations.h:2407
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2405
 msgid "Viterbo"
 msgstr ""
 
 # my-evolution/Locations.h:2408
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2406
 msgid "Vitoria"
 msgstr "维多利亚"
 
 # my-evolution/Locations.h:2409
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2407
 msgid "Vladikavkaz"
 msgstr ""
 
 # calendar/zones.h:258
 # my-evolution/Locations.h:2410
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2408
 msgid "Vladivostok"
 msgstr "符拉迪沃斯托克"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # addressbook/gui/contact-editor/fulladdr.glade.h:105
 # my-evolution/Locations.h:2411
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2409
 #, fuzzy
 msgid "Vlieland"
 msgstr "爱尔兰"
 
 # my-evolution/Locations.h:2412
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2410
 msgid "Vojens/Skrydstrup"
 msgstr ""
 
 # my-evolution/Locations.h:2413
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2411
 msgid "Volgograd"
 msgstr "伏尔加格勒"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # my-evolution/Locations.h:2414
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2412
 #, fuzzy
 msgid "Volkel"
 msgstr "托克劳群岛"
@@ -35047,20 +36780,20 @@ msgstr "托克劳群岛"
 # ui/evolution-message-composer.xml.h:49
 # ui/evolution-message-composer.xml.h:49
 # my-evolution/Locations.h:2415
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2413
 #, fuzzy
 msgid "Volk Field"
 msgstr "发件人域(_F)"
 
 # my-evolution/Locations.h:2416
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2414
 msgid "Voronezh"
 msgstr "沃罗涅什"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # addressbook/gui/contact-editor/fulladdr.glade.h:210
 # my-evolution/Locations.h:2417
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2415
 #, fuzzy
 msgid "Voslau"
 msgstr "托克劳群岛"
@@ -35068,94 +36801,94 @@ msgstr "托克劳群岛"
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # addressbook/gui/contact-editor/fulladdr.glade.h:139
 # my-evolution/Locations.h:2418
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2416
 msgid "Waco"
 msgstr "韦科"
 
 # my-evolution/Locations.h:2419
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2417
 msgid "Wadi Al Dawasser Airport"
 msgstr ""
 
 # my-evolution/Locations.h:2420
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2418
 msgid "Wainwright"
 msgstr ""
 
 # my-evolution/Locations.h:2421
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2419
 msgid "Wakefield"
 msgstr "韦克菲尔德"
 
 # my-evolution/Locations.h:2422
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2420
 msgid "Wakkanai Airport"
 msgstr ""
 
 # my-evolution/Locations.h:2423
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2421
 msgid "Walla Walla"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # addressbook/gui/contact-editor/fulladdr.glade.h:132
 # my-evolution/Locations.h:2424
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2422
 #, fuzzy
 msgid "Wallops Island"
 msgstr "马绍尔群岛"
 
 # my-evolution/Locations.h:2425
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2423
 msgid "Walnut Ridge"
 msgstr ""
 
 # mail/mail-callbacks.c:2128 widgets/misc/e-messagebox.c:159
 # mail/mail-callbacks.c:2247 widgets/misc/e-messagebox.c:159
 # my-evolution/Locations.h:2426
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2424
 #, fuzzy
 msgid "Warner Robins"
 msgstr "警告"
 
 # my-evolution/Locations.h:2427
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2425
 msgid "Warroad"
 msgstr ""
 
 # my-evolution/Locations.h:2428
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2426
 msgid "Warszawa"
 msgstr "华沙"
 
 # my-evolution/Locations.h:2429
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2427
 msgid "Washington"
 msgstr "华盛顿"
 
 # my-evolution/Locations.h:2430
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2428
 msgid "Washington/Dulles"
 msgstr "华盛顿/杜勒斯"
 
 # my-evolution/e-summary-weather.c:559
 # my-evolution/e-summary-weather.c:559
 # my-evolution/Locations.h:2431
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2429
 msgid "Waterbury"
 msgstr "沃特伯里"
 
 # my-evolution/e-summary-weather.c:559
 # my-evolution/e-summary-weather.c:559
 # my-evolution/Locations.h:2432
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2430
 msgid "Waterloo"
 msgstr "滑铁卢"
 
 # my-evolution/e-summary-weather.c:559
 # my-evolution/e-summary-weather.c:559
 # my-evolution/Locations.h:2433
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2431
 #, fuzzy
 msgid "Watertown"
 msgstr "天气"
@@ -35165,31 +36898,31 @@ msgstr "天气"
 # addressbook/backend/ebook/e-card-simple.c:104
 # calendar/gui/e-calendar-table.etspec.h:4
 # my-evolution/Locations.h:2434
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2432
 #, fuzzy
 msgid "Waterville"
 msgstr "类别"
 
 # my-evolution/Locations.h:2435
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2433
 msgid "Waukesha"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:228
 # addressbook/gui/contact-editor/fulladdr.glade.h:228
 # my-evolution/Locations.h:2436
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2434
 #, fuzzy
 msgid "Wausau"
 msgstr "努瓦阿图"
 
 # my-evolution/Locations.h:2437
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2435
 msgid "Waycross"
 msgstr ""
 
 # my-evolution/Locations.h:2438
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2436
 msgid "Waynesboro"
 msgstr ""
 
@@ -35198,46 +36931,46 @@ msgstr ""
 # addressbook/backend/ebook/e-card-simple.c:88
 # addressbook/gui/widgets/e-addressbook-view.c:877
 # my-evolution/Locations.h:2439
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2437
 msgid "Webster City"
 msgstr "韦伯斯特城"
 
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # my-evolution/Locations.h:2440
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2438
 #, fuzzy
 msgid "Wejh"
 msgstr "三"
 
 # my-evolution/Locations.h:2441
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2439
 msgid "Wellington"
 msgstr "惠灵顿"
 
 # my-evolution/e-summary-weather.c:559
 # my-evolution/e-summary-weather.c:559
 # my-evolution/Locations.h:2442
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2440
 #, fuzzy
 msgid "Wenatchee"
 msgstr "天气"
 
 # my-evolution/Locations.h:2443
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2441
 #, fuzzy
 msgid "Wendover"
 msgstr "发件人"
 
 # my-evolution/Locations.h:2444
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2442
 msgid "West Atlanta"
 msgstr "西亚特兰大"
 
 # widgets/misc/e-charset-picker.c:67
 # widgets/misc/e-charset-picker.c:67
 # my-evolution/Locations.h:2445
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2443
 #, fuzzy
 msgid "West Burke"
 msgstr "西欧"
@@ -35245,7 +36978,7 @@ msgstr "西欧"
 # addressbook/gui/contact-editor/fulladdr.glade.h:148
 # addressbook/gui/contact-editor/fulladdr.glade.h:148
 # my-evolution/Locations.h:2446
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2444
 #, fuzzy
 msgid "Westerland"
 msgstr "荷兰"
@@ -35253,33 +36986,33 @@ msgstr "荷兰"
 # my-evolution/metar.c:67
 # my-evolution/metar.c:67
 # my-evolution/Locations.h:2447
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2445
 #, fuzzy
 msgid "Westfield"
 msgstr "西"
 
 # my-evolution/Locations.h:2448
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2446
 msgid "Westhampton"
 msgstr ""
 
 # my-evolution/Locations.h:2449
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2447
 msgid "West Palm Beach"
 msgstr ""
 
 # my-evolution/Locations.h:2450
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2448
 msgid "West Virginia"
 msgstr "西维吉尼亚"
 
 # my-evolution/Locations.h:2451
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone"
 msgstr "西黄石国家公园"
 
 # my-evolution/Locations.h:2452
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2450
 msgid "West Yellowstone (2)"
 msgstr "西黄石国家公园 (2)"
 
@@ -35290,7 +37023,7 @@ msgstr "西黄石国家公园 (2)"
 # calendar/gui/dialogs/event-editor.c:263
 # calendar/gui/dialogs/event-editor.c:366
 # my-evolution/Locations.h:2453
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2451
 #, fuzzy
 msgid "Wheeling"
 msgstr "会见"
@@ -35298,55 +37031,55 @@ msgstr "会见"
 # addressbook/gui/contact-editor/fulladdr.glade.h:48
 # addressbook/gui/contact-editor/fulladdr.glade.h:48
 # my-evolution/Locations.h:2454
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2452
 #, fuzzy
 msgid "Whidbey Island"
 msgstr "圣诞岛"
 
 # my-evolution/Locations.h:2455
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2453
 msgid "Whitefield"
 msgstr "怀特菲尔德"
 
 # my-evolution/Locations.h:2456
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2454
 msgid "White Plains"
 msgstr ""
 
 # my-evolution/Locations.h:2457
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2455
 msgid "White Sulphur"
 msgstr ""
 
 # my-evolution/Locations.h:2458
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2456
 msgid "Whittier"
 msgstr "惠蒂尔"
 
 # my-evolution/Locations.h:2459
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2457
 msgid "Wichita"
 msgstr ""
 
 # my-evolution/Locations.h:2460
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2458
 msgid "Wichita Falls"
 msgstr ""
 
 # my-evolution/Locations.h:2461
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2459
 msgid "Wichita-Jabara"
 msgstr ""
 
 # my-evolution/Locations.h:2462
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2460
 msgid "Wichita-McConnell AFB"
 msgstr ""
 
 # addressbook/backend/ebook/e-card-simple.c:95
 # addressbook/backend/ebook/e-card-simple.c:95
 # my-evolution/Locations.h:2463
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2461
 #, fuzzy
 msgid "Wick"
 msgstr "绰号"
@@ -35354,147 +37087,147 @@ msgstr "绰号"
 # calendar/gui/print.c:498
 # calendar/gui/print.c:498
 # my-evolution/Locations.h:2464
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2462
 msgid "Wien"
 msgstr "维也纳"
 
 # my-evolution/Locations.h:2465
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2463
 msgid "Wildwood"
 msgstr ""
 
 # my-evolution/Locations.h:2466
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2464
 msgid "Wilkes - Barre"
 msgstr "威尔克斯地 - Barre"
 
 # my-evolution/Locations.h:2467
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2465
 msgid "Williams Field"
 msgstr ""
 
 # my-evolution/Locations.h:2468
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2466
 msgid "Williamsport"
 msgstr ""
 
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # addressbook/gui/contact-editor/e-contact-save-as.c:170
 # my-evolution/Locations.h:2469
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2467
 #, fuzzy
 msgid "Williston"
 msgstr "列表"
 
 # my-evolution/Locations.h:2470
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2468
 msgid "Willoughby"
 msgstr "威洛比"
 
 # my-evolution/Locations.h:2471
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2469
 msgid "Willow Airport"
 msgstr ""
 
 # my-evolution/Locations.h:2472
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2470
 msgid "Wilmington"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:121
 # addressbook/gui/contact-editor/fulladdr.glade.h:121
 # my-evolution/Locations.h:2473
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2471
 msgid "Winchester"
 msgstr "温彻斯特"
 
 # my-evolution/metar.c:397
 # my-evolution/metar.c:397
 # my-evolution/Locations.h:2474
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2472
 msgid "Windsor"
 msgstr "温莎"
 
 # my-evolution/Locations.h:2475
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2473
 msgid "Windsor Locks"
 msgstr ""
 
 # my-evolution/Locations.h:2476
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2474
 msgid "Wink"
 msgstr ""
 
 # my-evolution/Locations.h:2477
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2475
 msgid "Winnemucca"
 msgstr ""
 
 # calendar/zones.h:175
 # my-evolution/Locations.h:2478
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2476
 msgid "Winnipeg"
 msgstr "温尼伯"
 
 # my-evolution/Locations.h:2479
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2477
 msgid "Winslow"
 msgstr "温斯洛"
 
 # my-evolution/Locations.h:2480
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2478
 msgid "Winston-Salem"
 msgstr "温斯顿-塞伦"
 
 # my-evolution/Locations.h:2481
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2479
 msgid "Winter Haven"
 msgstr ""
 
 # mail/mail-session.c:322
 # mail/mail-session.c:322
 # my-evolution/Locations.h:2482
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2480
 msgid "Winter Park"
 msgstr "冬季公园"
 
 # my-evolution/Locations.h:2483
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2481
 msgid "Wiscasset"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # my-evolution/Locations.h:2484
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin"
 msgstr "威斯康星州"
 
 # my-evolution/Locations.h:2485
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2483
 msgid "Wisconsin Rapids"
 msgstr ""
 
 # my-evolution/Locations.h:2486
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2484
 #, fuzzy
 msgid "Wise"
 msgstr "是"
 
 # my-evolution/Locations.h:2487
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2485
 msgid "Woensdrecht"
 msgstr ""
 
 # my-evolution/Locations.h:2488
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2486
 msgid "Wolf Point"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:100
 # addressbook/gui/contact-editor/fulladdr.glade.h:100
 # my-evolution/Locations.h:2489
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2487
 #, fuzzy
 msgid "Woong Cheon"
 msgstr "香港"
@@ -35502,7 +37235,7 @@ msgstr "香港"
 # addressbook/printing/e-contact-print.glade.h:9
 # addressbook/printing/e-contact-print.glade.h:9
 # my-evolution/Locations.h:2490
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2488
 #, fuzzy
 msgid "Wooster"
 msgstr "脚注："
@@ -35510,14 +37243,14 @@ msgstr "脚注："
 # calendar/gui/dialogs/recurrence-page.glade.h:16
 # calendar/gui/dialogs/recurrence-page.glade.h:16
 # my-evolution/Locations.h:2491
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2489
 msgid "Worcester"
 msgstr "伍斯特"
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # addressbook/gui/contact-editor/fulladdr.glade.h:169
 # my-evolution/Locations.h:2492
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2490
 #, fuzzy
 msgid "Worland"
 msgstr "波兰"
@@ -35525,190 +37258,190 @@ msgstr "波兰"
 # mail/mail-mt.c:901
 # mail/mail-mt.c:901
 # my-evolution/Locations.h:2493
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2491
 #, fuzzy
 msgid "Worthington"
 msgstr "正在工作"
 
 # my-evolution/Locations.h:2494
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2492
 msgid "Wrangell"
 msgstr "兰格尔"
 
 # my-evolution/Locations.h:2495
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2493
 msgid "Wrightstown / Mcguire AFB"
 msgstr ""
 
 # my-evolution/Locations.h:2496
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2494
 msgid "Wuchia Observatory"
 msgstr ""
 
 # mail/mail-mt.c:901
 # mail/mail-mt.c:901
 # my-evolution/Locations.h:2497
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2495
 msgid "Wyoming"
 msgstr "怀俄明州"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 # my-evolution/Locations.h:2498
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2496
 msgid "Xiamen"
 msgstr "厦门"
 
 # my-evolution/Locations.h:2499
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2497
 msgid "Yacuiba"
 msgstr ""
 
 # my-evolution/Locations.h:2500
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2498
 msgid "Yakima"
 msgstr "雅吉瓦"
 
 # my-evolution/Locations.h:2501
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2499
 msgid "Yakushima"
 msgstr ""
 
 # addressbook/gui/contact-editor/fulladdr.glade.h:5
 # calendar/zones.h:176
 # my-evolution/Locations.h:2502
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2500
 #, fuzzy
 msgid "Yakutat"
 msgstr "美洲萨摩亚"
 
 # my-evolution/Locations.h:2503
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2501
 msgid "Yakutsk"
 msgstr "雅库茨克"
 
 # my-evolution/Locations.h:2504
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2502
 msgid "Yamagata Airport"
 msgstr ""
 
 # my-evolution/Locations.h:2505
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2503
 msgid "Yamaguchi Ube Airport"
 msgstr ""
 
 # my-evolution/Locations.h:2506
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2504
 msgid "Yankton"
 msgstr ""
 
 # shell/importer/intelligent.c:196
 # shell/importer/intelligent.c:196
 # my-evolution/Locations.h:2507
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2505
 #, fuzzy
 msgid "Yao Airport"
 msgstr "不要导入"
 
 # my-evolution/Locations.h:2508
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2506
 msgid "Yechon Ab"
 msgstr ""
 
 # my-evolution/Locations.h:2509
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2507
 msgid "Yekaterinburg"
 msgstr ""
 
 # my-evolution/Locations.h:2510
-#: my-evolution/Locations.h:2510
+#: my-evolution/Locations.h:2508
 msgid "Yellowknife"
 msgstr "耶洛奈夫"
 
 # my-evolution/Locations.h:2511
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2509
 msgid "Yellowstone"
 msgstr "黄石国家公园"
 
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 # my-evolution/Locations.h:2513
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2511
 msgid "Yenbo"
 msgstr "延布"
 
 # my-evolution/Locations.h:2514
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2512
 msgid "Yeoju Range"
 msgstr ""
 
 # my-evolution/Locations.h:2515
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2513
 msgid "Yeonpyeungdo"
 msgstr ""
 
 # my-evolution/Locations.h:2516
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2514
 msgid "Yeovilton"
 msgstr ""
 
 # my-evolution/Locations.h:2517
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2515
 msgid "Yokosuka Fwf"
 msgstr "横须贺 Fwf"
 
 # my-evolution/Locations.h:2518
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2516
 msgid "Yokota Ab"
 msgstr ""
 
 # my-evolution/Locations.h:2519
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2517
 msgid "Yongsan/H-208 Hp"
 msgstr ""
 
 # my-evolution/Locations.h:2520
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2518
 msgid "Yoro"
 msgstr ""
 
 # my-evolution/Locations.h:2521
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2519
 msgid "Yosu"
 msgstr ""
 
 # my-evolution/Locations.h:2522
-#: my-evolution/Locations.h:2522
+#: my-evolution/Locations.h:2520
 msgid "Youngstown"
 msgstr "扬斯敦"
 
 # my-evolution/Locations.h:2523
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2521
 msgid "Ypsilanti"
 msgstr ""
 
 # my-evolution/Locations.h:2525
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2523
 msgid "Yukon"
 msgstr "育空"
 
 # my-evolution/Locations.h:2526
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2524
 msgid "Yuma MCAS"
 msgstr "尤马 MCAS"
 
 # my-evolution/Locations.h:2527
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2525
 msgid "Yurimaguas"
 msgstr ""
 
 # my-evolution/Locations.h:2528
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2526
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
 # my-evolution/Locations.h:2529
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2527
 msgid "Zacatecas"
 msgstr "萨卡特卡斯"
 
@@ -35717,23 +37450,23 @@ msgstr "萨卡特卡斯"
 # calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # my-evolution/Locations.h:2530
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2528
 msgid "Zadar"
 msgstr "扎达尔"
 
 # calendar/zones.h:331
 # my-evolution/Locations.h:2531
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2529
 msgid "Zagreb"
 msgstr "萨格勒布"
 
 # my-evolution/Locations.h:2532
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2530
 msgid "Zakinthos"
 msgstr ""
 
 # my-evolution/Locations.h:2533
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2531
 msgid "Zama Airfield"
 msgstr ""
 
@@ -35748,7 +37481,7 @@ msgstr ""
 # calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
 # camel/camel-service.c:610 camel/camel-service.c:646
 # my-evolution/Locations.h:2534
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2532
 #, fuzzy
 msgid "Zanesville"
 msgstr "已经取消"
@@ -35756,82 +37489,83 @@ msgstr "已经取消"
 # addressbook/gui/contact-editor/fulladdr.glade.h:165
 # addressbook/gui/contact-editor/fulladdr.glade.h:165
 # my-evolution/Locations.h:2535
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2533
 msgid "Zaragoza"
 msgstr "萨拉戈萨"
 
 # my-evolution/Locations.h:2536
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2534
 msgid "Zell Am See"
 msgstr ""
 
 # my-evolution/Locations.h:2537
-#: my-evolution/Locations.h:2537
+#: my-evolution/Locations.h:2535
 msgid "Zuni Pueblo"
 msgstr "祖尼 普维布洛"
 
 # calendar/zones.h:333
 # my-evolution/Locations.h:2538
-#: my-evolution/Locations.h:2538
+#: my-evolution/Locations.h:2536
 msgid "Zurich"
 msgstr "苏黎世"
 
 # my-evolution/component-factory.c:44
 # my-evolution/component-factory.c:44
 # my-evolution/component-factory.c:44
-#: my-evolution/component-factory.c:44
+#: my-evolution/component-factory.c:51
 msgid "Folder containing the Evolution Summary"
 msgstr "含有 Evolution 概要的文件夹"
 
-# my-evolution/component-factory.c:153
-# my-evolution/component-factory.c:153
-# my-evolution/component-factory.c:153
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "无法初始化 Evolution 的概要成员。"
-
 # my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 # my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
 # my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "约会"
 
 # my-evolution/e-summary-calendar.c:341
 # my-evolution/e-summary-calendar.c:341
 # my-evolution/e-summary-calendar.c:341
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "没有约会"
 
 # my-evolution/e-summary-calendar.c:377
 # my-evolution/e-summary-calendar.c:377
 # my-evolution/e-summary-calendar.c:375
-#: my-evolution/e-summary-calendar.c:375
+#: my-evolution/e-summary-calendar.c:400
 msgid "%k:%M %d %B"
 msgstr "%B %d %k:%M"
 
 # my-evolution/e-summary-calendar.c:379
 # my-evolution/e-summary-calendar.c:379
 # my-evolution/e-summary-calendar.c:377
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr "%B %d %l:%M"
 
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:119
 # my-evolution/e-summary-calendar.c:395
-#: my-evolution/e-summary-calendar.c:395
+#: my-evolution/e-summary-calendar.c:420
 msgid "No description"
 msgstr "无描述"
 
 # my-evolution/e-summary-mail.c:129
 # my-evolution/e-summary-mail.c:129
 # my-evolution/e-summary-mail.c:129
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "邮件概要"
 
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+msgid "Local Folders"
+msgstr "本地文件夹"
+
 # my-evolution/e-summary-preferences.c:80
 # my-evolution/e-summary-weather.c:661
 # my-evolution/e-summary-preferences.c:80
@@ -35843,108 +37577,114 @@ msgstr "邮件概要"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:81
-#: my-evolution/e-summary-weather.c:606
+#: my-evolution/e-summary-preferences.c:108
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
 # my-evolution/e-summary-preferences.c:444
 # my-evolution/e-summary-preferences.c:444
 # my-evolution/e-summary-preferences.c:445
-#: my-evolution/e-summary-preferences.c:445
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com 的每日一词"
 
 # my-evolution/e-summary-preferences.c:465
 # my-evolution/e-summary-preferences.c:465
 # my-evolution/e-summary-preferences.c:466
-#: my-evolution/e-summary-preferences.c:466
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "每日引用"
 
 # my-evolution/e-summary-preferences.c:944
 # my-evolution/e-summary-preferences.c:944
 # my-evolution/e-summary-preferences.c:946
-#: my-evolution/e-summary-preferences.c:946
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "添加新闻来源"
 
 # my-evolution/e-summary-preferences.c:952
 # my-evolution/e-summary-preferences.c:952
 # my-evolution/e-summary-preferences.c:954
-#: my-evolution/e-summary-preferences.c:954
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "输入您希望添加的新闻来源的 URL"
 
-# my-evolution/e-summary-preferences.c:956
-# my-evolution/e-summary-preferences.c:956
-# my-evolution/e-summary-preferences.c:958
-#: my-evolution/e-summary-preferences.c:958
-msgid "Name:"
-msgstr "名称："
-
-# my-evolution/e-summary-preferences.c:1502
-# my-evolution/e-summary-preferences.c:1502
-# my-evolution/e-summary-preferences.c:1504
-#: my-evolution/e-summary-preferences.c:1504
-msgid "Summary Settings"
-msgstr "概要设置"
-
 # my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 # my-evolution/e-summary-rdf.c:415
 # my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
 # my-evolution/e-summary-rdf.c:415
 # my-evolution/e-summary-rdf.c:300
-#: my-evolution/e-summary-rdf.c:300
+#: my-evolution/e-summary-rdf.c:304
 msgid "Error downloading RDF"
 msgstr "下载 RDF 错误"
 
 # my-evolution/e-summary-rdf.c:528
 # my-evolution/e-summary-rdf.c:528
 # my-evolution/e-summary-rdf.c:443
-#: my-evolution/e-summary-rdf.c:443
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "新闻来源"
 
+# my-evolution/Locations.h:1354
+#: my-evolution/e-summary-shown.c:536
+#, fuzzy
+msgid "All"
+msgstr "麦卡伦"
+
+# calendar/gui/dialogs/recurrence-page.glade.h:1
+# calendar/gui/dialogs/recurrence-page.glade.h:1
+# calendar/gui/dialogs/recurrence-page.glade.h:1
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:545
+#, fuzzy
+msgid "Add"
+msgstr "添加(_D)"
+
+# my-evolution/metar.c:157
+# my-evolution/metar.c:157
+# my-evolution/metar.c:157
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "雪"
+
 # my-evolution/e-summary-tasks.c:248
 # my-evolution/e-summary-tasks.c:248
 # my-evolution/e-summary-tasks.c:241
-#: my-evolution/e-summary-tasks.c:241
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "没有任务"
 
 # my-evolution/e-summary-tasks.c:287
 # my-evolution/e-summary-tasks.c:287
 # my-evolution/e-summary-tasks.c:281
-#: my-evolution/e-summary-tasks.c:281
+#: my-evolution/e-summary-tasks.c:291
 msgid "(No Description)"
 msgstr "(没有描述)"
 
 # my-evolution/e-summary-weather.c:71
 # my-evolution/e-summary-weather.c:71
 # my-evolution/e-summary-weather.c:70
-#: my-evolution/e-summary-weather.c:70
+#: my-evolution/e-summary-weather.c:71
 msgid "My Weather"
 msgstr "天气"
 
+#: my-evolution/e-summary-weather.c:279
+msgid "There was an error downloading data for"
+msgstr ""
+
 # my-evolution/e-summary-weather.c:559
 # my-evolution/e-summary-weather.c:559
 # my-evolution/e-summary-weather.c:504
-#: my-evolution/e-summary-weather.c:504
+#: my-evolution/e-summary-weather.c:501
 msgid "Weather"
 msgstr "天气"
 
-# my-evolution/e-summary-weather.c:722
-# my-evolution/e-summary-weather.c:722
-# my-evolution/e-summary-weather.c:667
-#: my-evolution/e-summary-weather.c:667
-msgid "Regions"
-msgstr "区域"
-
 # my-evolution/e-summary.c:193
 # my-evolution/e-summary.c:193
 # my-evolution/e-summary.c:190
-#: my-evolution/e-summary.c:190
+#: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%Y %B %e %A"
 
@@ -35953,28 +37693,28 @@ msgstr "%Y %B %e %A"
 # importers/elm-importer.c:98 importers/netscape-importer.c:109
 # importers/pine-importer.c:103
 # my-evolution/e-summary.c:475
-#: my-evolution/e-summary.c:475
+#: my-evolution/e-summary.c:488
 msgid "Please wait..."
 msgstr "请等待..."
 
 # my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
 # my-evolution/e-summary.c:580 ui/my-evolution.xml.h:3
 # my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
-#: my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "打印概要"
 
 # my-evolution/e-summary.c:626
 # my-evolution/e-summary.c:626
 # my-evolution/e-summary.c:612
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "打印概要失败"
 
 # my-evolution/main.c:66
 # my-evolution/main.c:66
 # my-evolution/main.c:65
-#: my-evolution/main.c:65
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "实施概要组件无法初始化 Bonobo。\n"
 
@@ -38012,276 +39752,271 @@ msgstr "尘卷风"
 msgid "Drifting dust whirls"
 msgstr "阵尘卷风"
 
-# my-evolution/my-evolution.glade.h:1
-# my-evolution/my-evolution.glade.h:1
-# my-evolution/my-evolution.glade.h:1
-#: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr "删除(_R)"
-
 # my-evolution/my-evolution.glade.h:2
 # my-evolution/my-evolution.glade.h:2
 # my-evolution/my-evolution.glade.h:2
-#: my-evolution/my-evolution.glade.h:2
+#: my-evolution/my-evolution.glade.h:1
 msgid "Add n_ews feed"
 msgstr "添加新闻来源(_E)"
 
-# my-evolution/my-evolution.glade.h:3
-# my-evolution/my-evolution.glade.h:3
-# my-evolution/my-evolution.glade.h:3
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "所有站点(_L)："
-
-# my-evolution/my-evolution.glade.h:4
-# my-evolution/my-evolution.glade.h:4
-# my-evolution/my-evolution.glade.h:4
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "所有文件夹(_F)"
-
-# my-evolution/my-evolution.glade.h:5
-# my-evolution/my-evolution.glade.h:5
-# my-evolution/my-evolution.glade.h:5
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
-msgstr "所有新闻来源(_F)："
-
 # my-evolution/my-evolution.glade.h:6
 # my-evolution/my-evolution.glade.h:6
 # my-evolution/my-evolution.glade.h:6
-#: my-evolution/my-evolution.glade.h:6
+#: my-evolution/my-evolution.glade.h:2
 msgid "C_elsius"
 msgstr "摄氏度"
 
+# my-evolution/my-evolution.glade.h:5
+# my-evolution/my-evolution.glade.h:5
+# my-evolution/my-evolution.glade.h:5
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
+msgstr "所有新闻来源(_F)："
+
 # my-evolution/my-evolution.glade.h:8
 # my-evolution/my-evolution.glade.h:8
 # my-evolution/my-evolution.glade.h:8
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "日历一次应该显示多少日期？"
 
 # my-evolution/my-evolution.glade.h:9
 # my-evolution/my-evolution.glade.h:9
 # my-evolution/my-evolution.glade.h:9
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "显示项目的最大数(_X)："
 
 # my-evolution/my-evolution.glade.h:10
 # my-evolution/my-evolution.glade.h:10
 # my-evolution/my-evolution.glade.h:10
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "新闻来源设置"
 
 # my-evolution/my-evolution.glade.h:11
 # my-evolution/my-evolution.glade.h:11
 # my-evolution/my-evolution.glade.h:11
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "一个月(_H)"
 
 # my-evolution/my-evolution.glade.h:12
 # my-evolution/my-evolution.glade.h:12
 # my-evolution/my-evolution.glade.h:12
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "一周(_E)"
 
 # my-evolution/my-evolution.glade.h:13
 # my-evolution/my-evolution.glade.h:13
 # my-evolution/my-evolution.glade.h:13
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "刷新时间 (秒)(_E)："
 
 # my-evolution/my-evolution.glade.h:14
 # my-evolution/my-evolution.glade.h:14
 # my-evolution/my-evolution.glade.h:14
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "刷新时间 (秒)(_T)："
 
 # my-evolution/my-evolution.glade.h:15
 # my-evolution/my-evolution.glade.h:15
 # my-evolution/my-evolution.glade.h:15
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "显示文件夹的完整路径(_H)"
 
 # my-evolution/my-evolution.glade.h:16
 # my-evolution/my-evolution.glade.h:16
 # my-evolution/my-evolution.glade.h:16
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "显示所有任务(_A)"
 
 # my-evolution/my-evolution.glade.h:17
 # my-evolution/my-evolution.glade.h:17
 # my-evolution/my-evolution.glade.h:17
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "显示今天的任务(_T)"
 
 # my-evolution/my-evolution.glade.h:18
 # my-evolution/my-evolution.glade.h:18
 # my-evolution/my-evolution.glade.h:18
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr "以之显示温度："
 
 # my-evolution/my-evolution.glade.h:19
 # my-evolution/my-evolution.glade.h:19
 # my-evolution/my-evolution.glade.h:19
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "任务 "
 
 # my-evolution/my-evolution.glade.h:20
 # my-evolution/my-evolution.glade.h:20
 # my-evolution/my-evolution.glade.h:20
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "天气设置"
 
-# my-evolution/my-evolution.glade.h:22
-# my-evolution/my-evolution.glade.h:22
-# my-evolution/my-evolution.glade.h:22
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "显示文件夹(_D)："
-
-# my-evolution/my-evolution.glade.h:23
-# my-evolution/my-evolution.glade.h:23
-# my-evolution/my-evolution.glade.h:23
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "显示站点(_D)："
-
-# my-evolution/my-evolution.glade.h:24
-# my-evolution/my-evolution.glade.h:24
-# my-evolution/my-evolution.glade.h:24
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
-msgstr "已显示的来源："
-
 # my-evolution/my-evolution.glade.h:25
 # my-evolution/my-evolution.glade.h:25
 # my-evolution/my-evolution.glade.h:25
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr "华氏(_F)"
 
 # my-evolution/my-evolution.glade.h:26
 # my-evolution/my-evolution.glade.h:26
 # my-evolution/my-evolution.glade.h:26
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "五天(_F)"
 
 # my-evolution/my-evolution.glade.h:27
 # my-evolution/my-evolution.glade.h:27
 # my-evolution/my-evolution.glade.h:27
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "邮件(_M)"
 
 # my-evolution/my-evolution.glade.h:28
 # my-evolution/my-evolution.glade.h:28
 # my-evolution/my-evolution.glade.h:28
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "新闻来源(_N)"
 
 # my-evolution/my-evolution.glade.h:29
 # my-evolution/my-evolution.glade.h:29
 # my-evolution/my-evolution.glade.h:29
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "一天(_O)"
 
 # my-evolution/my-evolution.glade.h:30
 # my-evolution/my-evolution.glade.h:30
 # my-evolution/my-evolution.glade.h:30
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "调度(_S)"
 
 # my-evolution/my-evolution.glade.h:31
 # my-evolution/my-evolution.glade.h:31
 # my-evolution/my-evolution.glade.h:31
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "天气(_W)"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# mail/GNOME_Evolution_Mail.oaf.in.h:6
-# notes/GNOME_Evolution_Notes.oaf.in.h:3
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
-msgstr "Evolution 便签组件车间。"
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution folder settings."
+msgstr ""
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-# notes/GNOME_Evolution_Notes.oaf.in.h:4
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr "便签控制车间"
+# mail/mail-accounts.c:783 mail/mail-config.glade.h:42
+# mail/mail-accounts.c:798 mail/mail-config.glade.h:42
+# mail/mail-accounts.c:824 mail/mail-config.glade.h:49
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Folder Settings"
+msgstr "邮件设置"
 
 # shell/GNOME_Evolution_Shell.oaf.in.h:1
 # shell/GNOME_Evolution_Shell.oaf.in.h:1
 # shell/GNOME_Evolution_Shell.oaf.in.h:1
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution shell。"
 
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure various folder settings"
+msgstr ""
+
 # shell/e-activity-handler.c:200
 # shell/e-activity-handler.c:200
 # shell/e-activity-handler.c:200
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "显示细节"
 
 # shell/e-activity-handler.c:202
 # shell/e-activity-handler.c:202
 # shell/e-activity-handler.c:202
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "取消操作"
 
+# shell/e-storage-set-view.c:658
+# shell/e-storage-set-view.c:658
+# shell/e-storage-set-view.c:658
+#: shell/e-folder-dnd-bridge.c:52
+#, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"无法转移文件夹：\n"
+"%s"
+
+# mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+# shell/e-storage-set-view.etspec.h:1
+# mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+# shell/e-storage-set-view.etspec.h:1
+# mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+# shell/e-storage-set-view.etspec.h:1
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "文件夹"
+
+# mail/mail-config.glade.h:30 shell/e-local-storage.c:173
+# mail/mail-config.glade.h:30 shell/e-local-storage.c:173
+# mail/mail-config.glade.h:36 shell/e-local-storage.c:173
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "草稿"
+
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
 msgid "Inbox"
 msgstr "收件箱"
 
 # shell/e-local-storage.c:175
 # shell/e-local-storage.c:175
 # shell/e-local-storage.c:175
-#: shell/e-local-storage.c:175
+#: shell/e-local-storage.c:176
 msgid "Outbox"
 msgstr "发件箱"
 
-# shell/e-local-storage.c:636
-# shell/e-local-storage.c:636
-# shell/e-local-storage.c:636
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr "本地文件夹"
+# mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+# shell/e-local-storage.c:176
+# mail/mail-config.glade.h:73 mail/message-list.etspec.h:7
+# shell/e-local-storage.c:176
+# mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
+# shell/e-local-storage.c:176
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "已发送"
 
 # shell/e-setup.c:124
 # shell/e-setup.c:124
 # shell/e-setup.c:124
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "安装 Evolution"
 
 # shell/e-setup.c:128
 # shell/e-setup.c:128
 # shell/e-setup.c:128
-#: shell/e-setup.c:128
+#: shell/e-setup.c:130
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -38292,21 +40027,21 @@ msgstr ""
 # shell/e-setup.c:129
 # shell/e-setup.c:129
 # shell/e-setup.c:129
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "请点击“确认”以安装文件，或者点击“取消”以便退出。"
 
 # shell/e-setup.c:169
 # shell/e-setup.c:169
 # shell/e-setup.c:169
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "无法正确地更新文件"
 
 # shell/e-setup.c:192
 # shell/e-setup.c:192
 # shell/e-setup.c:192
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -38320,7 +40055,7 @@ msgstr ""
 # shell/e-setup.c:207
 # shell/e-setup.c:207
 # shell/e-setup.c:207
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -38332,7 +40067,7 @@ msgstr ""
 # camel/camel-session.c:532
 # shell/e-setup.c:280
 # shell/e-setup.c:280
-#: shell/e-setup.c:280
+#: shell/e-setup.c:282
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -38345,7 +40080,7 @@ msgstr ""
 
 # shell/e-setup.c:298
 # shell/e-setup.c:298
-#: shell/e-setup.c:298
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -38358,7 +40093,7 @@ msgstr ""
 
 # shell/e-setup.c:304
 # shell/e-setup.c:304
-#: shell/e-setup.c:304
+#: shell/e-setup.c:306
 #, c-format
 msgid ""
 "File %s\n"
@@ -38372,7 +40107,7 @@ msgstr ""
 # shell/e-setup.c:281
 # shell/e-setup.c:327
 # shell/e-setup.c:327
-#: shell/e-setup.c:327
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -38385,7 +40120,7 @@ msgstr ""
 # shell/e-setup.c:295
 # shell/e-setup.c:341
 # shell/e-setup.c:341
-#: shell/e-setup.c:341
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -38402,7 +40137,7 @@ msgstr ""
 # shell/e-setup.c:320
 # shell/e-setup.c:366
 # shell/e-setup.c:366
-#: shell/e-setup.c:366
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -38412,20 +40147,6 @@ msgstr ""
 "目录“%s”存在，但不是 Evolution 目录。\n"
 "请移走它以便安装 Evolution 用户文件。"
 
-# shell/e-shell-about-box.c:40
-# shell/e-shell-about-box.c:40
-# shell/e-shell-about-box.c:40
-#: shell/e-shell-about-box.c:40
-msgid "Evolution "
-msgstr "Evolution "
-
-# shell/e-shell-about-box.c:41
-# shell/e-shell-about-box.c:41
-# shell/e-shell-about-box.c:41
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "版权所有 1999，2000，2001 Ximian 公司。"
-
 # shell/e-shell-about-box.c:43
 # shell/e-shell-about-box.c:43
 # shell/e-shell-about-box.c:43
@@ -38433,31 +40154,91 @@ msgstr "版权所有 1999，2000，2001 Ximian 公司。"
 msgid "Brought to you by"
 msgstr "制作团队"
 
+# calendar/gui/e-calendar-table.etspec.h:8
+# calendar/gui/e-calendar-table.etspec.h:8
+# calendar/gui/e-calendar-table.etspec.h:8
+#: shell/e-shell-config-autocompletion.c:106
+#, fuzzy
+msgid "Extra Completion folders"
+msgstr "完成日期"
+
+# shell/e-shell-importer.c:1014
+# shell/e-shell-importer.c:1014
+# shell/e-shell-importer.c:1027
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "选择文件夹"
+
+# mail/mail-config.glade.h:83
+# mail/mail-config.glade.h:83
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "特殊文件夹"
+
+# mail/mail-ops.c:86
+# mail/mail-ops.c:87
+# mail/mail-ops.c:87
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "正在过滤文件夹"
+
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+# shell/e-local-storage.c:636
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "本地文件夹"
+
+# camel/providers/local/camel-mbox-summary.c:370
+# camel/providers/local/camel-spool-summary.c:497
+# camel/providers/local/camel-mbox-summary.c:370
+# camel/providers/local/camel-spool-summary.c:497
+# camel/providers/local/camel-mbox-summary.c:370
+# camel/providers/local/camel-spool-summary.c:497
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "无法检查文件夹： %s： %s"
+
+# shell/e-shell-folder-commands.c:488
+# shell/e-shell-folder-commands.c:488
+# shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
+msgstr ""
+"无法重命名文件夹：\n"
+"%s"
+
 # shell/e-shell-folder-commands.c:176
 # shell/e-shell-folder-commands.c:176
 # shell/e-shell-folder-commands.c:176
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "无法把文件夹移动到它本身。"
 
 # shell/e-shell-folder-commands.c:178
 # shell/e-shell-folder-commands.c:178
 # shell/e-shell-folder-commands.c:178
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "无法把文件夹复制到它本身。"
 
 # shell/e-shell-folder-commands.c:192
 # shell/e-shell-folder-commands.c:192
 # shell/e-shell-folder-commands.c:192
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:206
 msgid "Cannot move a folder into one of its descendants."
 msgstr "无法把文件夹移动到它子目录。"
 
 # shell/e-shell-folder-commands.c:307
 # shell/e-shell-folder-commands.c:307
 # shell/e-shell-folder-commands.c:307
-#: shell/e-shell-folder-commands.c:307
+#: shell/e-shell-folder-commands.c:321
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "给出一个文件夹以便将文件夹“%s”复制进去："
@@ -38465,14 +40246,14 @@ msgstr "给出一个文件夹以便将文件夹“%s”复制进去："
 # shell/e-shell-folder-commands.c:312
 # shell/e-shell-folder-commands.c:312
 # shell/e-shell-folder-commands.c:312
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "复制文件夹"
 
 # shell/e-shell-folder-commands.c:354
 # shell/e-shell-folder-commands.c:354
 # shell/e-shell-folder-commands.c:354
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "给出一个文件夹以便将文件夹“%s”移动进去："
@@ -38480,14 +40261,14 @@ msgstr "给出一个文件夹以便将文件夹“%s”移动进去："
 # shell/e-shell-folder-commands.c:359
 # shell/e-shell-folder-commands.c:359
 # shell/e-shell-folder-commands.c:359
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "移动文件夹"
 
 # shell/e-shell-folder-commands.c:385
 # shell/e-shell-folder-commands.c:385
 # shell/e-shell-folder-commands.c:385
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -38499,19 +40280,20 @@ msgstr ""
 # shell/e-shell-folder-commands.c:401
 # shell/e-shell-folder-commands.c:401
 # shell/e-shell-folder-commands.c:401
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "删除“%s”"
 
-# shell/e-shell-folder-commands.c:411
-# shell/e-shell-folder-commands.c:411
-# shell/e-shell-folder-commands.c:411
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "您确认您要删除文件夹“%s”？"
+# shell/e-shell-folder-commands.c:385
+# shell/e-shell-folder-commands.c:385
+# shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:407
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\"?"
+msgstr ""
+"无法删除文件夹：\n"
+"%s"
 
 # shell/e-shell-folder-commands.c:488
 # shell/e-shell-folder-commands.c:488
@@ -38528,7 +40310,7 @@ msgstr ""
 # shell/e-shell-folder-commands.c:537
 # shell/e-shell-folder-commands.c:537
 # shell/e-shell-folder-commands.c:537
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:535
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "把文件夹“%s”重命名为："
@@ -38536,7 +40318,7 @@ msgstr "把文件夹“%s”重命名为："
 # shell/e-shell-folder-commands.c:544
 # shell/e-shell-folder-commands.c:544
 # shell/e-shell-folder-commands.c:544
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
 msgstr "重命名文件夹"
 
@@ -38546,7 +40328,7 @@ msgstr "重命名文件夹"
 # shell/e-shell-folder-creation-dialog.c:148
 # shell/e-shell-folder-commands.c:554
 # shell/e-shell-folder-creation-dialog.c:168
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:552
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -38567,14 +40349,14 @@ msgstr ""
 # shell/e-shell-folder-creation-dialog.c:267
 # shell/e-shell-folder-creation-dialog.c:267
 # shell/e-shell-folder-creation-dialog.c:304
-#: shell/e-shell-folder-creation-dialog.c:304
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - 创建新文件夹"
 
 # shell/e-shell-folder-selection-dialog.c:98
 # shell/e-shell-folder-selection-dialog.c:98
 # shell/e-shell-folder-selection-dialog.c:98
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -38585,14 +40367,14 @@ msgstr ""
 # shell/e-shell-folder-selection-dialog.c:376
 # shell/e-shell-folder-selection-dialog.c:376
 # shell/e-shell-folder-selection-dialog.c:376
-#: shell/e-shell-folder-selection-dialog.c:376
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "正在新建..."
 
 # shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 # shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 # shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
-#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
+#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr "(无标题)"
 
@@ -38653,10 +40435,18 @@ msgstr ""
 "正在导入 %s\n"
 "正在导入项目 %d。"
 
+# mail/mail-account-gui.c:837
+# mail/mail-account-gui.c:837
+# mail/mail-account-gui.c:834
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "选择文件夹"
+
 # shell/e-shell-importer.c:397
 # shell/e-shell-importer.c:397
 # shell/e-shell-importer.c:409
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "文件 %s 不存在"
@@ -38665,22 +40455,22 @@ msgstr "文件 %s 不存在"
 # shell/e-shell-about-box.c:40
 # shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
 # shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
 msgid "Evolution Error"
 msgstr "Evolution 错误"
 
 # shell/e-shell-importer.c:409
 # shell/e-shell-importer.c:409
 # shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:420
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr "您只能导入到本地文件夹"
 
 # shell/e-shell-importer.c:424
 # shell/e-shell-importer.c:424
 # shell/e-shell-importer.c:435
-#: shell/e-shell-importer.c:435
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -38692,14 +40482,14 @@ msgstr ""
 # shell/e-shell-importer.c:434
 # shell/e-shell-importer.c:434
 # shell/e-shell-importer.c:445
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "正在导入"
 
 # shell/e-shell-importer.c:442
 # shell/e-shell-importer.c:442
 # shell/e-shell-importer.c:453
-#: shell/e-shell-importer.c:453
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -38711,7 +40501,7 @@ msgstr ""
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:466
-#: shell/e-shell-importer.c:466
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "启动 %s 错误"
@@ -38719,7 +40509,7 @@ msgstr "启动 %s 错误"
 # shell/e-shell-importer.c:474
 # shell/e-shell-importer.c:474
 # shell/e-shell-importer.c:485
-#: shell/e-shell-importer.c:485
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "装入 %s 错误"
@@ -38727,7 +40517,7 @@ msgstr "装入 %s 错误"
 # shell/e-shell-importer.c:491
 # shell/e-shell-importer.c:491
 # shell/e-shell-importer.c:502
-#: shell/e-shell-importer.c:502
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -38739,49 +40529,49 @@ msgstr ""
 # shell/e-shell-importer.c:561
 # shell/e-shell-importer.c:561
 # shell/e-shell-importer.c:572
-#: shell/e-shell-importer.c:572
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "自动"
 
 # shell/e-shell-importer.c:612
 # shell/e-shell-importer.c:612
 # shell/e-shell-importer.c:623
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "文件名："
 
 # shell/e-shell-importer.c:617
 # shell/e-shell-importer.c:617
 # shell/e-shell-importer.c:628
-#: shell/e-shell-importer.c:628
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "选择一个文件"
 
 # shell/e-shell-importer.c:627
 # shell/e-shell-importer.c:627
 # shell/e-shell-importer.c:638
-#: shell/e-shell-importer.c:638
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "文件类型："
 
 # shell/e-shell-importer.c:652
 # shell/e-shell-importer.c:652
 # shell/e-shell-importer.c:663
-#: shell/e-shell-importer.c:663
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr "从老版程序中导入数据和设置"
 
 # shell/e-shell-importer.c:656
 # shell/e-shell-importer.c:656
 # shell/e-shell-importer.c:667
-#: shell/e-shell-importer.c:667
+#: shell/e-shell-importer.c:740
 msgid "Import a single file"
 msgstr "导入单个文件"
 
 # shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
 # shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
 # shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -38792,14 +40582,14 @@ msgstr ""
 # shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
 # shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
 # shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "启动智能导入器"
 
 # shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
 # shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
 # shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, c-format
 msgid "From %s:"
 msgstr "从 %s："
@@ -38807,31 +40597,99 @@ msgstr "从 %s："
 # shell/e-shell-importer.c:1014
 # shell/e-shell-importer.c:1014
 # shell/e-shell-importer.c:1027
-#: shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "选择文件夹"
 
 # shell/e-shell-importer.c:1015
 # shell/e-shell-importer.c:1015
 # shell/e-shell-importer.c:1028
-#: shell/e-shell-importer.c:1028
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "为导入的数据选择目标文件夹"
 
 # shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
 # shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
 # shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "导入"
 
 # shell/e-shell-offline-handler.c:572
 # shell/e-shell-offline-handler.c:572
 # shell/e-shell-offline-handler.c:572
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "正在关闭连接..."
 
+# mail/mail-mt.c:254
+# mail/mail-mt.c:254
+# mail/mail-mt.c:254
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr ""
+"当“%s”时错误：\n"
+"%s"
+
+# camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+# camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:881
+# camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "正在同步文件夹"
+
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr ""
+
+# shell/e-shell-about-box.c:40
+# shell/e-shell-about-box.c:40
+# shell/e-shell-about-box.c:40
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution "
+
+# mail/mail-ops.c:1234
+# mail/mail-ops.c:1236
+# mail/mail-ops.c:1279
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "正在打开文件夹 %s"
+
+# mail/mail-ops.c:1234
+# mail/mail-ops.c:1236
+# mail/mail-ops.c:1279
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "正在打开文件夹 %s"
+
+# mail/mail-display.c:354
+# mail/mail-display.c:353
+# mail/mail-display.c:354
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "在 %s 中打开..."
+
+# shell/e-shell-folder-creation-dialog.c:111
+# shell/e-shell-folder-creation-dialog.c:111
+# shell/e-shell-folder-creation-dialog.c:125
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"无法创建指定的文件夹：\n"
+"%s"
+
 # shell/e-shell-startup-wizard.c:159
 # shell/e-shell-startup-wizard.c:159
 # shell/e-shell-startup-wizard.c:159
@@ -38856,8 +40714,8 @@ msgstr "无法启动 Evolution 邮件助手界面\n"
 # shell/e-shell-user-creatable-items-handler.c:495
 # shell/e-shell-user-creatable-items-handler.c:540
 # widgets/misc/e-charset-picker.c:104
-#: shell/e-shell-user-creatable-items-handler.c:495
-#: shell/e-shell-user-creatable-items-handler.c:540
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "新建"
@@ -38893,99 +40751,84 @@ msgstr "“.”和“..”是保留文件夹名。"
 # shell/e-shell-view-menu.c:165
 # shell/e-shell-view-menu.c:165
 # shell/e-shell-view-menu.c:165
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "在您的 $PATH 中找不到 Bug buddy。"
 
 # shell/e-shell-view-menu.c:173
 # shell/e-shell-view-menu.c:173
 # shell/e-shell-view-menu.c:173
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "无法运行 Bug buddy。"
 
 # shell/e-shell-view-menu.c:215
 # shell/e-shell-view-menu.c:215
 # shell/e-shell-view-menu.c:215
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:230
 msgid "About Ximian Evolution"
 msgstr "关于 Ximian Evolution"
 
 # shell/e-shell-view-menu.c:424
 # shell/e-shell-view-menu.c:424
 # shell/e-shell-view-menu.c:424
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "转到文件夹..."
 
 # shell/e-shell-view-menu.c:425
 # shell/e-shell-view-menu.c:425
 # shell/e-shell-view-menu.c:425
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "选择您希望打开的文件夹"
 
 # shell/e-shell-view-menu.c:545
 # shell/e-shell-view-menu.c:545
 # shell/e-shell-view-menu.c:545
-#: shell/e-shell-view-menu.c:545
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "创建新快捷方式"
 
 # shell/e-shell-view-menu.c:546
 # shell/e-shell-view-menu.c:546
 # shell/e-shell-view-menu.c:546
-#: shell/e-shell-view-menu.c:546
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "选择您希望快捷方式指向的文件夹："
 
-# shell/e-shell-view-menu.c:577
-# shell/e-shell-view-menu.c:577
-# shell/e-shell-view-menu.c:577
-#: shell/e-shell-view-menu.c:577
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "GNOME Pilot 工具好像并未安装到系统中。"
-
-# shell/e-shell-view-menu.c:585
-# shell/e-shell-view-menu.c:585
-# shell/e-shell-view-menu.c:585
-#: shell/e-shell-view-menu.c:585
-#, c-format
-msgid "Error executing %s."
-msgstr "执行 %s 错误。"
-
 # shell/e-shell-view-menu.c:688
 # shell/e-shell-view-menu.c:688
 # shell/e-shell-view-menu.c:688
-#: shell/e-shell-view-menu.c:688
+#: shell/e-shell-view-menu.c:762
 msgid "_Work Online"
 msgstr "在线工作(_W)"
 
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
-#: shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "离线工作(_W)"
 
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
-#: shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "离线工作"
 
 # shell/e-shell-view.c:214
 # shell/e-shell-view.c:214
 # shell/e-shell-view.c:215
-#: shell/e-shell-view.c:215
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(未显示文件夹)"
 
 # shell/e-shell-view.c:1585
 # shell/e-shell-view.c:1585
 # shell/e-shell-view.c:1598
-#: shell/e-shell-view.c:1598
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -38993,14 +40836,14 @@ msgstr "%s (%d)"
 # shell/e-shell-view.c:1587
 # shell/e-shell-view.c:1587
 # shell/e-shell-view.c:1600
-#: shell/e-shell-view.c:1600
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(无)"
 
 # shell/e-shell-view.c:1634
 # shell/e-shell-view.c:1634
 # shell/e-shell-view.c:1647
-#: shell/e-shell-view.c:1647
+#: shell/e-shell-view.c:1867
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
@@ -39008,22 +40851,37 @@ msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
 # shell/e-shell-view.c:1641
 # shell/e-shell-view.c:1641
 # shell/e-shell-view.c:1654
-#: shell/e-shell-view.c:1654
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution 正在离线过程中。"
 
 # shell/e-shell-view.c:1647
 # shell/e-shell-view.c:1647
 # shell/e-shell-view.c:1660
-#: shell/e-shell-view.c:1660
+#: shell/e-shell-view.c:1880
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
 
+# shell/evolution-shell-component-utils.c:134
+# shell/evolution-shell-component-utils.c:134
+# shell/evolution-shell-component-utils.c:134
+#: shell/e-shell.c:171
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"来自激活系统的错误是：\n"
+"%s"
+
 # shell/e-shell.c:651
 # shell/e-shell.c:651
 # shell/e-shell.c:651
-#: shell/e-shell.c:651
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "无法设置本地存储 -- %s"
@@ -39031,7 +40889,7 @@ msgstr "无法设置本地存储 -- %s"
 # shell/e-shell.c:1659
 # shell/e-shell.c:1659
 # shell/e-shell.c:1660
-#: shell/e-shell.c:1660
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -39045,28 +40903,28 @@ msgstr ""
 # shell/e-shell.c:1886
 # shell/e-shell.c:1886
 # shell/e-shell.c:1887
-#: shell/e-shell.c:1887
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "无效参数"
 
 # shell/e-shell.c:1888
 # shell/e-shell.c:1888
 # shell/e-shell.c:1889
-#: shell/e-shell.c:1889
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "无法注册到 OAF"
 
 # shell/e-shell.c:1890
 # shell/e-shell.c:1890
 # shell/e-shell.c:1891
-#: shell/e-shell.c:1891
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "找不到配置数据库"
 
 # shell/e-shell.c:1892 shell/e-storage.c:500
 # shell/e-shell.c:1892 shell/e-storage.c:500
 # shell/e-shell.c:1893 shell/e-storage.c:500
-#: shell/e-shell.c:1893 shell/e-storage.c:500
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "通用错误"
 
@@ -39106,285 +40964,276 @@ msgstr "不删除"
 # shell/e-shortcuts-view.c:209
 # shell/e-shortcuts-view.c:209
 # shell/e-shortcuts-view.c:209
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "重命名快捷方式组"
 
 # shell/e-shortcuts-view.c:210
 # shell/e-shortcuts-view.c:210
 # shell/e-shortcuts-view.c:210
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "把选中的快捷方式组重命名为："
 
 # shell/e-shortcuts-view.c:224
 # shell/e-shortcuts-view.c:224
 # shell/e-shortcuts-view.c:224
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "小图标(_S)"
 
 # shell/e-shortcuts-view.c:225
 # shell/e-shortcuts-view.c:225
 # shell/e-shortcuts-view.c:225
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "用小图标显示快捷方式"
 
 # shell/e-shortcuts-view.c:227
 # shell/e-shortcuts-view.c:227
 # shell/e-shortcuts-view.c:227
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "大图标(_L)"
 
 # shell/e-shortcuts-view.c:228
 # shell/e-shortcuts-view.c:228
 # shell/e-shortcuts-view.c:228
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "用大图标显示快捷方式"
 
 # shell/e-shortcuts-view.c:239
 # shell/e-shortcuts-view.c:239
 # shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "新组(_N)..."
 
 # shell/e-shortcuts-view.c:240
 # shell/e-shortcuts-view.c:240
 # shell/e-shortcuts-view.c:240
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "创建新快捷方式组"
 
 # shell/e-shortcuts-view.c:242
 # shell/e-shortcuts-view.c:242
 # shell/e-shortcuts-view.c:242
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "删除该组(_R)..."
 
 # shell/e-shortcuts-view.c:243
 # shell/e-shortcuts-view.c:243
 # shell/e-shortcuts-view.c:243
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "删除该快捷方式组"
 
 # shell/e-shortcuts-view.c:245
 # shell/e-shortcuts-view.c:245
 # shell/e-shortcuts-view.c:245
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "重命名该组(_N)..."
 
 # shell/e-shortcuts-view.c:246
 # shell/e-shortcuts-view.c:246
 # shell/e-shortcuts-view.c:246
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "重命名该快捷方式组"
 
 # shell/e-shortcuts-view.c:251
 # shell/e-shortcuts-view.c:251
 # shell/e-shortcuts-view.c:251
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "隐藏快捷方式栏(_H)"
 
 # shell/e-shortcuts-view.c:252
 # shell/e-shortcuts-view.c:252
 # shell/e-shortcuts-view.c:252
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "隐藏快捷方式栏"
 
 # shell/e-shortcuts-view.c:371
 # shell/e-shortcuts-view.c:371
 # shell/e-shortcuts-view.c:371
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "重命名快捷方式"
 
 # shell/e-shortcuts-view.c:372
 # shell/e-shortcuts-view.c:372
 # shell/e-shortcuts-view.c:372
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "把快捷方式重命名为："
 
 # shell/e-shortcuts-view.c:384
 # shell/e-shortcuts-view.c:384
 # shell/e-shortcuts-view.c:384
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "打开连接到该快捷方式的文件夹"
 
 # shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 # shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 # shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "在新窗口中打开(_W)"
 
 # shell/e-shortcuts-view.c:386
 # shell/e-shortcuts-view.c:386
 # shell/e-shortcuts-view.c:386
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "在新窗口中打开连接到该快捷方式的文件夹"
 
 # shell/e-shortcuts-view.c:389
 # shell/e-shortcuts-view.c:389
 # shell/e-shortcuts-view.c:389
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 # shell/e-shortcuts-view.c:389
 # shell/e-shortcuts-view.c:389
 # shell/e-shortcuts-view.c:389
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "重命名该快捷方式"
 
 # shell/e-shortcuts-view.c:391
 # shell/e-shortcuts-view.c:391
 # shell/e-shortcuts-view.c:391
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "删除(_M)"
 
 # shell/e-shortcuts-view.c:391
 # shell/e-shortcuts-view.c:391
 # shell/e-shortcuts-view.c:391
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "从快捷方式栏上删除该快捷方式"
 
 # shell/e-shortcuts.c:640
 # shell/e-shortcuts.c:640
 # shell/e-shortcuts.c:640
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "保存快捷方式错误。"
 
 # shell/e-shortcuts.c:1043
 # shell/e-shortcuts.c:1043
 # shell/e-shortcuts.c:1043
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "快捷方式"
 
-# shell/e-storage-set-view.c:658
-# shell/e-storage-set-view.c:658
-# shell/e-storage-set-view.c:658
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"无法转移文件夹：\n"
-"%s"
-
-# shell/e-storage.c:181 shell/e-storage.c:187
-# shell/e-storage.c:181 shell/e-storage.c:187
-# shell/e-storage.c:181 shell/e-storage.c:187
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(未命名)"
+# calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
+# calendar/gui/e-meeting-model.c:794
+# calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
+# calendar/gui/e-meeting-model.c:794
+# my-evolution/Locations.h:432
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "主席"
 
 # shell/e-storage.c:498
 # shell/e-storage.c:498
 # shell/e-storage.c:498
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "无错误"
 
 # shell/e-storage.c:502
 # shell/e-storage.c:502
 # shell/e-storage.c:502
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "已经有一个同名文件夹存在"
 
 # shell/e-storage.c:504
 # shell/e-storage.c:504
 # shell/e-storage.c:504
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "指定的文件夹类型无效"
 
 # shell/e-storage.c:506
 # shell/e-storage.c:506
 # shell/e-storage.c:506
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "输入输出错误"
 
 # shell/e-storage.c:508
 # shell/e-storage.c:508
 # shell/e-storage.c:508
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "没有足够的空间创建文件夹"
 
 # shell/e-storage.c:510
 # shell/e-storage.c:510
 # shell/e-storage.c:510
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "文件夹不为空"
 
 # shell/e-storage.c:512
 # shell/e-storage.c:512
 # shell/e-storage.c:512
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "找不到指定的文件夹"
 
 # shell/e-storage.c:514
 # shell/e-storage.c:514
 # shell/e-storage.c:514
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "在该存储中没有实现该功能"
 
 # shell/e-storage.c:518
 # shell/e-storage.c:518
 # shell/e-storage.c:518
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "不支持的操作"
 
 # shell/e-storage.c:520
 # shell/e-storage.c:520
 # shell/e-storage.c:520
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "在该存储中不支持指定的类型"
 
 # shell/e-storage.c:522
 # shell/e-storage.c:522
 # shell/e-storage.c:522
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "无法修改或删除指定的文件夹"
 
 # shell/e-storage.c:524
 # shell/e-storage.c:524
 # shell/e-storage.c:524
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "无法使文件夹成为它的子目录的子目录"
 
 # shell/e-storage.c:526
 # shell/e-storage.c:526
 # shell/e-storage.c:526
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "无法以那个名字创建文件夹"
 
@@ -39404,6 +41253,10 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+#: shell/evolution-folder-selector-button.c:86
+msgid "<click here to select a folder>"
+msgstr "<点击这里以便选择文件夹>"
+
 # shell/evolution-shell-component-utils.c:124
 # shell/evolution-shell-component-utils.c:124
 # shell/evolution-shell-component-utils.c:124
@@ -39453,112 +41306,112 @@ msgstr ""
 # shell/evolution-shell-component.c:1009
 # shell/evolution-shell-component.c:1009
 # shell/evolution-shell-component.c:1022
-#: shell/evolution-shell-component.c:1022
+#: shell/evolution-shell-component.c:1083
 msgid "CORBA error"
 msgstr "CORBA 错误"
 
 # shell/evolution-shell-component.c:1011
 # shell/evolution-shell-component.c:1011
 # shell/evolution-shell-component.c:1024
-#: shell/evolution-shell-component.c:1024
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr "被中断"
 
 # shell/evolution-shell-component.c:1013
 # shell/evolution-shell-component.c:1013
 # shell/evolution-shell-component.c:1026
-#: shell/evolution-shell-component.c:1026
+#: shell/evolution-shell-component.c:1087
 msgid "Invalid argument"
 msgstr "无效参数"
 
 # shell/evolution-shell-component.c:1015
 # shell/evolution-shell-component.c:1015
 # shell/evolution-shell-component.c:1028
-#: shell/evolution-shell-component.c:1028
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr "已经有所有者了"
 
 # shell/evolution-shell-component.c:1017
 # shell/evolution-shell-component.c:1017
 # shell/evolution-shell-component.c:1030
-#: shell/evolution-shell-component.c:1030
+#: shell/evolution-shell-component.c:1091
 msgid "No owner"
 msgstr "无所有者"
 
 # shell/evolution-shell-component.c:1019
 # shell/evolution-shell-component.c:1019
 # shell/evolution-shell-component.c:1032
-#: shell/evolution-shell-component.c:1032
+#: shell/evolution-shell-component.c:1093
 msgid "Not found"
 msgstr "没找到"
 
 # shell/evolution-shell-component.c:1021
 # shell/evolution-shell-component.c:1021
 # shell/evolution-shell-component.c:1034
-#: shell/evolution-shell-component.c:1034
+#: shell/evolution-shell-component.c:1095
 msgid "Unsupported type"
 msgstr "不支持的类型"
 
 # shell/evolution-shell-component.c:1023
 # shell/evolution-shell-component.c:1023
 # shell/evolution-shell-component.c:1036
-#: shell/evolution-shell-component.c:1036
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr "不支持的方案"
 
 # shell/evolution-shell-component.c:1025
 # shell/evolution-shell-component.c:1025
 # shell/evolution-shell-component.c:1038
-#: shell/evolution-shell-component.c:1038
+#: shell/evolution-shell-component.c:1099
 msgid "Unsupported operation"
 msgstr "不支持的操作"
 
 # shell/evolution-shell-component.c:1027
 # shell/evolution-shell-component.c:1027
 # shell/evolution-shell-component.c:1040
-#: shell/evolution-shell-component.c:1040
+#: shell/evolution-shell-component.c:1101
 msgid "Internal error"
 msgstr "内部错误"
 
 # shell/evolution-shell-component.c:1031
 # shell/evolution-shell-component.c:1031
 # shell/evolution-shell-component.c:1044
-#: shell/evolution-shell-component.c:1044
+#: shell/evolution-shell-component.c:1105
 msgid "Exists"
 msgstr "存在"
 
 # shell/evolution-shell-component.c:1033
 # shell/evolution-shell-component.c:1033
 # shell/evolution-shell-component.c:1046
-#: shell/evolution-shell-component.c:1046
+#: shell/evolution-shell-component.c:1107
 msgid "Invalid URI"
 msgstr "无效 URI"
 
 # shell/evolution-shell-component.c:1037
 # shell/evolution-shell-component.c:1037
 # shell/evolution-shell-component.c:1050
-#: shell/evolution-shell-component.c:1050
+#: shell/evolution-shell-component.c:1111
 msgid "Has subfolders"
 msgstr "含有子文件夹"
 
 # shell/evolution-shell-component.c:1039
 # shell/evolution-shell-component.c:1039
 # shell/evolution-shell-component.c:1052
-#: shell/evolution-shell-component.c:1052
+#: shell/evolution-shell-component.c:1113
 msgid "No space left"
 msgstr "没有剩余空间"
 
 # shell/evolution-shell-component.c:1041
 # shell/evolution-shell-component.c:1041
 # shell/evolution-shell-component.c:1054
-#: shell/evolution-shell-component.c:1054
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr "原所有者已死"
 
 # shell/e-shell-importer.c:627
 # shell/e-shell-importer.c:627
 # shell/evolution-test-component.c:41
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:49
 msgid "Test type"
 msgstr "测试类型"
 
@@ -39764,28 +41617,66 @@ msgstr "Evolution 可以从下列文件中导入数据："
 # data/evolution.desktop.in.h:1 shell/main.c:83
 # shell/main.c:83
 # shell/main.c:83
-#: shell/main.c:83
+#: shell/main.c:91
 msgid "Evolution"
 msgstr "Evolution"
 
 # shell/main.c:89
 # shell/main.c:89
 # shell/main.c:89
-#: shell/main.c:89
+#: shell/main.c:97
 msgid "Evolution is now exiting ..."
 msgstr "Evolution 正在退出 ..."
 
+#: shell/main.c:222
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+# ui/evolution.xml.h:31
+# data/evolution.desktop.in.h:2
+# data/evolution.desktop.in.h:2
+#: shell/main.c:245
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr "Ximian Evolution"
+
+# shell/importer/intelligent.c:198
+# shell/importer/intelligent.c:198
+# shell/importer/intelligent.c:198
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "不要再问我"
+
 # shell/main.c:210
 # shell/main.c:210
 # shell/main.c:210
-#: shell/main.c:210
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "无法访问 Ximian Evolution shell。"
 
 # shell/main.c:219
 # shell/main.c:219
 # shell/main.c:219
-#: shell/main.c:219
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "无法初始化 Ximian Evolution shell： %s"
@@ -39793,21 +41684,44 @@ msgstr "无法初始化 Ximian Evolution shell： %s"
 # shell/main.c:289
 # shell/main.c:289
 # shell/main.c:289
-#: shell/main.c:289
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "禁用启动屏幕"
 
+# importers/netscape-importer.c:897
+# importers/netscape-importer.c:897
+# importers/netscape-importer.c:897
+#: shell/main.c:438
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "开始导入"
+
+# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
+# shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
+# shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
+#: shell/main.c:439
+#, fuzzy
+msgid "Start in online mode"
+msgstr "启动智能导入器"
+
 # shell/main.c:290
 # shell/main.c:290
 # shell/main.c:290
-#: shell/main.c:290
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "把所有成员的调试输出发送到一个文件中。"
 
+#: shell/main.c:458
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
 # shell/main.c:332
 # shell/main.c:332
 # shell/main.c:332
-#: shell/main.c:332
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "无法初始化 Bonobo 成员系统。"
 
@@ -39847,134 +41761,152 @@ msgstr "输出文件"
 msgid "No filename provided."
 msgstr "没有提供文件名。"
 
+# ui/evolution-mail-message.xml.h:7
+# ui/evolution-mail-message.xml.h:7
+# ui/evolution-mail-message.xml.h:7
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "把选中的消息复制到其它文件夹"
+
 # ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 # ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
 # ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "复制选中内容"
 
+# mail/folder-browser.c:1467
+# mail/folder-browser.c:1476
+# mail/folder-browser.c:1477
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "复制到文件夹..."
+
 # ui/evolution-addressbook.xml.h:4
 # ui/evolution-addressbook.xml.h:4
 # ui/evolution-addressbook.xml.h:4
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "创建新的联系人"
 
 # ui/evolution-addressbook.xml.h:5
 # ui/evolution-addressbook.xml.h:5
 # ui/evolution-addressbook.xml.h:5
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "创建新的联系人列表"
 
 # ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 # ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 # ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "剪切选中内容"
 
 # ui/evolution-addressbook.xml.h:9
 # ui/evolution-addressbook.xml.h:9
 # ui/evolution-addressbook.xml.h:9
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "删除选中的联系人"
 
-# ui/evolution-addressbook.xml.h:12
-# ui/evolution-addressbook.xml.h:12
-# ui/evolution-addressbook.xml.h:12
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "新列表"
+# ui/evolution-mail-message.xml.h:53
+# ui/evolution-mail-message.xml.h:53
+# ui/evolution-mail-message.xml.h:53
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "把选中的邮件移动到其它文件夹"
+
+# mail/folder-browser.c:1466
+# mail/folder-browser.c:1475
+# mail/folder-browser.c:1476
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "移动到文件夹(_M)..."
 
 # ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 # ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 # ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "粘贴剪贴板"
 
 # ui/evolution-addressbook.xml.h:15
 # ui/evolution-addressbook.xml.h:15
 # ui/evolution-addressbook.xml.h:15
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "预览将要打印的联系人"
 
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-addressbook.xml.h:18
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "打印选中的联系人"
 
 # ui/evolution-addressbook.xml.h:20
 # ui/evolution-addressbook.xml.h:20
 # ui/evolution-addressbook.xml.h:20
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "把选中的联系人保存为 VCard。"
 
 # ui/evolution-addressbook.xml.h:21
 # ui/evolution-addressbook.xml.h:21
 # ui/evolution-addressbook.xml.h:21
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "全选"
 
 # ui/evolution-addressbook.xml.h:22
 # ui/evolution-addressbook.xml.h:22
 # ui/evolution-addressbook.xml.h:22
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "选中所有的联系人"
 
-# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "给联系人发邮件(_M)..."
-
 # ui/evolution-addressbook.xml.h:24
 # ui/evolution-addressbook.xml.h:24
 # ui/evolution-addressbook.xml.h:24
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "给选定的联系人发邮件。"
 
 # ui/evolution-addressbook.xml.h:25
 # ui/evolution-addressbook.xml.h:25
 # ui/evolution-addressbook.xml.h:25
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "给联系人发邮件"
 
 # ui/evolution-addressbook.xml.h:26
 # ui/evolution-addressbook.xml.h:26
 # ui/evolution-addressbook.xml.h:26
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "把选中的联系人发送给其他人。"
 
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "停止"
 
 # ui/evolution-addressbook.xml.h:28
 # ui/evolution-addressbook.xml.h:28
 # ui/evolution-addressbook.xml.h:28
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "停止载入"
 
 # ui/evolution-addressbook.xml.h:29
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:30
 msgid "View the current contact"
 msgstr "查看当前联系人"
 
@@ -39996,29 +41928,16 @@ msgstr "查看当前联系人"
 # ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
 # ui/evolution-mail-message.xml.h:93 ui/evolution-mail-messagedisplay.xml.h:4
 # ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:16
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:34
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:93 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "动作(_A)"
 
-# ui/evolution-addressbook.xml.h:30
-# ui/evolution-addressbook.xml.h:30
-# ui/evolution-addressbook.xml.h:31
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Addressbook Sources..."
-msgstr "地址簿来源(_A)..."
-
-# ui/evolution-addressbook.xml.h:31
-# ui/evolution-addressbook.xml.h:31
-# ui/evolution-addressbook.xml.h:32
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "联系人(_C)"
-
 # ui/evolution-addressbook.xml.h:32
 # ui/evolution-addressbook.xml.h:32
 # ui/evolution-addressbook.xml.h:33
@@ -40029,249 +41948,173 @@ msgstr "联系人列表(_C)"
 # ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
 # ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
 # ui/evolution-addressbook.xml.h:36 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "转发联系人(_F)..."
 
-# ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
-# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
-# ui/my-evolution.xml.h:7
-# ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
-# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:103
-# ui/my-evolution.xml.h:7
-# ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
-# ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:105
-# ui/my-evolution.xml.h:7
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:105
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "打印(_P)..."
+# mail/folder-browser.c:1466
+# mail/folder-browser.c:1475
+# mail/folder-browser.c:1476
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "移动到文件夹(_M)..."
 
 # ui/evolution-addressbook.xml.h:38
 # ui/evolution-addressbook.xml.h:38
 # ui/evolution-addressbook.xml.h:40
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "另存为 VCard(_S)"
 
 # ui/evolution-addressbook.xml.h:39
 # ui/evolution-addressbook.xml.h:39
 # ui/evolution-addressbook.xml.h:41
-#: ui/evolution-addressbook.xml.h:41
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "搜索联系人(_S)"
 
 # ui/evolution-addressbook.xml.h:40
 # ui/evolution-addressbook.xml.h:40
 # ui/evolution-addressbook.xml.h:42
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "全选(_S)"
 
-# ui/evolution-calendar.xml.h:2
-# ui/evolution-calendar.xml.h:2
-# ui/evolution-calendar.xml.h:2
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "配置日历的设置"
-
-# ui/evolution-calendar.xml.h:4
-# ui/evolution-calendar.xml.h:4
-# ui/evolution-calendar.xml.h:4
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "创建一个新的全天事件(_E)"
-
-# ui/evolution-calendar.xml.h:5
-# ui/evolution-calendar.xml.h:5
-# ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "创建新任务(_T)"
-
-# ui/evolution-calendar.xml.h:6
-# ui/evolution-calendar.xml.h:6
-# ui/evolution-calendar.xml.h:6
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "创建新约会(_N)"
-
-# ui/evolution-calendar.xml.h:9
-# ui/evolution-calendar.xml.h:9
-# ui/evolution-calendar.xml.h:9
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "为一整天创建一个事件"
+# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "给联系人发邮件(_M)..."
 
 # ui/evolution-calendar.xml.h:11
 # ui/evolution-calendar.xml.h:11
 # ui/evolution-calendar.xml.h:11
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "天"
 
 # ui/evolution-calendar.xml.h:12
 # ui/evolution-calendar.xml.h:12
 # ui/evolution-calendar.xml.h:12
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "删除约会"
 
 # ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
 # ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
 # ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "转到"
 
 # ui/evolution-calendar.xml.h:14
 # ui/evolution-calendar.xml.h:14
 # ui/evolution-calendar.xml.h:14
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "退回"
 
 # ui/evolution-calendar.xml.h:15
 # ui/evolution-calendar.xml.h:15
 # ui/evolution-calendar.xml.h:15
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "前进"
 
 # ui/evolution-calendar.xml.h:16
 # ui/evolution-calendar.xml.h:16
 # ui/evolution-calendar.xml.h:16
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "转到日期(_D)"
 
 # ui/evolution-calendar.xml.h:18
 # ui/evolution-calendar.xml.h:18
 # ui/evolution-calendar.xml.h:18
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "转到指定日期"
 
 # ui/evolution-calendar.xml.h:19
 # ui/evolution-calendar.xml.h:19
 # ui/evolution-calendar.xml.h:19
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "转到今天"
 
 # ui/evolution-calendar.xml.h:20
 # ui/evolution-calendar.xml.h:20
 # ui/evolution-calendar.xml.h:20
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "月"
 
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "新建约会"
-
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-# ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-msgid "New Task"
-msgstr "新建任务"
-
 # ui/evolution-calendar.xml.h:24
 # ui/evolution-calendar.xml.h:24
 # ui/evolution-calendar.xml.h:24
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "预览将要打印的日历"
 
 # ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 # ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
 # ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "打印预览(_V)"
 
 # ui/evolution-calendar.xml.h:26
 # ui/evolution-calendar.xml.h:26
 # ui/evolution-calendar.xml.h:26
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "打印该日历"
 
 # ui/evolution-calendar.xml.h:27
 # ui/evolution-calendar.xml.h:27
 # ui/evolution-calendar.xml.h:27
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "为该日历发布忙闲信息"
 
 # ui/evolution-calendar.xml.h:28
 # ui/evolution-calendar.xml.h:28
 # ui/evolution-calendar.xml.h:28
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "显示一天"
 
 # ui/evolution-calendar.xml.h:29
 # ui/evolution-calendar.xml.h:29
 # ui/evolution-calendar.xml.h:29
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "显示一个月"
 
 # ui/evolution-calendar.xml.h:30
 # ui/evolution-calendar.xml.h:30
 # ui/evolution-calendar.xml.h:30
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "显示一周"
 
 # ui/evolution-calendar.xml.h:31
 # ui/evolution-calendar.xml.h:31
 # ui/evolution-calendar.xml.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "显示工作周"
 
 # ui/evolution-calendar.xml.h:32
 # ui/evolution-calendar.xml.h:32
 # ui/evolution-calendar.xml.h:32
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "周"
 
-# ui/evolution-calendar.xml.h:35
-# ui/evolution-calendar.xml.h:35
-# ui/evolution-calendar.xml.h:35
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "约会(_A)..."
-
-# ui/evolution-calendar.xml.h:36
-# ui/evolution-calendar.xml.h:36
-# ui/evolution-calendar.xml.h:36
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "日历设置(_C)..."
-
-# ui/evolution-calendar.xml.h:42
-# ui/evolution-calendar.xml.h:42
-# ui/evolution-calendar.xml.h:42
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "发布忙闲信息(_P)"
-
-# ui/evolution-calendar.xml.h:43
-# ui/evolution-calendar.xml.h:43
-# ui/evolution-calendar.xml.h:43
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "任务(_T)..."
-
 # ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 # ui/evolution-contact-list-editor.xml.h:1
 # ui/evolution-mail-messagedisplay.xml.h:1
@@ -40315,8 +42158,8 @@ msgstr "删除这一项"
 # ui/evolution.xml.h:16
 # ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
 # ui/evolution.xml.h:16
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "主工具栏"
 
@@ -40334,13 +42177,6 @@ msgstr "预览被打印项"
 msgid "Print this item"
 msgstr "打印该项"
 
-# ui/evolution-comp-editor.xml.h:11
-# ui/evolution-comp-editor.xml.h:11
-# ui/evolution-comp-editor.xml.h:11
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "打印..."
-
 # ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
 # ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
 # ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
@@ -40348,10 +42184,20 @@ msgstr "打印..."
 # ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
 # ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "保存"
 
+# calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
+# widgets/misc/e-filter-bar.h:101
+# calendar/gui/dialogs/comp-editor.c:1111 ui/evolution-comp-editor.xml.h:13
+# widgets/misc/e-filter-bar.h:101
+# calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
+# widgets/misc/e-filter-bar.h:101
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "另存为..."
+
 # ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 # ui/evolution-contact-list-editor.xml.h:6
 # ui/evolution-signature-editor.xml.h:4
@@ -40363,7 +42209,7 @@ msgstr "保存"
 # ui/evolution-signature-editor.xml.h:4
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "保存并关闭"
 
@@ -40403,8 +42249,8 @@ msgstr "把该项保存到磁盘"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:36
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "文件(_F)"
 
@@ -40437,6 +42283,13 @@ msgstr "另存为(_A)..."
 msgid "Save the contact and close the dialog box"
 msgstr "保存联系人并关闭对话框"
 
+# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+# ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "给联系人发邮件(_M)..."
+
 # ui/evolution-contact-editor.xml.h:15
 # ui/evolution-contact-list-editor.xml.h:12
 # ui/evolution-message-composer.xml.h:53
@@ -40452,7 +42305,7 @@ msgstr "保存联系人并关闭对话框"
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Save"
 msgstr "保存(_S)"
 
@@ -40522,28 +42375,28 @@ msgstr "通过电子邮件转发该项"
 # ui/evolution-event-editor.xml.h:5
 # ui/evolution-event-editor.xml.h:5
 # ui/evolution-event-editor.xml.h:5
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "获取最新的会议信息"
 
 # ui/evolution-event-editor.xml.h:6
 # ui/evolution-event-editor.xml.h:6
 # ui/evolution-event-editor.xml.h:6
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "刷新会议(_F)"
 
 # ui/evolution-event-editor.xml.h:7
 # ui/evolution-event-editor.xml.h:7
 # ui/evolution-event-editor.xml.h:7
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "调度会议(_M)"
 
 # ui/evolution-event-editor.xml.h:8
 # ui/evolution-event-editor.xml.h:8
 # ui/evolution-event-editor.xml.h:8
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "为此项调度会议"
 
@@ -40568,143 +42421,94 @@ msgstr "取消当前邮件操作"
 msgid "Compose _New Message"
 msgstr "撰写新邮件(_N)"
 
-# ui/evolution-mail-global.xml.h:4
-# ui/evolution-mail-global.xml.h:4
-# ui/evolution-mail-global.xml.h:4
-#: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "创建或编辑邮件帐号和其它属性"
-
 # ui/evolution-mail-global.xml.h:5
 # ui/evolution-mail-global.xml.h:5
 # ui/evolution-mail-global.xml.h:5
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit rules for filtering new mail"
 msgstr "创建或编辑过滤新邮件的规则"
 
 # ui/evolution-mail-global.xml.h:6
 # ui/evolution-mail-global.xml.h:6
 # ui/evolution-mail-global.xml.h:6
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "创建或编辑虚拟文件夹定义"
 
 # ui/evolution-mail-global.xml.h:7
 # ui/evolution-mail-global.xml.h:7
 # ui/evolution-mail-global.xml.h:7
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "清空已删除邮件(_T)"
 
 # ui/evolution-mail-global.xml.h:8
 # ui/evolution-mail-global.xml.h:8
 # ui/evolution-mail-global.xml.h:8
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "丢弃密码(_P)"
 
 # ui/evolution-mail-global.xml.h:9
 # ui/evolution-mail-global.xml.h:9
 # ui/evolution-mail-global.xml.h:9
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "保存的密码被丢弃，所以将再次提示您输入密码"
 
-# ui/evolution-mail-global.xml.h:10
-# ui/evolution-mail-global.xml.h:10
-# ui/evolution-mail-global.xml.h:10
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "新建邮件"
-
 # ui/evolution-mail-global.xml.h:11
 # ui/evolution-mail-global.xml.h:11
 # ui/evolution-mail-global.xml.h:11
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "打开窗口以书写邮件"
 
 # ui/evolution-mail-global.xml.h:12
 # ui/evolution-mail-global.xml.h:12
 # ui/evolution-mail-global.xml.h:12
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "永久删除所有文件夹中的所有已删除的邮件"
 
-# ui/evolution-mail-global.xml.h:13
-# ui/evolution-mail-global.xml.h:13
-# ui/evolution-mail-global.xml.h:13
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "发送和接收"
-
-# ui/evolution-mail-global.xml.h:14
-# ui/evolution-mail-global.xml.h:14
-# ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "发送编队的邮件并检索新邮件"
-
 # ui/evolution-mail-global.xml.h:15
 # ui/evolution-mail-global.xml.h:15
 # ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "显示邮件预览窗口"
 
 # ui/evolution-mail-global.xml.h:16
 # ui/evolution-mail-global.xml.h:16
 # ui/evolution-mail-global.xml.h:16
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "订阅 或 取消订阅远程服务器上的文件夹"
 
 # ui/evolution-mail-global.xml.h:17
 # ui/evolution-mail-global.xml.h:17
 # ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "虚拟文件夹编辑器(_E)..."
 
 # ui/evolution-mail-global.xml.h:19
 # ui/evolution-mail-global.xml.h:19
 # ui/evolution-mail-global.xml.h:19
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "邮件过滤(_F)..."
 
-# ui/evolution-mail-global.xml.h:20
-# ui/evolution-mail-global.xml.h:20
-# ui/evolution-mail-global.xml.h:20
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "邮件(_M)"
-
-# ui/evolution-mail-global.xml.h:21
-# ui/evolution-mail-global.xml.h:21
-# ui/evolution-mail-global.xml.h:21
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "邮件设置(_M)..."
-
 # ui/evolution-mail-global.xml.h:22
 # ui/evolution-mail-global.xml.h:22
 # ui/evolution-mail-global.xml.h:22
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "预览窗口(_P)"
 
-# ui/evolution-mail-global.xml.h:23
-# ui/evolution-mail-global.xml.h:23
-# ui/evolution-mail-global.xml.h:23
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "发送和接收(_S)"
-
 # ui/evolution-mail-global.xml.h:24
 # ui/evolution-mail-global.xml.h:24
 # ui/evolution-mail-global.xml.h:24
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "订阅到文件夹(_S)..."
 
@@ -40866,14 +42670,14 @@ msgstr "按线索编排的邮件列表"
 # ui/evolution-mail-list.xml.h:26
 # ui/evolution-mail-list.xml.h:26
 # ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:20
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:20
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "删除(_E)"
 
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "文件夹(_F)"
 
@@ -40898,255 +42702,268 @@ msgstr "属性(_P)"
 msgid "_Threaded Message List"
 msgstr "按线索编排的邮件列表(_T)"
 
+# mail/folder-browser.c:1473 ui/evolution-mail-message.xml.h:1
+# mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:1
+# mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "将发件人添加到地址簿"
+
+# mail/folder-browser.c:1476
+# mail/folder-browser.c:1485
+# mail/folder-browser.c:1486
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "应用过滤规则"
+
+# mail/folder-browser.c:1473 ui/evolution-mail-message.xml.h:1
+# mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:1
+# mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "将发件人添加到地址簿"
+
 # ui/evolution-mail-message.xml.h:2
 # ui/evolution-mail-message.xml.h:2
 # ui/evolution-mail-message.xml.h:2
-#: ui/evolution-mail-message.xml.h:2
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "应用过滤规则到选中的邮件"
 
 # ui/evolution-mail-message.xml.h:3
 # ui/evolution-mail-message.xml.h:3
 # ui/evolution-mail-message.xml.h:3
-#: ui/evolution-mail-message.xml.h:3
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "为选中邮件的所有收件人撰写回复"
 
 # ui/evolution-mail-message.xml.h:4
 # ui/evolution-mail-message.xml.h:4
 # ui/evolution-mail-message.xml.h:4
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "为选中邮件的邮件列表撰写回复"
 
 # ui/evolution-mail-message.xml.h:5
 # ui/evolution-mail-message.xml.h:5
 # ui/evolution-mail-message.xml.h:5
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "为选中邮件的发件人撰写回复"
 
 # ui/evolution-mail-message.xml.h:7
 # ui/evolution-mail-message.xml.h:7
 # ui/evolution-mail-message.xml.h:7
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "把选中的消息复制到其它文件夹"
 
 # ui/evolution-mail-message.xml.h:8
 # ui/evolution-mail-message.xml.h:8
 # ui/evolution-mail-message.xml.h:8
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "从邮件创建虚拟文件夹(_V)"
 
 # ui/evolution-mail-message.xml.h:9
 # ui/evolution-mail-message.xml.h:9
 # ui/evolution-mail-message.xml.h:9
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "为来自该发件人的邮件创建邮件过滤规则"
 
 # ui/evolution-mail-message.xml.h:10
 # ui/evolution-mail-message.xml.h:10
 # ui/evolution-mail-message.xml.h:10
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "为发送给这些收件人的邮件创建邮件过滤规则"
 
 # ui/evolution-mail-message.xml.h:11
 # ui/evolution-mail-message.xml.h:11
 # ui/evolution-mail-message.xml.h:11
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "为该邮件列表创建邮件过滤规则"
 
 # ui/evolution-mail-message.xml.h:12
 # ui/evolution-mail-message.xml.h:12
 # ui/evolution-mail-message.xml.h:12
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "为该标题创建邮件过滤规则"
 
 # ui/evolution-mail-message.xml.h:13
 # ui/evolution-mail-message.xml.h:13
 # ui/evolution-mail-message.xml.h:13
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "为这些收件人创建虚拟文件夹"
 
 # ui/evolution-mail-message.xml.h:14
 # ui/evolution-mail-message.xml.h:14
 # ui/evolution-mail-message.xml.h:14
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "为该邮件列表创建虚拟文件夹"
 
 # ui/evolution-mail-message.xml.h:15
 # ui/evolution-mail-message.xml.h:15
 # ui/evolution-mail-message.xml.h:15
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "为该发件人创建虚拟文件夹"
 
 # ui/evolution-mail-message.xml.h:16
 # ui/evolution-mail-message.xml.h:16
 # ui/evolution-mail-message.xml.h:16
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "为该主题创建虚拟文件夹"
 
 # ui/evolution-mail-message.xml.h:17
 # ui/evolution-mail-message.xml.h:17
 # ui/evolution-mail-message.xml.h:17
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "缩减文本大小"
 
 # ui/evolution-mail-message.xml.h:19
 # ui/evolution-mail-message.xml.h:19
 # ui/evolution-mail-message.xml.h:19
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "显示下一个重要邮件"
 
 # ui/evolution-mail-message.xml.h:20
 # ui/evolution-mail-message.xml.h:20
 # ui/evolution-mail-message.xml.h:20
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "显示下一个邮件"
 
 # ui/evolution-mail-message.xml.h:21
 # ui/evolution-mail-message.xml.h:21
 # ui/evolution-mail-message.xml.h:21
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "显示下一个未读文件"
 
 # ui/evolution-mail-message.xml.h:22
 # ui/evolution-mail-message.xml.h:22
 # ui/evolution-mail-message.xml.h:22
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "显示下一个未阅读的线索"
 
 # ui/evolution-mail-message.xml.h:23
 # ui/evolution-mail-message.xml.h:23
 # ui/evolution-mail-message.xml.h:23
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "显示上一个重要邮件"
 
 # ui/evolution-mail-message.xml.h:24
 # ui/evolution-mail-message.xml.h:24
 # ui/evolution-mail-message.xml.h:24
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "显示上一个邮件"
 
 # ui/evolution-mail-message.xml.h:25
 # ui/evolution-mail-message.xml.h:25
 # ui/evolution-mail-message.xml.h:25
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "显示上一个未读邮件"
 
+# ui/evolution-mail-message.xml.h:31
+# ui/evolution-mail-message.xml.h:31
+# ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "转发"
+
 # ui/evolution-mail-message.xml.h:26
 # ui/evolution-mail-message.xml.h:26
 # ui/evolution-mail-message.xml.h:26
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "过滤邮件列表(_L)..."
 
 # ui/evolution-mail-message.xml.h:27
 # ui/evolution-mail-message.xml.h:27
 # ui/evolution-mail-message.xml.h:27
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "过滤发件人(_N)..."
 
 # ui/evolution-mail-message.xml.h:28
 # ui/evolution-mail-message.xml.h:28
 # ui/evolution-mail-message.xml.h:28
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "过滤收件人(_R)..."
 
 # ui/evolution-mail-message.xml.h:29
 # ui/evolution-mail-message.xml.h:29
 # ui/evolution-mail-message.xml.h:29
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "过滤标题(_S)..."
 
-# ui/evolution-mail-message.xml.h:30
-# ui/evolution-mail-message.xml.h:30
-# ui/evolution-mail-message.xml.h:30
-#: ui/evolution-mail-message.xml.h:30
-msgid "Force images in HTML mail to be loaded"
-msgstr "强制装入 HTML 邮件中的图像"
-
-# ui/evolution-mail-message.xml.h:31
-# ui/evolution-mail-message.xml.h:31
-# ui/evolution-mail-message.xml.h:31
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward"
-msgstr "转发"
-
-# ui/evolution-mail-message.xml.h:32
-# ui/evolution-mail-message.xml.h:32
-# ui/evolution-mail-message.xml.h:32
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward As"
-msgstr "转发方式"
-
-# ui/evolution-mail-message.xml.h:33
-# ui/evolution-mail-message.xml.h:33
-# ui/evolution-mail-message.xml.h:33
+# ui/evolution-mail-message.xml.h:51
+# ui/evolution-mail-message.xml.h:51
+# ui/evolution-mail-message.xml.h:51
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Attached"
-msgstr "附件方式(_A)"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "为选定的邮件做删除标记"
 
-# ui/evolution-mail-message.xml.h:34
-# ui/evolution-mail-message.xml.h:34
-# ui/evolution-mail-message.xml.h:34
+# addressbook/gui/contact-editor/contact-editor.glade.h:15
+# addressbook/gui/contact-editor/contact-editor.glade.h:15
+# addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Inline"
-msgstr "内文方式(_I)"
+#, fuzzy
+msgid "Follow _Up..."
+msgstr "全名(_N)..."
 
-# ui/evolution-mail-message.xml.h:35
-# ui/evolution-mail-message.xml.h:35
-# ui/evolution-mail-message.xml.h:35
+# ui/evolution-mail-message.xml.h:30
+# ui/evolution-mail-message.xml.h:30
+# ui/evolution-mail-message.xml.h:30
 #: ui/evolution-mail-message.xml.h:35
-msgid "Forward _Quoted"
-msgstr "引用方式(_Q)"
+msgid "Force images in HTML mail to be loaded"
+msgstr "强制装入 HTML 邮件中的图像"
 
 # ui/evolution-mail-message.xml.h:36
 # ui/evolution-mail-message.xml.h:36
 # ui/evolution-mail-message.xml.h:36
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "在新邮件体中转发选定的邮件"
 
 # ui/evolution-mail-message.xml.h:37
 # ui/evolution-mail-message.xml.h:37
 # ui/evolution-mail-message.xml.h:37
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "以类似于回复的引用方式转发选定的邮件"
 
 # ui/evolution-mail-message.xml.h:38
 # ui/evolution-mail-message.xml.h:38
 # ui/evolution-mail-message.xml.h:38
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "把选定的邮件转发给某人"
 
 # ui/evolution-mail-message.xml.h:39
 # ui/evolution-mail-message.xml.h:39
 # ui/evolution-mail-message.xml.h:39
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "把选定的邮件作为附件转发给某人"
 
@@ -41171,6 +42988,13 @@ msgstr "装入图像(_I)"
 msgid "Mark as I_mportant"
 msgstr "标记为重要(_M)"
 
+# mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
+# mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:45
+# mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "标记为未读(_N)"
+
 # ui/evolution-mail-message.xml.h:46
 # ui/evolution-mail-message.xml.h:46
 # ui/evolution-mail-message.xml.h:46
@@ -41182,28 +43006,32 @@ msgstr "标记为不重要(_O)"
 # ui/evolution-mail-message.xml.h:47
 # ui/evolution-mail-message.xml.h:47
 #: ui/evolution-mail-message.xml.h:47
-msgid "Mark the selected messages as having been read"
+#, fuzzy
+msgid "Mark the selected message(s) as having been read"
 msgstr "把选定的邮件标记为已读"
 
 # ui/evolution-mail-message.xml.h:48
 # ui/evolution-mail-message.xml.h:48
 # ui/evolution-mail-message.xml.h:48
 #: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as important"
+#, fuzzy
+msgid "Mark the selected message(s) as important"
 msgstr "报选定的邮件标记为重要邮件"
 
 # ui/evolution-mail-message.xml.h:49
 # ui/evolution-mail-message.xml.h:49
 # ui/evolution-mail-message.xml.h:49
 #: ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected messages as not having been read"
+#, fuzzy
+msgid "Mark the selected message(s) as not having been read"
 msgstr "把选定的邮件标记为未读"
 
 # ui/evolution-mail-message.xml.h:50
 # ui/evolution-mail-message.xml.h:50
 # ui/evolution-mail-message.xml.h:50
 #: ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as unimportant"
+#, fuzzy
+msgid "Mark the selected message(s) as unimportant"
 msgstr "把选定的邮件标记为不重要邮件"
 
 # ui/evolution-mail-message.xml.h:51
@@ -41224,7 +43052,8 @@ msgstr "移动"
 # ui/evolution-mail-message.xml.h:53
 # ui/evolution-mail-message.xml.h:53
 #: ui/evolution-mail-message.xml.h:53
-msgid "Move selected messages to another folder"
+#, fuzzy
+msgid "Move selected message(s) to another folder"
 msgstr "把选中的邮件移动到其它文件夹"
 
 # ui/evolution-mail-message.xml.h:54
@@ -41238,266 +43067,261 @@ msgstr "下一个"
 # ui/evolution-mail-message.xml.h:55
 # ui/evolution-mail-message.xml.h:55
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Important Message"
+#, fuzzy
+msgid "Next _Important Message"
 msgstr "下一个重要邮件"
 
-# ui/evolution-mail-message.xml.h:56
-# ui/evolution-mail-message.xml.h:56
-# ui/evolution-mail-message.xml.h:56
-#: ui/evolution-mail-message.xml.h:56
-msgid "Next Message"
-msgstr "下一个邮件"
-
 # ui/evolution-mail-message.xml.h:57
 # ui/evolution-mail-message.xml.h:57
 # ui/evolution-mail-message.xml.h:57
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next Thread"
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Next _Thread"
 msgstr "下一个线索"
 
 # ui/evolution-mail-message.xml.h:58
 # ui/evolution-mail-message.xml.h:58
 # ui/evolution-mail-message.xml.h:58
-#: ui/evolution-mail-message.xml.h:58
-msgid "Next Unread Message"
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "下一个未读邮件"
 
 # ui/evolution-mail-message.xml.h:59
 # ui/evolution-mail-message.xml.h:59
 # ui/evolution-mail-message.xml.h:59
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "在新窗口中打开选中的邮件"
 
 # ui/evolution-mail-message.xml.h:60
 # ui/evolution-mail-message.xml.h:60
 # ui/evolution-mail-message.xml.h:60
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "在邮件撰写器中打开选中的邮件以便重发"
 
 # ui/evolution-mail-message.xml.h:61
 # ui/evolution-mail-message.xml.h:61
 # ui/evolution-mail-message.xml.h:61
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "原大小(_Z)"
 
+# ui/evolution-mail-message.xml.h:66
+# ui/evolution-mail-message.xml.h:66
+# ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "上一个未读邮件"
+
+# ui/evolution-mail-message.xml.h:64
+# ui/evolution-mail-message.xml.h:64
+# ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "上一个重要邮件"
+
 # ui/evolution-mail-message.xml.h:62
 # ui/evolution-mail-message.xml.h:62
 # ui/evolution-mail-message.xml.h:62
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:63
 msgid "Preview the message to be printed"
 msgstr "预览需打印的邮件"
 
 # ui/evolution-mail-message.xml.h:63
 # ui/evolution-mail-message.xml.h:63
 # ui/evolution-mail-message.xml.h:63
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous"
 msgstr "上一个"
 
-# ui/evolution-mail-message.xml.h:64
-# ui/evolution-mail-message.xml.h:64
-# ui/evolution-mail-message.xml.h:64
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Important Message"
-msgstr "上一个重要邮件"
-
-# ui/evolution-mail-message.xml.h:65
-# ui/evolution-mail-message.xml.h:65
-# ui/evolution-mail-message.xml.h:65
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Message"
-msgstr "上一个邮件"
-
-# ui/evolution-mail-message.xml.h:66
-# ui/evolution-mail-message.xml.h:66
-# ui/evolution-mail-message.xml.h:66
-#: ui/evolution-mail-message.xml.h:66
-msgid "Previous Unread Message"
-msgstr "上一个未读邮件"
-
 # ui/evolution-mail-message.xml.h:69
 # ui/evolution-mail-message.xml.h:69
 # ui/evolution-mail-message.xml.h:69
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "打印该邮件"
 
 # ui/evolution-mail-message.xml.h:70
-#: ui/evolution-mail-message.xml.h:70
-msgid "Redirect"
+#: ui/evolution-mail-message.xml.h:68
+#, fuzzy
+msgid "Re_direct"
 msgstr "转发"
 
 # ui/evolution-mail-message.xml.h:38
 # ui/evolution-mail-message.xml.h:38
 # ui/evolution-mail-message.xml.h:71
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:69
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "将选定的消息转发(退回)给某人"
 
-# ui/evolution-mail-message.xml.h:70
-# ui/evolution-mail-message.xml.h:70
-# ui/evolution-mail-message.xml.h:72
-#: ui/evolution-mail-message.xml.h:72
-msgid "Reply"
-msgstr "回复"
-
-# ui/evolution-mail-message.xml.h:71
-# ui/evolution-mail-message.xml.h:71
-# ui/evolution-mail-message.xml.h:73
-#: ui/evolution-mail-message.xml.h:73
-msgid "Reply to All"
-msgstr "全部回复"
-
 # ui/evolution-mail-message.xml.h:74
 # ui/evolution-mail-message.xml.h:74
 # ui/evolution-mail-message.xml.h:76
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr "把文件重新设置为原来的大小"
 
 # ui/evolution-mail-message.xml.h:75
 # ui/evolution-mail-message.xml.h:75
 # ui/evolution-mail-message.xml.h:77
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "搜索邮件(_E)"
 
 # ui/evolution-mail-message.xml.h:76
 # ui/evolution-mail-message.xml.h:76
 # ui/evolution-mail-message.xml.h:78
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "更小(_M)"
 
 # ui/evolution-mail-message.xml.h:77
 # ui/evolution-mail-message.xml.h:77
 # ui/evolution-mail-message.xml.h:79
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "把邮件存为文本文件"
 
 # ui/evolution-mail-message.xml.h:78
 # ui/evolution-mail-message.xml.h:78
 # ui/evolution-mail-message.xml.h:80
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:78
 msgid "Search for text in the body of the displayed message"
 msgstr "在显示邮件的邮件体中搜索文本"
 
 # ui/evolution-mail-message.xml.h:79
 # ui/evolution-mail-message.xml.h:79
 # ui/evolution-mail-message.xml.h:81
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "设定您当前打印机的页面设置"
 
 # ui/evolution-mail-message.xml.h:80
 # ui/evolution-mail-message.xml.h:80
 # ui/evolution-mail-message.xml.h:82
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "显示电子邮件源代码(_S)"
 
 # ui/evolution-mail-message.xml.h:81
 # ui/evolution-mail-message.xml.h:81
 # ui/evolution-mail-message.xml.h:83
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "显示完整的邮件头(_H)"
 
 # ui/evolution-mail-message.xml.h:82
 # ui/evolution-mail-message.xml.h:82
 # ui/evolution-mail-message.xml.h:84
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "以常用方式显示邮件"
 
 # ui/evolution-mail-message.xml.h:83
 # ui/evolution-mail-message.xml.h:83
 # ui/evolution-mail-message.xml.h:85
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "显示邮件时显示所有邮件头"
 
 # ui/evolution-mail-message.xml.h:84
 # ui/evolution-mail-message.xml.h:84
 # ui/evolution-mail-message.xml.h:86
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "显示邮件的原始邮件源代码"
 
 # ui/evolution-mail-message.xml.h:85
 # ui/evolution-mail-message.xml.h:85
 # ui/evolution-mail-message.xml.h:87
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "文本大小(_Z)"
 
 # ui/evolution-mail-message.xml.h:86
 # ui/evolution-mail-message.xml.h:86
 # ui/evolution-mail-message.xml.h:88
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "反删除选中的邮件"
 
 # ui/evolution-mail-message.xml.h:87
 # ui/evolution-mail-message.xml.h:87
 # ui/evolution-mail-message.xml.h:89
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "关于邮件列表的虚拟文件夹(_L)..."
 
 # ui/evolution-mail-message.xml.h:88
 # ui/evolution-mail-message.xml.h:88
 # ui/evolution-mail-message.xml.h:90
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "关于发件人的虚拟文件夹(_N)..."
 
 # ui/evolution-mail-message.xml.h:89
 # ui/evolution-mail-message.xml.h:89
 # ui/evolution-mail-message.xml.h:91
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "关于收件人的虚拟文件夹(_R)..."
 
 # ui/evolution-mail-message.xml.h:90
 # ui/evolution-mail-message.xml.h:90
 # ui/evolution-mail-message.xml.h:92
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "关于主题的虚拟文件夹(_S)..."
 
-# ui/evolution-mail-message.xml.h:92
-# ui/evolution-mail-message.xml.h:92
-# ui/evolution-mail-message.xml.h:94
-#: ui/evolution-mail-message.xml.h:94
-msgid "_Apply Filters"
-msgstr "应用过滤规则(_A)"
+# ui/evolution-message-composer.xml.h:1
+# ui/evolution-message-composer.xml.h:1
+# ui/evolution-message-composer.xml.h:1
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Attached"
+msgstr "附加"
 
 # ui/evolution-mail-message.xml.h:93
 # ui/evolution-mail-message.xml.h:93
 # ui/evolution-mail-message.xml.h:95
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "复制到文件夹(_C)"
 
 # ui/evolution-mail-message.xml.h:94
 # ui/evolution-mail-message.xml.h:94
 # ui/evolution-mail-message.xml.h:96
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "从邮件创建过滤规则(_C)"
 
 # ui/evolution-mail-message.xml.h:97
 # ui/evolution-mail-message.xml.h:97
 # ui/evolution-mail-message.xml.h:99
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "转发邮件(_F)"
 
+# ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
+# ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
+# ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "转到"
+
+# mail/mail-config.glade.h:39
+# mail/mail-config.glade.h:39
+# mail/mail-config.glade.h:46
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "嵌入"
+
 # ui/evolution-mail-message.xml.h:98
 # ui/evolution-mail-message.xml.h:98
 # ui/evolution-mail-message.xml.h:100
@@ -41519,31 +43343,61 @@ msgstr "邮件显示(_M)"
 msgid "_Move to Folder"
 msgstr "移动到文件夹(_M)"
 
+# ui/evolution-mail-message.xml.h:56
+# ui/evolution-mail-message.xml.h:56
+# ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "下一个邮件"
+
 # ui/evolution-mail-message.xml.h:101
 # ui/evolution-mail-message.xml.h:101
 # ui/evolution-mail-message.xml.h:103
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "普通显示(_N)"
 
 # ui/evolution-mail-message.xml.h:102
 # ui/evolution-mail-message.xml.h:102
 # ui/evolution-mail-message.xml.h:104
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "打开邮件(_O)"
 
+# ui/evolution-mail-message.xml.h:65
+# ui/evolution-mail-message.xml.h:65
+# ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "上一个邮件"
+
+# mail/mail-config.glade.h:59
+# mail/mail-config.glade.h:59
+# mail/mail-config.glade.h:68
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "已引用"
+
 # ui/evolution-mail-message.xml.h:106 ui/evolution.xml.h:49
 # ui/my-evolution.xml.h:9
 # ui/evolution-mail-message.xml.h:106 ui/evolution.xml.h:49
 # ui/my-evolution.xml.h:9
 # ui/evolution-mail-message.xml.h:108 ui/evolution.xml.h:49
 # ui/my-evolution.xml.h:9
-#: ui/evolution-mail-message.xml.h:108 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "工具(_T)"
 
+# mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
+# mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
+# mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "反删除(_U)"
+
 # ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 # ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 # ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
@@ -41565,8 +43419,8 @@ msgstr "关闭该窗口"
 # ui/evolution.xml.h:33
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:33
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -41577,7 +43431,7 @@ msgstr "关闭(_C)"
 # ui/evolution-mail-messagedisplay.xml.h:8
 # ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "查看(_V)"
 
@@ -41619,14 +43473,14 @@ msgstr "用您的 S/MIME 加密证书加密该邮件"
 # ui/evolution-message-composer.xml.h:8
 # ui/evolution-message-composer.xml.h:8
 # ui/evolution-message-composer.xml.h:8
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "格式(_M)"
 
 # ui/evolution-message-composer.xml.h:9
 # ui/evolution-message-composer.xml.h:9
 # ui/evolution-message-composer.xml.h:9
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "HTML(_T)"
 
@@ -41651,6 +43505,16 @@ msgstr "把文件作为文本插入邮件"
 msgid "Insert text file..."
 msgstr "插入文本文件..."
 
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+# ui/evolution-message-composer.xml.h:13
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+# ui/evolution-message-composer.xml.h:13
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
+# ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "打开"
+
 # ui/evolution-message-composer.xml.h:14
 # ui/evolution-message-composer.xml.h:14
 # ui/evolution-message-composer.xml.h:14
@@ -41714,7 +43578,7 @@ msgstr "保存到文件夹..."
 # ui/evolution-message-composer.xml.h:24
 # ui/evolution-signature-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "保存当前文件"
 
@@ -41757,6 +43621,7 @@ msgstr "以后发送(_L)"
 # ui/evolution-message-composer.xml.h:30
 # ui/evolution-message-composer.xml.h:30
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "以 HTML 格式发送邮件"
 
@@ -41879,7 +43744,7 @@ msgstr "发件人域(_F)"
 # ui/evolution-message-composer.xml.h:50
 # ui/evolution-signature-editor.xml.h:10
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -41897,17 +43762,10 @@ msgstr "打开(_O)..."
 msgid "_Reply-To Field"
 msgstr "回复域(_R)"
 
-# ui/evolution-message-composer.xml.h:54
-# ui/evolution-message-composer.xml.h:54
-# ui/evolution-message-composer.xml.h:54
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "安全(_S)"
-
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "帮助(_H)"
 
@@ -42002,68 +43860,63 @@ msgstr "获取最新的任务信息"
 msgid "Re_fresh Task"
 msgstr "刷新任务(_F)"
 
-# ui/evolution-tasks.xml.h:2
-# ui/evolution-tasks.xml.h:2
-# ui/evolution-tasks.xml.h:2
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "配置任务试图的设置"
-
 # ui/evolution-tasks.xml.h:4
 # ui/evolution-tasks.xml.h:4
 # ui/evolution-tasks.xml.h:4
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "复制选中的任务"
 
 # ui/evolution-tasks.xml.h:7
 # ui/evolution-tasks.xml.h:7
 # ui/evolution-tasks.xml.h:8
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "剪切选中的任务"
 
 # ui/evolution-tasks.xml.h:9
 # ui/evolution-tasks.xml.h:9
 # ui/evolution-tasks.xml.h:9
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete completed tasks"
 msgstr "删除已完成的任务"
 
 # ui/evolution-tasks.xml.h:9
 # ui/evolution-tasks.xml.h:9
 # ui/evolution-tasks.xml.h:10
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "删除选中的任务"
 
 # calendar/gui/e-calendar-table.c:954
 # calendar/gui/e-calendar-table.c:954
 # ui/evolution-tasks.xml.h:11
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 msgid "Mar_k as Complete"
 msgstr "标记为完成(_K)"
 
 # ui/evolution-tasks.xml.h:12
 # ui/evolution-tasks.xml.h:12
 # ui/evolution-tasks.xml.h:14
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "从剪贴板中粘贴任务"
 
-# ui/evolution-tasks.xml.h:13
-# ui/evolution-tasks.xml.h:13
-# ui/evolution-tasks.xml.h:15
-#: ui/evolution-tasks.xml.h:15
-msgid "Tasks Settings..."
-msgstr "任务设置..."
+# ui/evolution-addressbook.xml.h:15
+# ui/evolution-addressbook.xml.h:15
+# ui/evolution-addressbook.xml.h:15
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "预览将要打印的联系人"
 
-# ui/evolution-tasks.xml.h:18
-# ui/evolution-tasks.xml.h:18
-# ui/evolution-tasks.xml.h:22
-#: ui/evolution-tasks.xml.h:22
-msgid "_Task"
-msgstr "任务(_T)"
+# ui/evolution-mail-message.xml.h:69
+# ui/evolution-mail-message.xml.h:69
+# ui/evolution-mail-message.xml.h:69
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "打印该邮件"
 
 # ui/evolution.xml.h:1
 # ui/evolution.xml.h:1
@@ -42163,209 +44016,229 @@ msgstr "从其它程序导入数据"
 msgid "Move this folder to another place"
 msgstr "把该文件夹移到其它位置"
 
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+#: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "创建新文件夹(_N)..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
 # ui/evolution.xml.h:18
 # ui/evolution.xml.h:18
 # ui/evolution.xml.h:18
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "在新窗口中打开"
 
 # ui/evolution.xml.h:20
 # ui/evolution.xml.h:20
 # ui/evolution.xml.h:20
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "在另一个窗口中打开该文件夹"
 
+# ui/evolution-mail-global.xml.h:13
+# ui/evolution-mail-global.xml.h:13
+# ui/evolution-mail-global.xml.h:13
+#: ui/evolution.xml.h:23
+msgid "Send / Receive"
+msgstr "发送和接收"
+
+# ui/evolution-mail-global.xml.h:14
+# ui/evolution-mail-global.xml.h:14
+# ui/evolution-mail-global.xml.h:14
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "发送编队的邮件并检索新邮件"
+
 # ui/evolution.xml.h:21
 # ui/evolution.xml.h:21
 # ui/evolution.xml.h:21
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "显示关于 Ximian Evolution 的信息"
 
 # ui/evolution.xml.h:22
 # ui/evolution.xml.h:22
 # ui/evolution.xml.h:22
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "提交错误报告"
 
 # ui/evolution.xml.h:23
 # ui/evolution.xml.h:23
 # ui/evolution.xml.h:23
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "提交错误报告(_B)"
 
 # ui/evolution.xml.h:24
 # ui/evolution.xml.h:24
 # ui/evolution.xml.h:24
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy 提交错误报告"
 
 # ui/evolution.xml.h:25
 # ui/evolution.xml.h:25
 # ui/evolution.xml.h:25
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "反转"
 
 # ui/evolution.xml.h:26
 # ui/evolution.xml.h:26
 # ui/evolution.xml.h:26
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "是否显示文件夹栏"
 
 # ui/evolution.xml.h:27
 # ui/evolution.xml.h:27
 # ui/evolution.xml.h:27
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "是否显示快捷方式栏"
 
 # ui/evolution.xml.h:28
 # ui/evolution.xml.h:28
 # ui/evolution.xml.h:28
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "我们是否离线工作。"
 
 # ui/evolution.xml.h:29
 # ui/evolution.xml.h:29
 # ui/evolution.xml.h:29
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "查看选中的文件夹"
 
 # ui/evolution.xml.h:31
 # ui/evolution.xml.h:31
 # ui/evolution.xml.h:31
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution 常见问题(_F)"
 
 # ui/evolution.xml.h:32
 # ui/evolution.xml.h:32
 # ui/evolution.xml.h:32
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "关于 Ximian Evolution(_A)..."
 
 # ui/evolution.xml.h:34
 # ui/evolution.xml.h:34
 # ui/evolution.xml.h:34
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "复制(_C)..."
 
 # ui/evolution.xml.h:38
 # ui/evolution.xml.h:38
 # ui/evolution.xml.h:38
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "文件夹工具栏(_F)"
 
 # ui/evolution.xml.h:39
 # ui/evolution.xml.h:39
 # ui/evolution.xml.h:39
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "转到文件夹(_G)..."
 
 # ui/evolution.xml.h:41
 # ui/evolution.xml.h:41
 # ui/evolution.xml.h:41
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:47
 msgid "_Import..."
 msgstr "正在导入(_I)..."
 
 # ui/evolution.xml.h:42
 # ui/evolution.xml.h:42
 # ui/evolution.xml.h:42
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "移动(_M)..."
 
 # ui/evolution.xml.h:43
 # ui/evolution.xml.h:43
 # ui/evolution.xml.h:43
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "新建(_N)"
 
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "新建文件夹(_N)"
 
 # ui/evolution.xml.h:45
 # ui/evolution.xml.h:45
 # ui/evolution.xml.h:45
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:51
 msgid "_Pilot Settings..."
 msgstr "Pilot 设置(_P)..."
 
 # ui/evolution.xml.h:46
 # ui/evolution.xml.h:46
 # ui/evolution.xml.h:46
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
+# ui/evolution-mail-global.xml.h:23
+# ui/evolution-mail-global.xml.h:23
+# ui/evolution-mail-global.xml.h:23
+#: ui/evolution.xml.h:53
+msgid "_Send / Receive"
+msgstr "发送和接收(_S)"
+
 # ui/evolution.xml.h:47
 # ui/evolution.xml.h:47
 # ui/evolution.xml.h:47
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "快捷方式(_S)"
 
 # ui/evolution.xml.h:48
 # ui/evolution.xml.h:48
 # ui/evolution.xml.h:48
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "快捷方式栏(_S)"
 
-# ui/my-evolution.xml.h:1
-# ui/my-evolution.xml.h:1
-# ui/my-evolution.xml.h:1
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "改变关于概要的设置"
-
 # ui/my-evolution.xml.h:4
 # ui/my-evolution.xml.h:4
 # ui/my-evolution.xml.h:4
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "打印概要"
 
 # ui/my-evolution.xml.h:5
 # ui/my-evolution.xml.h:5
 # ui/my-evolution.xml.h:5
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "重新载入"
 
 # ui/my-evolution.xml.h:6
 # ui/my-evolution.xml.h:6
 # ui/my-evolution.xml.h:6
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "重新载入视图"
 
-# ui/my-evolution.xml.h:8
-# ui/my-evolution.xml.h:8
-# ui/my-evolution.xml.h:8
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "概要设置(_S)..."
-
 # views/addressbook/galview.xml.h:1
 # views/addressbook/galview.xml.h:1
 # views/addressbook/galview.xml.h:1
@@ -42387,31 +44260,43 @@ msgstr "按公司"
 msgid "Phone List"
 msgstr "电话列表"
 
+# mail/mail-account-gui.c:837
+# mail/mail-account-gui.c:837
+# mail/mail-account-gui.c:834
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "选择文件夹"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
 # views/mail/galview.xml.h:1
 # views/mail/galview.xml.h:1
 # views/mail/galview.xml.h:1
-#: views/mail/galview.xml.h:1
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "按发件人"
 
 # views/mail/galview.xml.h:2
 # views/mail/galview.xml.h:2
 # views/mail/galview.xml.h:2
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "按状态"
 
 # views/mail/galview.xml.h:3
 # views/mail/galview.xml.h:3
 # views/mail/galview.xml.h:3
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "按主题"
 
 # views/mail/galview.xml.h:4
 # views/mail/galview.xml.h:4
 # views/mail/galview.xml.h:4
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "邮件"
 
@@ -42466,14 +44351,27 @@ msgstr ""
 # widgets/menus/gal-view-menus.c:195
 # widgets/menus/gal-view-menus.c:195
 # widgets/menus/gal-view-menus.c:195
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "当前视图(_C)"
 
+# widgets/menus/gal-view-menus.c:195
+# widgets/menus/gal-view-menus.c:195
+# widgets/menus/gal-view-menus.c:195
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:357
+#, fuzzy
+msgid "Custom View"
+msgstr "当前视图(_C)"
+
+#: widgets/menus/gal-view-menus.c:366
+msgid "Save Custom View"
+msgstr ""
+
 # widgets/menus/gal-view-menus.c:222
 # widgets/menus/gal-view-menus.c:222
 # widgets/menus/gal-view-menus.c:222
-#: widgets/menus/gal-view-menus.c:222
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "定义视图"
 
@@ -42629,7 +44527,7 @@ msgstr "可视"
 # widgets/misc/e-charset-picker.c:159
 # widgets/misc/e-charset-picker.c:159
 # widgets/misc/e-charset-picker.c:162
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "未知的字符集：%s"
@@ -42637,21 +44535,21 @@ msgstr "未知的字符集：%s"
 # widgets/misc/e-charset-picker.c:201
 # widgets/misc/e-charset-picker.c:201
 # widgets/misc/e-charset-picker.c:204
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "输入要使用的字符集"
 
 # widgets/misc/e-charset-picker.c:276
 # widgets/misc/e-charset-picker.c:276
 # widgets/misc/e-charset-picker.c:279
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "其它..."
 
 # widgets/misc/e-charset-picker.c:395
 # widgets/misc/e-charset-picker.c:395
 # widgets/misc/e-charset-picker.c:398
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "字符编码"
 
@@ -42665,38 +44563,42 @@ msgstr "..."
 # widgets/misc/e-filter-bar.c:152
 # widgets/misc/e-filter-bar.c:153
 # widgets/misc/e-filter-bar.c:153
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "搜索编辑器"
 
 # widgets/misc/e-filter-bar.c:168
 # widgets/misc/e-filter-bar.c:169
 # widgets/misc/e-filter-bar.c:169
-#: widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "保存搜索"
 
 # widgets/misc/e-filter-bar.c:168
+# widgets/misc/e-filter-bar.c:169
+# widgets/misc/e-filter-bar.c:169
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Save Search..."
+msgstr "保存搜索"
+
+# widgets/misc/e-filter-bar.c:168
 # widgets/misc/e-filter-bar.h:94
 # widgets/misc/e-filter-bar.h:94
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#, fuzzy
+msgid "_Edit Saved Searches..."
 msgstr "添加到被保存搜索"
 
-# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-# widgets/misc/e-filter-bar.h:95
-# widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "清除"
-
-# widgets/misc/e-filter-bar.h:102
-# widgets/misc/e-filter-bar.h:102
-# widgets/misc/e-filter-bar.h:102
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "全部显示"
+# addressbook/gui/component/addressbook.c:807 widgets/misc/e-filter-bar.h:104
+# addressbook/gui/component/addressbook.c:807 widgets/misc/e-filter-bar.h:97
+# widgets/misc/e-filter-bar.h:104
+# addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
+# widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "高级..."
 
 # widgets/misc/e-messagebox.c:152
 # widgets/misc/e-messagebox.c:152
@@ -42705,6 +44607,16 @@ msgstr "全部显示"
 msgid "Information"
 msgstr "信息"
 
+# widgets/misc/e-messagebox.c:166
+# widgets/misc/e-messagebox.c:166
+# executive-summary/test-service/rdf-summary.c:512
+# executive-summary/test-service/rdf-summary.c:549
+# executive-summary/test-service/rdf-summary.c:594
+# widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:166
+msgid "Error"
+msgstr "错误"
+
 # widgets/misc/e-messagebox.c:173
 # widgets/misc/e-messagebox.c:173
 # widgets/misc/e-messagebox.c:173
@@ -42727,17 +44639,35 @@ msgstr "邮件"
 msgid "Don't show this message again."
 msgstr "不再显示该邮件。"
 
-# widgets/misc/e-search-bar.c:334
-# widgets/misc/e-search-bar.c:334
-# widgets/misc/e-search-bar.c:334
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "搜索(_C)"
+# widgets/misc/e-search-bar.c:460
+# widgets/misc/e-search-bar.c:460
+# widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:512
+#, fuzzy
+msgid "_Find Now"
+msgstr "立即查找"
+
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# widgets/misc/e-filter-bar.h:95
+# widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-search-bar.c:513
+#, fuzzy
+msgid "_Clear"
+msgstr "清除"
+
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# widgets/misc/e-filter-bar.h:95
+# widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-search-bar.c:875
+msgid "Clear"
+msgstr "清除"
 
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "立即查找"
 
@@ -42784,6 +44714,1103 @@ msgstr "init_corba()： 无法初始化 GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo()： 无法初始化 Bonobo"
 
+# addressbook/backend/pas/pas-backend-ldap.c:483
+# addressbook/backend/pas/pas-backend-ldap.c:483
+# addressbook/backend/pas/pas-backend-ldap.c:486
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "正在连接 LDAP 服务器..."
+
+# addressbook/backend/pas/pas-backend-ldap.c:509
+# addressbook/backend/pas/pas-backend-ldap.c:509
+# addressbook/backend/pas/pas-backend-ldap.c:512
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "正在等待与 LDAP 服务器的连接..."
+
+# addressbook/gui/component/addressbook-component.c:526
+# addressbook/gui/component/addressbook-component.c:526
+# addressbook/gui/component/addressbook-component.c:527
+#~ msgid "New _Contact"
+#~ msgstr "新建联系人(_C)"
+
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:530
+#~ msgid "New Contact _List"
+#~ msgstr "新建联系人列表(_L)"
+
+# addressbook/gui/component/addressbook-config.c:186
+# addressbook/gui/component/addressbook-config.c:186
+# addressbook/gui/component/addressbook-config.c:223
+#~ msgid "Edit Addressbook"
+#~ msgstr "编辑地址簿"
+
+# camel/providers/smtp/camel-smtp-transport.c:222
+# camel/providers/smtp/camel-smtp-transport.c:222
+# addressbook/gui/component/addressbook-config.glade.h:3
+#~ msgid "A_uthenticate with server using:"
+#~ msgstr "以之与服务器进行认证(_U)："
+
+# addressbook/gui/component/addressbook-config.glade.h:2
+# addressbook/gui/component/addressbook-config.glade.h:2
+# addressbook/gui/component/addressbook-config.glade.h:4
+#~ msgid "Account Name"
+#~ msgstr "帐号名"
+
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/component/addressbook-config.glade.h:5
+#~ msgid "Add Addressbook"
+#~ msgstr "添加地址簿"
+
+# addressbook/gui/component/addressbook-config.glade.h:5
+# addressbook/gui/component/addressbook-config.glade.h:5
+# addressbook/gui/component/addressbook-config.glade.h:7
+#~ msgid "Advanced"
+#~ msgstr "高级"
+
+# addressbook/gui/component/addressbook-config.glade.h:6
+# addressbook/gui/component/addressbook-config.glade.h:6
+# addressbook/gui/component/addressbook-config.glade.h:8
+#~ msgid "Base"
+#~ msgstr "起点"
+
+# addressbook/gui/component/addressbook-config.glade.h:26
+# addressbook/gui/component/addressbook-config.glade.h:26
+# addressbook/gui/component/addressbook-config.glade.h:10
+#~ msgid "Check this if the server requires you to authenticate."
+#~ msgstr "如果服务器需要您进行认证就监查它。"
+
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:10
+# addressbook/gui/component/addressbook-config.glade.h:14
+#~ msgid ""
+#~ "Evolution will use this Distinquished Name (DN) to authenticate you with "
+#~ "the server"
+#~ msgstr "Evolution 将使用该识别姓名 (DN) 在服务器上对您进行认证"
+
+# addressbook/gui/component/addressbook-config.glade.h:14
+# addressbook/gui/component/addressbook-config.glade.h:14
+# addressbook/gui/component/addressbook-config.glade.h:19
+#~ msgid "Server Name"
+#~ msgstr "服务器名"
+
+# addressbook/gui/component/addressbook-config.glade.h:16
+# addressbook/gui/component/addressbook-config.glade.h:16
+# addressbook/gui/component/addressbook-config.glade.h:21
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "为添加地址簿，需要以下信息。  "
+
+# addressbook/gui/component/addressbook-config.glade.h:17
+# addressbook/gui/component/addressbook-config.glade.h:17
+# addressbook/gui/component/addressbook-config.glade.h:22
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "大部分 LDAP 服务器都不需要该信息。"
+
+# addressbook/gui/component/addressbook-config.glade.h:18
+# addressbook/gui/component/addressbook-config.glade.h:18
+# addressbook/gui/component/addressbook-config.glade.h:23
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "您的 LDAP 服务器用该信息来确定在搜索中使用那个节点。详情请咨询您的服务器管"
+#~ "理员。"
+
+# Addressbook/gui/component/addressbook-config.glade.h:19
+# addressbook/gui/component/addressbook-config.glade.h:19
+# addressbook/gui/component/addressbook-config.glade.h:24
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
+#~ msgstr ""
+#~ "这是您在 LDAP 服务器上进行的所有搜索的基本节点。详情请咨询您的服务器管理"
+#~ "员。"
+
+# addressbook/gui/component/addressbook-config.glade.h:20
+# addressbook/gui/component/addressbook-config.glade.h:20
+# addressbook/gui/component/addressbook-config.glade.h:27
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "这是您的地址簿所在的服务器的名称。"
+
+# addressbook/gui/component/addressbook-config.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:21
+# addressbook/gui/component/addressbook-config.glade.h:28
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "这是您的 LDAP 服务器所使用的端口。"
+
+# addressbook/gui/component/addressbook.c:804
+# addressbook/gui/component/addressbook.c:804
+# addressbook/gui/component/addressbook.c:837
+#~ msgid "Name contains"
+#~ msgstr "名称含有"
+
+# addressbook/gui/component/select-names/select-names.glade.h:1
+# addressbook/gui/component/select-names/select-names.glade.h:1
+# addressbook/gui/component/select-names/select-names.glade.h:1
+#~ msgid "C_ontaining:"
+#~ msgstr "含有(_O)："
+
+# addressbook/gui/component/select-names/select-names.glade.h:5
+# addressbook/gui/component/select-names/select-names.glade.h:5
+# addressbook/gui/component/select-names/select-names.glade.h:4
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "显示符合以下条件的联系人："
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolution 日历实施概要组件。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "日历概要组件车间。"
+
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+#~ msgid "Create a new appointment"
+#~ msgstr "创建新约会"
+
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:6
+#~ msgid "Create a new task"
+#~ msgstr "创建新任务"
+
+# calendar/gui/component-factory.c:649
+# calendar/gui/component-factory.c:649
+# calendar/gui/component-factory.c:649
+#~ msgid "New _Task"
+#~ msgstr "新建任务(_T)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "用默认提醒器创建新约会(_R)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#~ msgid "First day of wee_k:"
+#~ msgstr "每周的第一天(_K)："
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#~ msgid "Sta_rt of day:"
+#~ msgstr "每天的开始(_R)："
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#~ msgid "_End of day:"
+#~ msgstr "每天的结束(_E)："
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#~ msgid "_Other"
+#~ msgstr "其它(_O)"
+
+# calendar/gui/dialogs/meeting-page.glade.h:5
+# calendar/gui/dialogs/meeting-page.glade.h:5
+# calendar/gui/dialogs/meeting-page.glade.h:5
+#~ msgid "_Other Organizer"
+#~ msgstr "其他组织者(_O)"
+
+# calendar/gui/e-calendar-table.c:956
+# calendar/gui/e-calendar-table.c:956
+# calendar/gui/e-calendar-table.c:975
+#~ msgid "_Delete this Task"
+#~ msgstr "删除该任务(_D)"
+
+# calendar/gui/e-itip-control.c:1581
+# calendar/gui/e-itip-control.c:1581
+# calendar/gui/e-itip-control.c:1648
+#~ msgid "Unable to find any of your identities in the attendees list!\n"
+#~ msgstr "无法在参与者列表中找到您的任何身份！\n"
+
+# calendar/gui/itip-utils.c:370
+# calendar/gui/itip-utils.c:370
+# calendar/gui/itip-utils.c:370
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "忙闲信息 (%s 到 %s)"
+
+# calendar/gui/itip-utils.c:382
+# calendar/gui/itip-utils.c:382
+# calendar/gui/itip-utils.c:382
+#~ msgid "iCalendar information"
+#~ msgstr "iCalendar 信息"
+
+# camel/camel-cipher-context.c:211
+# camel/camel-cipher-context.c:209
+# camel/camel-cipher-context.c:209
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "该密码不支持清晰签名"
+
+# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
+# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
+# camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
+#~ msgid "Invalid type in body-contains, expecting string"
+#~ msgstr "邮件体内容中的无效类型，应该是字符串"
+
+# camel/camel-pgp-context.c:193
+# camel/camel-pgp-context.c:193
+# camel/camel-pgp-context.c:193
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "请为 %2$s 输入您的 %1$s 密码串"
+
+# camel/camel-pgp-context.c:196
+# camel/camel-pgp-context.c:196
+# camel/camel-pgp-context.c:196
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "请输入您的 %s 密码串"
+
+# camel/camel-pgp-context.c:575
+# camel/camel-pgp-context.c:575
+# camel/camel-pgp-context.c:575
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "无法签名该邮件：普通文本无法签名"
+
+# camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
+# camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
+# camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:762
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "无法签名该邮件：没有提供密码"
+
+# camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
+# camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
+# camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:768
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "无法签名该邮件：无法创建到 GPG/PGP 的管道： %s"
+
+# camel/camel-pgp-context.c:755
+# camel/camel-pgp-context.c:755
+# camel/camel-pgp-context.c:755
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "无法签名该邮件：普通文本无法清晰签名"
+
+# camel/camel-pgp-context.c:953
+# camel/camel-pgp-context.c:953
+# camel/camel-pgp-context.c:953
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "无法验证邮件：普通文本无法验证"
+
+# camel/camel-pgp-context.c:959
+# camel/camel-pgp-context.c:959
+# camel/camel-pgp-context.c:959
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "无法验证该邮件：无法创建到 GPG/PGP 的管道： %s"
+
+# camel/camel-pgp-context.c:1143
+# camel/camel-pgp-context.c:1143
+# camel/camel-pgp-context.c:1143
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "无法加密该邮件： 普通文本无法加密"
+
+# camel/camel-pgp-context.c:1153
+# camel/camel-pgp-context.c:1153
+# camel/camel-pgp-context.c:1153
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "无法加密该邮件： 没有提供密码"
+
+# camel/camel-pgp-context.c:1160
+# camel/camel-pgp-context.c:1160
+# camel/camel-pgp-context.c:1160
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "无法加密该邮件： 无法创建到 GPG/PGP 的管道： %s"
+
+# camel/camel-pgp-context.c:1337
+# camel/camel-pgp-context.c:1337
+# camel/camel-pgp-context.c:1337
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "无法解密该邮件： 没有解密的密码"
+
+# camel/camel-pgp-context.c:1345
+# camel/camel-pgp-context.c:1345
+# camel/camel-pgp-context.c:1345
+#~ msgid "Cannot decrypt this message: no password provided"
+#~ msgstr "无法解密该邮件： 没有提供密码"
+
+# camel/camel-pgp-context.c:1352
+# camel/camel-pgp-context.c:1352
+# camel/camel-pgp-context.c:1352
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "无法解密该邮件： 无法创建到 GPG/PGP 的管道： %s"
+
+# addressbook/gui/widgets/e-addressbook-util.c:76
+# addressbook/gui/widgets/e-addressbook-util.c:76
+# camel/camel-pkcs7-context.c:213
+#~ msgid "Error hashing password."
+#~ msgstr "杂凑口令出错。"
+
+# shell/evolution-shell-component.c:1013
+# shell/evolution-shell-component.c:1013
+# camel/camel-pkcs7-context.c:222
+#~ msgid "Invalid password."
+#~ msgstr "非法口令。"
+
+# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+# camel/camel-pkcs7-context.c:329
+#~ msgid "Could not sign: certificate not found for \"%s\"."
+#~ msgstr "无法签名：找不到“%s”的证书。"
+
+# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+# camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+# camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+# camel/camel-pkcs7-context.c:378
+#~ msgid "Could not clearsign: certificate not found for \"%s\"."
+#~ msgstr "无法清除签名：找不到“%s”的证书。"
+
+# camel/camel-pkcs7-context.c:567
+#~ msgid "Could not encrypt: failed to create enveloped data."
+#~ msgstr "无法加密：创建封装数据失败。"
+
+# mail/mail-crypto.c:113
+# mail/mail-crypto.c:113
+# camel/camel-pkcs7-context.c:590
+#~ msgid "Could not encrypt: failed to create encryption context."
+#~ msgstr "无法加密：创建加密上下文失败。"
+
+# camel/providers/pop3/camel-pop3-store.c:214
+# camel/providers/pop3/camel-pop3-store.c:214
+# camel/camel-pkcs7-context.c:620
+#~ msgid "Could not encrypt data: invalid user key: \"%s\"."
+#~ msgstr "无法加密数据：非法用户键：“%s”。"
+
+# mail/mail-account-gui.c:962
+# mail/mail-account-gui.c:962
+# camel/camel-pkcs7-context.c:626
+#~ msgid "Could not encrypt: encoding failed."
+#~ msgstr "无法加密：编码失败。"
+
+# camel/camel-remote-store.c:203
+# camel/camel-remote-store.c:203
+# camel/camel-remote-store.c:203
+#~ msgid "%s server %s"
+#~ msgstr "%s 服务器 %s"
+
+# camel/camel-remote-store.c:268
+# camel/camel-remote-store.c:268
+# camel/camel-remote-store.c:268
+#~ msgid "(unknown host)"
+#~ msgstr "(未知的主机)"
+
+# camel/camel-vee-folder.c:749
+# camel/camel-vee-folder.c:749
+# camel/camel-vee-folder.c:749
+#~ msgid "No such message: %s"
+#~ msgstr "没有邮件： %s"
+
+# camel/camel-vtrash-folder.c:117
+# camel/camel-vtrash-folder.c:117
+# camel/camel-vtrash-folder.c:117
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "您无法从该废件文件夹复制邮件。"
+
+# camel/providers/local/camel-spool-folder.c:512
+# camel/providers/local/camel-spool-folder.c:512
+# camel/providers/local/camel-spool-folder.c:512
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "无法将邮件附加到脱机文件： %s： %s"
+
+# camel/providers/local/camel-spool-summary.c:940
+# camel/providers/local/camel-spool-summary.c:940
+# camel/providers/local/camel-spool-summary.c:940
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "无法存档： %s： %s"
+
+# camel/providers/nntp/camel-nntp-auth.c:44
+# camel/providers/nntp/camel-nntp-auth.c:44
+# camel/providers/nntp/camel-nntp-auth.c:44
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "请为 %s@%s 输入 NNTP 密码"
+
+# camel/providers/nntp/camel-nntp-auth.c:64
+# camel/providers/nntp/camel-nntp-auth.c:64
+# camel/providers/nntp/camel-nntp-auth.c:64
+#~ msgid "Server rejected username"
+#~ msgstr "服务器拒绝的用户名"
+
+# camel/providers/nntp/camel-nntp-auth.c:70
+# camel/providers/nntp/camel-nntp-auth.c:70
+# camel/providers/nntp/camel-nntp-auth.c:70
+#~ msgid "Failed to send username to server"
+#~ msgstr "将用户名发送到服务器失败"
+
+# camel/providers/nntp/camel-nntp-auth.c:79
+# camel/providers/nntp/camel-nntp-auth.c:79
+# camel/providers/nntp/camel-nntp-auth.c:79
+#~ msgid "Server rejected username/password"
+#~ msgstr "服务器拒绝的 用户名/密码"
+
+# camel/providers/nntp/camel-nntp-folder.c:112
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "内部错误：非法格式的 uid：%s"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:45
+# camel/providers/nntp/camel-nntp-grouplist.c:45
+# camel/providers/nntp/camel-nntp-grouplist.c:45
+#~ msgid "Could not get group list from server."
+#~ msgstr "无法从服务器获取组列表。"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:98
+# camel/providers/nntp/camel-nntp-grouplist.c:107
+# camel/providers/nntp/camel-nntp-grouplist.c:98
+# camel/providers/nntp/camel-nntp-grouplist.c:107
+# camel/providers/nntp/camel-nntp-grouplist.c:98
+# camel/providers/nntp/camel-nntp-grouplist.c:107
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "无法为 %s 装入组列表文件： %s"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:158
+# camel/providers/nntp/camel-nntp-grouplist.c:158
+# camel/providers/nntp/camel-nntp-grouplist.c:158
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "无法为 %s 保存组列表文件： %s"
+
+# camel/providers/sendmail/camel-sendmail-transport.c:193
+# camel/providers/sendmail/camel-sendmail-transport.c:193
+# camel/providers/sendmail/camel-sendmail-transport.c:194
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "无法在邮件中找到“收件人”地址"
+
+# camel/providers/smtp/camel-smtp-transport.c:581
+# camel/providers/smtp/camel-smtp-transport.c:581
+# camel/providers/smtp/camel-smtp-transport.c:591
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "无法发送邮件： 发件人地址无定义。"
+
+# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+# executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+# my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "进行概括的 Evolution 组件。"
+
+# my-evolution/component-factory.c:153
+# my-evolution/component-factory.c:153
+# executive-summary/component/component-factory.c:151
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "无法初始化 Evolution 的实施概要组件。"
+
+# shell/e-shell-importer.c:617
+# shell/e-shell-importer.c:617
+# executive-summary/component/e-summary-callbacks.c:125
+#~ msgid "Select a service"
+#~ msgstr "选择一个服务"
+
+# executive-summary/component/e-summary-callbacks.c:289
+#~ 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 ""
+#~ "您可以为实施概要背景选择一个不同的 HTML 页面。\n"
+#~ "\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
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "以默认 GNOME 应用程序打开 %s"
+
+# executive-summary/component/e-summary-url.c:70
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "以默认 GNOME 网络浏览器打开 %s"
+
+# calendar/gui/dialogs/alarm-page.c:381
+# calendar/gui/dialogs/alarm-page.c:381
+# executive-summary/component/e-summary-url.c:71
+#~ msgid "Send an email to %s"
+#~ msgstr "给 %s 发送一封电子邮件"
+
+# calendar/gui/print.c:2306
+# calendar/gui/print.c:2306
+# executive-summary/component/e-summary-url.c:73
+#~ msgid "Run %s"
+#~ msgstr "运行 %s"
+
+# ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+# ui/evolution-contact-list-editor.xml.h:1
+# ui/evolution-mail-messagedisplay.xml.h:1
+# ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+# ui/evolution.xml.h:4
+# ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+# ui/evolution-contact-list-editor.xml.h:1
+# ui/evolution-mail-messagedisplay.xml.h:1
+# ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+# ui/evolution.xml.h:4
+# executive-summary/component/e-summary-url.c:75
+#~ msgid "Close %s"
+#~ msgstr "关闭 %s"
+
+# ui/evolution.xml.h:17
+# ui/evolution.xml.h:17
+# executive-summary/component/e-summary-url.c:76
+#~ msgid "Move %s to the left"
+#~ msgstr "将 %s 移动到左边"
+
+# executive-summary/component/e-summary-url.c:77
+#~ msgid "Move %s to the right"
+#~ msgstr "将 %s 移动到右边"
+
+# executive-summary/component/e-summary-url.c:78
+#~ msgid "Move %s into the previous row"
+#~ msgstr "将 %s 移动岛上一行"
+
+# executive-summary/component/e-summary-url.c:79
+#~ msgid "Move %s into the next row"
+#~ msgstr "将 %s 移动到下一行"
+
+# addressbook/printing/e-contact-print.glade.h:25
+# addressbook/printing/e-contact-print.glade.h:25
+# executive-summary/component/e-summary-url.c:553
+#~ msgid "page"
+#~ msgstr "页面"
+
+# shell/e-shell-folder-commands.c:488
+# shell/e-shell-folder-commands.c:488
+# executive-summary/component/e-summary.c:925
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法打开 HTML 文件：\n"
+#~ "%s"
+
+# shell/e-shell-importer.c:474
+# shell/e-shell-importer.c:474
+# executive-summary/component/e-summary.c:939
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "读入数据错误：\n"
+#~ "%s"
+
+# executive-summary/component/e-summary.c:957
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "文件中没有服务空间。\n"
+
+# executive-summary/component/main.c:61
+#~ 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 ""
+#~ "实施概要组件无法初始化 Bonobo。\n"
+#~ "如果出现关于 RootPOA 的警告信息，可能表明\n"
+#~ "您是与 GOAD 而不是 OAF 一起编译的 Bonobo。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "RDF 概要车间。"
+
+# calendar/gui/e-calendar-table.etspec.h:16
+# my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+# shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
+# calendar/gui/e-calendar-table.etspec.h:16
+# my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
+# shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
+# executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+#~ msgid "RDF Summary"
+#~ msgstr "RDF 概要"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "测试 bonobo 组件车间。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# mail/GNOME_Evolution_Mail.oaf.in.h:7
+# 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 "测试 bonobo 服务"
+
+# widgets/misc/e-charset-picker.c:58
+# widgets/misc/e-charset-picker.c:58
+# executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
+#~ msgid "Test service"
+#~ msgstr "测试服务"
+
+# executive-summary/test-service/rdf-summary.c:775
+#~ msgid "Update automatically"
+#~ msgstr "自动更新"
+
+# calendar/gui/e-itip-control.c:787
+# calendar/gui/e-itip-control.c:787
+# executive-summary/test-service/rdf-summary.c:785
+#~ msgid "Update now"
+#~ msgstr "现在更新"
+
+# calendar/gui/e-meeting-time-sel.c:515
+# calendar/gui/e-meeting-time-sel.c:518
+# executive-summary/test-service/rdf-summary.c:795
+#~ msgid "Update every "
+#~ msgstr "更新间隔 "
+
+#~ msgid "Enter folder URI"
+#~ msgstr "输入文件夹 URI"
+
+# calendar/gui/e-itip-control.c:986
+# calendar/gui/e-itip-control.c:986
+# mail/message-list.etspec.h:4
+#~ msgid "Needs Reply"
+#~ msgstr "需要回复"
+
+# mail/component-factory.c:101
+# mail/component-factory.c:101
+# mail/component-factory.c:101
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "邮件存储文件夹 (内部)"
+
+# mail/component-factory.c:129
+# mail/component-factory.c:129
+# mail/component-factory.c:129
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "无法连接到存储： %s"
+
+# mail/component-factory.c:951
+# mail/component-factory.c:951
+# mail/component-factory.c:955
+#~ msgid "New _Mail Message"
+#~ msgstr "新建邮件(_M)"
+
+# mail/folder-browser.c:1049
+# mail/folder-browser.c:1054
+# mail/folder-browser.c:1055
+#~ msgid "Create vFolder from Search"
+#~ msgstr "根据搜索创建虚拟文件夹"
+
+# mail/folder-browser.c:1462
+# mail/folder-browser.c:1469
+# mail/folder-browser.c:1470
+#~ msgid "Mark as Unim_portant"
+#~ msgstr "标记为不重要(_P)"
+
+# calendar/gui/e-itip-control.c:896
+# calendar/gui/e-itip-control.c:896
+# mail/folder-browser.c:1471
+#~ msgid "Mark as Needing Reply"
+#~ msgstr "标记为需要回复"
+
+# calendar/gui/e-itip-control.c:896
+# calendar/gui/e-itip-control.c:896
+# mail/folder-browser.c:1472
+#~ msgid "Mark as Not Needing Reply"
+#~ msgstr "标记为不需要回复"
+
+# mail/folder-browser.c:1628
+# mail/folder-browser.c:1656
+# mail/folder-browser.c:1657
+#~ msgid "Filter on Mailing List"
+#~ msgstr "过滤邮件列表"
+
+# mail/local-config.glade.h:3
+# mail/local-config.glade.h:3
+# mail/local-config.glade.h:3
+#~ msgid "Indexing:"
+#~ msgstr "正在建立索引："
+
+# mail/local-config.glade.h:4
+# mail/local-config.glade.h:4
+# mail/local-config.glade.h:4
+#~ msgid "Mailbox Format"
+#~ msgstr "邮件箱格式"
+
+# mail/mail-config.c:1860
+# mail/mail-config.c:1902
+# mail/mail-config.c:1995
+#~ msgid ""
+#~ "Could not get inbox for new mail store:\n"
+#~ "%s\n"
+#~ "No shortcut will be created."
+#~ msgstr ""
+#~ "无法为新邮件存储创建收件箱：\n"
+#~ "%s\n"
+#~ "没有创建快捷方式。"
+
+# mail/mail-config.c:1871
+# mail/mail-config.c:1913
+# mail/mail-config.c:2006
+#~ msgid "%s: Inbox"
+#~ msgstr "%s：收件箱"
+
+# mail/mail-config.glade.h:5
+# mail/mail-config.glade.h:5
+# mail/mail-config.glade.h:5
+#~ msgid "Account"
+#~ msgstr "帐号"
+
+# mail/mail-config.glade.h:9
+# mail/mail-config.glade.h:9
+# mail/mail-config.glade.h:9
+#~ msgid "Always _encrypt to myself when sending encrypted mail"
+#~ msgstr "当发送加密邮件时总是加密到自身(_E)"
+
+# mail/mail-config.glade.h:14
+# mail/mail-config.glade.h:14
+# mail/mail-config.glade.h:17
+#~ msgid "Composer"
+#~ msgstr "撰写器"
+
+# mail/mail-config.glade.h:24
+# mail/mail-config.glade.h:24
+# mail/mail-config.glade.h:28
+#~ msgid "Default Forward style is: "
+#~ msgstr "默认转发风格为： "
+
+# mail/mail-config.glade.h:28
+# mail/mail-config.glade.h:28
+# mail/mail-config.glade.h:33
+#~ msgid "Display"
+#~ msgstr "显示"
+
+# mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:103
+# mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+# widgets/misc/e-filter-bar.h:103
+# mail/mail-config.glade.h:38 widgets/misc/e-filter-bar.h:96
+# widgets/misc/e-filter-bar.h:103
+#~ msgid "Edit..."
+#~ msgstr "编辑..."
+
+# mail/mail-config.glade.h:46
+# mail/mail-config.glade.h:46
+# mail/mail-config.glade.h:54
+#~ msgid "News"
+#~ msgstr "新闻"
+
+# mail/mail-config.glade.h:68
+# mail/mail-config.glade.h:68
+# mail/mail-config.glade.h:77
+#~ msgid "Select Filter Log file..."
+#~ msgstr "选择过滤日志文件..."
+
+# mail/mail-config.glade.h:82
+# mail/mail-config.glade.h:82
+# mail/mail-config.glade.h:91
+#~ msgid "Sources"
+#~ msgstr "来源"
+
+# mail/mail-config.glade.h:102
+# mail/mail-config.glade.h:102
+# mail/mail-config.glade.h:111
+#~ msgid "_HTML signature:"
+#~ msgstr "HTML 签名(_H)："
+
+# mail/mail-config.glade.h:106
+# mail/mail-config.glade.h:106
+# mail/mail-config.glade.h:115
+#~ msgid "_Log filter actions to:"
+#~ msgstr "将过滤动作记录到(_L)："
+
+# mail/mail-config.glade.h:110
+# mail/mail-config.glade.h:110
+# mail/mail-config.glade.h:119
+#~ msgid "_Organization:"
+#~ msgstr "组织(_O)："
+
+# mail/mail-config.glade.h:113
+# mail/mail-config.glade.h:113
+# mail/mail-config.glade.h:122
+#~ msgid "_Remember this password"
+#~ msgstr "记住该密码(_R)"
+
+# mail/mail-config.glade.h:114
+# mail/mail-config.glade.h:114
+# mail/mail-config.glade.h:123
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "默认按 HTML 格式发送邮件。(_S)"
+
+# mail/mail-config.glade.h:115
+# mail/mail-config.glade.h:115
+# mail/mail-config.glade.h:124
+#~ msgid "_Server type: "
+#~ msgstr "服务器类型(_S)："
+
+# mail/mail-config.glade.h:122
+# mail/mail-config.glade.h:122
+# mail/mail-config.glade.h:131
+#~ msgid "placeholder"
+#~ msgstr "位置记录器"
+
+# mail/mail-config.glade.h:123
+# mail/mail-config.glade.h:123
+# mail/mail-config.glade.h:132
+#~ msgid "seconds."
+#~ msgstr "秒。"
+
+# mail/mail-crypto.c:113
+# mail/mail-crypto.c:113
+# mail/mail-crypto.c:113
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "无法创建 PGP 加密上下文。"
+
+# mail/mail-crypto.c:138
+# mail/mail-crypto.c:138
+# mail/mail-crypto.c:138
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "无法创建 PGP 解密上下文。"
+
+# mail/mail-format.c:1836
+# mail/mail-format.c:1772
+# mail/mail-format.c:1791
+#~ msgid "Evolution does not recognize this type of signed message."
+#~ msgstr "Evolution 无法识别该类型的带签名邮件。"
+
+# mail/mail-ops.c:895
+# mail/mail-ops.c:897
+# mail/mail-ops.c:940
+#~ msgid "Moving"
+#~ msgstr "正在移动"
+
+# mail/mail-ops.c:898
+# mail/mail-ops.c:900
+# mail/mail-ops.c:943
+#~ msgid "Copying"
+#~ msgstr "正在复制"
+
+# mail/mail-summary.c:109
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "不完整的消息被写入管道！"
+
+# my-evolution/e-summary-mail.c:129
+# my-evolution/e-summary-mail.c:129
+# mail/mail-summary.c:467
+#~ msgid "Mail Summary"
+#~ msgstr "邮件概要"
+
+# addressbook/printing/e-contact-print.glade.h:33
+# addressbook/printing/e-contact-print.glade.h:33
+# my-evolution/Locations.h:1881
+#~ msgid "Riga"
+#~ msgstr "里加"
+
+# my-evolution/component-factory.c:153
+# my-evolution/component-factory.c:153
+# my-evolution/component-factory.c:153
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "无法初始化 Evolution 的概要成员。"
+
+# my-evolution/e-summary-weather.c:722
+# my-evolution/e-summary-weather.c:722
+# my-evolution/e-summary-weather.c:667
+#~ msgid "Regions"
+#~ msgstr "区域"
+
+# my-evolution/my-evolution.glade.h:3
+# my-evolution/my-evolution.glade.h:3
+# my-evolution/my-evolution.glade.h:3
+#~ msgid "Al_l stations:"
+#~ msgstr "所有站点(_L)："
+
+# my-evolution/my-evolution.glade.h:4
+# my-evolution/my-evolution.glade.h:4
+# my-evolution/my-evolution.glade.h:4
+#~ msgid "All _folders:"
+#~ msgstr "所有文件夹(_F)"
+
+# my-evolution/my-evolution.glade.h:22
+# my-evolution/my-evolution.glade.h:22
+# my-evolution/my-evolution.glade.h:22
+#~ msgid "_Display folders:"
+#~ msgstr "显示文件夹(_D)："
+
+# my-evolution/my-evolution.glade.h:23
+# my-evolution/my-evolution.glade.h:23
+# my-evolution/my-evolution.glade.h:23
+#~ msgid "_Display stations:"
+#~ msgstr "显示站点(_D)："
+
+# my-evolution/my-evolution.glade.h:24
+# my-evolution/my-evolution.glade.h:24
+# my-evolution/my-evolution.glade.h:24
+#~ msgid "_Displayed feeds:"
+#~ msgstr "已显示的来源："
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+# notes/GNOME_Evolution_Notes.oaf.in.h:3
+#~ msgid "Factory for the Evolution notes component."
+#~ msgstr "Evolution 便签组件车间。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+# notes/GNOME_Evolution_Notes.oaf.in.h:4
+#~ msgid "Factory for the Notes control"
+#~ msgstr "便签控制车间"
+
+# shell/e-shell-about-box.c:41
+# shell/e-shell-about-box.c:41
+# shell/e-shell-about-box.c:41
+#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+#~ msgstr "版权所有 1999，2000，2001 Ximian 公司。"
+
+# shell/e-shell-folder-commands.c:411
+# shell/e-shell-folder-commands.c:411
+# shell/e-shell-folder-commands.c:411
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "您确认您要删除文件夹“%s”？"
+
+# shell/e-storage.c:181 shell/e-storage.c:187
+# shell/e-storage.c:181 shell/e-storage.c:187
+# shell/e-storage.c:181 shell/e-storage.c:187
+#~ msgid "(No name)"
+#~ msgstr "(未命名)"
+
+# ui/evolution-addressbook.xml.h:12
+# ui/evolution-addressbook.xml.h:12
+# ui/evolution-addressbook.xml.h:12
+#~ msgid "New List"
+#~ msgstr "新列表"
+
+# ui/evolution-calendar.xml.h:2
+# ui/evolution-calendar.xml.h:2
+# ui/evolution-calendar.xml.h:2
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "配置日历的设置"
+
+# ui/evolution-calendar.xml.h:4
+# ui/evolution-calendar.xml.h:4
+# ui/evolution-calendar.xml.h:4
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "创建一个新的全天事件(_E)"
+
+# ui/evolution-calendar.xml.h:5
+# ui/evolution-calendar.xml.h:5
+# ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
+#~ msgid "Create a New _Task"
+#~ msgstr "创建新任务(_T)"
+
+# ui/evolution-calendar.xml.h:6
+# ui/evolution-calendar.xml.h:6
+# ui/evolution-calendar.xml.h:6
+#~ msgid "Create a _New Appointment"
+#~ msgstr "创建新约会(_N)"
+
+# ui/evolution-calendar.xml.h:9
+# ui/evolution-calendar.xml.h:9
+# ui/evolution-calendar.xml.h:9
+#~ msgid "Create an event for the whole day"
+#~ msgstr "为一整天创建一个事件"
+
+# ui/evolution-calendar.xml.h:35
+# ui/evolution-calendar.xml.h:35
+# ui/evolution-calendar.xml.h:35
+#~ msgid "_Appointment..."
+#~ msgstr "约会(_A)..."
+
+# ui/evolution-calendar.xml.h:36
+# ui/evolution-calendar.xml.h:36
+# ui/evolution-calendar.xml.h:36
+#~ msgid "_Calendar Settings..."
+#~ msgstr "日历设置(_C)..."
+
+# ui/evolution-calendar.xml.h:43
+# ui/evolution-calendar.xml.h:43
+# ui/evolution-calendar.xml.h:43
+#~ msgid "_Task..."
+#~ msgstr "任务(_T)..."
+
+# ui/evolution-mail-global.xml.h:4
+# ui/evolution-mail-global.xml.h:4
+# ui/evolution-mail-global.xml.h:4
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "创建或编辑邮件帐号和其它属性"
+
+# ui/evolution-mail-global.xml.h:10
+# ui/evolution-mail-global.xml.h:10
+# ui/evolution-mail-global.xml.h:10
+#~ msgid "New Message"
+#~ msgstr "新建邮件"
+
+# ui/evolution-mail-global.xml.h:21
+# ui/evolution-mail-global.xml.h:21
+# ui/evolution-mail-global.xml.h:21
+#~ msgid "_Mail Settings..."
+#~ msgstr "邮件设置(_M)..."
+
+# ui/evolution-mail-message.xml.h:33
+# ui/evolution-mail-message.xml.h:33
+# ui/evolution-mail-message.xml.h:33
+#~ msgid "Forward _Attached"
+#~ msgstr "附件方式(_A)"
+
+# ui/evolution-mail-message.xml.h:34
+# ui/evolution-mail-message.xml.h:34
+# ui/evolution-mail-message.xml.h:34
+#~ msgid "Forward _Inline"
+#~ msgstr "内文方式(_I)"
+
+# ui/evolution-mail-message.xml.h:35
+# ui/evolution-mail-message.xml.h:35
+# ui/evolution-mail-message.xml.h:35
+#~ msgid "Forward _Quoted"
+#~ msgstr "引用方式(_Q)"
+
+# ui/evolution-mail-message.xml.h:92
+# ui/evolution-mail-message.xml.h:92
+# ui/evolution-mail-message.xml.h:94
+#~ msgid "_Apply Filters"
+#~ msgstr "应用过滤规则(_A)"
+
+# ui/evolution-tasks.xml.h:2
+# ui/evolution-tasks.xml.h:2
+# ui/evolution-tasks.xml.h:2
+#~ msgid "Configure the task view's settings"
+#~ msgstr "配置任务试图的设置"
+
+# ui/evolution-tasks.xml.h:13
+# ui/evolution-tasks.xml.h:13
+# ui/evolution-tasks.xml.h:15
+#~ msgid "Tasks Settings..."
+#~ msgstr "任务设置..."
+
+# ui/my-evolution.xml.h:1
+# ui/my-evolution.xml.h:1
+# ui/my-evolution.xml.h:1
+#~ msgid "Change the settings for the summary"
+#~ msgstr "改变关于概要的设置"
+
+# ui/my-evolution.xml.h:8
+# ui/my-evolution.xml.h:8
+# ui/my-evolution.xml.h:8
+#~ msgid "_Summary Settings..."
+#~ msgstr "概要设置(_S)..."
+
+# widgets/misc/e-filter-bar.h:102
+# widgets/misc/e-filter-bar.h:102
+# widgets/misc/e-filter-bar.h:102
+#~ msgid "Show All"
+#~ msgstr "全部显示"
+
+# widgets/misc/e-search-bar.c:334
+# widgets/misc/e-search-bar.c:334
+# widgets/misc/e-search-bar.c:334
+#~ msgid "Sear_ch"
+#~ msgstr "搜索(_C)"
+
 # addressbook/backend/ebook/e-card.c:3712
 # addressbook/backend/ebook/e-card.c:3712
 # addressbook/backend/ebook/e-card.c:3712
@@ -43170,16 +46197,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "无法连接到服务器： %s"
 
-# camel/providers/pop3/camel-pop3-store.c:377
-# camel/providers/pop3/camel-pop3-store.c:377
-# camel/providers/pop3/camel-pop3-store.c:377
-#~ msgid ""
-#~ "Unable to connect to POP server.\n"
-#~ "Error sending username: %s"
-#~ msgstr ""
-#~ "无法连接到 POP 服务器。\n"
-#~ "发送用户名错误： %s"
-
 # camel/providers/pop3/camel-pop3-store.c:380
 # camel/providers/pop3/camel-pop3-store.c:417
 # camel/providers/pop3/camel-pop3-store.c:380
@@ -43189,18 +46206,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "(Unknown)"
 #~ msgstr "(未知)"
 
-# camel/providers/pop3/camel-pop3-store.c:563
-# camel/providers/pop3/camel-pop3-store.c:563
-# camel/providers/pop3/camel-pop3-store.c:563
-#~ msgid "Unexpected response from POP server: %s"
-#~ msgstr "来自 POP 服务器的意外应答： %s"
-
-# mail/mail-config.glade.h:99
-# mail/mail-config.glade.h:99
-# mail/mail-config.glade.h:108
-#~ msgid "_Email Address:"
-#~ msgstr "电子邮件地址(_E)："
-
 # addressbook/gui/component/select-names/select-names.glade.h:2
 # addressbook/gui/component/select-names/select-names.glade.h:2
 #~ msgid "Co_ntacts:"
@@ -43308,11 +46313,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "该消息含有无效的收件人："
 
-# mail/mail-config.glade.h:83
-# mail/mail-config.glade.h:83
-#~ msgid "Special Folders"
-#~ msgstr "特殊文件夹"
-
 # my-evolution/e-summary-weather.c:348
 # my-evolution/e-summary-weather.c:348
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 56c02c9629..db0689ca73 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.16.99\n"
-"POT-Creation-Date: 2001-11-06 16:44-0500\n"
+"POT-Creation-Date: 2002-06-27 14:13-0400\n"
 "PO-Revision-Date: 2001-09-10 09:55+0800\n"
 "Last-Translator: Joe Man <trmetal@yahoo.com.hk>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
@@ -38,24 +38,25 @@ msgstr "匯入 VCard 檔案到 Evolution。"
 
 # addressbook/gui/widgets/e-addressbook-view.c:699
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:849
+#: addressbook/gui/widgets/e-addressbook-view.c:335
 msgid "File As"
 msgstr "歸檔為"
 
 # addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "名稱"
 
 # addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/gui/widgets/e-addressbook-view.c:337
 msgid "Email"
 msgstr "電子郵件"
 
 # addressbook/contact-editor/e-contact-editor.c:1257
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1651
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Primary"
 msgstr "首要的"
 
@@ -68,8 +69,8 @@ msgstr "首要的"
 # addressbook/gui/widgets/e-addressbook-view.c:733
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/contact-editor/e-contact-editor.c:1729
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Assistant"
 msgstr "助理"
 
@@ -77,8 +78,9 @@ msgstr "助理"
 # addressbook/contact-editor/e-contact-editor.c:1310
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1637
-#: addressbook/gui/contact-editor/e-contact-editor.c:1704
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor.c:1730
+#: addressbook/gui/contact-editor/e-contact-editor.c:1797
 msgid "Business"
 msgstr "商務電話"
 
@@ -90,13 +92,13 @@ msgstr "商務電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1246
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1640
+#: addressbook/gui/contact-editor/e-contact-editor.c:1733
 msgid "Callback"
 msgstr "回撥電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1642
+#: addressbook/gui/contact-editor/e-contact-editor.c:1735
 msgid "Company"
 msgstr "公司電話"
 
@@ -111,14 +113,15 @@ msgstr "公司電話"
 # addressbook/contact-editor/e-contact-editor.c:1311
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1643
-#: addressbook/gui/contact-editor/e-contact-editor.c:1705
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/contact-editor/e-contact-editor.c:1798
 msgid "Home"
 msgstr "住家電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:858
+#: addressbook/gui/widgets/e-addressbook-view.c:344
 msgid "Organization"
 msgstr "團體"
 
@@ -129,21 +132,23 @@ msgstr "團體"
 
 # addressbook/contact-editor/e-contact-editor.c:1253
 #: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1647
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Mobile"
 msgstr "行動電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1641
+#: addressbook/gui/contact-editor/e-contact-editor.c:1734
 msgid "Car"
 msgstr "汽車電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1245
 # addressbook/gui/widgets/e-addressbook-view.c:713
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1639
-#: addressbook/gui/widgets/e-addressbook-view.c:863
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1732
+#: addressbook/gui/widgets/e-addressbook-view.c:349
 msgid "Business Fax"
 msgstr "商務傅真"
 
@@ -156,14 +161,14 @@ msgstr "商務傅真"
 # addressbook/contact-editor/e-contact-editor.c:1251
 # addressbook/gui/widgets/e-addressbook-view.c:714
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1645
-#: addressbook/gui/widgets/e-addressbook-view.c:864
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
+#: addressbook/gui/widgets/e-addressbook-view.c:350
 msgid "Home Fax"
 msgstr "住家傳真"
 
 # addressbook/contact-editor/e-contact-editor.c:1244
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1638
+#: addressbook/gui/contact-editor/e-contact-editor.c:1731
 msgid "Business 2"
 msgstr "商務電話 2"
 
@@ -174,15 +179,15 @@ msgstr "商務電話 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1250
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1644
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Home 2"
 msgstr "住家電話 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1252
 # addressbook/gui/widgets/e-addressbook-view.c:717
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1646
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/widgets/e-addressbook-view.c:353
 msgid "ISDN"
 msgstr "ISDN"
 
@@ -190,47 +195,46 @@ msgstr "ISDN"
 # addressbook/contact-editor/e-contact-editor.c:1312
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1648
-#: addressbook/gui/contact-editor/e-contact-editor.c:1706
-#: mail/mail-config.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/gui/contact-editor/e-contact-editor.c:1799
 msgid "Other"
 msgstr "其它電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1649
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
+#: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "Other Fax"
 msgstr "其它傳真"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1650
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "Pager"
 msgstr "呼叫器"
 
 # addressbook/contact-editor/e-contact-editor.c:1258
 # addressbook/gui/widgets/e-addressbook-view.c:721
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1652
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Radio"
 msgstr "無線電電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1259
 # addressbook/gui/widgets/e-addressbook-view.c:722
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1653
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Telex"
 msgstr "電報"
 
 # addressbook/gui/widgets/e-addressbook-view.c:723
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:359
 msgid "TTY"
 msgstr "TTY"
 
@@ -238,8 +242,8 @@ msgstr "TTY"
 # addressbook/gui/widgets/e-addressbook-view.c:725
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1679
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
+#: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Email 2"
 msgstr "電子郵件 2"
 
@@ -247,14 +251,14 @@ msgstr "電子郵件 2"
 # addressbook/gui/widgets/e-addressbook-view.c:726
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1680
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Email 3"
 msgstr "電子郵件 3"
 
 # addressbook/gui/widgets/e-addressbook-view.c:727
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Web Site"
 msgstr "網址"
 
@@ -264,7 +268,7 @@ msgstr "Url"
 
 # addressbook/gui/widgets/e-addressbook-view.c:728
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:364
 msgid "Department"
 msgstr "部門"
 
@@ -274,7 +278,7 @@ msgstr "部門"
 
 # addressbook/gui/widgets/e-addressbook-view.c:729
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:365
 msgid "Office"
 msgstr "辦公室"
 
@@ -285,13 +289,13 @@ msgstr "辦公室"
 
 # addressbook/gui/widgets/e-addressbook-view.c:730
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:366
 msgid "Title"
 msgstr "頭銜"
 
 # addressbook/gui/widgets/e-addressbook-view.c:731
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:367
 msgid "Profession"
 msgstr "專業"
 
@@ -301,7 +305,7 @@ msgstr "專業"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:368
 msgid "Manager"
 msgstr "主管"
 
@@ -316,7 +320,7 @@ msgstr "助理"
 
 # addressbook/gui/widgets/e-addressbook-view.c:734
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:370
 msgid "Nickname"
 msgstr "暱稱"
 
@@ -327,13 +331,13 @@ msgstr "暱稱"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:371
 msgid "Spouse"
 msgstr "配偶"
 
 # addressbook/gui/widgets/e-addressbook-view.c:736
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:372
 msgid "Note"
 msgstr "備註"
 
@@ -350,7 +354,7 @@ msgstr ""
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:373
 msgid "Free-busy URL"
 msgstr "空閒-忙碌 URL"
 
@@ -385,339 +389,18 @@ msgid "Family Name"
 msgstr "姓"
 
 # addressbook/gui/widgets/alphabet.glade.h:25
-#: addressbook/backend/ebook/e-card-simple.c:788
+#: addressbook/backend/ebook/e-card-simple.c:792
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-# addressbook/backend/ebook/e-card.c:3314
-#: addressbook/backend/ebook/e-card.c:3712
-msgid "Card: "
-msgstr "名片："
-
-# addressbook/backend/ebook/e-card.c:3316
-#: addressbook/backend/ebook/e-card.c:3714
-msgid ""
-"\n"
-"Name: "
-msgstr ""
-"\n"
-"名字："
-
-# addressbook/backend/ebook/e-card.c:3317
-#: addressbook/backend/ebook/e-card.c:3715
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr ""
-"\n"
-"  前置：     "
-
-# addressbook/backend/ebook/e-card.c:3318
-#: addressbook/backend/ebook/e-card.c:3716
-msgid ""
-"\n"
-"  Given:      "
-msgstr ""
-"\n"
-"  姓：       "
-
-# addressbook/backend/ebook/e-card.c:3319
-#: addressbook/backend/ebook/e-card.c:3717
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
-"\n"
-"  額外的： "
-
-# addressbook/backend/ebook/e-card.c:3320
-#: addressbook/backend/ebook/e-card.c:3718
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
-"\n"
-"  姓氏：     "
-
-# addressbook/backend/ebook/e-card.c:3321
-#: addressbook/backend/ebook/e-card.c:3719
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr ""
-"\n"
-"  後置：     "
-
-# addressbook/backend/ebook/e-card.c:3335
-#: addressbook/backend/ebook/e-card.c:3733
-msgid ""
-"\n"
-"Birth Date: "
-msgstr ""
-"\n"
-"出生日期："
-
-# addressbook/backend/ebook/e-card.c:3346
-#: addressbook/backend/ebook/e-card.c:3744
-msgid ""
-"\n"
-"Address:"
-msgstr ""
-"\n"
-"地址："
-
-# addressbook/backend/ebook/e-card.c:3348
-#: addressbook/backend/ebook/e-card.c:3746
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr ""
-"\n"
-"  信箱：  "
-
-# addressbook/backend/ebook/e-card.c:3349
-#: addressbook/backend/ebook/e-card.c:3747
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
-"\n"
-"  內線：         "
-
-# addressbook/backend/ebook/e-card.c:3350
-#: addressbook/backend/ebook/e-card.c:3748
-msgid ""
-"\n"
-"  Street:      "
-msgstr ""
-"\n"
-"  街：      "
-
-# addressbook/backend/ebook/e-card.c:3351
-#: addressbook/backend/ebook/e-card.c:3749
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
-"\n"
-"  縣/市：        "
-
-# addressbook/backend/ebook/e-card.c:3352
-#: addressbook/backend/ebook/e-card.c:3750
-msgid ""
-"\n"
-"  Region:      "
-msgstr ""
-"\n"
-"  地區：      "
-
-# addressbook/backend/ebook/e-card.c:3353
-#: addressbook/backend/ebook/e-card.c:3751
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr ""
-"\n"
-"  郵遞區號： "
-
-# addressbook/backend/ebook/e-card.c:3354
-#: addressbook/backend/ebook/e-card.c:3752
-msgid ""
-"\n"
-"  Country:     "
-msgstr ""
-"\n"
-"  國家：     "
-
-# addressbook/backend/ebook/e-card.c:3367
-#: addressbook/backend/ebook/e-card.c:3765
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
-"\n"
-"送遞標籤： "
-
-# addressbook/backend/ebook/e-card.c:3379
-#: addressbook/backend/ebook/e-card.c:3777
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr ""
-"\n"
-"電話：\n"
-
-# addressbook/backend/ebook/e-card.c:3382
-#: addressbook/backend/ebook/e-card.c:3780
-msgid ""
-"\n"
-"Telephone:"
-msgstr ""
-"\n"
-"電話："
-
-# addressbook/backend/ebook/e-card.c:3406
-#: addressbook/backend/ebook/e-card.c:3804
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr ""
-"\n"
-"電子郵件：\n"
-
-# addressbook/backend/ebook/e-card.c:3409
-#: addressbook/backend/ebook/e-card.c:3807
-msgid ""
-"\n"
-"E-mail:"
-msgstr ""
-"\n"
-"電子郵件："
-
-# addressbook/backend/ebook/e-card.c:3428
-#: addressbook/backend/ebook/e-card.c:3826
-msgid ""
-"\n"
-"Mailer: "
-msgstr ""
-"\n"
-"寄件者: "
-
-# addressbook/backend/ebook/e-card.c:3434
-#: addressbook/backend/ebook/e-card.c:3832
-msgid ""
-"\n"
-"Time Zone: "
-msgstr ""
-"\n"
-"時區： "
-
-# addressbook/backend/ebook/e-card.c:3442
-#: addressbook/backend/ebook/e-card.c:3840
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
-"\n"
-"經緯："
-
-# addressbook/backend/ebook/e-card.c:3446
-#: addressbook/backend/ebook/e-card.c:3844
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
-"\n"
-"業務職位： "
-
-# addressbook/backend/ebook/e-card.c:3458
-#: addressbook/backend/ebook/e-card.c:3856
-msgid ""
-"\n"
-"Org: "
-msgstr ""
-"\n"
-"團體： "
-
-# addressbook/backend/ebook/e-card.c:3459
-#: addressbook/backend/ebook/e-card.c:3857
-msgid ""
-"\n"
-"  Name:  "
-msgstr ""
-"\n"
-"  名稱：  "
-
-# addressbook/backend/ebook/e-card.c:3460
-#: addressbook/backend/ebook/e-card.c:3858
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
-"\n"
-"  單位：  "
-
-# addressbook/backend/ebook/e-card.c:3461
-#: addressbook/backend/ebook/e-card.c:3859
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
-"\n"
-"  單位2： "
-
-# addressbook/backend/ebook/e-card.c:3462
-#: addressbook/backend/ebook/e-card.c:3860
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
-"\n"
-"  單位3： "
-
-# addressbook/backend/ebook/e-card.c:3463
-#: addressbook/backend/ebook/e-card.c:3861
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
-"\n"
-"  單位4： "
-
-# addressbook/backend/ebook/e-card.c:3467
-#: addressbook/backend/ebook/e-card.c:3865
-msgid ""
-"\n"
-"Categories: "
-msgstr ""
-"\n"
-"類別： "
-
-# addressbook/backend/ebook/e-card.c:3468
-#: addressbook/backend/ebook/e-card.c:3866
-msgid ""
-"\n"
-"Comment: "
-msgstr ""
-"\n"
-"備註： "
-
-# addressbook/backend/ebook/e-card.c:3481
-#. 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:3879
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
-"\n"
-"唯一字串： "
-
-# addressbook/backend/ebook/e-card.c:3484
-#: addressbook/backend/ebook/e-card.c:3882
-msgid ""
-"\n"
-"Public Key: "
-msgstr ""
-"\n"
-"公鑰： "
-
 # addressbook/backend/ebook/e-card.c:3745
-#: addressbook/backend/ebook/e-card.c:4235
+#: addressbook/backend/ebook/e-card.c:2679
 msgid "Multiple VCards"
 msgstr "多重 VCard"
 
 # addressbook/backend/ebook/e-card.c:3753
-#: addressbook/backend/ebook/e-card.c:4243
+#: addressbook/backend/ebook/e-card.c:2687
 #, c-format
 msgid "VCard for %s"
 msgstr "給 %s 的 VCard"
@@ -735,12 +418,13 @@ msgstr "給 %s 的 VCard"
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1533
+#: addressbook/backend/ebook/test-client.c:34
+#: addressbook/conduit/address-conduit.c:1860
 #: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1449
-#: calendar/conduits/todo/todo-conduit.c:1128
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+#: calendar/conduits/calendar/calendar-conduit.c:1727
+#: calendar/conduits/todo/todo-conduit.c:1385
+#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
+#: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
@@ -748,22 +432,22 @@ msgstr "不能初始化 Bonobo"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: addressbook/backend/pas/pas-backend-file.c:259
-#: addressbook/backend/pas/pas-backend-ldap.c:2212
+#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-ldap.c:2735
 #, fuzzy
 msgid "Searching..."
 msgstr "尋找"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: addressbook/backend/pas/pas-backend-file.c:261
+#: addressbook/backend/pas/pas-backend-file.c:263
 #, fuzzy
 msgid "Loading..."
 msgstr "正在等待..."
 
 # camel/camel-folder-search.c:338
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:270
+#: addressbook/backend/pas/pas-backend-file.c:272
 #, fuzzy
 msgid "Error in search expression."
 msgstr ""
@@ -772,85 +456,80 @@ msgstr ""
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: addressbook/backend/pas/pas-backend-ldap.c:475
-#, fuzzy
-msgid "Connecting to LDAP server..."
-msgstr "正在連線至伺服器..."
-
-# camel/providers/imap/camel-imap-store.c:531
-#: addressbook/backend/pas/pas-backend-ldap.c:485
-#, fuzzy
-msgid "Unable to connect to LDAP server."
-msgstr ""
-"無法驗證進入 IMAP 伺服器。\n"
-"%s\n"
-"\n"
-
-# mail/mail-config.c:1213
-# mail/mail-config.c:1216
-#: addressbook/backend/pas/pas-backend-ldap.c:501
-#, fuzzy
-msgid "Waiting for connection to LDAP server..."
-msgstr "正在連線至伺服器..."
-
-# mail/mail-config.c:1213
-# mail/mail-config.c:1216
-#: addressbook/backend/pas/pas-backend-ldap.c:870
+#: addressbook/backend/pas/pas-backend-ldap.c:1126
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "正在連線至伺服器..."
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: addressbook/backend/pas/pas-backend-ldap.c:971
+#: addressbook/backend/pas/pas-backend-ldap.c:1229
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "移除名片..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1080
+#: addressbook/backend/pas/pas-backend-ldap.c:1465
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2157
-msgid "Receiving LDAP search results..."
+#: addressbook/backend/pas/pas-backend-ldap.c:2589
+msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2162
-msgid "Restarting search."
+#: addressbook/backend/pas/pas-backend-ldap.c:2681
+msgid "Receiving LDAP search results..."
 msgstr ""
 
+# executive-summary/component/e-summary.c:940
+#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#, fuzzy
+msgid "Error performing search"
+msgstr "移除名片時發生錯誤"
+
+# camel/camel-url.c:289
+#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#, fuzzy
+msgid "Could not parse query string"
+msgstr "不能分析 URL `%s'"
+
+# mail/mail-config.glade.h:29
+#: addressbook/conduit/address-conduit.c:293
+#, fuzzy
+msgid "Default Sync Address:"
+msgstr "電子郵件地址："
+
 # addressbook/conduit/address-conduit.c:201
-#: addressbook/conduit/address-conduit.c:294
+#: addressbook/conduit/address-conduit.c:536
 msgid "Cursor could not be loaded\n"
 msgstr "不能載入滑鼠遊標\n"
 
 # addressbook/conduit/address-conduit.c:214
-#: addressbook/conduit/address-conduit.c:307
+#: addressbook/conduit/address-conduit.c:549
 msgid "EBook not loaded\n"
 msgstr "尚未載入 EBook\n"
 
 # addressbook/conduit/address-conduit.c:654
 # calendar/conduits/calendar/calendar-conduit.c:731
 # calendar/conduits/todo/todo-conduit.c:545
-#: addressbook/conduit/address-conduit.c:1089
-#: calendar/conduits/calendar/calendar-conduit.c:981
-#: calendar/conduits/todo/todo-conduit.c:692
+#: addressbook/conduit/address-conduit.c:1354
+#: calendar/conduits/calendar/calendar-conduit.c:1203
+#: calendar/conduits/todo/todo-conduit.c:889
 msgid "Could not start wombat server"
 msgstr "不能啟動 wombat 服務"
 
 # addressbook/conduit/address-conduit.c:655
 # calendar/conduits/calendar/calendar-conduit.c:732
 # calendar/conduits/todo/todo-conduit.c:546
-#: addressbook/conduit/address-conduit.c:1090
-#: calendar/conduits/calendar/calendar-conduit.c:982
-#: calendar/conduits/todo/todo-conduit.c:693
+#: addressbook/conduit/address-conduit.c:1355
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:890
 msgid "Could not start wombat"
 msgstr "不能啟動 wombat"
 
 # addressbook/conduit/address-conduit.c:687
 # addressbook/conduit/address-conduit.c:690
-#: addressbook/conduit/address-conduit.c:1120
-#: addressbook/conduit/address-conduit.c:1123
+#: addressbook/conduit/address-conduit.c:1385
+#: addressbook/conduit/address-conduit.c:1388
 msgid "Could not read pilot's Address application block"
 msgstr "不能讀取 pilot 通訊錄程式區塊"
 
@@ -869,259 +548,154 @@ msgstr "用於顯示地址的 Bonobo 控制."
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "顯示目錄服務的 Bonobo 控制例子."
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Configuration control for the Evolution Addressbook Storages."
+msgstr ""
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "顯示 Evolution 目錄服務迷你名片之控制項."
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Directory Servers"
+msgstr ""
+
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution 目錄服務迷你名片檢視"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution component for handling contacts."
 msgstr "用作處理連絡人的 Evolution 元件。"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook Minicard control"
 msgstr "目錄服務迷你名片控制項工廠"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address displayer"
 msgstr "目錄服務地址顯示器工廠"
 
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address popup"
 msgstr "目錄服務地址彈出選單工廠"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+msgid "Factory for the configuration controls for the Evolution Addressbook."
+msgstr ""
+
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the sample Addressbook control"
 msgstr "簡易目錄服務控制項工廠"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "This page can be used to configure access to LDAP directory servers"
+msgstr ""
+
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:620
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
-#: shell/e-shortcuts.c:1061
+#: calendar/gui/dialogs/comp-editor-util.c:366
+#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "連絡人"
 
 # mail/mail-callbacks.c:1349
-#: addressbook/gui/component/addressbook-component.c:71
+#: addressbook/gui/component/addressbook-component.c:73
 msgid "Folder containing contact information"
 msgstr "資料夾包含連絡人資訊"
 
 # addressbook/gui/component/addressbook-config.c:148
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:75
 #, fuzzy
 msgid "LDAP Server"
 msgstr "NNTP 伺服器："
 
 # mail/mail-callbacks.c:1349
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:75
 #, fuzzy
 msgid "LDAP server containing contact information"
 msgstr "資料夾包含連絡人資訊"
 
-# ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/component/addressbook-component.c:526
-#: ui/evolution-addressbook.xml.h:11
-msgid "New Contact"
-msgstr "新增連絡人"
-
-# ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/component/addressbook-component.c:526
-msgid "New _Contact"
-msgstr "新增連絡人(_C)"
-
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:527
+#: addressbook/gui/component/addressbook-component.c:578
 msgid "New Contact List"
 msgstr "新增連絡人清單"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:527
-msgid "New Contact _List"
-msgstr "新增連絡人清單"
-
-# addressbook/gui/component/addressbook-config.c:660
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Edit Addressbook"
-msgstr "編輯目錄服務"
-
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "389"
-msgstr "389"
-
-# mail/mail-config.glade.h:3
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Account Name"
-msgstr "帳號"
-
-# addressbook/gui/component/addressbook-config.c:662
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "Add Addressbook"
-msgstr "新增目錄服務"
-
-# addressbook/gui/component/addressbook-config.glade.h:2
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Addressbook Sources"
-msgstr "目錄服務來源"
-
-# widgets/misc/e-filter-bar.h:97
-# widgets/misc/e-filter-bar.h:104
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Advanced"
-msgstr "進階"
-
-# addressbook/gui/component/addressbook-config.c:177
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Base"
-msgstr "基礎項目"
-
-#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:178
-msgid "Basic"
-msgstr "基本"
+#: addressbook/gui/component/addressbook-component.c:578
+#, fuzzy
+msgid "Contact _List"
+msgstr "連絡人清單(_C)"
 
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "De_lete"
-msgstr "刪除(_L)"
+# ui/evolution-addressbook.xml.h:7
+#: addressbook/gui/component/addressbook-component.c:581
+msgid "New Contact"
+msgstr "新增連絡人"
 
-# mail/mail-config.glade.h:29
-#: addressbook/gui/component/addressbook-config.glade.h:9
-msgid "Email Address:"
-msgstr "電子郵件地址："
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/component/addressbook-component.c:581
+#: ui/evolution-addressbook.xml.h:32
+msgid "_Contact"
+msgstr "連絡人(_C)"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
+# camel/providers/imap/camel-imap-store.c:531
+#: addressbook/gui/component/addressbook-config.c:197
+#, fuzzy
+msgid "Failed to connect to LDAP server"
 msgstr ""
+"無法驗證進入 IMAP 伺服器。\n"
+"%s\n"
+"\n"
 
-# addressbook/gui/component/addressbook-config.c:179
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "One"
-msgstr "一"
-
-# addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Search _base:"
-msgstr "尋找起點(_B)："
-
-# addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/addressbook-config.glade.h:13
-msgid "Search s_cope: "
-msgstr "尋找範圍(_C)："
-
-# addressbook/gui/component/select-names/select-names.glade.h:3
-#: addressbook/gui/component/addressbook-config.glade.h:14
-msgid "Server Name"
-msgstr "伺服器名稱"
-
-# calendar/gui/print.c:362
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid "Sub"
-msgstr "日"
-
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "The information below is required in order to add an addressbook.  "
-msgstr "下列資訊是新增目錄服務所需要的。"
-
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "This information is not required for most ldap servers. "
-msgstr "此資訊大多數的 LDAP 伺服器都不需要。"
-
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid ""
-"This information is used by your ldap server to specify which nodes are used "
-"in a search. Contact your server administrator for more information."
+# camel/providers/imap/camel-imap-store.c:531
+#: addressbook/gui/component/addressbook-config.c:216
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
 msgstr ""
-"此資訊被您的 LDAP 伺服器用來指出那一個節點正被用於搜尋.連絡您的伺服器管理者以"
-"得到更多資訊。"
+"無法驗證進入 IMAP 伺服器。\n"
+"%s\n"
+"\n"
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+#: addressbook/gui/component/addressbook-config.c:239
+msgid "Could not perform query on Root DSE"
 msgstr ""
-"這是您在 LDAP 伺服器上所有搜尋的基礎節點.連絡您的伺服器管理者以得到更多資訊。"
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "This is the name of the server where your addressbook is located."
-msgstr "這是您的目錄服務所在之伺服器的名稱。"
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "This is the port that your ldap server uses."
-msgstr "這是您的 LDAP 伺服器使用的連接埠。"
-
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
-msgstr "此名稱將用於識別您的帳號.僅做為顯示之用。"
-
-# mail/mail-config.glade.h:5
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid "_Account name:"
-msgstr "帳號(_A)："
-
-# addressbook/contact-editor/contact-editor.glade.h:17
-# mail/mail-config.glade.h:84
-#: addressbook/gui/component/addressbook-config.glade.h:24
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
-msgid "_Add"
-msgstr "新增 (_A)"
+#: addressbook/gui/component/addressbook-config.c:648
+msgid "The server responded with no supported search bases"
+msgstr ""
 
-# mail/mail-config.glade.h:86
-# ui/evolution-event-editor.xml.h:58
-# ui/evolution-message-composer.xml.h:45
-# ui/evolution-subscribe.xml.h:10
-# ui/evolution-task-editor-dialog.xml.h:70
-# ui/evolution.xml.h:48
-#: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:16
-msgid "_Edit"
-msgstr "編輯 (_E)"
+#: addressbook/gui/component/addressbook-config.c:1152
+msgid "This server does not support LDAPv3 schema information"
+msgstr ""
 
-# mail/mail-config.glade.h:73
-#: addressbook/gui/component/addressbook-config.glade.h:26
-msgid "_My server requires authentication"
-msgstr "伺服器要求驗證(_M)"
+# mail/mail-callbacks.c:1349
+#: addressbook/gui/component/addressbook-config.c:1174
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"載入過濾器資訊時發生錯誤：\n"
+"%s"
 
-# addressbook/gui/component/addressbook-config.c:409
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "_Port:"
-msgstr "通訊埠(_P)："
+# camel/providers/imap/camel-imap-command.c:487
+#: addressbook/gui/component/addressbook-config.c:1182
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP 伺服器的回應沒有包含 %s 資訊"
 
-# calendar/gui/e-itip-control.glade.h:10
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "_Server name:"
-msgstr "伺服器名稱(_S)："
+#: addressbook/gui/component/addressbook-config.c:1638
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(此一版本的 evolution 並不支援 SSL)"
 
 # addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 # addressbook/backend/ebook/load-pine-addressbook.c:22
@@ -1133,24 +707,24 @@ msgstr "伺服器名稱(_S)："
 # calendar/conduits/todo/todo-conduit.c:965
 # calendar/gui/alarm-notify/notify-main.c:98
 # calendar/gui/main.c:57
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
+#: addressbook/gui/component/addressbook-factory.c:72
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
 msgid "Could not initialize gnome-vfs"
 msgstr "不能始初化 gnome-vfs"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-storage.c:167
+#: addressbook/gui/component/addressbook-storage.c:168
 #, fuzzy
 msgid "Other Contacts"
 msgstr "連絡人"
 
 # addressbook/gui/component/addressbook.c:438
-#: addressbook/gui/component/addressbook.c:468
+#: addressbook/gui/component/addressbook.c:516
 msgid "Unable to open addressbook"
 msgstr "不能開啟目錄服務"
 
 # addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/component/addressbook.c:477
+#: addressbook/gui/component/addressbook.c:525
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -1161,7 +735,7 @@ msgstr ""
 "或者 LDAP 伺服器沒有啟動"
 
 # addressbook/gui/component/addressbook.c:450
-#: addressbook/gui/component/addressbook.c:482
+#: addressbook/gui/component/addressbook.c:530
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -1173,7 +747,7 @@ msgstr ""
 "及安裝 OpenLDAP，然後再重新編譯 Evolution。\n"
 
 # addressbook/gui/component/addressbook.c:458
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:538
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -1182,51 +756,53 @@ msgstr ""
 "您是否擁有存取權限。"
 
 # camel/camel-smime-context.c:194
-#: addressbook/gui/component/addressbook.c:623
+#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:651
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "請輸入 %s 所須的密碼"
 
-# addressbook/gui/component/addressbook.c:618
-# calendar/gui/gnome-cal.c:233
-#: addressbook/gui/component/addressbook.c:760
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "任何欄位包含"
-
-# addressbook/gui/component/addressbook.c:619
-#: addressbook/gui/component/addressbook.c:761
-msgid "Name contains"
-msgstr "姓名包含"
+#: addressbook/gui/component/addressbook.c:776
+#, fuzzy
+msgid "Name begins with"
+msgstr "以此終結"
 
-# addressbook/gui/component/addressbook.c:620
-#: addressbook/gui/component/addressbook.c:762
-msgid "Email contains"
-msgstr "電郵地址包含"
+# addressbook/contact-editor/e-contact-editor.c:1285
+# addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/component/addressbook.c:777
+#, fuzzy
+msgid "Email is"
+msgstr "電子郵件 2"
 
 # calendar/gui/e-calendar-table.c:150
-#: addressbook/gui/component/addressbook.c:763
-#: calendar/gui/cal-search-bar.c:59
+#: addressbook/gui/component/addressbook.c:778
+#: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "類別為"
 
+# addressbook/gui/component/addressbook.c:618
+# calendar/gui/gnome-cal.c:233
+#. We attach subitems below
+#: addressbook/gui/component/addressbook.c:779
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "任何欄位包含"
+
 # widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:764 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:780
 msgid "Advanced..."
 msgstr "進階..."
 
 # calendar/gui/e-tasks.c:155
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1005
-#: calendar/gui/cal-search-bar.c:412
+#: addressbook/gui/component/addressbook.c:1008
+#: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "任何類別"
 
 # addressbook/gui/component/addressbook.c:763
-#: addressbook/gui/component/addressbook.c:1045
+#: addressbook/gui/component/addressbook.c:1090
 msgid "The URI that the Folder Browser will display"
 msgstr "資料夾瀏覽器顯示之URI"
 
@@ -1243,8 +819,8 @@ msgstr "(沒有)"
 # addressbook/contact-editor/contact-editor.glade.h:14
 # addressbook/contact-editor/e-contact-editor.c:1284
 #: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1678
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 msgid "Primary Email"
 msgstr "主要電子郵件"
 
@@ -1301,6 +877,655 @@ msgstr "關閉查詢"
 msgid "Enable Queries (Dangerous!)"
 msgstr "啟動查詢(非常危險！)"
 
+# mail/mail-config.glade.h:1
+#: addressbook/gui/component/ldap-config.glade.h:1
+#, fuzzy
+msgid "  S_how Supported Bases "
+msgstr " 檢查可支援的類別(_C)"
+
+#: addressbook/gui/component/ldap-config.glade.h:2
+msgid "1234"
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:377
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "1:00"
+msgstr "100%"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "2:30"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
+msgid "3268"
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:375
+#: addressbook/gui/component/ldap-config.glade.h:6
+#, fuzzy
+msgid "380"
+msgstr "80%"
+
+#: addressbook/gui/component/ldap-config.glade.h:7
+msgid "389"
+msgstr "389"
+
+#: addressbook/gui/component/ldap-config.glade.h:8
+msgid "5:00"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "636"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:10
+msgid "666"
+msgstr ""
+
+# addressbook/gui/component/select-names/e-select-names-popup.c:161
+# composer/e-msg-composer-attachment-bar.c:468
+# shell/e-shortcuts-view.c:265
+# shell/e-shortcuts-view.c:388
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "移除(_R)"
+
+# addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "選項"
+
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add (or Edit) Attribute Mappings"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:14
+msgid "Addressbook Sources"
+msgstr "目錄服務來源"
+
+# calendar/gui/e-calendar-table.c:162
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: mail/mail-config.glade.h:15
+#, fuzzy
+msgid "Always"
+msgstr "提醒"
+
+# camel/camel-sasl-anonymous.c:33
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "匿名"
+
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Associated LDAP Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:18
+msgid "Attribute"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:19
+msgid ""
+"Congratulations, you are finished setting up this LDAP server. You\n"
+"are now ready to access this directory.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+
+# mail/mail-ops.c:1939
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Connecting"
+msgstr "中斷與 %s 的連線"
+
+#: addressbook/gui/component/ldap-config.glade.h:24
+msgid "Corresponding Evolution Attribute"
+msgstr ""
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:395
+#: addressbook/gui/component/ldap-config.glade.h:25
+#, fuzzy
+msgid "DN Customization"
+msgstr "沒有資訊"
+
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+# addressbook/gui/widgets/e-addressbook-view.c:616
+# calendar/gui/e-meeting-dialog.glade.h:8
+# calendar/gui/event-editor-dialog.glade.h:9
+# mail/mail-config.glade.h:23
+# mail/message-browser.c:202
+# ui/evolution-addressbook.xml.h:3
+# ui/evolution-event-editor.xml.h:17
+# ui/evolution-mail.xml.h:22
+# ui/evolution-task-editor-dialog.xml.h:18
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "De_lete"
+msgstr "刪除(_L)"
+
+# composer/e-msg-composer-attachment.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Distinguished _name:"
+msgstr "列出名稱 (_N)："
+
+# mail/mail-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Email Address:"
+msgstr "電子郵件地址："
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Evolution Attribute"
+msgstr "Evolution"
+
+#: addressbook/gui/component/ldap-config.glade.h:30
+msgid "Evolution will use this DN to authenticate you with the server"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:31
+msgid ""
+"Evolution will use this email address to authenticate you with the server"
+msgstr ""
+
+# mail/mail-search.c:316
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
+msgid "Finished"
+msgstr "尋找(_I)"
+
+# addressbook/contact-editor/contact-editor.glade.h:10
+# executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+msgid "General"
+msgstr "一般"
+
+# mail/mail-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:34
+#, fuzzy
+msgid "LDAP Attribute"
+msgstr "LDAP 驗證"
+
+# mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:35
+#, fuzzy
+msgid "LDAP Configuration Assistant"
+msgstr "郵件設定"
+
+# addressbook/printing/e-contact-print.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
+msgid "Mappings"
+msgstr "邊界"
+
+# calendar/gui/event-editor-dialog.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "Never"
+msgstr "每"
+
+#: addressbook/gui/component/ldap-config.glade.h:38
+msgid ""
+"Now, you must specify how you want to connect to the LDAP server. The SSL "
+"(Secure Sockets Layer)\n"
+"and TLS (Transport Layer Security) protocols are used by some servers to "
+"cryptographically protect\n"
+"your connection. Ask your system administrator if your LDAP server uses "
+"these protocols."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:41
+msgid "Objectclasses"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:42
+msgid "Objectclasses Used in Evolution:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:43
+msgid "Objectclasses Used on Server:"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:179
+#: addressbook/gui/component/ldap-config.glade.h:44
+msgid "One"
+msgstr "一"
+
+#: addressbook/gui/component/ldap-config.glade.h:45
+msgid ""
+"Please select and Evolution attribute and an\n"
+"LDAP attribute to associate with it."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:47
+msgid "R_estore Defaults"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:48
+msgid "Re_store Defaults"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "S_earch scope: "
+msgstr "尋找範圍(_C)："
+
+# addressbook/gui/search/e-addressbook-search-dialog.c:158
+# mail/mail-search.c:242
+#. No time range is set, so don't start a query
+#: addressbook/gui/component/ldap-config.glade.h:50
+#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
+#: calendar/gui/e-week-view.c:1213
+#, fuzzy
+msgid "Searching"
+msgstr "尋找"
+
+# ui/evolution-event-editor.xml.h:48
+# ui/evolution-task-editor-dialog.xml.h:57
+#: addressbook/gui/component/ldap-config.glade.h:51
+#, fuzzy
+msgid "Select"
+msgstr "全選"
+
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "Selected:"
+msgstr "已刪除"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if\n"
+"your LDAP server supports SSL or TLS."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:55
+msgid ""
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a \n"
+"insecure environment. For example, if you and your LDAP server are behind a "
+"firewall\n"
+"at work, then Evolution doesn't need to use SSL/TLS because your connection "
+"is already\n"
+"secure."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:59
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This \n"
+"means that your connection will be insecure, and that you will be vulnerable "
+"to security\n"
+"exploits. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:62
+msgid ""
+"Selecting this option will let you change Evolution's default settings for "
+"LDAP\n"
+"searches, and for creating and editting contacts. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:64
+msgid ""
+"Specifying a display name is the last required step in configuring an LDAP "
+"server."
+msgstr ""
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:395
+#: addressbook/gui/component/ldap-config.glade.h:65
+#, fuzzy
+msgid "Step 1: Server Information"
+msgstr "來源資訊"
+
+# mail/mail-config.c:1213
+# mail/mail-config.c:1216
+#: addressbook/gui/component/ldap-config.glade.h:66
+#, fuzzy
+msgid "Step 2: Connecting to Server"
+msgstr "正在連線至伺服器..."
+
+#: addressbook/gui/component/ldap-config.glade.h:67
+msgid "Step 3: Searching the Directory"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:68
+msgid "Step 4: Display Name"
+msgstr ""
+
+# calendar/gui/print.c:362
+#: addressbook/gui/component/ldap-config.glade.h:69
+msgid "Sub"
+msgstr "日"
+
+#: addressbook/gui/component/ldap-config.glade.h:70
+msgid "Supported Search Bases"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:71
+msgid ""
+"The first step in configuring an LDAP server is to provide its name, and "
+"your log in\n"
+"information. Please ask your system administrator if you are unsure of this "
+"information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:73
+msgid ""
+"The options on this page control how many entries should be included in "
+"your\n"
+"searches, and how long a search should take. Ask your system administrator "
+"if you\n"
+"need to change these options."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:76
+msgid ""
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will \n"
+"begin. If you leave this blank, the search will begin at the root of the "
+"directory tree."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:78
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the \n"
+"directory tree. A search scope of \"sub\" will include all entries below "
+"your search base.\n"
+"A search scope of \"one\" will only include the entries one level beneath "
+"your base."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:81
+msgid ""
+"This assistant will help you to access online directory services\n"
+"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"\n"
+"Adding a new LDAP server requires some specialized information\n"
+"about the server. Please contact your system administrator if you \n"
+"need help finding this information."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:87
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:88
+msgid ""
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
+"too large will slow down your addressbook."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:90
+msgid ""
+"This is the method evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your ldap "
+"server."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:91
+#, fuzzy
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
+"It is for display purposes only. "
+msgstr "此名稱將用於識別您的帳號.僅做為顯示之用。"
+
+#: addressbook/gui/component/ldap-config.glade.h:93
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
+"list of standard ports has been provided. Ask your system administrator\n"
+"what port you should specify."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:96
+msgid "This option controls how long a search will be run."
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:97
+msgid ""
+"To add an attribute to the DN, select it from the list and click the \"Add "
+"Attribute\" button.\n"
+"Any values that you add to the DN will become required values for any new "
+"contacts\n"
+"that you add to the directory on the LDAP server. "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:100
+msgid "U_se SSL/TLS:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:101
+msgid "Using distinguished name (DN)"
+msgstr ""
+
+# addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:102
+#, fuzzy
+msgid "Using email address"
+msgstr "這是郵寄地址 (_T)"
+
+#: addressbook/gui/component/ldap-config.glade.h:103
+#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+msgid "Whenever Possible"
+msgstr ""
+
+# addressbook/contact-editor/contact-editor.glade.h:17
+# mail/mail-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:141
+msgid "_Add"
+msgstr "新增 (_A)"
+
+# addressbook/contact-editor/contact-editor.glade.h:17
+# mail/mail-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:105
+#, fuzzy
+msgid "_Add ->"
+msgstr "新增 (_A)"
+
+#: addressbook/gui/component/ldap-config.glade.h:106
+#, fuzzy
+msgid "_Add Mapping"
+msgstr "新增動作"
+
+#: addressbook/gui/component/ldap-config.glade.h:107
+#, fuzzy
+msgid "_Add to DN"
+msgstr "新增動作"
+
+# calendar/gui/e-calendar-table.c:162
+#: addressbook/gui/component/ldap-config.glade.h:108
+#, fuzzy
+msgid "_Always"
+msgstr "提醒"
+
+# addressbook/contact-editor/contact-editor.glade.h:23
+# mail/folder-browser.c:715
+# mail/mail-config.glade.h:85
+# ui/evolution-event-editor.xml.h:57
+# ui/evolution-mail.xml.h:103
+# ui/evolution-task-editor-dialog.xml.h:69
+# ui/evolution.xml.h:46
+#: addressbook/gui/component/ldap-config.glade.h:109
+#, fuzzy
+msgid "_Delete Mapping"
+msgstr "全部刪除(_D)"
+
+# calendar/gui/calendar-summary.c:622
+# mail/mail-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:110
+#, fuzzy
+msgid "_Display name:"
+msgstr "顯示(_D)"
+
+#: addressbook/gui/component/ldap-config.glade.h:111
+msgid "_Distinguished Name (DN):"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:112
+msgid "_Don't use SSL/TLS"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:113
+msgid "_Download limit:"
+msgstr ""
+
+# mail/mail-config.glade.h:86
+# ui/evolution-event-editor.xml.h:58
+# ui/evolution-message-composer.xml.h:45
+# ui/evolution-subscribe.xml.h:10
+# ui/evolution-task-editor-dialog.xml.h:70
+# ui/evolution.xml.h:48
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
+#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
+msgid "_Edit"
+msgstr "編輯 (_E)"
+
+# calendar/gui/dialogs/alarm-notify.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:115
+#, fuzzy
+msgid "_Edit Mapping"
+msgstr "編輯約會(_E)"
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: addressbook/gui/component/ldap-config.glade.h:116
+#, fuzzy
+msgid "_Evolution attribute:"
+msgstr "Evolution"
+
+#: addressbook/gui/component/ldap-config.glade.h:117
+msgid "_If necessary "
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:118
+msgid "_LDAP attribute:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:119
+msgid "_LDAP attributes:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:120
+msgid "_Log in method:"
+msgstr ""
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:431
+#: addressbook/gui/component/ldap-config.glade.h:121
+#, fuzzy
+msgid "_More Options >>"
+msgstr "選項(_O)"
+
+# addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/ldap-config.glade.h:122
+#, fuzzy
+msgid "_Port number:"
+msgstr "通訊埠(_P)："
+
+#: addressbook/gui/component/ldap-config.glade.h:123
+msgid "_Restore Defaults"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/ldap-config.glade.h:124
+#, fuzzy
+msgid "_Search base:"
+msgstr "尋找起點(_B)："
+
+# calendar/gui/e-itip-control.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:125
+msgid "_Server name:"
+msgstr "伺服器名稱(_S)："
+
+# calendar/gui/dialogs/alarm-notify.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:126
+#, fuzzy
+msgid "_Timeout (minutes):"
+msgstr "延遲時間 (分鐘)"
+
+# mail/mail-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:127
+#, fuzzy
+msgid "account-druid"
+msgstr "帳號"
+
+# addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:128
+#, fuzzy
+msgid "account-editor"
+msgstr "連絡人清單編輯器"
+
+# calendar/gui/calendar-model.c:638
+# calendar/gui/calendar-model.c:1176
+# calendar/gui/dialogs/task-editor-dialog.glade.h:14
+# calendar/gui/e-calendar-table.c:419
+#: addressbook/gui/component/ldap-config.glade.h:129
+#, fuzzy
+msgid "cards"
+msgstr "沒有名片"
+
+# mail/mail-ops.c:1939
+#: addressbook/gui/component/ldap-config.glade.h:130
+#, fuzzy
+msgid "connecting-tab"
+msgstr "中斷與 %s 的連線"
+
+#: addressbook/gui/component/ldap-config.glade.h:131
+msgid "dn-customization-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:132
+msgid "edit_server_window_simple"
+msgstr ""
+
+# addressbook/contact-editor/contact-editor.glade.h:10
+# executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:133
+#, fuzzy
+msgid "general-tab"
+msgstr "一般"
+
+#: addressbook/gui/component/ldap-config.glade.h:134
+msgid "mappings-tab"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:135
+msgid "objectclasses-tab"
+msgstr ""
+
+# addressbook/gui/search/e-addressbook-search-dialog.c:158
+# mail/mail-search.c:242
+#: addressbook/gui/component/ldap-config.glade.h:136
+#, fuzzy
+msgid "searching-tab"
+msgstr "尋找"
+
 # addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
 msgid "Evolution's addressbook name selection interface."
@@ -1315,10 +1540,12 @@ msgstr "目錄服務名稱選擇介面工廠"
 # composer/e-msg-composer-attachment-bar.c:468
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
+#. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:777
-#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
-#: filter/filter-rule.c:625 shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:980
+#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
+#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "移除"
 
@@ -1354,7 +1581,13 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "未命名的連絡人"
 
-#: addressbook/gui/component/select-names/e-select-names.c:524
+# addressbook/gui/component/addressbook.c:619
+#: addressbook/gui/component/select-names/e-select-names.c:600
+#, fuzzy
+msgid "Find contact in"
+msgstr "寄件者包含"
+
+#: addressbook/gui/component/select-names/e-select-names.c:716
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -1364,7 +1597,7 @@ msgid ""
 "occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:532
+#: addressbook/gui/component/select-names/e-select-names.c:724
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "Under normal circumstances, this should never happen.\n"
@@ -1372,109 +1605,131 @@ msgid ""
 "correct this problem."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:608
+#: addressbook/gui/component/select-names/e-select-names.c:806
 msgid "Select Contacts from Addressbook"
 msgstr "從目錄服務選擇連絡人"
 
+# addressbook/gui/component/select-names/select-names.glade.h:3
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
-msgstr "包含(_O)："
+msgid "Select Names"
+msgstr "選擇名稱"
 
-# ui/evolution-addressbook.xml.h:17
+# addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Co_ntacts:"
-msgstr "連絡人(_N)："
+#, fuzzy
+msgid "Selected Contacts:"
+msgstr "刪除連絡人？"
 
-# mail/mail-search.c:316
+# ui/evolution-addressbook.xml.h:17
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "F_ind"
-msgstr "尋找(_I)"
+#, fuzzy
+msgid "Show Contacts"
+msgstr "連絡人"
 
-# addressbook/gui/component/select-names/select-names.glade.h:3
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select Names"
-msgstr "選擇名稱"
+msgid ""
+"Type a name into the entry, or\n"
+"select one from the list below:"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show contacts matching the following criteria:"
-msgstr "顯示符合下列條件的連絡人："
+# ui/evolution.xml.h:57
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "_Browse..."
+msgstr "移動(_M)..."
 
 # calendar/gui/e-tasks.c:155
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "類別 (_C)："
 
 # ui/evolution-mail.xml.h:106
 # ui/evolution.xml.h:50
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Folder:"
 msgstr "資料夾 (_F)："
 
-# addressbook/gui/component/select-names/select-names.glade.h:2
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Message Recipients:"
-msgstr "收件者(_M)："
+# addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#, fuzzy
+msgid "A_ssistant's name:"
+msgstr "助理名稱 (_A)："
+
+# addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#, fuzzy
+msgid "Add_ress..."
+msgstr "地址 (_A)..."
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Anni_versary:"
 msgstr "週年紀念 (_V)："
 
-# addressbook/contact-editor/contact-editor.glade.h:3
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "B_usiness"
-msgstr "商務 (_U)"
+# addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#, fuzzy
+msgid "Birthda_y:"
+msgstr "生日 (_B)："
 
-# addressbook/contact-editor/contact-editor.glade.h:4
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Business _Fax"
-msgstr "商務傳真 (_F)"
+# calendar/gui/dialogs/task-editor-dialog.glade.h:24
+# calendar/gui/event-editor-dialog.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#, fuzzy
+msgid "C_ontacts..."
+msgstr "連絡人 (_C)..."
 
 # 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
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "類別 (_T)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
 msgstr ""
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor.c:1367
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
+# addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "D_epartment:"
+msgstr "部門 (_D)："
+
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:183
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: calendar/gui/dialogs/task-editor.c:187
 msgid "Details"
 msgstr "詳細資料"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "F_ree/Busy URL:"
 msgstr "空閒-忙碌 URL"
 
 # addressbook/contact-editor/contact-editor.glade.h:9
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "File A_s:"
 msgstr "歸檔為(_S)："
 
-# addressbook/contact-editor/contact-editor.glade.h:10
-# executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "General"
-msgstr "一般"
+# addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#, fuzzy
+msgid "Full _Name..."
+msgstr "全名 (_F)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
 "Internet, enter the address\n"
@@ -1482,58 +1737,48 @@ msgid ""
 msgstr ""
 
 # addressbook/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "New phone type"
 msgstr "新增電話種類"
 
 # addressbook/contact-editor/contact-editor.glade.h:12
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "No_tes:"
 msgstr "備註 (_T)："
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Organi_zation:"
 msgstr "團體(_Z)："
 
+# addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#, fuzzy
+msgid "P_rofession:"
+msgstr "專業(_P)："
+
 # addressbook/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Phone Types"
 msgstr "電話種類"
 
+# addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+msgid "S_pouse:"
+msgstr "配偶(_S)："
+
+# addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#, fuzzy
+msgid "This is the _mailing address"
+msgstr "這是郵寄地址 (_T)"
+
 # addressbook/contact-editor/contact-editor.glade.h:15
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Wants to receive _HTML mail"
 msgstr "允許接收 HTML 格式的電子郵件"
 
-# addressbook/contact-editor/contact-editor.glade.h:18
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "_Address..."
-msgstr "地址 (_A)..."
-
-# addressbook/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Assistant's name:"
-msgstr "助理名稱 (_A)："
-
-# addressbook/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "_Birthday:"
-msgstr "生日 (_B)："
-
-# addressbook/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Business"
-msgstr "商務 (_B)"
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:24
-# calendar/gui/event-editor-dialog.glade.h:29
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
-msgstr "連絡人 (_C)..."
-
 # addressbook/contact-editor/contact-editor.glade.h:23
 # mail/folder-browser.c:715
 # mail/mail-config.glade.h:85
@@ -1541,991 +1786,947 @@ msgstr "連絡人 (_C)..."
 # ui/evolution-mail.xml.h:103
 # ui/evolution-task-editor-dialog.xml.h:69
 # ui/evolution.xml.h:46
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:704 filter/filter.glade.h:8
-#: mail/folder-browser.c:1505 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
+#: calendar/gui/dialogs/meeting-page.c:673
+#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
+#: filter/filter.glade.h:8 mail/folder-browser.c:1703
+#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:41
 msgid "_Delete"
 msgstr "刪除 (_D)"
 
-# addressbook/contact-editor/contact-editor.glade.h:24
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Department:"
-msgstr "部門 (_D)："
-
-# addressbook/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Full Name..."
-msgstr "全名 (_F)..."
-
-# addressbook/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Home"
-msgstr "住家 (_H)"
-
 # addressbook/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Job title:"
 msgstr "職稱 (_J)："
 
 # addressbook/contact-editor/contact-editor.glade.h:28
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager's Name:"
 msgstr "主管名稱(_M)："
 
-# addressbook/contact-editor/contact-editor.glade.h:29
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Mobile"
-msgstr "行動電話(_M)"
-
 # addressbook/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
 msgstr "暱稱(_N)："
 
 # addressbook/contact-editor/contact-editor.glade.h:31
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Office:"
 msgstr "辦公室(_O)："
 
-# addressbook/contact-editor/contact-editor.glade.h:32
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Profession:"
-msgstr "專業(_P)："
-
 # calendar/gui/print.c:1156
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "_Public Calendar URL:"
 msgstr "列印行事曆"
 
-# addressbook/contact-editor/contact-editor.glade.h:33
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Spouse:"
-msgstr "配偶(_S)："
-
-# addressbook/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr "這是郵寄地址 (_T)"
-
 # addressbook/contact-editor/contact-editor.glade.h:16
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Web page address:"
 msgstr "Web 網址(_W)："
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"您確定要刪除\n"
-"這個連絡人？"
-
-# addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "刪除連絡人？"
-
-# addressbook/contact-editor/e-contact-editor.c:603
-#: addressbook/gui/contact-editor/e-contact-editor.c:755
-msgid "This contact belongs to these categories:"
-msgstr "此連絡人屬於這些類別："
-
-# addressbook/contact-editor/e-contact-editor.c:1260
-#: addressbook/gui/contact-editor/e-contact-editor.c:1654
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-# camel/providers/local/camel-local-store.c:279
-#: addressbook/gui/contact-editor/e-contact-editor.c:2276
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "不能找到欄位 `%s' 之界面工具"
-
-# addressbook/contact-editor/e-contact-quick-add.c:233
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
-msgstr "快速新增連絡人"
-
-# addressbook/contact-editor/e-contact-quick-add.c:235
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
-msgstr "編輯全部"
-
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-msgid "Full Name"
-msgstr "全名"
-
-# addressbook/contact-editor/e-contact-quick-add.c:282
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
-msgid "E-mail"
-msgstr "電子郵件"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
-msgid "card.vcf"
-msgstr ""
-
-# addressbook/contact-editor/fullname.glade.h:8
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
-#, fuzzy
-msgid "list"
-msgstr "靄"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s 已經存在\n"
-"您是否要複寫它?"
-
-# addressbook/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "地址 2(_2)："
+# mail/mail-search.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
+#: my-evolution/Locations.h:2341
+msgid "United States"
+msgstr "美國"
 
 # addressbook/contact-editor/e-contact-editor.c:1242
 # addressbook/gui/widgets/e-addressbook-view.c:733
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
 msgid "Afghanistan"
 msgstr "阿富汗"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
+#: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "阿爾巴尼亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "阿爾及利亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "American Samoa"
 msgstr "美屬薩摩亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Andorra"
 msgstr "安道爾"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Angola"
 msgstr "安哥拉"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Anguilla"
 msgstr "安圭拉島"
 
 # shell/e-shell-importer.c:490
-#: addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Antarctica"
 msgstr "南極洲"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Antigua And Barbuda"
 msgstr "安地卡及巴布達"
 
 # addressbook/printing/e-contact-print.glade.h:24
-#: addressbook/gui/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "阿根廷"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:12
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Armenia"
 msgstr "亞美尼亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Aruba"
 msgstr "阿盧巴島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:14
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "澳大利亞"
 
 # calendar/gui/goto-dialog.glade.h:2
-#: addressbook/gui/contact-editor/fulladdr.glade.h:15
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "奧地利"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:16
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Azerbaijan"
 msgstr "亞賽拜然"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:17
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "巴哈馬"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:18
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "巴林"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Bangladesh"
 msgstr "孟加拉"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Barbados"
 msgstr "巴貝多"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:21
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Belarus"
 msgstr "白俄羅斯"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:22
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "比利時"
 
 # addressbook/printing/e-contact-print.glade.h:36
-#: addressbook/gui/contact-editor/fulladdr.glade.h:23
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "貝里斯"
 
 # mail/mail-send-recv.c:306
-#: addressbook/gui/contact-editor/fulladdr.glade.h:24
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Benin"
 msgstr "貝南"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bermuda"
 msgstr "百慕達"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bhutan"
 msgstr "不丹"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:27
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "玻利維亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:28
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bosnia And Herzegowina"
 msgstr "波士尼亞-赫芝格維納"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:29
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Botswana"
 msgstr "波札那"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:30
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bouvet Island"
 msgstr "波維特島"
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: addressbook/gui/contact-editor/fulladdr.glade.h:31
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "巴西"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:32
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "British Indian Ocean Territory"
 msgstr "英屬印度洋地區"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:33
-msgid "British Virgin Islands"
-msgstr "英屬維爾京群島"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:34
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Brunei Darussalam"
 msgstr "汶萊"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:35
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "保加利亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:36
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Burkina Faso"
 msgstr "布吉納法索"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:37
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Burundi"
 msgstr "浦隆地"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:38
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Cambodia"
 msgstr "柬埔寨王國"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:39
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Cameroon"
 msgstr "喀麥隆"
 
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: addressbook/gui/contact-editor/fulladdr.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "加拿大"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:41
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Cape Verde"
 msgstr "維德角島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:42
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "開曼群島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Central African Republic"
 msgstr "中非"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: addressbook/gui/contact-editor/fulladdr.glade.h:44
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Chad"
 msgstr "查德"
 
-# addressbook/contact-editor/fulladdr.glade.h:3
-#: addressbook/gui/contact-editor/fulladdr.glade.h:45
-msgid "Check Address"
-msgstr "檢查地址"
-
 # addressbook/gui/component/addressbook-config.c:150
-#: addressbook/gui/contact-editor/fulladdr.glade.h:46
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "智利"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:47
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "China"
 msgstr "中國"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:48
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "聖誕島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:49
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cocos (Keeling) Islands"
 msgstr "可可斯群島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:50
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "哥倫比亞"
 
 # ui/evolution-mail.xml.h:5
-#: addressbook/gui/contact-editor/fulladdr.glade.h:51
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Comoros"
 msgstr "葛摩"
 
 # mail/mail-ops.c:917
-#: addressbook/gui/contact-editor/fulladdr.glade.h:52
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Congo"
 msgstr "剛果共和國"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:53
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Cook Islands"
 msgstr "科克群島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:54
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "哥斯大黎加"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:55
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cote d'Ivoire"
 msgstr "象牙海岸"
 
-# addressbook/contact-editor/fulladdr.glade.h:4
-#: addressbook/gui/contact-editor/fulladdr.glade.h:56
-msgid "Countr_y:"
-msgstr "國家 (_Y)："
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:57
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "克羅埃西亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:58
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "古巴"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:59
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "賽普勒斯"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:60
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "捷克"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:61
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "丹麥"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:62
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Djibouti"
 msgstr "吉布地"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:63
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Dominica"
 msgstr "多明尼克"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:64
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "多明尼加"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:65
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "East Timor"
 msgstr "帝汶"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:66
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "厄瓜多"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:67
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "埃及"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:68
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "薩爾瓦多"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:69
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Equatorial Guinea"
 msgstr "赤道幾內亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:70
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Eritrea"
 msgstr "厄利垂亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:71
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "愛沙尼亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:72
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Ethiopia"
 msgstr "依索比亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:73
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Falkland Islands"
 msgstr "福克蘭群島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:74
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Faroe Islands"
 msgstr "法羅群島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:75
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Fiji"
 msgstr "斐濟群島"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/fulladdr.glade.h:76
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "芬蘭"
 
 # ui/evolution-mail.xml.h:2
-#: addressbook/gui/contact-editor/fulladdr.glade.h:77
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: my-evolution/Locations.h:766
 msgid "France"
 msgstr "法國"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:78
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "French Guiana"
 msgstr "法屬圭亞那"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:79
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "French Polynesia"
 msgstr "法屬玻里尼西亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:80
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "French Southern Territories"
 msgstr "法屬南部屬地"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:81
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Gabon"
 msgstr "加彭"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:82
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Gambia"
 msgstr "甘比亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:83
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "喬治亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:84
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "德國"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:85
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Ghana"
 msgstr "迦納"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:86
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "直布羅陀"
 
 # ui/evolution-calendar.xml.h:36
-#: addressbook/gui/contact-editor/fulladdr.glade.h:87
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "希臘"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/fulladdr.glade.h:88
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Greenland"
 msgstr "格陵蘭"
 
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: addressbook/gui/contact-editor/fulladdr.glade.h:89
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Grenada"
 msgstr "格瑞那達"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:90
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Guadeloupe"
 msgstr "瓜德魯普島"
 
 # calendar/gui/e-day-view.c:570
 # calendar/gui/e-week-view.c:300
 # calendar/gui/print.c:617
-#: addressbook/gui/contact-editor/fulladdr.glade.h:91
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Guam"
 msgstr "關島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:92
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "瓜地馬拉"
 
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/contact-editor/fulladdr.glade.h:93
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guinea"
 msgstr "幾內亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:94
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guinea-bissau"
 msgstr "幾內亞比索"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:95
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guyana"
 msgstr "蓋亞納"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: addressbook/gui/contact-editor/fulladdr.glade.h:96
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "海地"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:97
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Heard And McDonald Islands"
 msgstr "赫德及麥當勞群島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:98
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Holy See"
 msgstr "教廷"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:99
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "宏都拉斯"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:100
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "香港"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 # calendar/gui/event-editor.c:481
-#: addressbook/gui/contact-editor/fulladdr.glade.h:101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "冰島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:103
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: my-evolution/Locations.h:991
 msgid "India"
 msgstr "印度"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:104
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Indonesia"
 msgstr "印尼"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:105
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "愛爾蘭"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:106
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Israel"
 msgstr "以色列"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:107
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "義大利"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:108
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "牙買加"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:109
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "日本"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:110
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "約旦"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:111
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Kazakhstan"
 msgstr "哈薩克"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:112
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Kenya"
 msgstr "肯亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:113
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Kiribati"
 msgstr "吉里巴斯"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:114
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#, fuzzy
+msgid "Korea, Republic Of"
+msgstr "韓國"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "科威特"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:115
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Kyrgyzstan"
 msgstr "吉爾吉斯"
 
 # mail/message-list.c:685
-#: addressbook/gui/contact-editor/fulladdr.glade.h:116
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Laos"
 msgstr "寮國"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Latvia"
 msgstr "拉脫維亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:118
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "黎巴嫩"
 
 # mail/message-list.c:685
-#: addressbook/gui/contact-editor/fulladdr.glade.h:119
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Lesotho"
 msgstr "賴索托"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:120
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "賴比瑞亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:121
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Liechtenstein"
 msgstr "列支敦斯登"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:122
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:123
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "盧森堡"
 
 # calendar/gui/goto-dialog.glade.h:10
-#: addressbook/gui/contact-editor/fulladdr.glade.h:124
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Macau"
 msgstr "澳門"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Macedonia"
 msgstr "馬其頓"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:126
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Madagascar"
 msgstr "馬達加斯加"
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: addressbook/gui/contact-editor/fulladdr.glade.h:127
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Malawi"
 msgstr "馬拉威"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:128
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Malaysia"
 msgstr "馬來西亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Maldives"
 msgstr "馬爾地夫"
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: addressbook/gui/contact-editor/fulladdr.glade.h:130
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Mali"
 msgstr "馬利"
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: addressbook/gui/contact-editor/fulladdr.glade.h:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "馬爾他"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Marshall Islands"
 msgstr "馬紹爾群島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Martinique"
 msgstr "法屬馬丁尼克"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Mauritania"
 msgstr "茅利塔尼亞"
 
 # addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/gui/contact-editor/fulladdr.glade.h:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Mauritius"
 msgstr "模里西斯"
 
 # calendar/gui/goto-dialog.glade.h:11
-#: addressbook/gui/contact-editor/fulladdr.glade.h:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Mayotte"
 msgstr "美亞特"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: my-evolution/Locations.h:1386
 msgid "Mexico"
 msgstr "墨西哥"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Micronesia"
 msgstr "密克羅尼西亞"
 
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+msgid "Moldova, Republic Of"
+msgstr ""
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 # calendar/gui/event-editor.c:475
-#: addressbook/gui/contact-editor/fulladdr.glade.h:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Monaco"
 msgstr "摩納哥"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mongolia"
 msgstr "蒙古"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Montserrat"
 msgstr "蒙瑟拉特島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: my-evolution/Locations.h:1469
 msgid "Morocco"
 msgstr "摩洛哥"
 
 # addressbook/contact-editor/e-contact-editor.c:1253
-#: addressbook/gui/contact-editor/fulladdr.glade.h:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mozambique"
 msgstr "莫三比克"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: addressbook/gui/contact-editor/fulladdr.glade.h:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Myanmar"
 msgstr "緬甸"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Namibia"
 msgstr "納米比亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Nauru"
 msgstr "諾魯"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: addressbook/gui/contact-editor/fulladdr.glade.h:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Nepal"
 msgstr "尼泊爾"
 
 # addressbook/contact-editor/contact-editor.glade.h:12
-#: addressbook/gui/contact-editor/fulladdr.glade.h:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: my-evolution/Locations.h:1530
 msgid "Netherlands"
 msgstr "荷蘭"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Netherlands Antilles"
 msgstr "荷屬安地列斯"
 
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/contact-editor/fulladdr.glade.h:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "New Caledonia"
 msgstr "新喀里多尼亞島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: my-evolution/Locations.h:1559
 msgid "New Zealand"
 msgstr "紐西蘭"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: my-evolution/Locations.h:1561
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
 # mail/message-list.c:690
-#: addressbook/gui/contact-editor/fulladdr.glade.h:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Niger"
 msgstr "尼日"
 
 # mail/message-list.c:690
-#: addressbook/gui/contact-editor/fulladdr.glade.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nigeria"
 msgstr "奈及利亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Niue"
 msgstr "紐威島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: my-evolution/Locations.h:1573
 msgid "Norfolk Island"
 msgstr "諾福克群島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Northern Mariana Islands"
 msgstr "北馬里亞納群島"
 
 # widgets/misc/e-cell-date-edit.c:221
 # widgets/misc/e-dateedit.c:418
-#: addressbook/gui/contact-editor/fulladdr.glade.h:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1586
 msgid "Norway"
 msgstr "挪威"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1631
 msgid "Oman"
 msgstr "阿曼"
 
 # ui/evolution-event-editor.xml.h:30
 # ui/evolution-task-editor-dialog.xml.h:33
-#: addressbook/gui/contact-editor/fulladdr.glade.h:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: my-evolution/Locations.h:1672
 msgid "Pakistan"
 msgstr "巴基斯坦"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Palau"
 msgstr "帛琉群島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 #, fuzzy
 msgid "Palestinian Territory"
 msgstr "英屬印度洋地區"
 
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: addressbook/gui/contact-editor/fulladdr.glade.h:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1682
 msgid "Panama"
 msgstr "巴拿馬"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Papua New Guinea"
 msgstr "巴布亞紐幾內亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1687
 msgid "Paraguay"
 msgstr "巴拉圭"
 
 # addressbook/printing/e-contact-print.glade.h:27
-#: addressbook/gui/contact-editor/fulladdr.glade.h:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1722
 msgid "Peru"
 msgstr "秘魯"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Philippines"
 msgstr "菲律賓"
 
 # ui/evolution-calendar.xml.h:25
-#: addressbook/gui/contact-editor/fulladdr.glade.h:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Pitcairn"
 msgstr "皮特康"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/fulladdr.glade.h:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: my-evolution/Locations.h:1763
 msgid "Poland"
 msgstr "波蘭"
 
 # addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/gui/contact-editor/fulladdr.glade.h:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1790
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: my-evolution/Locations.h:1823
 msgid "Puerto Rico"
 msgstr "波多黎各"
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#: addressbook/gui/contact-editor/fulladdr.glade.h:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1835
 msgid "Qatar"
 msgstr "卡達"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:173
-msgid "Republic Of Korea"
-msgstr "韓國"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:174
-msgid "Republic Of Moldova"
-msgstr "摩爾多瓦"
-
 # addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/gui/contact-editor/fulladdr.glade.h:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Reunion"
 msgstr "留尼旺"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: my-evolution/Locations.h:1910
 msgid "Romania"
 msgstr "羅馬尼亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Russian Federation"
 msgstr "俄羅斯"
 
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: addressbook/gui/contact-editor/fulladdr.glade.h:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Rwanda"
 msgstr "盧安達"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Saint Kitts And Nevis"
 msgstr "聖克里斯多福"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Saint Lucia"
 msgstr "聖露西亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Saint Vincent And The Grena-dines"
 msgstr "聖文森"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Samoa"
 msgstr "薩摩亞群島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "San Marino"
 msgstr "聖馬利諾"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Sao Tome And Principe"
 msgstr "聖多美及普林西比"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: my-evolution/Locations.h:2033
 msgid "Saudi Arabia"
 msgstr "沙烏地阿拉伯"
 
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/contact-editor/fulladdr.glade.h:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Senegal"
 msgstr "塞內加爾"
 
 # calendar/gui/e-meeting-dialog.glade.h:21
-#: addressbook/gui/contact-editor/fulladdr.glade.h:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Seychelles"
 msgstr "塞席爾"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Sierra Leone"
 msgstr "獅子山"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: my-evolution/Locations.h:2088
 msgid "Singapore"
 msgstr "新加坡"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: my-evolution/Locations.h:2101
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: my-evolution/Locations.h:2102
 msgid "Slovenia"
 msgstr "斯洛凡尼亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Solomon Islands"
 msgstr "索羅門群島"
 
@@ -2535,108 +2736,120 @@ msgstr "索羅門群島"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:13
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
-#: addressbook/gui/contact-editor/fulladdr.glade.h:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Somalia"
 msgstr "索馬利亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: my-evolution/Locations.h:2117
 msgid "South Africa"
 msgstr "南非"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "南喬治亞及南桑威奇群島"
 
 # ui/evolution-message-composer.xml.h:26
-#: addressbook/gui/contact-editor/fulladdr.glade.h:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2125
 msgid "Spain"
 msgstr "西班牙"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Sri Lanka"
 msgstr "斯里蘭卡"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "St. Helena"
 msgstr "聖赫勒拿島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "St. Pierre And Miquelon"
 msgstr "聖匹及密啟倫群島"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: addressbook/gui/contact-editor/fulladdr.glade.h:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Sudan"
 msgstr "蘇丹"
 
 # addressbook/gui/widgets/e-addressbook-view.c:734
-#: addressbook/gui/contact-editor/fulladdr.glade.h:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2174
 msgid "Suriname"
 msgstr "蘇利南"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "斯瓦巴及尖棉島"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/fulladdr.glade.h:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Swaziland"
 msgstr "史瓦濟蘭"
 
 # mail/message-list.c:678
-#: addressbook/gui/contact-editor/fulladdr.glade.h:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: my-evolution/Locations.h:2179
 msgid "Sweden"
 msgstr "瑞典"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: my-evolution/Locations.h:2181
 msgid "Switzerland"
 msgstr "瑞士"
 
 # addressbook/contact-editor/e-contact-editor.c:1258
 # addressbook/gui/widgets/e-addressbook-view.c:721
-#: addressbook/gui/contact-editor/fulladdr.glade.h:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: my-evolution/Locations.h:2203
 msgid "Taiwan"
 msgstr "臺灣"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: addressbook/gui/contact-editor/fulladdr.glade.h:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Tajikistan"
 msgstr "塔吉克"
 
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#, fuzzy
+msgid "Tanzania, United Republic Of"
+msgstr "坦尚尼亞"
+
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: addressbook/gui/contact-editor/fulladdr.glade.h:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Thailand"
 msgstr "泰國"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
-#: addressbook/gui/contact-editor/fulladdr.glade.h:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Togo"
 msgstr "多哥"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Tokelau"
 msgstr "托克勞群島"
 
 # ui/evolution-calendar.xml.h:34
 # widgets/misc/e-cell-date-edit.c:229
 # widgets/misc/e-dateedit.c:424
-#: addressbook/gui/contact-editor/fulladdr.glade.h:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Tonga"
 msgstr "東加"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Trinidad And Tobago"
 msgstr "千里達"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tunisia"
 msgstr "突尼西亞"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: addressbook/gui/contact-editor/fulladdr.glade.h:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: my-evolution/Locations.h:2319
 msgid "Turkey"
 msgstr "土耳其"
 
@@ -2645,120 +2858,227 @@ msgstr "土耳其"
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: addressbook/gui/contact-editor/fulladdr.glade.h:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Turkmenistan"
 msgstr "土庫曼"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Turks And Caicos Islands"
 msgstr "土克斯及開科斯群島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tuvalu"
 msgstr "吐瓦魯"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:218
-msgid "U.S. Virgin Islands"
-msgstr "美屬維爾京群島"
-
 # addressbook/contact-editor/fulladdr.glade.h:2
-#: addressbook/gui/contact-editor/fulladdr.glade.h:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Uganda"
 msgstr "烏干達"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: my-evolution/Locations.h:2332
 msgid "Ukraine"
 msgstr "烏克蘭"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "United Arab Emirates"
 msgstr "阿拉伯聯合大公國"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2340
 msgid "United Kingdom"
 msgstr "英國"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:223
-msgid "United Republic Of Tanzania"
-msgstr "坦尚尼亞"
-
-# mail/mail-search.c:138
-#: addressbook/gui/contact-editor/fulladdr.glade.h:224
-msgid "United States"
-msgstr "美國"
-
-#: addressbook/gui/contact-editor/fulladdr.glade.h:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "United States Minor Outlying Islands"
 msgstr "美屬邊疆群島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: my-evolution/Locations.h:2346
 msgid "Uruguay"
 msgstr "烏拉圭"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Uzbekistan"
 msgstr "烏茲別克"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Vanuatu"
 msgstr "萬那杜"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2378
 msgid "Venezuela"
 msgstr "委內瑞拉"
 
 # addressbook/gui/component/select-names/select-names.glade.h:3
-#: addressbook/gui/contact-editor/fulladdr.glade.h:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: my-evolution/Locations.h:2390
 msgid "Viet Nam"
 msgstr "越南"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#, fuzzy
+msgid "Virgin Islands, British"
+msgstr "美屬維爾京群島"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#, fuzzy
+msgid "Virgin Islands, U.S."
+msgstr "美屬維爾京群島"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Wallis And Futuna Islands"
 msgstr "沃里斯與伏塔那島"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Western Sahara"
 msgstr "西撒哈拉"
 
 # mail/message-list.c:678
-#: addressbook/gui/contact-editor/fulladdr.glade.h:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: my-evolution/Locations.h:2510
 msgid "Yemen"
 msgstr "葉門"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2522
 msgid "Yugoslavia"
 msgstr "南斯拉夫"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Zambia"
 msgstr "尚比亞"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Zimbabwe"
 msgstr "辛巴威"
 
+# mail/mail-accounts.c:280
+# mail/mail-accounts.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"您確定要刪除\n"
+"這個連絡人？"
+
+# addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
+msgid "Delete Contact?"
+msgstr "刪除連絡人？"
+
+# calendar/gui/dialogs/alarm-notify-dialog.c:207
+#: addressbook/gui/contact-editor/e-contact-editor.c:825
+#, fuzzy
+msgid "Category editor not available."
+msgstr "沒有描述。"
+
+# addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor.c:832
+msgid "This contact belongs to these categories:"
+msgstr "此連絡人屬於這些類別："
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+# addressbook/gui/widgets/e-addressbook-view.c:551
+# addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/gui/contact-editor/e-contact-editor.c:1046
+#, fuzzy
+msgid "Save Contact as VCard"
+msgstr "儲存成 VCard 檔案格式"
+
+# addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+# camel/providers/local/camel-local-store.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
+#, c-format
+msgid "Could not find widget for a field: `%s'"
+msgstr "不能找到欄位 `%s' 之界面工具"
+
+# addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+msgid "Contact Quick-Add"
+msgstr "快速新增連絡人"
+
+# addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
+msgid "Edit Full"
+msgstr "編輯全部"
+
+# addressbook/contact-editor/e-contact-quick-add.c:276
+# addressbook/gui/widgets/e-addressbook-view.c:700
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: addressbook/gui/widgets/e-addressbook-view.c:336
+msgid "Full Name"
+msgstr "全名"
+
+# addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
+msgid "E-mail"
+msgstr "電子郵件"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:106
+msgid "card.vcf"
+msgstr ""
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/e-contact-save-as.c:177
+#, fuzzy
+msgid "list"
+msgstr "靄"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:215
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s 已經存在\n"
+"您是否要複寫它?"
+
+# addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "地址 2(_2)："
+
+# addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Check Address"
+msgstr "檢查地址"
+
+# addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Countr_y:"
+msgstr "國家 (_Y)："
+
 # addressbook/contact-editor/fulladdr.glade.h:7
-#: addressbook/gui/contact-editor/fulladdr.glade.h:237
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "_Address:"
 msgstr "地址 (_A)："
 
 # addressbook/contact-editor/fulladdr.glade.h:8
-#: addressbook/gui/contact-editor/fulladdr.glade.h:238
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_City:"
 msgstr "縣/市 (_C)："
 
 # addressbook/contact-editor/fulladdr.glade.h:9
-#: addressbook/gui/contact-editor/fulladdr.glade.h:239
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "郵箱 (_P)："
 
 # addressbook/contact-editor/fulladdr.glade.h:10
-#: addressbook/gui/contact-editor/fulladdr.glade.h:240
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "州/省 (_S)："
 
 # addressbook/contact-editor/fulladdr.glade.h:11
-#: addressbook/gui/contact-editor/fulladdr.glade.h:241
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "郵遞區號 (_Z)"
 
@@ -2881,10 +3201,19 @@ msgstr "連絡人清單編輯器"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:231
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
 msgid "Contact List Editor"
 msgstr "連絡人清單編輯器"
 
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+# addressbook/gui/widgets/e-addressbook-view.c:551
+# addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
+#, fuzzy
+msgid "Save List as VCard"
+msgstr "儲存成 VCard 檔案格式"
+
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 msgid "Add Anyway"
 msgstr "不管怎樣都新增"
@@ -2936,7 +3265,7 @@ msgstr ""
 
 # widgets/misc/e-filter-bar.c:239
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:231
 msgid "Advanced Search"
 msgstr "進階尋找"
 
@@ -2951,142 +3280,72 @@ msgstr "尋找"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:137
 msgid "No cards"
 msgstr "沒有名片"
 
 # ui/evolution-calendar.xml.h:25
-#: addressbook/gui/widgets/e-addressbook-model.c:130
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "1 card"
 msgstr "1 張名片"
 
 # calendar/gui/event-editor.c:1563
-#: addressbook/gui/widgets/e-addressbook-model.c:133
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 #, c-format
 msgid "%d cards"
 msgstr " %d 張名片"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-# addressbook/gui/widgets/e-addressbook-view.c:551
-# addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:671
-#: addressbook/gui/widgets/e-addressbook-view.c:733
-#: addressbook/gui/widgets/e-addressbook-view.c:1405
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr "儲存成 VCard 檔案格式"
-
-# calendar/gui/e-day-view.c:3162
-# calendar/gui/e-week-view.c:3292
-# ui/evolution-calendar.xml.h:19
-# ui/evolution-message-composer.xml.h:11
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "開啟"
-
-# ui/evolution-mail.xml.h:35
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:734
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "連絡人轉寄"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-# addressbook/gui/widgets/e-addressbook-view.c:613
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:735
-msgid "Send Message to Contact"
-msgstr "傳送郵件給連絡人"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-# addressbook/gui/widgets/e-addressbook-view.c:614
-# mail/message-browser.c:199
-# ui/evolution-addressbook.xml.h:9
-# ui/evolution-calendar.xml.h:23
-# ui/evolution-mail.xml.h:65
-# ui/evolution-tasks.xml.h:4
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:736
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
-#: ui/my-evolution.xml.h:2
-msgid "Print"
-msgstr "列印"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-# addressbook/gui/widgets/e-addressbook-view.c:615
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:738
-msgid "Print Envelope"
-msgstr "列印信封"
-
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
-#: addressbook/gui/widgets/e-addressbook-view.c:740 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
-#: ui/evolution-tasks.xml.h:8
-msgid "Delete"
-msgstr "刪除"
+# shell/e-shell-importer.c:384
+#: addressbook/gui/widgets/e-addressbook-model.c:370
+#, fuzzy
+msgid "Error getting book view"
+msgstr "啟動 %s 時發生錯誤"
 
 # shell/e-shell-importer.c:404
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "編輯名片時發生錯誤"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:33
-#: shell/evolution-shell-component.c:1007
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: shell/evolution-shell-component.c:1079
 msgid "Success"
 msgstr "成功"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: addressbook/gui/widgets/e-addressbook-util.c:34
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1044
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: camel/providers/imap/camel-imap-command.c:305
+#: camel/providers/imap/camel-imap-command.c:393
+#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
-#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 msgid "Repository offline"
 msgstr "資料庫離線"
 
 # shell/e-storage.c:475
-#: addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
-#: shell/evolution-shell-component.c:1035
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
+#: shell/evolution-shell-component.c:1109
 msgid "Permission denied"
 msgstr "權限不足"
 
 # calendar/gui/calendar-commands.c:266
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 msgid "Card not found"
 msgstr "找不到名片"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card ID already exists"
 msgstr "名片 ID 已經存在"
 
 # shell/e-storage.c:477
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Protocol not supported"
 msgstr "通訊協定不支援"
 
@@ -3096,141 +3355,366 @@ msgstr "通訊協定不支援"
 # calendar/gui/e-calendar-table.c:422
 # camel/camel-service.c:544
 # camel/camel-service.c:580
-#: addressbook/gui/widgets/e-addressbook-util.c:40
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1193
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:481 calendar/gui/print.c:2255
-#: camel/camel-service.c:607 camel/camel-service.c:643
+#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
+#: camel/camel-service.c:738 camel/camel-service.c:778
+#: camel/camel-service.c:846 camel/camel-service.c:889
 msgid "Cancelled"
 msgstr "已取消"
 
+# camel/camel-sasl-anonymous.c:110
+# camel/camel-sasl-plain.c:87
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "驗証失敗。"
+
+# camel/providers/smtp/camel-smtp-transport.c:218
+#: addressbook/gui/widgets/e-addressbook-util.c:44
+#, fuzzy
+msgid "Authentication Required"
+msgstr "要求驗證"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:45
+msgid "TLS not Available"
+msgstr ""
+
 # shell/e-storage.c:467
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Other error"
 msgstr "其它錯誤"
 
 # calendar/gui/dialogs/save-comp.c:51
-#: addressbook/gui/widgets/e-addressbook-util.c:57
+#: addressbook/gui/widgets/e-addressbook-util.c:62
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "您是否須要儲存？"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:81
 msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:291
 msgid "Error adding card"
 msgstr "新增名片時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/e-addressbook-util.c:85
+#: addressbook/gui/widgets/e-addressbook-util.c:90
 msgid "Error modifying list"
 msgstr "編輯清單時發生錯誤"
 
 # executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/e-addressbook-util.c:95
+#: addressbook/gui/widgets/e-addressbook-util.c:100
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
 # executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:1278
+#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "移除名片時發生錯誤"
 
-#. Translators: put here a list of labels you want to see on buttons in
-#. addressbook. You may use any character to separate labels but it must
-#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:378
-msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+# calendar/gui/calendar-summary.c:622
+# mail/mail-config.glade.h:24
+#: addressbook/gui/widgets/e-addressbook-util.c:207
+#, fuzzy
+msgid "Display Cards?"
+msgstr "顯示"
 
-#. Translators: put here a list of characters that correspond to buttons
-#. in addressbook. You may use any character to separate labels but it
-#. must also be placed at the begining ot the string.
-#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:383
-msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+# calendar/gui/calendar-summary.c:622
+# mail/mail-config.glade.h:24
+#: addressbook/gui/widgets/e-addressbook-util.c:208
+#, fuzzy
+msgid "Display Cards"
+msgstr "顯示"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:212
+#, c-format
+msgid ""
+"You have requested that %d cards be cards. This will cause %d new windows to "
+"be\n"
+"displayed on your screen. Do you really want to display all of these cards?"
+msgstr ""
+
+# mail/mail-callbacks.c:850
+#: addressbook/gui/widgets/e-addressbook-util.c:347
+#, fuzzy
+msgid "Move card to"
+msgstr "將郵件移至"
+
+# calendar/gui/e-calendar-table.c:714
+#: addressbook/gui/widgets/e-addressbook-util.c:349
+#, fuzzy
+msgid "Copy card to"
+msgstr "複製選定的工作"
+
+# calendar/gui/calendar-model.c:638
+# calendar/gui/calendar-model.c:1176
+# calendar/gui/dialogs/task-editor-dialog.glade.h:14
+# calendar/gui/e-calendar-table.c:419
+#: addressbook/gui/widgets/e-addressbook-util.c:352
+#, fuzzy
+msgid "Move cards to"
+msgstr "沒有名片"
+
+# calendar/gui/calendar-model.c:638
+# calendar/gui/calendar-model.c:1176
+# calendar/gui/dialogs/task-editor-dialog.glade.h:14
+# calendar/gui/e-calendar-table.c:419
+#: addressbook/gui/widgets/e-addressbook-util.c:354
+#, fuzzy
+msgid "Copy cards to"
+msgstr "沒有名片"
 
 # addressbook/gui/widgets/e-addressbook-view.c:698
-#: addressbook/gui/widgets/e-addressbook-view.c:848
+#: addressbook/gui/widgets/e-addressbook-view.c:334
 msgid "* Click here to add a contact *"
 msgstr "* 按這裏新增連絡人 *"
 
 # addressbook/gui/widgets/e-addressbook-view.c:702
-#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:338
 msgid "Primary Phone"
 msgstr "主要電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:703
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:339
 msgid "Assistant Phone"
 msgstr "助理電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:704
-#: addressbook/gui/widgets/e-addressbook-view.c:854
+#: addressbook/gui/widgets/e-addressbook-view.c:340
 msgid "Business Phone"
 msgstr "商務電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:705
-#: addressbook/gui/widgets/e-addressbook-view.c:855
+#: addressbook/gui/widgets/e-addressbook-view.c:341
 msgid "Callback Phone"
 msgstr "回撥電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:706
-#: addressbook/gui/widgets/e-addressbook-view.c:856
+#: addressbook/gui/widgets/e-addressbook-view.c:342
 msgid "Company Phone"
 msgstr "公司電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:707
-#: addressbook/gui/widgets/e-addressbook-view.c:857
+#: addressbook/gui/widgets/e-addressbook-view.c:343
 msgid "Home Phone"
 msgstr "住家電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:709
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:345
 msgid "Business Address"
 msgstr "商務地址"
 
 # addressbook/gui/widgets/e-addressbook-view.c:710
-#: addressbook/gui/widgets/e-addressbook-view.c:860
+#: addressbook/gui/widgets/e-addressbook-view.c:346
 msgid "Home Address"
 msgstr "住家地址"
 
 # addressbook/gui/widgets/e-addressbook-view.c:711
-#: addressbook/gui/widgets/e-addressbook-view.c:861
+#: addressbook/gui/widgets/e-addressbook-view.c:347
 msgid "Mobile Phone"
 msgstr "行動電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:712
-#: addressbook/gui/widgets/e-addressbook-view.c:862
+#: addressbook/gui/widgets/e-addressbook-view.c:348
 msgid "Car Phone"
 msgstr "汽車電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:715
-#: addressbook/gui/widgets/e-addressbook-view.c:865
+#: addressbook/gui/widgets/e-addressbook-view.c:351
 msgid "Business Phone 2"
 msgstr "商務電話 2"
 
 # addressbook/gui/widgets/e-addressbook-view.c:716
-#: addressbook/gui/widgets/e-addressbook-view.c:866
+#: addressbook/gui/widgets/e-addressbook-view.c:352
 msgid "Home Phone 2"
 msgstr "住家電話 2"
 
 # addressbook/gui/widgets/e-addressbook-view.c:718
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/gui/widgets/e-addressbook-view.c:354
 msgid "Other Phone"
 msgstr "其它電話"
 
 # addressbook/gui/widgets/e-addressbook-view.c:724
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 msgid "Other Address"
 msgstr "其它地址"
 
+# importers/pine-importer.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+msgid "Addressbook"
+msgstr "目錄服務"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+# addressbook/gui/widgets/e-addressbook-view.c:551
+# addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1826
+#: ui/evolution-addressbook.xml.h:21
+msgid "Save as VCard"
+msgstr "儲存成 VCard 檔案格式"
+
+# ui/evolution-addressbook.xml.h:7
+#: addressbook/gui/widgets/e-addressbook-view.c:877
+#, fuzzy
+msgid "New Contact..."
+msgstr "新增連絡人"
+
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:878
+#, fuzzy
+msgid "New Contact List..."
+msgstr "新增連絡人清單"
+
+# ui/evolution.xml.h:52
+#: addressbook/gui/widgets/e-addressbook-view.c:881
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "移至資料夾(_G)..."
+
+# shell/e-shell-importer.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+#, fuzzy
+msgid "Import..."
+msgstr "匯入..."
+
+# ui/evolution-addressbook.xml.h:19
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#, fuzzy
+msgid "Search for Contacts..."
+msgstr "尋找連絡人(_S)"
+
+# ui/evolution-addressbook.xml.h:16
+#: addressbook/gui/widgets/e-addressbook-view.c:885
+#, fuzzy
+msgid "Addressbook Sources..."
+msgstr "目錄服務來源(_A)..."
+
+# ui/evolution-mail.xml.h:110
+#: addressbook/gui/widgets/e-addressbook-view.c:887
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "郵件設定(_M)..."
+
+# ui/evolution-mail.xml.h:35
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: ui/evolution-addressbook.xml.h:12
+msgid "Forward Contact"
+msgstr "連絡人轉寄"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+# addressbook/gui/widgets/e-addressbook-view.c:613
+#: addressbook/gui/widgets/e-addressbook-view.c:892
+msgid "Send Message to Contact"
+msgstr "傳送郵件給連絡人"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+# addressbook/gui/widgets/e-addressbook-view.c:614
+# mail/message-browser.c:199
+# ui/evolution-addressbook.xml.h:9
+# ui/evolution-calendar.xml.h:23
+# ui/evolution-mail.xml.h:65
+# ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/my-evolution.xml.h:1
+msgid "Print"
+msgstr "列印"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+# addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+msgid "Print Envelope"
+msgstr "列印信封"
+
+# mail/folder-browser.c:713
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#, fuzzy
+msgid "Copy to folder..."
+msgstr "復製至資料夾(_C)..."
+
+# mail/folder-browser.c:711
+#: addressbook/gui/widgets/e-addressbook-view.c:900
+#, fuzzy
+msgid "Move to folder..."
+msgstr "移至資料夾(_M)..."
+
+# ui/evolution-event-editor.xml.h:15
+# ui/evolution-task-editor-dialog.xml.h:16
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "剪下"
+
+# ui/evolution-event-editor.xml.h:13
+# ui/evolution-mail.xml.h:8
+# ui/evolution-task-editor-dialog.xml.h:14
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "複製"
+
+# ui/evolution-event-editor.xml.h:30
+# ui/evolution-task-editor-dialog.xml.h:33
+#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+msgid "Paste"
+msgstr "貼上"
+
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+# addressbook/gui/widgets/e-addressbook-view.c:616
+# calendar/gui/e-meeting-dialog.glade.h:8
+# calendar/gui/event-editor-dialog.glade.h:9
+# mail/mail-config.glade.h:23
+# mail/message-browser.c:202
+# ui/evolution-addressbook.xml.h:3
+# ui/evolution-event-editor.xml.h:17
+# ui/evolution-mail.xml.h:22
+# ui/evolution-task-editor-dialog.xml.h:18
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+msgid "Delete"
+msgstr "刪除"
+
+# widgets/menus/gal-view-menus.c:176
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#, fuzzy
+msgid "Current View"
+msgstr "目前檢視(_C)"
+
+#. Minicard view stuff
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c:942
+msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+
+#. Translators: put here a list of characters that correspond to buttons
+#. in addressbook. You may use any character to separate labels but it
+#. must also be placed at the begining ot the string.
+#. Use lower case letters if possible.
+#: addressbook/gui/widgets/e-addressbook-view.c:947
+msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3246,11 +3730,12 @@ msgid "Save in addressbook"
 msgstr "存入目錄服務"
 
 # addressbook/gui/widgets/e-minicard-view.c:216
-#: addressbook/gui/widgets/e-minicard-view.c:150
+#: addressbook/gui/widgets/e-minicard-view.c:140
+#, fuzzy
 msgid ""
 "\n"
 "\n"
-"There are no items to show in this view\n"
+"There are no items to show in this view.\n"
 "\n"
 "Double-click here to create a new Contact."
 msgstr ""
@@ -3260,11 +3745,43 @@ msgstr ""
 "\n"
 "雙擊這裏新增連絡人。"
 
+# addressbook/gui/widgets/e-minicard-view.c:216
+#: addressbook/gui/widgets/e-minicard-view.c:143
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"沒有項目可供這種檢視方式顯示\n"
+"\n"
+"雙擊這裏新增連絡人。"
+
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr "名片檢視模式"
 
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+# addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/printing/e-contact-print-envelope.c:215
+#: addressbook/printing/e-contact-print-envelope.c:236
+msgid "Print envelope"
+msgstr "列印信封"
+
+# ui/evolution-calendar.xml.h:25
+#: addressbook/printing/e-contact-print.c:1115
+msgid "Print cards"
+msgstr "列印名片"
+
+# ui/evolution-calendar.xml.h:25
+#: addressbook/printing/e-contact-print.c:1175
+#: addressbook/printing/e-contact-print.c:1197
+msgid "Print card"
+msgstr "列印名片"
+
 # addressbook/printing/e-contact-print.glade.h:1
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3352,6 +3869,7 @@ msgstr "包含："
 
 # addressbook/printing/e-contact-print.glade.h:18
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:628
 msgid "Landscape"
 msgstr "橫向"
 
@@ -3377,17 +3895,19 @@ msgid "Number of columns:"
 msgstr "欄數："
 
 # addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "選項"
 
 # addressbook/printing/e-contact-print.glade.h:24
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:615
 msgid "Orientation"
 msgstr "紙張方向"
 
 # addressbook/printing/e-contact-print.glade.h:25
 #: addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1671
 msgid "Page"
 msgstr "頁"
 
@@ -3407,7 +3927,9 @@ msgid "Paper source:"
 msgstr "紙張來源："
 
 # addressbook/printing/e-contact-print.glade.h:29
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:621
 msgid "Portrait"
 msgstr "縱向"
 
@@ -3476,26 +3998,8 @@ msgstr "寬："
 msgid "_Font..."
 msgstr "字型(_F)..."
 
-# ui/evolution-calendar.xml.h:25
-#: addressbook/printing/e-contact-print.c:1111
-msgid "Print cards"
-msgstr "列印名片"
-
-# ui/evolution-calendar.xml.h:25
-#: addressbook/printing/e-contact-print.c:1171
-#: addressbook/printing/e-contact-print.c:1193
-msgid "Print card"
-msgstr "列印名片"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-# addressbook/gui/widgets/e-addressbook-view.c:615
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
-msgid "Print envelope"
-msgstr "列印信封"
-
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/cal-util/cal-component.c:1202
+#: calendar/cal-util/cal-component.c:1221
 #, fuzzy
 msgid "Untitled appointment"
 msgstr "編輯約會(_E)"
@@ -3505,9 +4009,9 @@ msgstr "編輯約會(_E)"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:10
 # calendar/gui/e-calendar-table.c:345
 # mail/message-list.c:689
-#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
+#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:405 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
 msgid "High"
 msgstr "高"
 
@@ -3517,10 +4021,10 @@ msgstr "高"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:13
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/calendar-model.c:1703
+#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
+#: calendar/gui/calendar-model.c:1711
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
 msgid "Normal"
 msgstr "普通"
 
@@ -3529,9 +4033,9 @@ msgstr "普通"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:12
 # calendar/gui/e-calendar-table.c:347
 # mail/message-list.c:687
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
+#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
 msgid "Low"
 msgstr "低"
 
@@ -3539,30 +4043,36 @@ msgstr "低"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:518
+#: calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:408
+#: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "未指定"
 
 # calendar/conduits/calendar/calendar-conduit.c:687
 # calendar/conduits/todo/todo-conduit.c:501
-#: calendar/conduits/calendar/calendar-conduit.c:935
-#: calendar/conduits/todo/todo-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:1150
+#: calendar/conduits/todo/todo-conduit.c:835
 msgid "Error while communicating with calendar server"
 msgstr "與行事曆伺服器通訊時發生錯誤"
 
 # calendar/conduits/calendar/calendar-conduit.c:786
 # calendar/conduits/calendar/calendar-conduit.c:789
-#: calendar/conduits/calendar/calendar-conduit.c:1075
-#: calendar/conduits/calendar/calendar-conduit.c:1078
+#: calendar/conduits/calendar/calendar-conduit.c:1297
+#: calendar/conduits/calendar/calendar-conduit.c:1300
 msgid "Could not read pilot's Calendar application block"
 msgstr "不能讀取 pilot 行事曆程式區塊"
 
+# calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: calendar/conduits/todo/todo-conduit.c:206
+#, fuzzy
+msgid "Default Priority:"
+msgstr "優先順序(_P)："
+
 # calendar/conduits/todo/todo-conduit.c:600
 # calendar/conduits/todo/todo-conduit.c:603
-#: calendar/conduits/todo/todo-conduit.c:754
-#: calendar/conduits/todo/todo-conduit.c:757
+#: calendar/conduits/todo/todo-conduit.c:951
+#: calendar/conduits/todo/todo-conduit.c:954
 msgid "Could not read pilot's ToDo application block"
 msgstr "不能讀取 pilot 待辦事項程式區塊"
 
@@ -3577,26 +4087,28 @@ msgstr "一個可以顯示行事曆的 Bonobo 控制項例子"
 msgid "A sample Bonobo control which displays an calendar."
 msgstr "一個可以顯示行事曆的 Bonobo 控制項例子"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+# ui/evolution-mail.xml.h:110
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar executive summary component."
-msgstr "Evolution 行事曆執行摘要元件."
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "行事曆與工作設定"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Calendar."
+msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution 行事曆 iTip/iMip 檢視器"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution component for handling the calendar."
 msgstr "用作處理行事曆的 Evolution 元件。"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Calendar Summary component."
-msgstr "行事曆摘要元件工廠."
-
 # mail/GNOME_Evolution_Mail.oaf.in.h:6
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
@@ -3623,6 +4135,10 @@ msgstr "集中式行事曆元件編輯器對話視窗工廠。"
 msgid "Factory to create a component editor factory"
 msgstr "建立元件編輯器工廠。"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
+msgid "This page can be used to configure Calendar and Task preferences"
+msgstr ""
+
 # calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -3693,11 +4209,11 @@ msgid "_Edit appointment"
 msgstr "編輯約會(_E)"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: calendar/gui/alarm-notify/alarm-queue.c:670
+#: calendar/gui/alarm-notify/alarm-queue.c:675
 msgid "No description available."
 msgstr "沒有描述。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:730
+#: calendar/gui/alarm-notify/alarm-queue.c:735
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3705,38 +4221,72 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:781
+# widgets/misc/e-messagebox.c:159
+#: calendar/gui/alarm-notify/alarm-queue.c:753
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: widgets/misc/e-messagebox.c:159
+msgid "Warning"
+msgstr "警告"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:758
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger.\n"
-"This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
 
+# importers/elm-importer.c:528
+# importers/netscape-importer.c:807
+# importers/pine-importer.c:668
+#: calendar/gui/alarm-notify/alarm-queue.c:772
+#, fuzzy
+msgid "Do not ask me about this program again."
+msgstr "不要再顯示這個訊息。"
+
 # calendar/gui/alarm-notify/notify-main.c:93
 # calendar/gui/main.c:52
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "不能初始化 GNOME"
 
 # calendar/gui/alarm-notify/notify-main.c:108
-#: calendar/gui/alarm-notify/notify-main.c:181
+#: calendar/gui/alarm-notify/notify-main.c:183
 #, fuzzy
 msgid "Could not create the alarm notify service"
 msgstr "不能建立聲音提醒服務元件工廠"
 
 # calendar/gui/alarm-notify/notify-main.c:108
-#: calendar/gui/alarm-notify/notify-main.c:186
+#: calendar/gui/alarm-notify/notify-main.c:188
 msgid "Could not create the alarm notify service factory"
 msgstr "不能建立聲音提醒服務元件工廠"
 
+# calendar/gui/gnome-cal.c:234
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "主旨包含"
+
+# calendar/gui/gnome-cal.c:235
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "描述包含"
+
+# calendar/gui/gnome-cal.c:236
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "備註包含"
+
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+msgid "Unmatched"
+msgstr "沒有相符資料"
+
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-#: calendar/gui/calendar-commands.c:446
+#: calendar/gui/calendar-commands.c:405
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
@@ -3745,22 +4295,22 @@ msgstr "%A %d %B %Y"
 # calendar/gui/e-week-view-main-item.c:334
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:449 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 # calendar/gui/print.c:1093
-#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
-#: calendar/gui/calendar-commands.c:458
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:476
-#: calendar/gui/calendar-commands.c:482 calendar/gui/calendar-commands.c:484
+#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
+#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
@@ -3768,13 +4318,13 @@ msgstr "%d %B %Y"
 #. 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/calendar-commands.c:474
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
+#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
 msgid "%d %B"
 msgstr "%d %B"
 
 # calendar/gui/calendar-commands.c:468
-#: calendar/gui/calendar-commands.c:805
+#: calendar/gui/calendar-commands.c:800
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "不能建立行事曆檢視。  請檢查 ORBit 和 OAF 的設定。"
@@ -3782,23 +4332,23 @@ msgstr "不能建立行事曆檢視。  請檢查 ORBit 和 OAF 的設定。"
 # calendar/gui/calendar-model.c:363
 # calendar/gui/calendar-model.c:900
 # calendar/gui/e-calendar-table.c:324
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:984
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "私人"
 
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:986
-#: calendar/gui/e-calendar-table.c:385
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "機密"
 
 # calendar/gui/calendar-model.c:360
 # calendar/gui/calendar-model.c:898
 # calendar/gui/e-calendar-table.c:323
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:383
+#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:396
 msgid "Public"
 msgstr "公開"
 
@@ -3823,15 +4373,15 @@ msgid "W"
 msgstr "W"
 
 # ui/evolution-calendar.xml.h:36
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1143
-#: calendar/gui/e-calendar-table.c:457
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "空閒"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:458
-#: calendar/gui/e-meeting-time-sel.c:427
-#: shell/evolution-shell-component.c:1029
+#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
+#: calendar/gui/e-meeting-time-sel.c:438
+#: shell/evolution-shell-component.c:1103
 msgid "Busy"
 msgstr "忙碌"
 
@@ -3839,9 +4389,9 @@ msgstr "忙碌"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1187
+#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/print.c:2246
+#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "未開始"
 
@@ -3849,9 +4399,9 @@ msgstr "未開始"
 # calendar/gui/calendar-model.c:1178
 # calendar/gui/dialogs/task-editor-dialog.glade.h:11
 # calendar/gui/e-calendar-table.c:420
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1189
+#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2249
+#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "進行中"
 
@@ -3859,15 +4409,15 @@ msgstr "進行中"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1191
+#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:480 calendar/gui/e-meeting-model.c:328
-#: calendar/gui/e-meeting-model.c:351 calendar/gui/print.c:2252
+#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
+#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "已完成"
 
 # calendar/gui/calendar-model.c:970
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1052
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3892,48 +4442,41 @@ msgstr ""
 # widgets/misc/e-dateedit.c:1341
 # widgets/misc/e-dateedit.c:1456
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1185 calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1485
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:405
-#: mail/mail-config.glade.h:47
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
+#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
+#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
+#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
+#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1487 widgets/misc/e-dateedit.c:1602
+#: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "無"
 
 # calendar/gui/calendar-model.c:1576
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1713
 msgid "Recurring"
 msgstr "循環模式"
 
 # calendar/gui/calendar-model.c:1578
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1715
 msgid "Assigned"
 msgstr "已指定"
 
 # calendar/gui/calendar-model.c:1584
-#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:300
-#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:536
-#: calendar/gui/e-meeting-model.c:776
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
+#: calendar/gui/e-meeting-model.c:848
 msgid "Yes"
 msgstr "是"
 
 # calendar/gui/calendar-model.c:1584
-#: calendar/gui/calendar-model.c:1713 calendar/gui/e-meeting-model.c:312
-#: calendar/gui/e-meeting-model.c:777
+#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:849
 msgid "No"
 msgstr "否"
 
-# addressbook/gui/search/e-addressbook-search-dialog.c:158
-# mail/mail-search.c:242
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1966 calendar/gui/e-day-view.c:1675
-#: calendar/gui/e-week-view.c:1182
-#, fuzzy
-msgid "Searching"
-msgstr "尋找"
-
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 msgid "Day View"
@@ -3954,78 +4497,102 @@ msgstr "週檢視"
 msgid "Month View"
 msgstr "月檢視"
 
-# calendar/gui/gnome-cal.c:234
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
-msgstr "主旨包含"
-
-# calendar/gui/gnome-cal.c:235
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
-msgstr "描述包含"
-
-# calendar/gui/gnome-cal.c:236
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
-msgstr "備註包含"
-
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1075
-msgid "Unmatched"
-msgstr "沒有相符資料"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "行事曆"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing appointments and events"
 msgstr "資料夾包含約會與事件"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
-#: my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
-#: views/tasks/galview.xml.h:1
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
+#: calendar/importers/icalendar-importer.c:645
+#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "工作"
 
 # mail/folder-browser.c:871
-#: calendar/gui/component-factory.c:69
+#: calendar/gui/component-factory.c:75
 msgid "Folder containing to-do items"
 msgstr "資料夾包含待辦事項"
 
-# ui/evolution-calendar.xml.h:5
-#: calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-msgid "Create a new appointment"
-msgstr "建立一個新的約會"
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: calendar/gui/component-factory.c:704
+#, fuzzy
+msgid "New meeting"
+msgstr "新聞發送伺服器設定"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: calendar/gui/component-factory.c:704
+#, fuzzy
+msgid "_Meeting"
+msgstr "會議"
+
+# ui/evolution-tasks.xml.h:3
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New task"
+msgstr "新增工作"
+
+# ui/evolution-tasks.xml.h:9
+#: calendar/gui/component-factory.c:708
+msgid "_Task"
+msgstr "工作(_T)"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3447
-msgid "New _Appointment"
+#: calendar/gui/component-factory.c:712
+#, fuzzy
+msgid "New All Day Appointment"
+msgstr "新增約會"
+
+# calendar/gui/e-day-view.c:3146
+# ui/evolution-calendar.xml.h:16
+#: calendar/gui/component-factory.c:712
+#, fuzzy
+msgid "All _Day Appointment"
 msgstr "新增約會(_A)"
 
-# ui/evolution-tasks.xml.h:2
-#: calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-#: ui/evolution-tasks.xml.h:5
-msgid "Create a new task"
-msgstr "建立一個新的工作"
+# calendar/gui/e-day-view.c:3146
+# ui/evolution-calendar.xml.h:16
+#: calendar/gui/component-factory.c:716
+#, fuzzy
+msgid "New appointment"
+msgstr "新增約會"
 
-# ui/evolution-tasks.xml.h:3
-#: calendar/gui/component-factory.c:649
-msgid "New _Task"
-msgstr "新增工作(_T)"
+# calendar/gui/event-editor-dialog.glade.h:3
+#: calendar/gui/component-factory.c:716
+#, fuzzy
+msgid "_Appointment"
+msgstr "約會"
+
+# calendar/gui/gnome-cal.c:840
+#: calendar/gui/control-factory.c:123
+#, fuzzy, c-format
+msgid "Could not open the folder in '%s'"
+msgstr "不能開啟 `%s' 內的資料夾"
 
 # calendar/gui/control-factory.c:126
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:167
 msgid "The URI that the calendar will display"
 msgstr "行事曆將顯示此 URI "
 
+#: calendar/gui/control-factory.c:174
+msgid "The type of view to show"
+msgstr ""
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
@@ -4223,12 +4790,12 @@ msgstr "約會結束後"
 msgid "%s at the end of the appointment"
 msgstr "約會結束後"
 
-#: calendar/gui/dialogs/alarm-page.c:453
+#: calendar/gui/dialogs/alarm-page.c:452
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:459
+#: calendar/gui/dialogs/alarm-page.c:458
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -4254,7 +4821,7 @@ msgstr "提醒"
 # calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:737 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "摘要："
 
@@ -4264,13 +4831,12 @@ msgid "_Options..."
 msgstr "選項(_O)..."
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#. Automatically generated. Do not edit.
-#: calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "after"
 msgstr "之後"
 
 # calendar/gui/event-editor-dialog.glade.h:34
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "之前"
 
@@ -4292,7 +4858,7 @@ msgstr "時"
 
 # calendar/gui/event-editor-dialog.glade.h:42
 # mail/mail-config.glade.h:87
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
 msgid "minute(s)"
 msgstr "分"
 
@@ -4326,38 +4892,38 @@ msgstr "30 分"
 msgid "60 minutes"
 msgstr "60 分"
 
+# calendar/gui/e-calendar-table.c:162
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:13
+#, fuzzy
+msgid "Alerts"
+msgstr "提醒"
+
 # ui/evolution-mail.xml.h:110
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "行事曆與工作設定"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "過期的工作色彩"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "今天到期的工作色彩"
 
-# ui/evolution-calendar.xml.h:5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
-msgstr "以預設提醒建立新的約會(_R)"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Day _ends:"
+msgstr ""
 
 # ui/evolution-calendar.xml.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "天"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
-msgstr "每週的第一天(_K)："
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 # calendar/gui/event-editor.c:479
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
+#: calendar/gui/dialogs/recurrence-page.c:1125
 msgid "Friday"
 msgstr "星期五"
 
@@ -4373,189 +4939,200 @@ msgstr "分"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 # calendar/gui/event-editor.c:475
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
+#: calendar/gui/dialogs/recurrence-page.c:1121
 msgid "Monday"
 msgstr "星期一"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr "過期的工作(_V)："
+#, fuzzy
+msgid "S_un"
+msgstr "週日(_N)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 # calendar/gui/event-editor.c:480
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
+#: calendar/gui/dialogs/recurrence-page.c:1126
 msgid "Saturday"
 msgstr "星期六"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
-msgstr "在週及月的檢視內顯示約會的結束時間(_E)"
+msgid "Sh_ow a reminder"
+msgstr ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Show week _numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Sta_rt of day:"
-msgstr "工作開始時間(_R)："
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Su_n"
-msgstr "週日(_N)"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 # calendar/gui/event-editor.c:481
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.c:1127
 msgid "Sunday"
 msgstr "星期日"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#, fuzzy
+msgid "T_asks due today:"
+msgstr "今天到期的工作(_K)："
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_hu"
 msgstr "週四(_H)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "T_ue"
-msgstr "週二(_U)"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr "今天到期的工作(_K)："
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#, fuzzy
+msgid "Task List"
+msgstr "工作清單(_T)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 # calendar/gui/event-editor.c:478
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:962
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:1124
 msgid "Thursday"
 msgstr "星期四"
 
 # addressbook/gui/widgets/e-addressbook-view.c:730
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Time"
 msgstr "時間"
 
 # addressbook/backend/ebook/e-card.c:3434
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time _zone:"
 msgstr "時區(_Z)： "
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
-msgstr "時間間隔(_V)："
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time format:"
 msgstr "時間格式："
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 # calendar/gui/event-editor.c:476
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:960
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1122
 msgid "Tuesday"
 msgstr "星期二"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "W_eek starts:"
+msgstr ""
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 # calendar/gui/event-editor.c:477
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:961
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:1123
 msgid "Wednesday"
 msgstr "星期三"
 
 # ui/evolution-calendar.xml.h:35
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "工作週"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Work days:"
+msgstr ""
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "_12 hour (AM/PM)"
 msgstr "_12 小時 (上午/下午)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_24 hour"
 msgstr "_24 小時"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認(_A)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#, fuzzy
+msgid "_Day begins:"
+msgstr "顯示站臺(_D)："
+
 # calendar/gui/calendar-summary.c:622
 # mail/mail-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Display"
 msgstr "顯示(_D)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "_End of day:"
-msgstr "工作結束時間(_E)："
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Fri"
 msgstr "週五(_F)"
 
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: mail/mail-config.glade.h:161
 msgid "_General"
 msgstr "一般(_G)"
 
 # ui/evolution-mail.xml.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Mon"
 msgstr "週一(_M)"
 
-# addressbook/contact-editor/e-contact-editor.c:1254
-# addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "其它(_O)"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "_Overdue tasks:"
+msgstr "過期的工作(_V)："
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Sat"
 msgstr "週六(_S)"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "_Show appointment end times in week and month views"
+msgstr "在週及月的檢視內顯示約會的結束時間(_E)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
-msgstr "工作清單(_T)"
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "時間間隔(_V)："
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "_Tue"
+msgstr "週二(_U)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Wed"
 msgstr "週三(_W)"
 
-# calendar/gui/event-editor.c:1612
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "before the start of the appointment"
-msgstr "約會開始前"
+# calendar/gui/event-editor.c:1622
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "before every appointment"
+msgstr "約會結束前"
 
 #: calendar/gui/dialogs/cancel-comp.c:51
 msgid "The meeting status has changed. Send an updated version?"
@@ -4622,7 +5199,7 @@ msgstr "%s 您已經做了些變更。放棄這些變更並且更新這個編輯
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s   您沒有做任何變更，更新這個編輯器？"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2208
 msgid " to "
 msgstr "到"
 
@@ -4630,7 +5207,7 @@ msgstr "到"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
 msgid " (Completed "
 msgstr " (已完成)"
 
@@ -4638,33 +5215,47 @@ msgstr " (已完成)"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
 msgid "Completed "
 msgstr "已完成"
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
 msgid " (Due "
 msgstr "(期限)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 # calendar/gui/e-calendar-table.c:155
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
 msgid "Due "
 msgstr "期限"
 
 # shell/e-setup.c:163
-#: calendar/gui/dialogs/comp-editor.c:303
+#: calendar/gui/dialogs/comp-editor.c:342
+#, fuzzy
+msgid "Could not update invalid object"
+msgstr "不能正確地更新檔案"
+
+#: calendar/gui/dialogs/comp-editor.c:345
+msgid "Object not found, not updated"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:348
+msgid "You don't have permissions to update this object"
+msgstr ""
+
+# shell/e-setup.c:163
+#: calendar/gui/dialogs/comp-editor.c:351
 #, fuzzy
-msgid "Could not update object!"
+msgid "Could not update object"
 msgstr "不能正確地更新檔案"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/gui/dialogs/comp-editor.c:676
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/comp-editor.c:681
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
@@ -4672,47 +5263,36 @@ msgstr "約會 - %s"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/comp-editor.c:684
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:687
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日誌項目 - %s"
 
 # calendar/gui/e-calendar-table.c:159
-#: calendar/gui/dialogs/comp-editor.c:701
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "沒有摘要"
 
-# mail/mail-callbacks.c:1140
-# mail/mail-display.c:92
-#: calendar/gui/dialogs/comp-editor.c:1059 mail/mail-callbacks.c:1891
-#: mail/mail-display.c:102
-msgid "Overwrite file?"
-msgstr "覆蓋檔案？"
+# composer/e-msg-composer.c:774
+#: calendar/gui/dialogs/comp-editor.c:1203
+#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
+#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+msgid "Save as..."
+msgstr "另存新檔..."
 
-# mail/mail-callbacks.c:1144
-# mail/mail-display.c:96
-#: calendar/gui/dialogs/comp-editor.c:1063 mail/mail-callbacks.c:1898
-#: mail/mail-display.c:106
+#: calendar/gui/dialogs/comp-editor.c:1299
+#: calendar/gui/dialogs/comp-editor.c:1323
+#: calendar/gui/dialogs/comp-editor.c:1347
 msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+"Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
-"同一名稱的檔案已經存在。\n"
-"是否複蓋該檔案？"
 
-# widgets/misc/e-filter-bar.h:94
-# widgets/misc/e-filter-bar.h:101
-#: calendar/gui/dialogs/comp-editor.c:1109 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "另存新檔..."
-
-#: calendar/gui/dialogs/comp-editor.c:1270
+#: calendar/gui/dialogs/comp-editor.c:1374
 msgid "Unable to obtain current version!"
 msgstr "無法取得目前的版本！"
 
@@ -4783,31 +5363,33 @@ msgid "Enter Delegate"
 msgstr "輸入代表"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:194 calendar/gui/print.c:2247
 msgid "Appointment"
 msgstr "約會"
 
 # calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/dialogs/event-editor.c:190
+#: calendar/gui/dialogs/event-editor.c:199
 msgid "Reminder"
 msgstr "提醒"
 
 # calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:204
 msgid "Recurrence"
 msgstr "週期性"
 
 # ui/evolution-event-editor.xml.h:46
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:352
+#: calendar/gui/dialogs/event-editor.c:211
+#: calendar/gui/dialogs/event-editor.c:277
+#: calendar/gui/dialogs/event-editor.c:401
 #, fuzzy
 msgid "Scheduling"
 msgstr "會議排程(_M)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:355
+#: calendar/gui/dialogs/event-editor.c:216
+#: calendar/gui/dialogs/event-editor.c:280
+#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "會議"
 
@@ -4850,59 +5432,74 @@ msgstr "日期及時間"
 msgid "F_ree"
 msgstr "空閒(_R)"
 
+# addressbook/backend/ebook/e-card.c:3442
+#: calendar/gui/dialogs/event-page.glade.h:8
+#, fuzzy
+msgid "L_ocation:"
+msgstr ""
+"\n"
+"經緯："
+
 # calendar/gui/dialogs/task-editor-dialog.glade.h:15
 # calendar/gui/event-editor-dialog.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "私人 (_V)"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:17
 # calendar/gui/event-editor-dialog.glade.h:17
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "公開 (_B)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "顯示時間為"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:19
 # calendar/gui/event-editor-dialog.glade.h:27
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "主旨 (_M)："
 
-# calendar/gui/event-editor-dialog.glade.h:30
+# calendar/gui/dialogs/task-editor-dialog.glade.h:24
+# calendar/gui/event-editor-dialog.glade.h:29
 #: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "_Contacts..."
+msgstr "連絡人 (_C)..."
+
+# calendar/gui/event-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "_End time:"
 msgstr "結束時間 (_E)："
 
 # calendar/gui/event-editor-dialog.glade.h:31
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_Start time:"
 msgstr "開始時間 (_S)："
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:413
 #, fuzzy
 msgid "An organizer is required."
 msgstr "必須指定一個召集人。"
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:623
+#: calendar/gui/dialogs/meeting-page.c:593
 msgid "That person is already attending the meeting!"
 msgstr "此人已經出席本會議!"
 
 # calendar/gui/e-calendar-table.c:708
 # ui/evolution-task-editor-dialog.xml.h:19
-#: calendar/gui/dialogs/meeting-page.c:698
+#: calendar/gui/dialogs/meeting-page.c:668
 msgid "_Delegate To..."
 msgstr "委派給(_D)..."
 
@@ -4951,7 +5548,7 @@ msgid "Member"
 msgstr "會員"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:798
+#: calendar/gui/e-itip-control.c:1003
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4965,15 +5562,15 @@ msgstr "角色"
 # mail/message-list.c:1081
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:49
-#: mail/message-list.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "狀況"
 
 # mail/mail-config.glade.h:78
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "類別"
@@ -4991,42 +5588,117 @@ msgstr "變更會議召集人(_C)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:411
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:445
+#: calendar/gui/e-meeting-time-sel.c:456
 msgid "_Invite Others..."
 msgstr "邀請其他人(_I)..."
 
-# calendar/gui/e-itip-control.glade.h:9
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
-msgstr "其他會議召集人(_O)"
+# calendar/gui/print.c:300
+#: calendar/gui/dialogs/recurrence-page.c:126
+#: calendar/gui/dialogs/recurrence-page.c:146
+#: calendar/gui/dialogs/recurrence-page.c:156
+#, fuzzy
+msgid "st"
+msgstr "1日"
+
+# calendar/gui/print.c:300
+#: calendar/gui/dialogs/recurrence-page.c:127
+#: calendar/gui/dialogs/recurrence-page.c:147
+#, fuzzy
+msgid "nd"
+msgstr "2日"
+
+# calendar/gui/print.c:300
+#: calendar/gui/dialogs/recurrence-page.c:128
+#: calendar/gui/dialogs/recurrence-page.c:148
+#, fuzzy
+msgid "rd"
+msgstr "3日"
+
+# calendar/gui/event-editor.c:608
+#: calendar/gui/dialogs/recurrence-page.c:129
+#: calendar/gui/dialogs/recurrence-page.c:130
+#: calendar/gui/dialogs/recurrence-page.c:131
+#: calendar/gui/dialogs/recurrence-page.c:132
+#: calendar/gui/dialogs/recurrence-page.c:133
+#: calendar/gui/dialogs/recurrence-page.c:134
+#: calendar/gui/dialogs/recurrence-page.c:135
+#: calendar/gui/dialogs/recurrence-page.c:136
+#: calendar/gui/dialogs/recurrence-page.c:137
+#: calendar/gui/dialogs/recurrence-page.c:138
+#: calendar/gui/dialogs/recurrence-page.c:139
+#: calendar/gui/dialogs/recurrence-page.c:140
+#: calendar/gui/dialogs/recurrence-page.c:141
+#: calendar/gui/dialogs/recurrence-page.c:142
+#: calendar/gui/dialogs/recurrence-page.c:143
+#: calendar/gui/dialogs/recurrence-page.c:144
+#: calendar/gui/dialogs/recurrence-page.c:145
+#: calendar/gui/dialogs/recurrence-page.c:149
+#: calendar/gui/dialogs/recurrence-page.c:150
+#: calendar/gui/dialogs/recurrence-page.c:151
+#: calendar/gui/dialogs/recurrence-page.c:152
+#: calendar/gui/dialogs/recurrence-page.c:153
+#: calendar/gui/dialogs/recurrence-page.c:154
+#: calendar/gui/dialogs/recurrence-page.c:155
+msgid "th"
+msgstr " "
 
 # calendar/gui/event-editor.c:871
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: calendar/gui/dialogs/recurrence-page.c:629
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性約會。"
 
 # calendar/gui/event-editor.c:449
-#: calendar/gui/dialogs/recurrence-page.c:932
+#: calendar/gui/dialogs/recurrence-page.c:997
 msgid "on"
 msgstr "於"
 
+# addressbook/contact-editor/fullname.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.c:1062
+#, fuzzy
+msgid "first"
+msgstr "靄"
+
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+msgid "second"
+msgstr "秒"
+
+# addressbook/contact-editor/e-contact-editor.c:1247
+#: calendar/gui/dialogs/recurrence-page.c:1064
+#, fuzzy
+msgid "third"
+msgstr "主席"
+
+# addressbook/gui/widgets/e-addressbook-view.c:736
+#: calendar/gui/dialogs/recurrence-page.c:1065
+#, fuzzy
+msgid "fourth"
+msgstr "北"
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.c:1066
+#, fuzzy
+msgid "last"
+msgstr "靄"
+
+# addressbook/contact-editor/e-contact-editor.c:1255
+# addressbook/gui/widgets/e-addressbook-view.c:719
+#: calendar/gui/dialogs/recurrence-page.c:1092
+#, fuzzy
+msgid "Other Date"
+msgstr "其它傳真"
+
 # calendar/gui/event-editor.c:474
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
 msgid "day"
 msgstr "每天"
 
 # calendar/gui/event-editor.c:601
-#: calendar/gui/dialogs/recurrence-page.c:1088
+#: calendar/gui/dialogs/recurrence-page.c:1260
 msgid "on the"
 msgstr "在第"
 
-# calendar/gui/event-editor.c:608
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
-msgstr " "
-
 # calendar/gui/event-editor.c:754
-#: calendar/gui/dialogs/recurrence-page.c:1269
+#: calendar/gui/dialogs/recurrence-page.c:1445
 msgid "occurrences"
 msgstr "出現"
 
@@ -5109,17 +5781,23 @@ msgstr "每週"
 msgid "year(s)"
 msgstr "每年"
 
-#: calendar/gui/dialogs/send-comp.c:55
+#: calendar/gui/dialogs/send-comp.c:56
+#, fuzzy
+msgid "The meeting information has been created. Send it?"
+msgstr "會議資訊已變更。是否傳送更新後的資訊？"
+
+#: calendar/gui/dialogs/send-comp.c:59
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "會議資訊已變更。是否傳送更新後的資訊？"
 
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The task information has changed. Send an updated version?"
+#: calendar/gui/dialogs/send-comp.c:66
+#, fuzzy
+msgid "The task assignment information has been created. Send it?"
 msgstr "工作資訊已變更。是否傳送更新後的資訊？"
 
-#: calendar/gui/dialogs/send-comp.c:65
-msgid "The journal entry has changed. Send an updated version?"
-msgstr "日誌項目已變更。是否傳送更新後的資訊？"
+#: calendar/gui/dialogs/send-comp.c:70
+msgid "The task information has changed. Send an updated version?"
+msgstr "工作資訊已變更。是否傳送更新後的資訊？"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:2
 #: calendar/gui/dialogs/task-details-page.glade.h:2
@@ -5140,7 +5818,7 @@ msgstr "進度"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:21
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:966
+#: my-evolution/e-summary-preferences.c:887
 msgid "URL:"
 msgstr "網址："
 
@@ -5154,19 +5832,23 @@ msgstr "優先順序(_P)："
 msgid "_Status:"
 msgstr "狀態(_S)："
 
+#: calendar/gui/dialogs/task-editor.c:182
+msgid "Basic"
+msgstr "基本"
+
 # calendar/gui/calendar-model.c:1578
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:322
+#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:238
+#: calendar/gui/dialogs/task-editor.c:353
 msgid "Assignment"
 msgstr "指派工作"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:746
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "描述："
 
@@ -5181,172 +5863,169 @@ msgid "_Due Date:"
 msgstr "到期日(_D)："
 
 # calendar/gui/e-calendar-table.c:367
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:440
 #, c-format
 msgid "0%"
 msgstr "0%"
 
 # calendar/gui/e-calendar-table.c:368
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:441
 #, c-format
 msgid "10%"
 msgstr "10%"
 
 # calendar/gui/e-calendar-table.c:369
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:442
 #, c-format
 msgid "20%"
 msgstr "20%"
 
 # calendar/gui/e-calendar-table.c:370
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:443
 #, c-format
 msgid "30%"
 msgstr "30%"
 
 # calendar/gui/e-calendar-table.c:371
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:444
 #, c-format
 msgid "40%"
 msgstr "40%"
 
 # calendar/gui/e-calendar-table.c:372
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:445
 #, c-format
 msgid "50%"
 msgstr "50%"
 
 # calendar/gui/e-calendar-table.c:373
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:446
 #, c-format
 msgid "60%"
 msgstr "60%"
 
 # calendar/gui/e-calendar-table.c:374
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:447
 #, c-format
 msgid "70%"
 msgstr "70%"
 
 # calendar/gui/e-calendar-table.c:375
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:448
 #, c-format
 msgid "80%"
 msgstr "80%"
 
 # calendar/gui/e-calendar-table.c:376
-#: calendar/gui/e-calendar-table.c:436
+#: calendar/gui/e-calendar-table.c:449
 #, c-format
 msgid "90%"
 msgstr "90%"
 
 # calendar/gui/e-calendar-table.c:377
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/e-calendar-table.c:450
 #, c-format
 msgid "100%"
 msgstr "100%"
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-calendar-table.c:721 calendar/gui/e-day-view.c:2724
-#: calendar/gui/e-week-view.c:1822
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
+#: calendar/gui/e-week-view.c:1853
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "刪除選定的連絡人"
 
 # mail/folder-browser.c:686
-#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
-#: calendar/gui/e-week-view.c:3395 mail/folder-browser.c:1484
-#: shell/e-shortcuts-view.c:384
+#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
+#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
+#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
 msgid "_Open"
 msgstr "開啟(_O)"
 
+# composer/e-msg-composer.c:774
+#: calendar/gui/e-calendar-table.c:985
+#, fuzzy
+msgid "_Save as..."
+msgstr "另存新檔..."
+
+# ui/evolution-addressbook.xml.h:18
+# ui/evolution-calendar.xml.h:42
+# ui/evolution-contact-editor.xml.h:15
+#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
+#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
+#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+msgid "_Print..."
+msgstr "列印(_P)..."
+
 # ui/evolution-event-editor.xml.h:6
 # ui/evolution-task-editor-dialog.xml.h:7
-#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
-#: calendar/gui/e-week-view.c:3404 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
+#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪下(_U)"
 
 # ui/evolution-event-editor.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:67
-#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
-#: calendar/gui/e-week-view.c:3406 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:14
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "複製(_C)"
 
 # ui/evolution-event-editor.xml.h:68
 # ui/evolution-task-editor-dialog.xml.h:81
-#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
-#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3382
-#: calendar/gui/e-week-view.c:3408 ui/evolution-addressbook.xml.h:36
-#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
+#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
+#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "貼上(_P)"
 
+# calendar/gui/calendar-model.c:1578
+#: calendar/gui/e-calendar-table.c:996
+#, fuzzy
+msgid "_Assign Task"
+msgstr "指派工作"
+
+# calendar/gui/calendar-summary.c:721
+# calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/e-calendar-table.c:997
+#, fuzzy
+msgid "_Forward as iCalendar"
+msgstr "以 i_Calendar 轉寄"
+
 # calendar/gui/e-calendar-table.c:707
-#: calendar/gui/e-calendar-table.c:952
+#: calendar/gui/e-calendar-table.c:998
 msgid "_Mark as Complete"
 msgstr "標示完成(_M)"
 
-# calendar/gui/e-calendar-table.c:708
-# ui/evolution-task-editor-dialog.xml.h:19
-#: calendar/gui/e-calendar-table.c:954
-msgid "_Delete this Task"
-msgstr "刪除這個工作(_D)"
-
 # calendar/gui/e-calendar-table.c:713
-#: calendar/gui/e-calendar-table.c:957
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:999
+#, fuzzy
+msgid "_Mark Selected Tasks as Complete"
 msgstr "標示為已完成的工作(_M)"
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-calendar-table.c:959
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Delete Selected Tasks"
 msgstr "刪除選定的工作(_D)"
 
-#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:7029
-#: calendar/gui/e-week-view.c:3889
+#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
+#: calendar/gui/e-week-view.c:4194
 msgid "Updating objects"
 msgstr ""
 
 # calendar/gui/e-calendar-table.c:163
-#: calendar/gui/e-calendar-table.c:1224
+#: calendar/gui/e-calendar-table.c:1354
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "請按這裡新增新的工作"
 
-# calendar/gui/calendar-model.c:794
-# e-util/e-time-utils.c:278
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:357
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
-
-# calendar/gui/calendar-model.c:797
-# e-util/e-time-utils.c:287
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:366
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-# calendar/gui/calendar-model.c:802
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"日期必須依此格式輸入：\n"
-"\n"
-"%s"
-
 # calendar/gui/e-calendar-table.c:162
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
@@ -5354,8 +6033,8 @@ msgstr "提醒"
 
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:723
-#: camel/camel-filter-driver.c:837
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:1051
 msgid "Complete"
 msgstr "完成"
 
@@ -5395,8 +6074,8 @@ msgstr "開始日期"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
+#: my-evolution/component-factory.c:51 shell/e-shell.c:774
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "摘要"
 
@@ -5412,6 +6091,34 @@ msgstr "工作排序"
 msgid "URL"
 msgstr "網址 URL"
 
+# calendar/gui/calendar-model.c:794
+# e-util/e-time-utils.c:278
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:357
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %m/%d/%Y %H:%M:%S"
+
+# calendar/gui/calendar-model.c:797
+# e-util/e-time-utils.c:287
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:366
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+# calendar/gui/calendar-model.c:802
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"日期必須依此格式輸入：\n"
+"\n"
+"%s"
+
 # calendar/gui/e-day-view-time-item.c:519
 #: calendar/gui/e-day-view-time-item.c:518
 #, c-format
@@ -5423,8 +6130,8 @@ msgstr "間隔 %02i 分鐘"
 # calendar/gui/e-week-view-main-item.c:325
 #. 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:284 calendar/gui/e-day-view.c:1387
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5433,7 +6140,7 @@ msgstr "%A %d %B"
 # calendar/gui/e-week-view-main-item.c:348
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1414
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1440
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
@@ -5442,8 +6149,8 @@ msgstr "%d %b"
 # calendar/gui/e-week-view.c:300
 # calendar/gui/print.c:617
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:768
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "上午"
 
@@ -5451,83 +6158,155 @@ msgstr "上午"
 # calendar/gui/e-week-view.c:303
 # calendar/gui/print.c:616
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
-#: calendar/gui/print.c:770
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "下午"
 
+# calendar/gui/e-day-view.c:3146
+# ui/evolution-calendar.xml.h:16
+#: calendar/gui/e-day-view.c:3549
+msgid "New _Appointment"
+msgstr "新增約會(_A)"
+
 # calendar/gui/e-day-view.c:3148
 # calendar/gui/e-week-view.c:3279
-#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3377
+#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
 msgid "New All Day _Event"
 msgstr "新增全天要事(_E)"
 
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#, fuzzy
+msgid "New Meeting"
+msgstr "會議"
+
+# ui/evolution-tasks.xml.h:3
+#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+msgid "New Task"
+msgstr "新增工作"
+
+# ui/evolution-contact-editor.xml.h:7
+# ui/evolution-event-editor.xml.h:38
+# ui/evolution-task-editor-dialog.xml.h:41
+#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "列印..."
+
 # ui/evolution-calendar.xml.h:12
-#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3387
-#: ui/evolution-calendar.xml.h:17
+#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "今日(_T)"
 
 # calendar/gui/e-day-view.c:3155
 # calendar/gui/e-week-view.c:3286
-#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3389
+#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
 msgid "_Go to Date..."
 msgstr "到指定日期(_G)..."
 
-# calendar/gui/e-day-view.c:3164
-# calendar/gui/e-week-view.c:3294
-#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3397
-msgid "_Delete this Appointment"
-msgstr "刪除這個約會(_D)"
+# mail/mail-config.glade.h:61
+#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: ui/evolution-calendar.xml.h:31
+msgid "_Publish Free/Busy Information"
+msgstr "發佈 空閒/忙碌 資訊(_P)"
+
+# mail/mail-config.glade.h:40
+#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
+#: ui/evolution.xml.h:39
+#, fuzzy
+msgid "_Configure..."
+msgstr "郵件設定"
+
+# mail/mail-config.glade.h:40
+#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#, fuzzy
+msgid "_Configure Pilot..."
+msgstr "郵件設定"
+
+# mail/folder-browser.c:690
+# ui/evolution-calendar.xml.h:43
+# ui/evolution-mail.xml.h:118
+# ui/evolution-tasks.xml.h:8
+#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
+#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+msgid "_Save As..."
+msgstr "另存新檔(_S)..."
+
+# ui/evolution-event-editor.xml.h:46
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "會議排程(_M)"
+
+# calendar/gui/calendar-summary.c:721
+# calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "以 i_Calendar 轉寄"
 
 # calendar/gui/e-day-view.c:3175
 # calendar/gui/e-week-view.c:3309
-#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3422
+#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
 
 # calendar/gui/e-day-view.c:3177
 # calendar/gui/e-week-view.c:3311
-#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3424
+#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
 # calendar/gui/e-week-view.c:3313
-#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3426
+#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
-#: calendar/gui/e-itip-control.c:524
+#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
+#: shell/e-shell-view-menu.c:638
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+# camel/camel-filter-driver.c:871
+#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
+#: shell/e-shell-view-menu.c:646
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "執行過濾器發生錯誤： %s: %s"
+
+#: calendar/gui/e-itip-control.c:678
 msgid "Meeting begins: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:529
+#: calendar/gui/e-itip-control.c:683
 msgid "Task begins: <b>"
 msgstr ""
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:534
+#: calendar/gui/e-itip-control.c:688
 #, fuzzy
 msgid "Free/Busy info begins: <b>"
 msgstr "空閒/忙碌 資訊"
 
-#: calendar/gui/e-itip-control.c:538
+#: calendar/gui/e-itip-control.c:692
 msgid "Begins: <b>"
 msgstr ""
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: calendar/gui/e-itip-control.c:550
+#: calendar/gui/e-itip-control.c:704
 #, fuzzy
 msgid "Meeting ends: <b>"
 msgstr "會議結束時間(_E)："
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:707
 #, fuzzy
 msgid "Free/Busy info ends: <b>"
 msgstr "空閒/忙碌 資訊"
 
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:711
 msgid "Ends: <b>"
 msgstr ""
 
@@ -5535,17 +6314,17 @@ msgstr ""
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: calendar/gui/e-itip-control.c:571
+#: calendar/gui/e-itip-control.c:725
 #, fuzzy
 msgid "Task Completed: <b>"
 msgstr " (已完成)"
 
-#: calendar/gui/e-itip-control.c:581
+#: calendar/gui/e-itip-control.c:735
 msgid "Task Due: <b>"
 msgstr ""
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:618 calendar/gui/e-itip-control.c:667
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "行事曆資訊"
@@ -5553,324 +6332,390 @@ msgstr "行事曆資訊"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #. Title
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:787
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "行事曆"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: calendar/gui/e-itip-control.c:698 calendar/gui/e-itip-control.c:714
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
 #, fuzzy
 msgid "An unknown person"
 msgstr "不明的寄件者"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:875
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/e-itip-control.c:891
 msgid "<i>None</i>"
 msgstr ""
 
+# calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: calendar/gui/e-itip-control.c:903
+#, fuzzy
+msgid "Status:"
+msgstr "狀態(_S)："
+
+#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
+#: calendar/gui/itip-utils.c:382
+msgid "Accepted"
+msgstr "接受"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#, fuzzy
+msgid "Tentatively Accepted"
+msgstr "暫訂"
+
+#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+msgid "Declined"
+msgstr "婉拒"
+
+# calendar/gui/calendar-model.c:369
+# calendar/gui/event-editor.c:1601
+# calendar/gui/event-editor.c:1628
+# camel/providers/smtp/camel-smtp-transport.c:221
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
+#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
+#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
+msgid "Unknown"
+msgstr "不明"
+
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-itip-control.c:778 calendar/gui/e-itip-control.c:794
-#: calendar/gui/e-itip-control.c:810 calendar/gui/e-itip-control.c:823
-#: calendar/gui/e-itip-control.c:837 calendar/gui/e-itip-control.c:851
+#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
+#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
 #, fuzzy
 msgid "Choose an action:"
 msgstr "選擇一個動作"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:972
 #, fuzzy
 msgid "Update"
 msgstr "工作更新"
 
 # widgets/misc/e-cell-date-edit.c:245
-#: calendar/gui/e-itip-control.c:780 calendar/gui/e-itip-control.c:799
-#: calendar/gui/e-itip-control.c:812 calendar/gui/e-itip-control.c:825
-#: calendar/gui/e-itip-control.c:839 calendar/gui/e-itip-control.c:853
-#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
+#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "確認"
 
-#: calendar/gui/e-itip-control.c:795
+#: calendar/gui/e-itip-control.c:1000
 #, fuzzy
 msgid "Accept"
 msgstr "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:1001
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "暫訂"
 
-#: calendar/gui/e-itip-control.c:797
+#: calendar/gui/e-itip-control.c:1002
 #, fuzzy
 msgid "Decline"
 msgstr "婉拒"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:1026
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "空閒/忙碌 資訊"
 
-#: calendar/gui/e-itip-control.c:824
+#: calendar/gui/e-itip-control.c:1039
 msgid "Update respondent status"
 msgstr ""
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:838
+#: calendar/gui/e-itip-control.c:1052
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "工作資訊"
 
 # ui/evolution-mail.xml.h:2
-#: calendar/gui/e-itip-control.c:852 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
+#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
 
-#: calendar/gui/e-itip-control.c:867
+#: calendar/gui/e-itip-control.c:1117
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 已經發佈會議資訊。"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:1118
 msgid "Meeting Information"
 msgstr "會議資訊"
 
-#: calendar/gui/e-itip-control.c:872
+#: calendar/gui/e-itip-control.c:1122
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 請求您出席此次會議。"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:873
+#: calendar/gui/e-itip-control.c:1123
 msgid "Meeting Proposal"
 msgstr "會議提案"
 
-#: calendar/gui/e-itip-control.c:877
+#: calendar/gui/e-itip-control.c:1127
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> 希望加入一個既存的會議。"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:1128
 msgid "Meeting Update"
 msgstr "會議更新"
 
-#: calendar/gui/e-itip-control.c:882
+#: calendar/gui/e-itip-control.c:1132
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 希望收到最新的會議資訊。"
 
-#: calendar/gui/e-itip-control.c:883
+#: calendar/gui/e-itip-control.c:1133
 msgid "Meeting Update Request"
 msgstr "會議更新請求"
 
-#: calendar/gui/e-itip-control.c:887
+#: calendar/gui/e-itip-control.c:1156
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已經答覆了會議請求。"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:888
+#: calendar/gui/e-itip-control.c:1157
 msgid "Meeting Reply"
 msgstr "會議答覆"
 
-#: calendar/gui/e-itip-control.c:892
+#: calendar/gui/e-itip-control.c:1161
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> 已經消取會議。"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-itip-control.c:893
+#: calendar/gui/e-itip-control.c:1162
 msgid "Meeting Cancellation"
 msgstr "會議取消"
 
-#: calendar/gui/e-itip-control.c:897 calendar/gui/e-itip-control.c:947
-#: calendar/gui/e-itip-control.c:982
+#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 傳送了一個難以理解的訊息。"
 
 # mail/mail-search.c:268
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:1167
 msgid "Bad Meeting Message"
 msgstr "不正確的會議訊息"
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:1189
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 已經發佈了工作資訊。"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:918
+#: calendar/gui/e-itip-control.c:1190
 msgid "Task Information"
 msgstr "工作資訊"
 
-#: calendar/gui/e-itip-control.c:922
+#: calendar/gui/e-itip-control.c:1194
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 要求您進行工作。"
 
-#: calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:1195
 msgid "Task Proposal"
 msgstr "工作計畫"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1199
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> 希望加入一項既存的工作。"
 
-#: calendar/gui/e-itip-control.c:928
+#: calendar/gui/e-itip-control.c:1200
 msgid "Task Update"
 msgstr "工作更新"
 
-#: calendar/gui/e-itip-control.c:932
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望收到最新的工作資訊。"
 
-#: calendar/gui/e-itip-control.c:933
+#: calendar/gui/e-itip-control.c:1205
 msgid "Task Update Request"
 msgstr "工作更新請求"
 
-#: calendar/gui/e-itip-control.c:937
+#: calendar/gui/e-itip-control.c:1229
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已經回覆指派的工作。"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: calendar/gui/e-itip-control.c:938
+#: calendar/gui/e-itip-control.c:1230
 msgid "Task Reply"
 msgstr "工作回覆"
 
-#: calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> 已經取消工作。"
 
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Cancellation"
 msgstr "工作取消"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/gui/e-itip-control.c:948
+#: calendar/gui/e-itip-control.c:1240
 msgid "Bad Task Message"
 msgstr "不正確的工作訊息"
 
-#: calendar/gui/e-itip-control.c:967
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 已經發佈 空閒/忙碌 資訊。"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:1260
 msgid "Free/Busy Information"
 msgstr "空閒/忙碌 資訊"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:1264
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 請求您的 空閒/忙碌 資訊。"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/e-itip-control.c:973
+#: calendar/gui/e-itip-control.c:1265
 msgid "Free/Busy Request"
 msgstr "空閒/忙碌 請求"
 
-#: calendar/gui/e-itip-control.c:977
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 已經答覆 空閒/忙碌 請求。"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/e-itip-control.c:978
+#: calendar/gui/e-itip-control.c:1270
 msgid "Free/Busy Reply"
 msgstr "空閒/忙碌 回覆"
 
 # mail/mail-callbacks.c:1407
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:1275
 msgid "Bad Free/Busy Message"
 msgstr "不正確的 空閒/忙碌 訊息"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1354
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "資料夾好像已經損毀並且不能復原。"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1373
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "這個郵件只包含密件副本收件者。"
 
-#: calendar/gui/e-itip-control.c:1099 calendar/gui/e-itip-control.c:1105
+#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1432
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
 #, fuzzy
-msgid "Calendar file could not be updated!\n"
+msgid "There was an error on the CORBA system\n"
+msgstr "下載新聞發送伺服器時發生錯誤"
+
+#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#, fuzzy
+msgid "Object could not be found\n"
 msgstr "不能傳送這個項目！\n"
 
+#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+msgid "You don't have permissions to update the calendar\n"
+msgstr ""
+
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1579
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: calendar/gui/e-itip-control.c:1276
-msgid "Attendee status could not be updated because of an invalid status!\n"
+#: calendar/gui/e-itip-control.c:1582
+#, fuzzy
+msgid "Calendar file could not be updated!\n"
+msgstr "不能傳送這個項目！\n"
+
+#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1284
-msgid "Attendee status ould not be updated!\n"
+#: calendar/gui/e-itip-control.c:1632
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1286
-msgid "Attendee status updated\n"
+#: calendar/gui/e-itip-control.c:1644
+msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1288
-msgid "Attendee status can not be updated because the item no longer exists"
+#: calendar/gui/e-itip-control.c:1671
+msgid "Attendee status updated\n"
 msgstr ""
 
-# calendar/gui/e-itip-control.c:470
-#: calendar/gui/e-itip-control.c:1316
-msgid "I couldn't remove the item from your calendar file!\n"
-msgstr "無法將項目從您的行事曆檔案移除！\n"
+#: calendar/gui/e-itip-control.c:1674
+#, fuzzy
+msgid "Attendee status could not be updated!\n"
+msgstr "不能傳送這個項目！\n"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1709
 msgid "Removal Complete"
 msgstr "移除完成"
 
-#: calendar/gui/e-itip-control.c:1350 calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
 msgid "Item sent!\n"
 msgstr "項目傳送！\n"
 
-#: calendar/gui/e-itip-control.c:1352 calendar/gui/e-itip-control.c:1404
+#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
 msgid "The item could not be sent!\n"
 msgstr "不能傳送這個項目！\n"
 
-#: calendar/gui/e-itip-control.c:1568
-msgid "Unable to find any of your identities in the attendees list!\n"
-msgstr ""
+# mail/mail-account-gui.c:682
+#: calendar/gui/e-itip-control.c:1896
+#, fuzzy
+msgid "Select Calendar Folder"
+msgstr "選擇資料夾"
+
+# mail/mail-account-gui.c:682
+#: calendar/gui/e-itip-control.c:1903
+#, fuzzy
+msgid "Select Tasks Folder"
+msgstr "選擇資料夾"
 
 # calendar/gui/e-itip-control.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:2
@@ -5920,104 +6765,82 @@ msgid "date-start"
 msgstr "開始日期"
 
 # addressbook/gui/widgets/e-addressbook-view.c:712
-#: calendar/gui/e-meeting-model.c:94
+#: calendar/gui/e-meeting-model.c:84
 msgid "Chair Persons"
 msgstr "主席"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-meeting-model.c:95 calendar/gui/e-meeting-model.c:1504
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
 msgid "Required Participants"
 msgstr "出席者"
 
-#: calendar/gui/e-meeting-model.c:96
+#: calendar/gui/e-meeting-model.c:86
 msgid "Optional Participants"
 msgstr "列席者"
 
-#: calendar/gui/e-meeting-model.c:97
+#: calendar/gui/e-meeting-model.c:87
 msgid "Non-Participants"
 msgstr "缺席者"
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:744
+#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
 msgid "Individual"
 msgstr "個人"
 
 # shell/e-shortcuts-view.c:137
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:745
+#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
+#: calendar/gui/e-meeting-model.c:817
 msgid "Group"
 msgstr "組別"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:746
+#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
+#: calendar/gui/e-meeting-model.c:818
 msgid "Resource"
 msgstr "資源"
 
-#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:747
+#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
+#: calendar/gui/e-meeting-model.c:819
 msgid "Room"
 msgstr "會議室"
 
-# calendar/gui/calendar-model.c:369
-# calendar/gui/event-editor.c:1601
-# calendar/gui/event-editor.c:1628
-# camel/providers/smtp/camel-smtp-transport.c:221
-#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:356 calendar/gui/e-meeting-model.c:748
-#: calendar/gui/e-meeting-model.c:764
-#: camel/providers/smtp/camel-smtp-transport.c:222
-#: widgets/misc/e-charset-picker.c:57 widgets/misc/e-charset-picker.c:439
-msgid "Unknown"
-msgstr "不明"
-
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:760
+#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
+#: calendar/gui/e-meeting-model.c:832
 msgid "Chair"
 msgstr "主席"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:761
+#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
 msgid "Required Participant"
 msgstr "出席者"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:762
+#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-meeting-model.c:834
 msgid "Optional Participant"
 msgstr "列席者"
 
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:763
+#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
+#: calendar/gui/e-meeting-model.c:835
 msgid "Non-Participant"
 msgstr "缺席者"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
-#: calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
 msgid "Needs Action"
 msgstr "需要動作"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:790
-msgid "Accepted"
-msgstr "接受"
-
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-model.c:791
-msgid "Declined"
-msgstr "婉拒"
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:792 calendar/gui/e-meeting-time-sel.c:426
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
+#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "暫訂"
 
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:793
+#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-model.c:865
 msgid "Delegated"
 msgstr "已委派"
 
@@ -6025,7 +6848,7 @@ msgstr "已委派"
 # calendar/gui/calendar-model.c:1178
 # calendar/gui/dialogs/task-editor-dialog.glade.h:11
 # calendar/gui/e-calendar-table.c:420
-#: calendar/gui/e-meeting-model.c:330 calendar/gui/e-meeting-model.c:353
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
 msgid "In Process"
 msgstr "進行中"
 
@@ -6033,8 +6856,8 @@ msgstr "進行中"
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:471
-#: calendar/gui/e-meeting-time-sel.c:2083
+#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel.c:2107
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -6043,8 +6866,8 @@ msgstr "%A, %B %d, %Y"
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2113 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel-item.c:479
+#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
@@ -6056,125 +6879,155 @@ msgstr "%a %m/%d/%Y"
 # widgets/misc/e-dateedit.c:1465
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1611
+#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
-#: calendar/gui/e-meeting-time-sel.c:428
+#: calendar/gui/e-meeting-time-sel.c:439
 msgid "Out of Office"
 msgstr "不在辦公室"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: calendar/gui/e-meeting-time-sel.c:429
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "No Information"
 msgstr "沒有資訊"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:431
-#: calendar/gui/e-meeting-time-sel.c:465
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "_Options"
 msgstr "選項(_O)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:448
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:495
 msgid "Show _Only Working Hours"
 msgstr "只顯示工作時間(_O)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:461
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:508
 msgid "Show _Zoomed Out"
 msgstr "顯示縮小(_Z)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:479
-#: calendar/gui/e-meeting-time-sel.c:513
+#: calendar/gui/e-meeting-time-sel.c:526
 msgid "_Update Free/Busy"
 msgstr "更新空閒/忙碌(_U)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:497
-#: calendar/gui/e-meeting-time-sel.c:531
+#: calendar/gui/e-meeting-time-sel.c:544
 msgid "_<<"
 msgstr "_<<"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:514
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "_Autopick"
 msgstr "自動選擇(_A)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:528
-#: calendar/gui/e-meeting-time-sel.c:562
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid ">_>"
 msgstr ">_>"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:545
-#: calendar/gui/e-meeting-time-sel.c:579
+#: calendar/gui/e-meeting-time-sel.c:592
 msgid "_All People and Resources"
 msgstr "所有人員與資源(_A)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:558
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:605
 msgid "All _People and One Resource"
 msgstr "所有與會者與一項資源(_P)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:571
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:618
 msgid "_Required People"
 msgstr "需要與會者(_R)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:584
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:631
 msgid "Required People and _One Resource"
 msgstr "需要與會者與一項資源(_O)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:607
-#: calendar/gui/e-meeting-time-sel.c:641
+#: calendar/gui/e-meeting-time-sel.c:654
 msgid "Meeting _start time:"
 msgstr "會議開始時間(_S)："
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: calendar/gui/e-meeting-time-sel.c:660
+#: calendar/gui/e-meeting-time-sel.c:673
 msgid "Meeting _end time:"
 msgstr "會議結束時間(_E)："
 
 # mail/mail-ops.c:1262
-#: calendar/gui/e-tasks.c:328
+#: calendar/gui/e-tasks.c:362
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "開啟貯藏 %s"
 
 # calendar/gui/e-tasks.c:298
-#: calendar/gui/e-tasks.c:355
+#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "不能載入 `%s' 裡的工作"
 
 # calendar/gui/e-tasks.c:310
-#: calendar/gui/e-tasks.c:367
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "不支援用作載入 `%s'  必須的方法"
 
+# calendar/gui/gnome-cal.c:840
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#, fuzzy, c-format
+msgid "You don't have permission to open the folder in `%s'"
+msgstr "不能開啟 `%s' 內的資料夾"
+
+# calendar/gui/e-calendar-table.c:152
+#: calendar/gui/e-tasks.c:558
+#, fuzzy
+msgid "Completing tasks..."
+msgstr "完成日期"
+
+# calendar/gui/e-calendar-table.c:714
+#: calendar/gui/e-tasks.c:581
+#, fuzzy
+msgid "Deleting selected objects..."
+msgstr "刪除選定的連絡人"
+
+# mail/mail-ops.c:1449
+#: calendar/gui/e-tasks.c:674
+#, fuzzy
+msgid "Expunging"
+msgstr "刪除資料夾"
+
 # calendar/gui/e-week-view.c:3277
 # calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-week-view.c:3375 calendar/gui/e-week-view.c:3413
+#: calendar/gui/e-week-view.c:3438
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
+# calendar/gui/e-day-view.c:3164
+# calendar/gui/e-week-view.c:3294
+#: calendar/gui/e-week-view.c:3489
+msgid "_Delete this Appointment"
+msgstr "刪除這個約會(_D)"
+
 # calendar/gui/gnome-cal.c:840
-#: calendar/gui/gnome-cal.c:1499
+#: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "不能開啟 `%s' 內的資料夾"
 
 # calendar/gui/gnome-cal.c:851
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:1533
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "不支援用作開啟 `%s'  必須的方法"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: calendar/gui/gnome-cal.c:1865
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "開啟資料夾 %s"
@@ -6249,227 +7102,272 @@ msgstr "10月"
 msgid "September"
 msgstr "9月"
 
-#: calendar/gui/itip-utils.c:243
-msgid "Atleast one attendee is necessary"
+#: calendar/gui/itip-utils.c:280
+msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:311
 msgid "An organizer must be set."
 msgstr "必須指定一個召集人。"
 
-#: calendar/gui/itip-utils.c:570
+# data/evolution.keys.in.h:2
+#: calendar/gui/itip-utils.c:354
+#, fuzzy
+msgid "Event information"
+msgstr "行事曆資訊"
+
+# widgets/misc/e-messagebox.c:152
+#: calendar/gui/itip-utils.c:356
+#, fuzzy
+msgid "Task information"
+msgstr "工作資訊"
+
+# mail/mail-config.glade.h:47
+#: calendar/gui/itip-utils.c:358
+#, fuzzy
+msgid "Journal information"
+msgstr "選用的資訊"
+
+# mail/mail-config.glade.h:61
+#: calendar/gui/itip-utils.c:360
+#, fuzzy
+msgid "Free/Busy information"
+msgstr "空閒/忙碌 資訊"
+
+# data/evolution.keys.in.h:2
+#: calendar/gui/itip-utils.c:362
+#, fuzzy
+msgid "Calendar information"
+msgstr "行事曆資訊"
+
+#: calendar/gui/itip-utils.c:398
+#, fuzzy
+msgid "Updated"
+msgstr "工作更新"
+
+# ui/evolution-subscribe.xml.h:4
+#: calendar/gui/itip-utils.c:406
+#, fuzzy
+msgid "Refresh"
+msgstr "重整清單"
+
+#: calendar/gui/itip-utils.c:410
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr ""
 
 # calendar/gui/alarm-notify/notify-main.c:108
-#: calendar/gui/main.c:91
+#: calendar/gui/main.c:96
 msgid "Could not create the component editor factory"
 msgstr "不能建立元件編輯器工廠"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr "1日"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr "2日"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr "3日"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr "4日"
 
 # calendar/gui/print.c:300
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr "5日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr "6日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr "7日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr "8日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr "9日"
 
 # calendar/gui/print.c:301
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr "10日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr "11日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr "12日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr "13日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr "14日"
 
 # calendar/gui/print.c:302
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr "15日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr "16日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr "17日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr "18日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr "19日"
 
 # calendar/gui/print.c:303
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr "20日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr "21日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr "22日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr "23日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr "24日"
 
 # calendar/gui/print.c:304
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr "25日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr "26日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr "27日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr "28日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr "29日"
 
 # calendar/gui/print.c:305
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr "30日"
 
 # calendar/gui/print.c:306
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr "31日"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr "日"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "一"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "二"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "三"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "四"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "五"
 
 # calendar/gui/print.c:362
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "六"
 
 # calendar/gui/print.c:1078
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1863
 msgid "Selected day (%a %b %d %Y)"
 msgstr "選擇的日期(%a %b %d %Y)"
 
 # calendar/gui/print.c:1092
 # calendar/gui/print.c:1096
-#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
+#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
 # calendar/gui/print.c:1093
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1889
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
@@ -6477,63 +7375,63 @@ msgstr "%a %d %Y"
 # calendar/gui/print.c:1097
 # calendar/gui/print.c:1099
 # calendar/gui/print.c:1100
-#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1852
+#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
+#: calendar/gui/print.c:1896
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
 # calendar/gui/print.c:1104
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1900
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "選擇的週(%s - %s)"
 
 # calendar/gui/print.c:1112
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1908
 msgid "Selected month (%b %Y)"
 msgstr "選擇的月(%b %Y)"
 
 # calendar/gui/print.c:1119
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1915
 msgid "Selected year (%Y)"
 msgstr "選擇的年(%Y)"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/print.c:2205
+#: calendar/gui/print.c:2249
 #, fuzzy
 msgid "Task"
 msgstr "工作"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2306
 #, fuzzy, c-format
 msgid "Status: %s"
 msgstr "狀態(_S)："
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: calendar/gui/print.c:2280
+#: calendar/gui/print.c:2324
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "優先順序(_P)："
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/print.c:2294
+#: calendar/gui/print.c:2338
 #, fuzzy, c-format
 msgid "Percent Complete: %i"
 msgstr "完成日期："
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2350
 #, fuzzy, c-format
 msgid "URL: %s"
 msgstr "網址："
 
 # addressbook/backend/ebook/e-card.c:3467
-#: calendar/gui/print.c:2320
+#: calendar/gui/print.c:2364
 #, fuzzy, c-format
 msgid "Categories: %s"
 msgstr ""
@@ -6541,13 +7439,13 @@ msgstr ""
 "類別： "
 
 # ui/evolution-addressbook.xml.h:17
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2375
 #, fuzzy
 msgid "Contacts: "
 msgstr "連絡人(_N)："
 
 # calendar/gui/print.c:1156
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2430
 msgid "Print Calendar"
 msgstr "列印行事曆"
 
@@ -6555,30 +7453,26 @@ msgstr "列印行事曆"
 # mail/mail-callbacks.c:1447
 # ui/evolution-addressbook.xml.h:10
 # ui/evolution-calendar.xml.h:24
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2352 my-evolution/e-summary.c:614
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
+#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
+#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "預覽列印"
 
 # ui/evolution-contact-editor.xml.h:6
 # ui/evolution-event-editor.xml.h:37
 # ui/evolution-task-editor-dialog.xml.h:40
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2550
 msgid "Print Item"
 msgstr "列印項目"
 
 # ui/evolution-event-editor.xml.h:36
 # ui/evolution-task-editor-dialog.xml.h:39
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2631
 msgid "Print Setup"
 msgstr "列印設定"
 
-# calendar/gui/tasks-control.c:108
-#: calendar/gui/tasks-control.c:126
-msgid "The URI of the tasks folder to display"
-msgstr "工作資料夾顯示的 URI"
-
 # calendar/gui/calendar-commands.c:468
 #: calendar/gui/tasks-control-factory.c:75
 #, fuzzy
@@ -6586,6 +7480,38 @@ msgid ""
 "Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr "不能建立行事曆檢視。  請檢查 ORBit 和 OAF 的設定。"
 
+# calendar/gui/tasks-control.c:108
+#: calendar/gui/tasks-control.c:147
+msgid "The URI of the tasks folder to display"
+msgstr "工作資料夾顯示的 URI"
+
+#: calendar/gui/tasks-control.c:456
+#, fuzzy
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"這個動作會永久地清除所有標示為刪除的郵件。如果您要繼續，您將不能復原這些郵"
+"件。\n"
+"\n"
+"確定清除這些郵件？"
+
+# importers/elm-importer.c:528
+# importers/netscape-importer.c:807
+# importers/pine-importer.c:668
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2672
+msgid "Do not ask me again."
+msgstr "不要再顯示這個訊息。"
+
+# ui/evolution-calendar.xml.h:25
+#: calendar/gui/tasks-control.c:612
+#, fuzzy
+msgid "Print Tasks"
+msgstr "列印名片"
+
 # calendar/gui/tasks-migrate.c:106
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
@@ -6627,90 +7553,137 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "日一二三四五六"
 
-#: calendar/pcs/query.c:234
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import iCalendar files into Evolution"
+msgstr "匯入 VCard 檔案到 Evolution 的元件工廠。"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#, fuzzy
+msgid "Imports iCalendar files into Evolution"
+msgstr "匯入 VCard 檔案到 Evolution。"
+
+# addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#, fuzzy
+msgid "Imports vCalendar files into Evolution"
+msgstr "匯入 VCard 檔案到 Evolution。"
+
+# calendar/gui/event-editor-dialog.glade.h:20
+#: calendar/importers/icalendar-importer.c:424
+#, fuzzy
+msgid "Reminder!!"
+msgstr "提醒"
+
+# calendar/gui/e-itip-control.glade.h:4
+#: calendar/importers/icalendar-importer.c:638
+#, fuzzy
+msgid "Calendar Events"
+msgstr "行事曆訊息"
+
+# importers/pine-importer.c:705
+#: calendar/importers/icalendar-importer.c:663
+#, fuzzy
+msgid ""
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution 找到 Pine 格式的郵件檔案。\n"
+"您是否要將它們匯入至 Evolution？"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: calendar/importers/icalendar-importer.c:670
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "行事曆"
+
+#: calendar/pcs/query.c:248
 msgid "time-now expects 0 arguments"
 msgstr "time-now 要求 0 個參數"
 
-#: calendar/pcs/query.c:258
+#: calendar/pcs/query.c:272
 msgid "make-time expects 1 argument"
 msgstr "make-time 要求 1 個參數"
 
-#: calendar/pcs/query.c:263
+#: calendar/pcs/query.c:277
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time 要求參數 1 為字串"
 
-#: calendar/pcs/query.c:271
+#: calendar/pcs/query.c:285
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time 參數 1 必須為 ISO 8601 日期/時間字串"
 
-#: calendar/pcs/query.c:300
+#: calendar/pcs/query.c:314
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day 要求 2 個參數"
 
-#: calendar/pcs/query.c:305
+#: calendar/pcs/query.c:319
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day 要求參數 1 為 time_t"
 
-#: calendar/pcs/query.c:312
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day 要求參數 2 為整數"
 
-#: calendar/pcs/query.c:339
+#: calendar/pcs/query.c:353
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin 要求 1 個參數"
 
-#: calendar/pcs/query.c:344
+#: calendar/pcs/query.c:358
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin 要求參數 1 為 time_t"
 
-#: calendar/pcs/query.c:371
+#: calendar/pcs/query.c:385
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end 要求 1 個參數"
 
-#: calendar/pcs/query.c:376
+#: calendar/pcs/query.c:390
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end 要求參數 1 為 time_t"
 
-#: calendar/pcs/query.c:412
+#: calendar/pcs/query.c:426
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype 要求 0 個參數"
 
-#: calendar/pcs/query.c:508
+#: calendar/pcs/query.c:522
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? 要求 2 個參數"
 
-#: calendar/pcs/query.c:513
+#: calendar/pcs/query.c:527
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? 要求參數 1 為 time_t"
 
-#: calendar/pcs/query.c:520
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? 要求參數 2 為 time_t"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: calendar/pcs/query.c:650
+#: calendar/pcs/query.c:664
 msgid "contains? expects 2 arguments"
 msgstr "contains? 要求 2 個參數"
 
-#: calendar/pcs/query.c:655
+#: calendar/pcs/query.c:669
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? 要求參數 1 為字串"
 
-#: calendar/pcs/query.c:662
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? 要求參數 2 為字串"
 
-#: calendar/pcs/query.c:679
+#: calendar/pcs/query.c:693
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr "contains? 要求參數 1 為 \"any\", \"summary\", \"description\" 其中之一"
 
-#: calendar/pcs/query.c:721
+#: calendar/pcs/query.c:735
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? 要求至少 1 個參數"
 
-#: calendar/pcs/query.c:733
+#: calendar/pcs/query.c:747
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6718,51 +7691,1721 @@ msgstr ""
 "has-categories? 要求所有的參數為字串或僅有的一個為布林值 false(#f) 的參數"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: calendar/pcs/query.c:821
+#: calendar/pcs/query.c:835
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? 要求 0 個參數"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: calendar/pcs/query.c:866
+#: calendar/pcs/query.c:880
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "is-completed? 要求 0 個參數"
 
-#: calendar/pcs/query.c:871
+#: calendar/pcs/query.c:885
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "time-day-begin 要求參數 1 為 time_t"
 
-#: calendar/pcs/query.c:1159
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "搜尋表示出的值結果不能為布林值"
 
+#.
+#. * These are the timezone names from the Olson timezone data.
+#. * We only place them here so gettext picks them up for translation.
+#. * Don't include in any C files.
+#.
+#: calendar/zones.h:7
+msgid "Africa/Abidjan"
+msgstr ""
+
+#: calendar/zones.h:8
+msgid "Africa/Accra"
+msgstr ""
+
+#: calendar/zones.h:9
+msgid "Africa/Addis_Ababa"
+msgstr ""
+
+#: calendar/zones.h:10
+msgid "Africa/Algiers"
+msgstr ""
+
+#: calendar/zones.h:11
+msgid "Africa/Asmera"
+msgstr ""
+
+#: calendar/zones.h:12
+msgid "Africa/Bamako"
+msgstr ""
+
+#: calendar/zones.h:13
+msgid "Africa/Bangui"
+msgstr ""
+
+#: calendar/zones.h:14
+msgid "Africa/Banjul"
+msgstr ""
+
+#: calendar/zones.h:15
+msgid "Africa/Bissau"
+msgstr ""
+
+#: calendar/zones.h:16
+msgid "Africa/Blantyre"
+msgstr ""
+
+#: calendar/zones.h:17
+msgid "Africa/Brazzaville"
+msgstr ""
+
+#: calendar/zones.h:18
+msgid "Africa/Bujumbura"
+msgstr ""
+
+#: calendar/zones.h:19
+msgid "Africa/Cairo"
+msgstr ""
+
+#: calendar/zones.h:20
+msgid "Africa/Casablanca"
+msgstr ""
+
+#: calendar/zones.h:21
+msgid "Africa/Ceuta"
+msgstr ""
+
+#: calendar/zones.h:22
+msgid "Africa/Conakry"
+msgstr ""
+
+#: calendar/zones.h:23
+msgid "Africa/Dakar"
+msgstr ""
+
+#: calendar/zones.h:24
+msgid "Africa/Dar_es_Salaam"
+msgstr ""
+
+#: calendar/zones.h:25
+#, fuzzy
+msgid "Africa/Djibouti"
+msgstr "吉布地"
+
+#: calendar/zones.h:26
+msgid "Africa/Douala"
+msgstr ""
+
+#: calendar/zones.h:27
+msgid "Africa/El_Aaiun"
+msgstr ""
+
+#: calendar/zones.h:28
+msgid "Africa/Freetown"
+msgstr ""
+
+#: calendar/zones.h:29
+msgid "Africa/Gaborone"
+msgstr ""
+
+#: calendar/zones.h:30
+msgid "Africa/Harare"
+msgstr ""
+
+#: calendar/zones.h:31
+msgid "Africa/Johannesburg"
+msgstr ""
+
+#: calendar/zones.h:32
+msgid "Africa/Kampala"
+msgstr ""
+
+#: calendar/zones.h:33
+msgid "Africa/Khartoum"
+msgstr ""
+
+#: calendar/zones.h:34
+msgid "Africa/Kigali"
+msgstr ""
+
+#: calendar/zones.h:35
+msgid "Africa/Kinshasa"
+msgstr ""
+
+#: calendar/zones.h:36
+msgid "Africa/Lagos"
+msgstr ""
+
+#: calendar/zones.h:37
+msgid "Africa/Libreville"
+msgstr ""
+
+#: calendar/zones.h:38
+msgid "Africa/Lome"
+msgstr ""
+
+#: calendar/zones.h:39
+msgid "Africa/Luanda"
+msgstr ""
+
+#: calendar/zones.h:40
+msgid "Africa/Lubumbashi"
+msgstr ""
+
+#: calendar/zones.h:41
+msgid "Africa/Lusaka"
+msgstr ""
+
+#: calendar/zones.h:42
+msgid "Africa/Malabo"
+msgstr ""
+
+#: calendar/zones.h:43
+msgid "Africa/Maputo"
+msgstr ""
+
+#: calendar/zones.h:44
+msgid "Africa/Maseru"
+msgstr ""
+
+#: calendar/zones.h:45
+msgid "Africa/Mbabane"
+msgstr ""
+
+#: calendar/zones.h:46
+msgid "Africa/Mogadishu"
+msgstr ""
+
+#: calendar/zones.h:47
+msgid "Africa/Monrovia"
+msgstr ""
+
+#: calendar/zones.h:48
+msgid "Africa/Nairobi"
+msgstr ""
+
+#: calendar/zones.h:49
+msgid "Africa/Ndjamena"
+msgstr ""
+
+#: calendar/zones.h:50
+msgid "Africa/Niamey"
+msgstr ""
+
+#: calendar/zones.h:51
+msgid "Africa/Nouakchott"
+msgstr ""
+
+#: calendar/zones.h:52
+msgid "Africa/Ouagadougou"
+msgstr ""
+
+#: calendar/zones.h:53
+msgid "Africa/Porto-Novo"
+msgstr ""
+
+#: calendar/zones.h:54
+msgid "Africa/Sao_Tome"
+msgstr ""
+
+#: calendar/zones.h:55
+msgid "Africa/Timbuktu"
+msgstr ""
+
+#: calendar/zones.h:56
+msgid "Africa/Tripoli"
+msgstr ""
+
+#: calendar/zones.h:57
+msgid "Africa/Tunis"
+msgstr ""
+
+#: calendar/zones.h:58
+msgid "Africa/Windhoek"
+msgstr ""
+
+#: calendar/zones.h:59
+#, fuzzy
+msgid "America/Adak"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:60
+#, fuzzy
+msgid "America/Anchorage"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:61
+#, fuzzy
+msgid "America/Anguilla"
+msgstr "安圭拉島"
+
+#: calendar/zones.h:62
+#, fuzzy
+msgid "America/Antigua"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:63
+#, fuzzy
+msgid "America/Araguaina"
+msgstr "尼加拉瓜"
+
+#: calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: calendar/zones.h:65
+#, fuzzy
+msgid "America/Asuncion"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:66
+#, fuzzy
+msgid "America/Barbados"
+msgstr "巴貝多"
+
+#: calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:36
+#: calendar/zones.h:68
+#, fuzzy
+msgid "America/Belize"
+msgstr "貝里斯"
+
+#: calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: calendar/zones.h:70
+#, fuzzy
+msgid "America/Bogota"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:71
+msgid "America/Boise"
+msgstr ""
+
+#: calendar/zones.h:72
+msgid "America/Buenos_Aires"
+msgstr ""
+
+#: calendar/zones.h:73
+msgid "America/Cambridge_Bay"
+msgstr ""
+
+#: calendar/zones.h:74
+msgid "America/Cancun"
+msgstr ""
+
+#: calendar/zones.h:75
+#, fuzzy
+msgid "America/Caracas"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:76
+#, fuzzy
+msgid "America/Catamarca"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: calendar/zones.h:78
+#, fuzzy
+msgid "America/Cayman"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:79
+#, fuzzy
+msgid "America/Chicago"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: calendar/zones.h:81
+#, fuzzy
+msgid "America/Cordoba"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:82
+#, fuzzy
+msgid "America/Costa_Rica"
+msgstr "哥斯大黎加"
+
+#: calendar/zones.h:83
+#, fuzzy
+msgid "America/Cuiaba"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:84
+#, fuzzy
+msgid "America/Curacao"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: calendar/zones.h:86
+#, fuzzy
+msgid "America/Dawson"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:87
+msgid "America/Dawson_Creek"
+msgstr ""
+
+#: calendar/zones.h:88
+msgid "America/Denver"
+msgstr ""
+
+#: calendar/zones.h:89
+msgid "America/Detroit"
+msgstr ""
+
+#: calendar/zones.h:90
+#, fuzzy
+msgid "America/Dominica"
+msgstr "多明尼克"
+
+#: calendar/zones.h:91
+#, fuzzy
+msgid "America/Edmonton"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: calendar/zones.h:93
+#, fuzzy
+msgid "America/El_Salvador"
+msgstr "薩爾瓦多"
+
+#: calendar/zones.h:94
+msgid "America/Fortaleza"
+msgstr ""
+
+#: calendar/zones.h:95
+msgid "America/Glace_Bay"
+msgstr ""
+
+#: calendar/zones.h:96
+#, fuzzy
+msgid "America/Godthab"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:97
+msgid "America/Goose_Bay"
+msgstr ""
+
+#: calendar/zones.h:98
+msgid "America/Grand_Turk"
+msgstr ""
+
+#: calendar/zones.h:99
+#, fuzzy
+msgid "America/Grenada"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:100
+#, fuzzy
+msgid "America/Guadeloupe"
+msgstr "瓜德魯普島"
+
+#: calendar/zones.h:101
+#, fuzzy
+msgid "America/Guatemala"
+msgstr "瓜地馬拉"
+
+#: calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: calendar/zones.h:103
+#, fuzzy
+msgid "America/Guyana"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:104
+#, fuzzy
+msgid "America/Halifax"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:105
+#, fuzzy
+msgid "America/Havana"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:106
+msgid "America/Hermosillo"
+msgstr ""
+
+#: calendar/zones.h:107
+msgid "America/Indiana/Indianapolis"
+msgstr ""
+
+#: calendar/zones.h:108
+msgid "America/Indiana/Knox"
+msgstr ""
+
+#: calendar/zones.h:109
+msgid "America/Indiana/Marengo"
+msgstr ""
+
+#: calendar/zones.h:110
+msgid "America/Indiana/Vevay"
+msgstr ""
+
+#: calendar/zones.h:111
+msgid "America/Indianapolis"
+msgstr ""
+
+#: calendar/zones.h:112
+msgid "America/Inuvik"
+msgstr ""
+
+#: calendar/zones.h:113
+msgid "America/Iqaluit"
+msgstr ""
+
+#: calendar/zones.h:114
+#, fuzzy
+msgid "America/Jamaica"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: calendar/zones.h:116
+#, fuzzy
+msgid "America/Juneau"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:117
+msgid "America/Kentucky/Louisville"
+msgstr ""
+
+#: calendar/zones.h:118
+msgid "America/Kentucky/Monticello"
+msgstr ""
+
+#: calendar/zones.h:119
+#, fuzzy
+msgid "America/La_Paz"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:120
+#, fuzzy
+msgid "America/Lima"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:121
+msgid "America/Los_Angeles"
+msgstr ""
+
+#: calendar/zones.h:122
+msgid "America/Louisville"
+msgstr ""
+
+#: calendar/zones.h:123
+#, fuzzy
+msgid "America/Maceio"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:124
+#, fuzzy
+msgid "America/Managua"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:125
+#, fuzzy
+msgid "America/Manaus"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:126
+#, fuzzy
+msgid "America/Martinique"
+msgstr "法屬馬丁尼克"
+
+#: calendar/zones.h:127
+#, fuzzy
+msgid "America/Mazatlan"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:128
+#, fuzzy
+msgid "America/Mendoza"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:129
+msgid "America/Menominee"
+msgstr ""
+
+#: calendar/zones.h:130
+msgid "America/Merida"
+msgstr ""
+
+#: calendar/zones.h:131
+msgid "America/Mexico_City"
+msgstr ""
+
+#: calendar/zones.h:132
+msgid "America/Miquelon"
+msgstr ""
+
+#: calendar/zones.h:133
+msgid "America/Monterrey"
+msgstr ""
+
+#: calendar/zones.h:134
+msgid "America/Montevideo"
+msgstr ""
+
+#: calendar/zones.h:135
+#, fuzzy
+msgid "America/Montreal"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:136
+#, fuzzy
+msgid "America/Montserrat"
+msgstr "蒙瑟拉特島"
+
+#: calendar/zones.h:137
+#, fuzzy
+msgid "America/Nassau"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:138
+msgid "America/New_York"
+msgstr ""
+
+#: calendar/zones.h:139
+msgid "America/Nipigon"
+msgstr ""
+
+#: calendar/zones.h:140
+#, fuzzy
+msgid "America/Nome"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:141
+#, fuzzy
+msgid "America/Noronha"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: calendar/zones.h:143
+#, fuzzy
+msgid "America/Panama"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: calendar/zones.h:145
+#, fuzzy
+msgid "America/Paramaribo"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:146
+msgid "America/Phoenix"
+msgstr ""
+
+#: calendar/zones.h:147
+msgid "America/Port-au-Prince"
+msgstr ""
+
+#: calendar/zones.h:148
+msgid "America/Port_of_Spain"
+msgstr ""
+
+#: calendar/zones.h:149
+msgid "America/Porto_Velho"
+msgstr ""
+
+#: calendar/zones.h:150
+#, fuzzy
+msgid "America/Puerto_Rico"
+msgstr "波多黎各"
+
+#: calendar/zones.h:151
+msgid "America/Rainy_River"
+msgstr ""
+
+#: calendar/zones.h:152
+msgid "America/Rankin_Inlet"
+msgstr ""
+
+#: calendar/zones.h:153
+msgid "America/Recife"
+msgstr ""
+
+#: calendar/zones.h:154
+#, fuzzy
+msgid "America/Regina"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: calendar/zones.h:156
+#, fuzzy
+msgid "America/Rosario"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:157
+#, fuzzy
+msgid "America/Santiago"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:158
+#, fuzzy
+msgid "America/Santo_Domingo"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:159
+#, fuzzy
+msgid "America/Sao_Paulo"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: calendar/zones.h:161
+#, fuzzy
+msgid "America/Shiprock"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:162
+#, fuzzy
+msgid "America/St_Johns"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: calendar/zones.h:164
+#, fuzzy
+msgid "America/St_Lucia"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:165
+#, fuzzy
+msgid "America/St_Thomas"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:166
+msgid "America/St_Vincent"
+msgstr ""
+
+#: calendar/zones.h:167
+msgid "America/Swift_Current"
+msgstr ""
+
+#: calendar/zones.h:168
+msgid "America/Tegucigalpa"
+msgstr ""
+
+#: calendar/zones.h:169
+msgid "America/Thule"
+msgstr ""
+
+#: calendar/zones.h:170
+msgid "America/Thunder_Bay"
+msgstr ""
+
+#: calendar/zones.h:171
+#, fuzzy
+msgid "America/Tijuana"
+msgstr "亞賽拜然"
+
+#: calendar/zones.h:172
+#, fuzzy
+msgid "America/Tortola"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:173
+msgid "America/Vancouver"
+msgstr ""
+
+#: calendar/zones.h:174
+msgid "America/Whitehorse"
+msgstr ""
+
+#: calendar/zones.h:175
+msgid "America/Winnipeg"
+msgstr ""
+
+#: calendar/zones.h:176
+#, fuzzy
+msgid "America/Yakutat"
+msgstr "美屬薩摩亞"
+
+#: calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+# shell/e-shell-importer.c:490
+#: calendar/zones.h:178
+#, fuzzy
+msgid "Antarctica/Casey"
+msgstr "南極洲"
+
+# shell/e-shell-importer.c:490
+#: calendar/zones.h:179
+#, fuzzy
+msgid "Antarctica/Davis"
+msgstr "南極洲"
+
+#: calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+# shell/e-shell-importer.c:490
+#: calendar/zones.h:181
+#, fuzzy
+msgid "Antarctica/Mawson"
+msgstr "南極洲"
+
+# shell/e-shell-importer.c:490
+#: calendar/zones.h:182
+#, fuzzy
+msgid "Antarctica/McMurdo"
+msgstr "南極洲"
+
+# shell/e-shell-importer.c:490
+#: calendar/zones.h:183
+#, fuzzy
+msgid "Antarctica/Palmer"
+msgstr "南極洲"
+
+# shell/e-shell-importer.c:490
+#: calendar/zones.h:184
+#, fuzzy
+msgid "Antarctica/South_Pole"
+msgstr "南極洲"
+
+# shell/e-shell-importer.c:490
+#: calendar/zones.h:185
+#, fuzzy
+msgid "Antarctica/Syowa"
+msgstr "南極洲"
+
+# shell/e-shell-importer.c:490
+#: calendar/zones.h:186
+#, fuzzy
+msgid "Antarctica/Vostok"
+msgstr "南極洲"
+
+#: calendar/zones.h:187
+msgid "Arctic/Longyearbyen"
+msgstr ""
+
+#: calendar/zones.h:188
+msgid "Asia/Aden"
+msgstr ""
+
+#: calendar/zones.h:189
+msgid "Asia/Almaty"
+msgstr ""
+
+#: calendar/zones.h:190
+msgid "Asia/Amman"
+msgstr ""
+
+#: calendar/zones.h:191
+msgid "Asia/Anadyr"
+msgstr ""
+
+#: calendar/zones.h:192
+msgid "Asia/Aqtau"
+msgstr ""
+
+#: calendar/zones.h:193
+msgid "Asia/Aqtobe"
+msgstr ""
+
+#: calendar/zones.h:194
+msgid "Asia/Ashgabat"
+msgstr ""
+
+#: calendar/zones.h:195
+msgid "Asia/Baghdad"
+msgstr ""
+
+#: calendar/zones.h:196
+#, fuzzy
+msgid "Asia/Bahrain"
+msgstr "巴林"
+
+#: calendar/zones.h:197
+msgid "Asia/Baku"
+msgstr ""
+
+#: calendar/zones.h:198
+msgid "Asia/Bangkok"
+msgstr ""
+
+#: calendar/zones.h:199
+msgid "Asia/Beirut"
+msgstr ""
+
+#: calendar/zones.h:200
+msgid "Asia/Bishkek"
+msgstr ""
+
+#: calendar/zones.h:201
+msgid "Asia/Brunei"
+msgstr ""
+
+#: calendar/zones.h:202
+msgid "Asia/Calcutta"
+msgstr ""
+
+#: calendar/zones.h:203
+msgid "Asia/Choibalsan"
+msgstr ""
+
+#: calendar/zones.h:204
+msgid "Asia/Chongqing"
+msgstr ""
+
+#: calendar/zones.h:205
+#, fuzzy
+msgid "Asia/Colombo"
+msgstr "哥倫比亞"
+
+#: calendar/zones.h:206
+msgid "Asia/Damascus"
+msgstr ""
+
+#: calendar/zones.h:207
+msgid "Asia/Dhaka"
+msgstr ""
+
+#: calendar/zones.h:208
+msgid "Asia/Dili"
+msgstr ""
+
+#: calendar/zones.h:209
+msgid "Asia/Dubai"
+msgstr ""
+
+#: calendar/zones.h:210
+msgid "Asia/Dushanbe"
+msgstr ""
+
+#: calendar/zones.h:211
+msgid "Asia/Gaza"
+msgstr ""
+
+#: calendar/zones.h:212
+msgid "Asia/Harbin"
+msgstr ""
+
+#: calendar/zones.h:213
+#, fuzzy
+msgid "Asia/Hong_Kong"
+msgstr "香港"
+
+#: calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1242
+# addressbook/gui/widgets/e-addressbook-view.c:733
+#: calendar/zones.h:216
+#, fuzzy
+msgid "Asia/Istanbul"
+msgstr "助理"
+
+#: calendar/zones.h:217
+msgid "Asia/Jakarta"
+msgstr ""
+
+#: calendar/zones.h:218
+msgid "Asia/Jayapura"
+msgstr ""
+
+#: calendar/zones.h:219
+msgid "Asia/Jerusalem"
+msgstr ""
+
+#: calendar/zones.h:220
+msgid "Asia/Kabul"
+msgstr ""
+
+#: calendar/zones.h:221
+msgid "Asia/Kamchatka"
+msgstr ""
+
+#: calendar/zones.h:222
+msgid "Asia/Karachi"
+msgstr ""
+
+#: calendar/zones.h:223
+msgid "Asia/Kashgar"
+msgstr ""
+
+#: calendar/zones.h:224
+msgid "Asia/Katmandu"
+msgstr ""
+
+#: calendar/zones.h:225
+msgid "Asia/Krasnoyarsk"
+msgstr ""
+
+#: calendar/zones.h:226
+msgid "Asia/Kuala_Lumpur"
+msgstr ""
+
+#: calendar/zones.h:227
+msgid "Asia/Kuching"
+msgstr ""
+
+#: calendar/zones.h:228
+#, fuzzy
+msgid "Asia/Kuwait"
+msgstr "科威特"
+
+#: calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:10
+#: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "澳門"
+
+#: calendar/zones.h:231
+msgid "Asia/Magadan"
+msgstr ""
+
+#: calendar/zones.h:232
+msgid "Asia/Makassar"
+msgstr ""
+
+#: calendar/zones.h:233
+msgid "Asia/Manila"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1242
+# addressbook/gui/widgets/e-addressbook-view.c:733
+#: calendar/zones.h:234
+#, fuzzy
+msgid "Asia/Muscat"
+msgstr "助理"
+
+#: calendar/zones.h:235
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:236
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+# calendar/gui/calendar-model.c:1578
+#: calendar/zones.h:237
+#, fuzzy
+msgid "Asia/Omsk"
+msgstr "指派工作"
+
+#: calendar/zones.h:238
+msgid "Asia/Oral"
+msgstr ""
+
+#: calendar/zones.h:239
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: calendar/zones.h:240
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: calendar/zones.h:241
+msgid "Asia/Pyongyang"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: calendar/zones.h:242
+#, fuzzy
+msgid "Asia/Qatar"
+msgstr "卡達"
+
+#: calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: calendar/zones.h:244
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: calendar/zones.h:245
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: calendar/zones.h:246
+msgid "Asia/Saigon"
+msgstr ""
+
+#: calendar/zones.h:247
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: calendar/zones.h:248
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: calendar/zones.h:249
+msgid "Asia/Seoul"
+msgstr ""
+
+#: calendar/zones.h:250
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: calendar/zones.h:251
+#, fuzzy
+msgid "Asia/Singapore"
+msgstr "新加坡"
+
+#: calendar/zones.h:252
+msgid "Asia/Taipei"
+msgstr ""
+
+#: calendar/zones.h:253
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: calendar/zones.h:254
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: calendar/zones.h:255
+msgid "Asia/Tehran"
+msgstr ""
+
+#: calendar/zones.h:256
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: calendar/zones.h:257
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: calendar/zones.h:258
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: calendar/zones.h:259
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: calendar/zones.h:260
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: calendar/zones.h:261
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: calendar/zones.h:262
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: calendar/zones.h:263
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: calendar/zones.h:264
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: calendar/zones.h:265
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: calendar/zones.h:266
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: calendar/zones.h:267
+#, fuzzy
+msgid "Atlantic/Bermuda"
+msgstr "百慕達"
+
+#: calendar/zones.h:268
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: calendar/zones.h:269
+#, fuzzy
+msgid "Atlantic/Cape_Verde"
+msgstr "維德角島"
+
+#: calendar/zones.h:270
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: calendar/zones.h:271
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: calendar/zones.h:272
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: calendar/zones.h:273
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: calendar/zones.h:274
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: calendar/zones.h:275
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: calendar/zones.h:276
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: calendar/zones.h:277
+#, fuzzy
+msgid "Australia/Adelaide"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:278
+#, fuzzy
+msgid "Australia/Brisbane"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:279
+#, fuzzy
+msgid "Australia/Broken_Hill"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:280
+#, fuzzy
+msgid "Australia/Darwin"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:281
+#, fuzzy
+msgid "Australia/Hobart"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:282
+#, fuzzy
+msgid "Australia/Lindeman"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:283
+#, fuzzy
+msgid "Australia/Lord_Howe"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:284
+#, fuzzy
+msgid "Australia/Melbourne"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:285
+#, fuzzy
+msgid "Australia/Perth"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:286
+#, fuzzy
+msgid "Australia/Sydney"
+msgstr "澳大利亞"
+
+#: calendar/zones.h:287
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: calendar/zones.h:288
+#, fuzzy
+msgid "Europe/Andorra"
+msgstr "安道爾"
+
+# mail/folder-browser-factory.c:198
+# ui/evolution-event-editor.xml.h:39
+# ui/evolution-task-editor-dialog.xml.h:42
+#: calendar/zones.h:289
+#, fuzzy
+msgid "Europe/Athens"
+msgstr "內容"
+
+#: calendar/zones.h:290
+msgid "Europe/Belfast"
+msgstr ""
+
+#: calendar/zones.h:291
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: calendar/zones.h:292
+msgid "Europe/Berlin"
+msgstr ""
+
+#: calendar/zones.h:293
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: calendar/zones.h:294
+msgid "Europe/Brussels"
+msgstr ""
+
+#: calendar/zones.h:295
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: calendar/zones.h:296
+msgid "Europe/Budapest"
+msgstr ""
+
+#: calendar/zones.h:297
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: calendar/zones.h:298
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: calendar/zones.h:299
+msgid "Europe/Dublin"
+msgstr ""
+
+#: calendar/zones.h:300
+#, fuzzy
+msgid "Europe/Gibraltar"
+msgstr "直布羅陀"
+
+#: calendar/zones.h:301
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: calendar/zones.h:302
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: calendar/zones.h:303
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: calendar/zones.h:304
+msgid "Europe/Kiev"
+msgstr ""
+
+#: calendar/zones.h:305
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: calendar/zones.h:306
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: calendar/zones.h:307
+msgid "Europe/London"
+msgstr ""
+
+#: calendar/zones.h:308
+#, fuzzy
+msgid "Europe/Luxembourg"
+msgstr "盧森堡"
+
+#: calendar/zones.h:309
+msgid "Europe/Madrid"
+msgstr ""
+
+#: calendar/zones.h:310
+msgid "Europe/Malta"
+msgstr ""
+
+#: calendar/zones.h:311
+msgid "Europe/Minsk"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: calendar/zones.h:312
+#, fuzzy
+msgid "Europe/Monaco"
+msgstr "摩納哥"
+
+#: calendar/zones.h:313
+msgid "Europe/Moscow"
+msgstr ""
+
+#: calendar/zones.h:314
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: calendar/zones.h:315
+msgid "Europe/Oslo"
+msgstr ""
+
+# mail/folder-browser-factory.c:198
+# ui/evolution-event-editor.xml.h:39
+# ui/evolution-task-editor-dialog.xml.h:42
+#: calendar/zones.h:316
+#, fuzzy
+msgid "Europe/Paris"
+msgstr "內容"
+
+#: calendar/zones.h:317
+msgid "Europe/Prague"
+msgstr ""
+
+#: calendar/zones.h:318
+msgid "Europe/Riga"
+msgstr ""
+
+#: calendar/zones.h:319
+msgid "Europe/Rome"
+msgstr ""
+
+#: calendar/zones.h:320
+msgid "Europe/Samara"
+msgstr ""
+
+#: calendar/zones.h:321
+#, fuzzy
+msgid "Europe/San_Marino"
+msgstr "聖馬利諾"
+
+#: calendar/zones.h:322
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: calendar/zones.h:323
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: calendar/zones.h:324
+msgid "Europe/Skopje"
+msgstr ""
+
+#: calendar/zones.h:325
+msgid "Europe/Sofia"
+msgstr ""
+
+#: calendar/zones.h:326
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: calendar/zones.h:327
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: calendar/zones.h:328
+msgid "Europe/Tirane"
+msgstr ""
+
+#: calendar/zones.h:329
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: calendar/zones.h:330
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: calendar/zones.h:331
+msgid "Europe/Vatican"
+msgstr ""
+
+#: calendar/zones.h:332
+msgid "Europe/Vienna"
+msgstr ""
+
+#: calendar/zones.h:333
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: calendar/zones.h:334
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: calendar/zones.h:335
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: calendar/zones.h:336
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: calendar/zones.h:337
+msgid "Europe/Zurich"
+msgstr ""
+
+#: calendar/zones.h:338
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: calendar/zones.h:339
+msgid "Indian/Chagos"
+msgstr ""
+
+#: calendar/zones.h:340
+msgid "Indian/Christmas"
+msgstr ""
+
+#: calendar/zones.h:341
+msgid "Indian/Cocos"
+msgstr ""
+
+# ui/evolution-mail.xml.h:5
+#: calendar/zones.h:342
+#, fuzzy
+msgid "Indian/Comoro"
+msgstr "葛摩"
+
+#: calendar/zones.h:343
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: calendar/zones.h:344
+#, fuzzy
+msgid "Indian/Mahe"
+msgstr "印度"
+
+#: calendar/zones.h:345
+#, fuzzy
+msgid "Indian/Maldives"
+msgstr "馬爾地夫"
+
+# addressbook/printing/e-contact-print.glade.h:21
+#: calendar/zones.h:346
+#, fuzzy
+msgid "Indian/Mauritius"
+msgstr "模里西斯"
+
+# calendar/gui/goto-dialog.glade.h:11
+#: calendar/zones.h:347
+#, fuzzy
+msgid "Indian/Mayotte"
+msgstr "美亞特"
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: calendar/zones.h:348
+#, fuzzy
+msgid "Indian/Reunion"
+msgstr "留尼旺"
+
+#: calendar/zones.h:349
+msgid "Pacific/Apia"
+msgstr ""
+
+#: calendar/zones.h:350
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: calendar/zones.h:351
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: calendar/zones.h:352
+msgid "Pacific/Easter"
+msgstr ""
+
+#: calendar/zones.h:353
+msgid "Pacific/Efate"
+msgstr ""
+
+#: calendar/zones.h:354
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: calendar/zones.h:355
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: calendar/zones.h:356
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: calendar/zones.h:357
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: calendar/zones.h:358
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: calendar/zones.h:359
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: calendar/zones.h:360
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: calendar/zones.h:361
+msgid "Pacific/Guam"
+msgstr ""
+
+#: calendar/zones.h:362
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: calendar/zones.h:363
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: calendar/zones.h:364
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: calendar/zones.h:365
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: calendar/zones.h:366
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: calendar/zones.h:367
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: calendar/zones.h:368
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: calendar/zones.h:369
+msgid "Pacific/Midway"
+msgstr ""
+
+#: calendar/zones.h:370
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: calendar/zones.h:371
+msgid "Pacific/Niue"
+msgstr ""
+
+#: calendar/zones.h:372
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: calendar/zones.h:373
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: calendar/zones.h:374
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: calendar/zones.h:375
+msgid "Pacific/Palau"
+msgstr ""
+
+# ui/evolution-calendar.xml.h:25
+#: calendar/zones.h:376
+#, fuzzy
+msgid "Pacific/Pitcairn"
+msgstr "皮特康"
+
+#: calendar/zones.h:377
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: calendar/zones.h:378
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: calendar/zones.h:379
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: calendar/zones.h:380
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: calendar/zones.h:381
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: calendar/zones.h:382
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: calendar/zones.h:383
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: calendar/zones.h:384
+msgid "Pacific/Truk"
+msgstr ""
+
+#: calendar/zones.h:385
+msgid "Pacific/Wake"
+msgstr ""
+
+#: calendar/zones.h:386
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: calendar/zones.h:387
+msgid "Pacific/Yap"
+msgstr ""
+
 # camel/camel-cipher-context.c:171
-#: camel/camel-cipher-context.c:171
+#: camel/camel-cipher-context.c:170
 msgid "Signing is not supported by this cipher"
 msgstr "此加密器不支援加簽"
 
-# camel/camel-cipher-context.c:211
-#: camel/camel-cipher-context.c:211
-msgid "Clearsigning is not supported by this cipher"
-msgstr "此加密器不支援明確簽章"
-
 # camel/camel-cipher-context.c:251
-#: camel/camel-cipher-context.c:251
+#: camel/camel-cipher-context.c:210
 msgid "Verifying is not supported by this cipher"
 msgstr "此加密器不支援驗證加簽"
 
 # camel/camel-cipher-context.c:294
-#: camel/camel-cipher-context.c:294
+#: camel/camel-cipher-context.c:254
 msgid "Encryption is not supported by this cipher"
 msgstr "此加密器不支援加密"
 
 # camel/camel-cipher-context.c:336
-#: camel/camel-cipher-context.c:336
+#: camel/camel-cipher-context.c:296
 msgid "Decryption is not supported by this cipher"
 msgstr "此加密器不支援解密"
 
-#: camel/camel-disco-diary.c:180
+# mail/mail-ops.c:1728
+#: camel/camel-data-cache.c:169
+#, fuzzy
+msgid "Unable to create cache path"
+msgstr ""
+"無法建立輸出檔案：%s\n"
+" %s"
+
+# camel/providers/imap/camel-imap-message-cache.c:150
+#: camel/camel-data-cache.c:443
+#, fuzzy, c-format
+msgid "Could not remove cache entry: %s: %s"
+msgstr "不能開啟快取目錄：%s"
+
+#: camel/camel-disco-diary.c:185
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -6773,7 +9416,7 @@ msgstr ""
 "接下來在此伺服器上的操作，在您重新連線到網路時\n"
 "將不會重播。"
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:248
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -6784,148 +9427,259 @@ msgstr ""
 "%s\n"
 "這個資料夾內所做的變更將不會重新同步。"
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:282
 msgid "Resynchronizing with server"
 msgstr "與伺服器重新同步"
 
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#: camel/camel-disco-folder.c:278
+#, fuzzy, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr "建立資料夾 %s"
+
 # camel/camel-disco-store.c:271
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-store.c:367
 msgid "You must be working online to complete this operation"
 msgstr "您必須於線上工作才能完成此操作"
 
 # camel/camel-filter-driver.c:534
 # camel/camel-filter-driver.c:543
-#: camel/camel-filter-driver.c:553 camel/camel-filter-driver.c:562
+#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
 msgid "Syncing folders"
 msgstr "同步處理資料夾"
 
+# camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "分析過濾器發生錯誤： %s: %s"
+
+# camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "執行過濾器發生錯誤： %s: %s"
+
 # camel/camel-filter-driver.c:643
-#: camel/camel-filter-driver.c:664
+#: camel/camel-filter-driver.c:884
 msgid "Unable to open spool folder"
 msgstr "無法開啟 spool 資料夾"
 
 # camel/camel-filter-driver.c:652
-#: camel/camel-filter-driver.c:673
+#: camel/camel-filter-driver.c:893
 msgid "Unable to process spool folder"
 msgstr "無法處理 spool 資料夾"
 
 # camel/camel-filter-driver.c:666
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:908
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "接收郵件 %d (%d%%)"
 
 # camel/camel-filter-driver.c:671
-#: camel/camel-filter-driver.c:692
+#: camel/camel-filter-driver.c:912
 msgid "Cannot open message"
 msgstr "不能開啟郵件"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
+#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
 #, c-format
 msgid "Failed on message %d"
 msgstr "在第 %d 封郵件發生錯誤"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
 msgid "Syncing folder"
 msgstr "同步處理資料夾"
 
 # camel/camel-filter-driver.c:748
-#: camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:1013
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在接收第 %d / %d 封郵件"
 
 # camel/camel-filter-driver.c:753
 # camel/camel-filter-driver.c:771
-#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
+#: camel/camel-filter-driver.c:1028
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d / %d 封郵件失敗"
 
-# camel/camel-filter-driver.c:866
-#: camel/camel-filter-driver.c:921
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "分析過濾器發生錯誤： %s: %s"
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#: camel/camel-filter-search.c:140
+#, fuzzy
+msgid "Failed to retrieve message"
+msgstr "解密郵件失敗。"
 
-# camel/camel-filter-driver.c:871
-#: camel/camel-filter-driver.c:927
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "執行過濾器發生錯誤： %s: %s"
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#: camel/camel-filter-search.c:538
+#, fuzzy, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "解密郵件失敗。"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#: camel/camel-filter-search.c:577
+#, fuzzy, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "解密郵件失敗。"
 
 # camel/camel-filter-search.c:439
 # camel/camel-filter-search.c:445
-#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
+#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "執行過濾器搜尋發生錯誤： %s: %s"
 
-#: camel/camel-folder.c:471
+# camel/camel-folder-search.c:328
+#: camel/camel-folder-search.c:343
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"不能分析搜尋詞句：%s：\n"
+"%s"
+
+# camel/camel-folder-search.c:338
+#: camel/camel-folder-search.c:353
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"執行搜尋詞句時發生錯誤：%s：\n"
+"%s"
+
+# camel/camel-folder-search.c:485
+# camel/camel-folder-search.c:513
+#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+msgid "(match-all) requires a single bool result"
+msgstr "(符合-全部) 需要單一布林值結果"
+
+# camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:650
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "在不明的檔頭內執行查詢：%s"
+
+#: camel/camel-folder.c:583
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
 # camel/camel-folder-search.c:338
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1161
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "執行搜尋詞句時發生錯誤：%s：\n"
 "%s"
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1201
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
 # mail/mail-ops.c:898
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1317
 #, fuzzy
 msgid "Moving messages"
 msgstr "將郵件移到 %s"
 
-# camel/camel-folder-search.c:328
-#: camel/camel-folder-search.c:332
+# mail/mail-ops.c:898
+#: camel/camel-folder.c:1317
+#, fuzzy
+msgid "Copying messages"
+msgstr "將郵件複製到 %s"
+
+#: camel/camel-gpg-context.c:696
 #, c-format
 msgid ""
-"Cannot parse search expression: %s:\n"
+"Unexpected GnuPG status message encountered:\n"
+"\n"
 "%s"
 msgstr ""
-"不能分析搜尋詞句：%s：\n"
-"%s"
 
-# camel/camel-folder-search.c:338
-#: camel/camel-folder-search.c:342
+#: camel/camel-gpg-context.c:710
+msgid "Failed to parse gpg userid hint."
+msgstr ""
+
+#: camel/camel-gpg-context.c:733
+msgid "Failed to parse gpg passphrase request."
+msgstr ""
+
+#: camel/camel-gpg-context.c:741
 #, c-format
 msgid ""
-"Error executing search expression: %s:\n"
-"%s"
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
 msgstr ""
-"執行搜尋詞句時發生錯誤：%s：\n"
-"%s"
 
-# camel/camel-folder-search.c:485
-# camel/camel-folder-search.c:513
-#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
-msgid "(match-all) requires a single bool result"
-msgstr "(符合-全部) 需要單一布林值結果"
+# mail/mail-send-recv.c:471
+#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
+#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
+#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+msgid "Cancelled."
+msgstr "已取消。"
 
-# camel/camel-folder-search.c:559
-#: camel/camel-folder-search.c:638
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "在不明的檔頭內執行查詢：%s"
+#: camel/camel-gpg-context.c:770
+msgid "Failed to unlock secret key: 3 bad passphrases given."
+msgstr ""
 
-# camel/camel-folder-search.c:670
-# camel/camel-folder-search.c:714
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
-msgstr "錯誤的類型於 body-contains，需要字串"
+# camel/providers/imap/camel-imap-command.c:232
+#: camel/camel-gpg-context.c:776
+#, fuzzy, c-format
+msgid "Unexpected response from GnuPG: %s"
+msgstr "從 IMAP 伺服器傳回不當的回應： %s"
+
+# camel/camel-pgp-context.c:1073
+#: camel/camel-gpg-context.c:782
+#, fuzzy
+msgid "No data provided"
+msgstr "沒有指定資料夾名稱。"
+
+# camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/camel-gpg-context.c:827
+#, fuzzy
+msgid "Failed to encrypt: No valid recipients specified."
+msgstr "無法傳送郵件：沒有提供收件者。"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#: camel/camel-gpg-context.c:1077
+#, fuzzy, c-format
+msgid ""
+"Failed to GPG %s message: %s\n"
+"\n"
+"%.*s"
+msgstr "解密郵件失敗。"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#: camel/camel-gpg-context.c:1083
+#, fuzzy, c-format
+msgid "Failed to GPG %s message: %s\n"
+msgstr "解密郵件失敗。"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
+#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#, fuzzy
+msgid "Failed to execute gpg."
+msgstr "解密郵件失敗。"
+
+# camel/camel-pgp-context.c:890
+#: camel/camel-gpg-context.c:1258
+#, fuzzy, c-format
+msgid "Cannot verify message signature: could not create temp file: %s"
+msgstr "不能建立暫存檔案：%s"
 
 # camel/camel-movemail.c:306
 #: camel/camel-lock-client.c:111
@@ -7043,180 +9797,42 @@ msgstr "寫入郵件暫存檔案時發生錯誤：%s"
 msgid "Error copying mail temp file: %s"
 msgstr "複製郵件暫存檔案時發生錯誤：%s"
 
-# camel/camel-pgp-context.c:190
-#: camel/camel-pgp-context.c:194
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "請輸入 %2$s 所須的 %1$s 密碼"
-
-# camel/camel-pgp-context.c:193
-#: camel/camel-pgp-context.c:197
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "請輸入您的 %s 密碼"
-
-# camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:561
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to sign"
-msgstr "無法傳送郵件：沒有提供收件者。"
-
-# camel/providers/smtp/camel-smtp-transport.c:568
-#: camel/camel-pgp-context.c:568 camel/camel-pgp-context.c:748
-#, fuzzy
-msgid "Cannot sign this message: no password provided"
-msgstr "無法傳送郵件：寄件者的地址無效。"
-
-# camel/camel-pgp-context.c:524
-# camel/camel-pgp-context.c:696
-# camel/camel-pgp-context.c:879
-# camel/camel-pgp-context.c:1064
-# camel/camel-pgp-context.c:1276
-#: camel/camel-pgp-context.c:574 camel/camel-pgp-context.c:754
-#, fuzzy, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "不能建立導管至 GPG/PGP：%s"
-
-# camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:741
-#, fuzzy
-msgid "Cannot sign this message: no plaintext to clearsign"
-msgstr "無法傳送郵件：沒有提供收件者。"
-
-# camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:939
-#, fuzzy
-msgid "Cannot verify this message: no plaintext to verify"
-msgstr "無法傳送郵件：沒有提供收件者。"
-
-# camel/camel-pgp-context.c:524
-# camel/camel-pgp-context.c:696
-# camel/camel-pgp-context.c:879
-# camel/camel-pgp-context.c:1064
-# camel/camel-pgp-context.c:1276
-#: camel/camel-pgp-context.c:945
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "不能建立導管至 GPG/PGP：%s"
-
-# camel/camel-pgp-context.c:890
-#: camel/camel-pgp-context.c:956
-#, fuzzy, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
-msgstr "不能建立暫存檔案：%s"
-
-# camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:1129
-#, fuzzy
-msgid "Cannot encrypt this message: no plaintext to encrypt"
-msgstr "無法傳送郵件：沒有提供收件者。"
-
-# camel/providers/smtp/camel-smtp-transport.c:568
-#: camel/camel-pgp-context.c:1139
-#, fuzzy
-msgid "Cannot encrypt this message: no password provided"
-msgstr "無法傳送郵件：寄件者的地址無效。"
-
-# camel/camel-pgp-context.c:524
-# camel/camel-pgp-context.c:696
-# camel/camel-pgp-context.c:879
-# camel/camel-pgp-context.c:1064
-# camel/camel-pgp-context.c:1276
-#: camel/camel-pgp-context.c:1146
-#, fuzzy, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "不能建立導管至 GPG/PGP：%s"
-
-# camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:1155
-#, fuzzy
-msgid "Cannot encrypt this message: no recipients specified"
-msgstr "無法傳送郵件：沒有提供收件者。"
+#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+msgid "Failed to decrypt MIME part: protocol error"
+msgstr ""
 
-# camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-pgp-context.c:1323
-#, fuzzy
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
-msgstr "無法傳送郵件：沒有提供收件者。"
+#: camel/camel-multipart-encrypted.c:325
+msgid "Failed to decrypt MIME part: parse error"
+msgstr ""
 
-#: camel/camel-pgp-context.c:1331
-msgid "Cannot decrypt this message: no password provided"
+#: camel/camel-multipart-signed.c:624
+msgid "This is a digitally signed message part"
 msgstr ""
 
-# camel/camel-pgp-context.c:524
-# camel/camel-pgp-context.c:696
-# camel/camel-pgp-context.c:879
-# camel/camel-pgp-context.c:1064
-# camel/camel-pgp-context.c:1276
-#: camel/camel-pgp-context.c:1338
-#, fuzzy, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "不能建立導管至 GPG/PGP：%s"
+# shell/e-storage.c:467
+#: camel/camel-multipart-signed.c:678
+#, fuzzy
+msgid "parse error"
+msgstr "其它錯誤"
 
 # camel/camel-provider.c:131
-#: camel/camel-provider.c:130
+#: camel/camel-provider.c:131
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "不能載入模組 %s： 此系統不支援載入模組。"
 
 # camel/camel-provider.c:140
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "不能載入 %s：%s"
 
 # camel/camel-provider.c:148
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "不能載入 %s：模組內沒有初始碼。"
 
-# camel/camel-remote-store.c:191
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s server %s"
-msgstr "%s 伺服器 %s"
-
-# camel/camel-remote-store.c:195
-#: camel/camel-remote-store.c:207
-#, c-format
-msgid "%s service for %s on %s"
-msgstr "用於 %3$s 上之 %2$s 的 %1$s 服務"
-
-# camel/camel-remote-store.c:252
-#: camel/camel-remote-store.c:264
-msgid "Connection cancelled"
-msgstr "連線已取消"
-
-# camel/camel-remote-store.c:255
-# camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:270
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "不能連線至 %s (埠號 %d)： %s"
-
-# camel/camel-remote-store.c:256
-#: camel/camel-remote-store.c:268
-msgid "(unknown host)"
-msgstr "(不明的主機)"
-
-# camel/camel-remote-store.c:337
-# camel/camel-remote-store.c:399
-# camel/camel-remote-store.c:470
-# camel/providers/imap/camel-imap-command.c:287
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
-#: camel/providers/imap/camel-imap-command.c:386
-msgid "Operation cancelled"
-msgstr "行動已取消"
-
-# camel/camel-remote-store.c:476
-#: camel/camel-remote-store.c:484
-#, fuzzy, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "伺服器突然中斷連線"
-
 # camel/camel-sasl-anonymous.c:33
 #: camel/camel-sasl-anonymous.c:33
 msgid "Anonymous"
@@ -7344,13 +9960,14 @@ msgstr ""
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:496
+#: camel/providers/imap/camel-imap-store.c:846
 msgid "Bad authentication response from server."
 msgstr "來自伺服器的不良許可回應。"
 
 # camel/camel-sasl-login.c:32
 #: camel/camel-sasl-login.c:32
-msgid "NT Login"
+#, fuzzy
+msgid "Login"
 msgstr "NT 登錄"
 
 # camel/camel-sasl-login.c:34
@@ -7364,17 +9981,21 @@ msgstr "這個選項將會使用普通的密碼連線至伺服器。"
 msgid "Unknown authentication state."
 msgstr "不詳的驗証狀況。"
 
-# addressbook/gui/component/addressbook-config.c:165
-# camel/camel-sasl-plain.c:32
-# camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:291
-# camel/providers/pop3/camel-pop3-provider.c:67
-# mail/mail-config.glade.h:52
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:301
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
-msgid "Password"
-msgstr "密碼"
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
+msgstr ""
+
+# camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-ntlm.c:33
+#, fuzzy
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr "這個選項將會使用 Kerberos 4 驗證連線至伺服器。"
+
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
+msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
@@ -7404,47 +10025,65 @@ msgid "Regular expression compilation failed: %s: %s"
 msgstr "正規表示式編譯失敗： %s： %s"
 
 # camel/camel-service.c:154
-#: camel/camel-service.c:157
+#: camel/camel-service.c:281
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' 須要 username 元件"
 
 # camel/camel-service.c:162
-#: camel/camel-service.c:165
+#: camel/camel-service.c:289
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' 須要 host 元件"
 
 # camel/camel-service.c:170
-#: camel/camel-service.c:173
+#: camel/camel-service.c:297
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' 須要 path 元件"
 
 # camel/camel-service.c:548
-#: camel/camel-service.c:611
+#: camel/camel-service.c:742
 #, c-format
 msgid "Resolving: %s"
 msgstr "解析：%s"
 
 # camel/camel-service.c:575
-#: camel/camel-service.c:638
+#: camel/camel-service.c:773 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "搜尋名稱失敗： %s"
 
 # camel/camel-service.c:600
-#: camel/camel-service.c:663
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "搜尋主機失敗： %s ：找不到主機"
 
 # camel/camel-service.c:602
-#: camel/camel-service.c:665
+#: camel/camel-service.c:800
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "搜尋主機失敗： %s ：不明原因"
 
+# camel/camel-service.c:548
+#: camel/camel-service.c:850
+#, fuzzy
+msgid "Resolving address"
+msgstr "解析：%s"
+
+# camel/camel-service.c:600
+#: camel/camel-service.c:912
+#, fuzzy
+msgid "Host lookup failed: host not found"
+msgstr "搜尋主機失敗： %s ：找不到主機"
+
+# camel/camel-service.c:602
+#: camel/camel-service.c:915
+#, fuzzy
+msgid "Host lookup failed: unknown reason"
+msgstr "搜尋主機失敗： %s ：不明原因"
+
 # camel/camel-session.c:68
 #: camel/camel-session.c:75
 msgid "Virtual folder email provider"
@@ -7457,13 +10096,13 @@ msgstr "使讀取郵件如同於其他資料夾查詢"
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: camel/camel-session.c:346 camel/camel-session.c:415
+#: camel/camel-session.c:351 camel/camel-session.c:419
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "沒有可處理通訊協定 `%s' 的服務可用"
 
 # camel/camel-session.c:479
-#: camel/camel-session.c:532
+#: camel/camel-session.c:536
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -7516,19 +10155,19 @@ msgid "Failed to verify certificates."
 msgstr "驗證證書失敗。"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/camel-store.c:220
+#: camel/camel-store.c:241
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "無法建立資料夾鎖定 %s ： %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/camel-store.c:280
+#: camel/camel-store.c:303
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "無法建立資料夾鎖定 %s ： %s"
 
 # camel/camel-tcp-stream-openssl.c:423
-#: camel/camel-tcp-stream-openssl.c:536
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -7539,8 +10178,7 @@ msgstr ""
 
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
-#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:541 camel/camel-tcp-stream-ssl.c:428
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7555,25 +10193,42 @@ msgstr ""
 "\n"
 "您無論如何都要接受嗎？"
 
-# camel/camel-tcp-stream-ssl.c:348
-#: camel/camel-tcp-stream-ssl.c:412
+#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
+#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
+#: camel/camel-tcp-stream-ssl.c:495
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
-msgstr ""
-"電子郵件: %s\n"
-"通用名稱: %s\n"
-"組織單位: %s\n"
-"組織: %s\n"
-"地區: %s\n"
-"州: %s\n"
-"國家: %s"
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:501
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-ssl.c:501
+msgid "BAD"
+msgstr ""
+
+# camel/camel-tcp-stream-openssl.c:428
+# camel/camel-tcp-stream-ssl.c:364
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:504
+#, fuzzy, c-format
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
+msgstr ""
+"來自 %s 的不良證書：\n"
+"\n"
+"%s\n"
+"\n"
+"您無論如何都要接受嗎？"
 
 # camel/camel-url.c:289
 #: camel/camel-url.c:288
@@ -7582,20 +10237,20 @@ msgid "Could not parse URL `%s'"
 msgstr "不能分析 URL `%s'"
 
 # camel/camel-vee-folder.c:451
-#: camel/camel-vee-folder.c:588
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%2$s 沒有 %1$s 這個郵件"
 
-# camel/camel-vee-folder.c:546
-#: camel/camel-vee-folder.c:749
-#, c-format
-msgid "No such message: %s"
-msgstr "沒有這個郵件： %s"
+# camel/providers/imap/camel-imap-provider.c:45
+#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#, fuzzy
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "檢查所有資料夾裡的新郵件"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-vee-store.c:258
+#: camel/camel-vee-store.c:262
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
@@ -7604,7 +10259,7 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:297
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
@@ -7612,108 +10267,121 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/camel-vee-store.c:306
+#: camel/camel-vee-store.c:310
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "無法將資料夾：%s 重新命名"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/camel-vee-store.c:314
+#: camel/camel-vee-store.c:318
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "不能將資料夾 %s 重新命名為 %s： %s"
 
-# camel/camel-vtrash-folder.c:109
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
-msgstr "您不能從垃圾桶資料夾內複製郵件。"
+# camel/camel-remote-store.c:337
+# camel/camel-remote-store.c:399
+# camel/camel-remote-store.c:470
+# camel/providers/imap/camel-imap-command.c:287
+#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-command.c:259
+#: camel/providers/imap/camel-imap-command.c:438
+#: camel/providers/imap/camel-imap-store.c:2276
+msgid "Operation cancelled"
+msgstr "行動已取消"
+
+# camel/camel-remote-store.c:476
+#: camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-store.c:2279
+#, fuzzy, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "伺服器突然中斷連線"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: camel/providers/imap/camel-imap-command.c:329
+#: camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "從 IMAP 伺服器傳回不當的回應： %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/imap/camel-imap-command.c:339
+#: camel/providers/imap/camel-imap-command.c:392
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP 指令失敗： %s"
 
 # camel/providers/imap/camel-imap-command.c:295
-#: camel/providers/imap/camel-imap-command.c:394
+#: camel/providers/imap/camel-imap-command.c:447
 msgid "Server response ended too soon."
 msgstr "伺服器太早傳回結束的回應。"
 
 # camel/providers/imap/camel-imap-command.c:487
-#: camel/providers/imap/camel-imap-command.c:586
+#: camel/providers/imap/camel-imap-command.c:636
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP 伺服器的回應沒有包含 %s 資訊"
 
 # camel/providers/imap/camel-imap-command.c:524
-#: camel/providers/imap/camel-imap-command.c:622
+#: camel/providers/imap/camel-imap-command.c:672
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "從 IMAP 伺服器傳回不當的 OK 回應： %s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: camel/providers/imap/camel-imap-folder.c:194
+#: camel/providers/imap/camel-imap-folder.c:215
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "不能建立目錄 %s： %s"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: camel/providers/imap/camel-imap-folder.c:213
+#: camel/providers/imap/camel-imap-folder.c:234
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "不能載入給 %s 的摘要"
 
-#: camel/providers/imap/camel-imap-folder.c:277
+#: camel/providers/imap/camel-imap-folder.c:300
 msgid "Folder was destroyed and recreated on server."
 msgstr "資料夾已破壞並在伺服器上重建。"
 
 # mail/mail-ops.c:1649
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:461
+#: camel/providers/imap/camel-imap-folder.c:525
 msgid "Scanning for changed messages"
 msgstr "掃描變更過的郵件"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: camel/providers/imap/camel-imap-folder.c:1562
-#: camel/providers/imap/camel-imap-folder.c:1974
+#: camel/providers/imap/camel-imap-folder.c:1842
+#: camel/providers/imap/camel-imap-folder.c:2323
 msgid "This message is not currently available"
 msgstr "這封郵件目前仍未可用"
 
-#: camel/providers/imap/camel-imap-folder.c:1713
-#: camel/providers/imap/camel-imap-folder.c:1794
+#: camel/providers/imap/camel-imap-folder.c:1999
+#: camel/providers/imap/camel-imap-folder.c:2076
 msgid "Fetching summary information for new messages"
 msgstr "正取得新郵件的摘要資訊"
 
 # mail/mail-ops.c:992
-#: camel/providers/imap/camel-imap-folder.c:1719
+#: camel/providers/imap/camel-imap-folder.c:2005
 msgid "Scanning for new messages"
 msgstr "掃描新郵件"
 
 # camel/providers/imap/camel-imap-folder.c:1075
 # camel/providers/imap/camel-imap-folder.c:1314
-#: camel/providers/imap/camel-imap-folder.c:2011
+#: camel/providers/imap/camel-imap-folder.c:2360
 msgid "Could not find message body in FETCH response."
 msgstr "在 FETCH 的回應內找不到郵件的內文。"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: camel/providers/imap/camel-imap-message-cache.c:154
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "不能開啟快取目錄：%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/providers/imap/camel-imap-message-cache.c:256
-#: camel/providers/imap/camel-imap-message-cache.c:313
-#: camel/providers/imap/camel-imap-message-cache.c:344
-#: camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/providers/imap/camel-imap-message-cache.c:257
+#: camel/providers/imap/camel-imap-message-cache.c:314
+#: camel/providers/imap/camel-imap-message-cache.c:345
+#: camel/providers/imap/camel-imap-message-cache.c:377
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "解密郵件失敗。"
@@ -7731,7 +10399,7 @@ msgstr "檢查所有資料夾裡的新郵件"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:820
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
 msgid "Folders"
 msgstr "資料夾"
 
@@ -7765,40 +10433,106 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
 
+# addressbook/gui/component/addressbook-config.c:165
+# camel/camel-sasl-plain.c:32
+# camel/providers/imap/camel-imap-provider.c:80
+# camel/providers/nntp/camel-nntp-store.c:291
+# camel/providers/pop3/camel-pop3-provider.c:67
+# mail/mail-config.glade.h:52
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "密碼"
+
 # camel/providers/imap/camel-imap-provider.c:82
 #: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
 
+# camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/imap/camel-imap-store.c:423
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP 伺服器 %s"
+
+# camel/camel-remote-store.c:195
+#: camel/providers/imap/camel-imap-store.c:425
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "用於 %3$s 上之 %2$s 的 %1$s 服務"
+
+# camel/camel-remote-store.c:252
+#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:180
+msgid "Connection cancelled"
+msgstr "連線已取消"
+
+# camel/camel-remote-store.c:255
+# camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:276
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "不能連線至 %s (埠號 %d)： %s"
+
+# camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/imap/camel-imap-store.c:606
+#: camel/providers/imap/camel-imap-store.c:637
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"不能夠連線到 POP 伺服器。\n"
+"傳送使用者名稱時發生錯誤：%s"
+
+# shell/e-storage.c:477
+#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/pop3/camel-pop3-store.c:213
+#, fuzzy
+msgid "SSL/TLS extension not supported."
+msgstr "行動不支援"
+
+# camel/camel-sasl-anonymous.c:110
+# camel/camel-sasl-plain.c:87
+#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/pop3/camel-pop3-store.c:254
+#, fuzzy
+msgid "SSL negotiations failed"
+msgstr "驗証失敗。"
+
 # camel/providers/imap/camel-imap-store.c:456
-#: camel/providers/imap/camel-imap-store.c:519
+#: camel/providers/imap/camel-imap-store.c:869
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 伺服器 %s 不支援所要求的驗證類別 %s"
 
 # camel/providers/imap/camel-imap-store.c:466
 # camel/providers/smtp/camel-smtp-transport.c:366
-#: camel/providers/imap/camel-imap-store.c:529
-#: camel/providers/smtp/camel-smtp-transport.c:386
+#: camel/providers/imap/camel-imap-store.c:879
+#: camel/providers/smtp/camel-smtp-transport.c:471
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "不支援驗證類別 %s"
 
 # camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:903
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s 請輸入 %s@%s 的 IMAP 密碼"
 
 # camel/providers/imap/camel-imap-store.c:505
 # camel/providers/smtp/camel-smtp-transport.c:410
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:430
+#: camel/providers/imap/camel-imap-store.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:512
 msgid "You didn't enter a password."
 msgstr "您沒有輸入密碼。"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: camel/providers/imap/camel-imap-store.c:594
+#: camel/providers/imap/camel-imap-store.c:947
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -7811,127 +10545,166 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: camel/providers/imap/camel-imap-store.c:897
+#: camel/providers/imap/camel-imap-store.c:1269
+#: camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid "No such folder %s"
 msgstr "沒有這個資料夾 %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1656
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "母資料夾並不允許包含子資料夾"
 
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:351
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s (%d)"
+
+# camel/providers/local/camel-mbox-folder.c:203
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:355
+#: camel/providers/local/camel-local-folder.c:358
+#, fuzzy, c-format
+msgid "mailbox:%s (%s)"
+msgstr "無法開啟 mailbox：%s： %s\n"
+
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:362
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s (%d)"
+
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
+msgstr ""
+
 # camel/providers/local/camel-local-provider.c:39
-#: camel/providers/local/camel-local-provider.c:42
+#: camel/providers/local/camel-local-provider.c:49
 msgid "MH-format mail directories"
 msgstr "MH-format 郵件目錄"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in MH-like mail directories."
 msgstr "用於儲存本地端郵件至 MH-like 郵件目錄。"
 
 # mail/mail-config.glade.h:76
-#: camel/providers/local/camel-local-provider.c:52
+#: camel/providers/local/camel-local-provider.c:65
 msgid "Local delivery"
 msgstr "本地端寄送"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: camel/providers/local/camel-local-provider.c:66
 msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "用於自標準 mbox 格式排程器接收本地端郵件。"
 
 # camel/providers/imap/camel-imap-provider.c:57
-#: camel/providers/local/camel-local-provider.c:62
+#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:94
 #, fuzzy
 msgid "Apply filters to new messages in INBOX"
 msgstr "將過濾器套用於此伺服器上 INBOX 裡的新郵件"
 
 # camel/providers/local/camel-local-provider.c:39
-#: camel/providers/local/camel-local-provider.c:68
+#: camel/providers/local/camel-local-provider.c:83
 #, fuzzy
 msgid "Maildir-format mail directories"
 msgstr "MH-format 郵件目錄"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: camel/providers/local/camel-local-provider.c:84
 #, fuzzy
 msgid "For storing local mail in maildir directories."
 msgstr "用於儲存本地端郵件至 qmail maildir 目錄。"
 
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
+msgstr ""
+
 # mail/mail-config.glade.h:77
-#: camel/providers/local/camel-local-provider.c:80
-msgid "Standard Unix mbox spools"
+#: camel/providers/local/camel-local-provider.c:101
+#, fuzzy
+msgid "Standard Unix mbox spool or directory"
 msgstr "標準 Unix mbox 排程器"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: camel/providers/local/camel-local-provider.c:81
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/providers/local/camel-local-provider.c:102
+#, fuzzy
+msgid ""
+"For reading and storing local mail in standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr "用於讀取及儲存本地諯郵件於標準 mbox 排程器檔案。"
 
 # camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:109
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "儲存根目錄 %s 不是絕對路徑"
 
 # camel/providers/local/camel-local-store.c:134
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "儲存根目錄 %s 不是合法的目錄"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-local-store.c:153
-#: camel/providers/local/camel-local-store.c:169
-#: camel/providers/local/camel-local-store.c:235
+#: camel/providers/local/camel-local-store.c:154
+#: camel/providers/local/camel-local-store.c:170
+#: camel/providers/local/camel-local-store.c:236
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "無法取得資料夾：%s：%s"
 
 # camel/providers/local/camel-local-store.c:173
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 msgid "Local stores do not have an inbox"
 msgstr "本地端的存儲沒有收件匣"
 
 # camel/providers/local/camel-local-store.c:183
-#: camel/providers/local/camel-local-store.c:196
+#: camel/providers/local/camel-local-store.c:197
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地端郵件檔案 %s"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
+#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "不能將資料夾 %s 重新命名為 %s： %s"
 
+# camel/providers/local/camel-mbox-summary.c:655
+#: camel/providers/local/camel-local-store.c:358
+#, fuzzy, c-format
+msgid "Could not rename '%s': %s"
+msgstr "無法將資料夾：%s 重新命名"
+
 # camel/providers/local/camel-local-store.c:279
-#: camel/providers/local/camel-local-store.c:374
+#: camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "不能刪除資料夾摘要檔案 `%s'： %s"
 
 # camel/providers/local/camel-local-store.c:289
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:389
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "不能刪除資料夾索引檔案 `%s'： %s"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: camel/providers/local/camel-local-summary.c:367
+#: camel/providers/local/camel-local-summary.c:406
 #, fuzzy, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "不能載入給 %s 的摘要"
 
 # camel/providers/local/camel-local-summary.c:404
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
+#: camel/providers/local/camel-local-summary.c:462
 msgid "Unable to add message to summary: unknown reason"
 msgstr "無法新增郵件到摘要資訊：不明的原因"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:184
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "在第 %d 封郵件發生錯誤"
@@ -7939,7 +10712,7 @@ msgstr "在第 %d 封郵件發生錯誤"
 # camel/providers/local/camel-maildir-folder.c:150
 # camel/providers/local/camel-maildir-folder.c:158
 # camel/providers/local/camel-maildir-folder.c:169
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:187
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "無法將郵件儲存到 maildir 資料夾： %s： %s"
@@ -7951,14 +10724,13 @@ msgstr "無法將郵件儲存到 maildir 資料夾： %s： %s"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:579
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -7970,24 +10742,23 @@ msgstr ""
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:579
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "沒有這封郵件"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
 msgstr "無效的郵件內文"
 
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:89
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -7999,17 +10770,17 @@ msgstr ""
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "資料夾 `%s' 不存在。"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: camel/providers/local/camel-maildir-store.c:116
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/providers/local/camel-maildir-store.c:117
+#: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -8019,7 +10790,7 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-maildir-store.c:122
-#: camel/providers/local/camel-maildir-store.c:131
+#: camel/providers/local/camel-maildir-store.c:132
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' 不是一個 maildir 目錄。"
@@ -8027,43 +10798,67 @@ msgstr "`%s' 不是一個 maildir 目錄。"
 # camel/providers/local/camel-maildir-store.c:151
 # camel/providers/local/camel-maildir-store.c:188
 # camel/providers/local/camel-mh-store.c:127
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "無法刪除資料夾 `%s'：%s"
 
 # camel/providers/local/camel-maildir-store.c:152
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "不是一個 maildir 目錄"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/providers/local/camel-maildir-store.c:335
+#: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "無法掃描資料夾 `%s'：%s"
 
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: camel/providers/local/camel-maildir-summary.c:405
-#: camel/providers/local/camel-maildir-summary.c:526
+#: camel/providers/local/camel-maildir-summary.c:408
+#: camel/providers/local/camel-maildir-summary.c:531
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "無法開啟 maildir 目錄路徑：%s: %s"
 
+# camel/providers/imap/camel-imap-provider.c:43
+# mail/mail-config.glade.h:13
+#: camel/providers/local/camel-maildir-summary.c:525
+#, fuzzy
+msgid "Checking folder consistency"
+msgstr "檢查新郵件"
+
+# mail/mail-ops.c:992
+#: camel/providers/local/camel-maildir-summary.c:629
+#, fuzzy
+msgid "Checking for new messages"
+msgstr "掃描新郵件"
+
+# camel/camel-filter-driver.c:690
+# camel/camel-filter-driver.c:788
+#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-mbox-summary.c:345
+#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-spool-summary.c:145
+#, fuzzy
+msgid "Storing folder"
+msgstr "同步處理資料夾"
+
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:147
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "無法建立資料夾鎖定 %s ： %s"
 
 # camel/providers/local/camel-mbox-folder.c:203
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:456
+#: camel/providers/local/camel-mbox-folder.c:215
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "無法開啟 mailbox：%s： %s\n"
@@ -8072,13 +10867,13 @@ msgstr "無法開啟 mailbox：%s： %s\n"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:275
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "行動已取消"
 
 # camel/providers/local/camel-mbox-folder.c:259
-#: camel/providers/local/camel-mbox-folder.c:268
+#: camel/providers/local/camel-mbox-folder.c:278
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "無法將郵件儲存到 mbox 檔案： %s： %s"
@@ -8086,12 +10881,9 @@ msgstr "無法將郵件儲存到 mbox 檔案： %s： %s"
 # camel/providers/local/camel-mbox-folder.c:335
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:595
-#: camel/providers/local/camel-spool-folder.c:627
-#: camel/providers/local/camel-spool-folder.c:639
+#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:405
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -8101,19 +10893,17 @@ msgstr ""
 "  %s"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:628
+#: camel/providers/local/camel-mbox-folder.c:398
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "資料夾好像已經損毀並且不能復原。"
 
 # camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:640
+#: camel/providers/local/camel-mbox-folder.c:406
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "郵件結構錯誤：損毀的 mailbox ？"
 
 # camel/providers/local/camel-mbox-store.c:94
-#: camel/providers/local/camel-mbox-store.c:93
+#: camel/providers/local/camel-mbox-store.c:95
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -8123,7 +10913,7 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-mbox-store.c:110
-#: camel/providers/local/camel-mbox-store.c:109
+#: camel/providers/local/camel-mbox-store.c:111
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -8134,16 +10924,16 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: camel/providers/local/camel-mbox-store.c:118
-#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:120
+#: camel/providers/local/camel-mbox-store.c:147
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' 不是一個合法的檔案。"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/providers/local/camel-mbox-store.c:137
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:139
+#: camel/providers/local/camel-mbox-store.c:162
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -8153,29 +10943,14 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-mbox-store.c:153
-#: camel/providers/local/camel-mbox-store.c:152
+#: camel/providers/local/camel-mbox-store.c:154
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "資料夾 `%s' 內仍有檔案。所以不刪除。"
 
-# camel/camel-filter-driver.c:690
-# camel/camel-filter-driver.c:788
-#. 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:248
-#: camel/providers/local/camel-mbox-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:378
-#: camel/providers/local/camel-spool-summary.c:643
-#: camel/providers/local/camel-spool-summary.c:935
-#, fuzzy
-msgid "Storing folder"
-msgstr "同步處理資料夾"
-
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
+#: camel/providers/local/camel-mbox-summary.c:350
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
@@ -8183,24 +10958,22 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-mbox-summary.c:296
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
+#: camel/providers/local/camel-mbox-summary.c:398
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "靠近位於資料夾 %2$s 裡 %1$ld 發生嚴重的郵件分析錯誤"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
+#: camel/providers/local/camel-mbox-summary.c:452
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "無法取得資料夾：%s：%s"
 
 # camel/providers/local/camel-mbox-store.c:94
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:648
+#: camel/providers/local/camel-mbox-summary.c:587
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
@@ -8208,146 +10981,151 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-mbox-summary.c:524
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "無法開啟暫存 mailbox：%s"
 
-# camel/providers/local/camel-mbox-summary.c:549
-# camel/providers/local/camel-mbox-summary.c:557
-# camel/providers/local/camel-mbox-summary.c:746
-# camel/providers/local/camel-mbox-summary.c:754
-#: camel/providers/local/camel-mbox-summary.c:544
-#: camel/providers/local/camel-mbox-summary.c:552
-#: camel/providers/local/camel-mbox-summary.c:741
-#: camel/providers/local/camel-mbox-summary.c:749
-#: camel/providers/local/camel-spool-summary.c:697
-#: camel/providers/local/camel-spool-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:978
-#: camel/providers/local/camel-spool-summary.c:986
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "摘要與資料夾不協調，即使經過同步"
-
-# camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-spool-summary.c:749
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "寫入暫存郵箱時發生錯誤：%s"
-
-# camel/providers/local/camel-mbox-summary.c:617
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-spool-summary.c:771
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "寫入暫存郵箱失敗：%s：%s"
-
 # camel/providers/local/camel-mbox-summary.c:635
 # camel/providers/local/camel-mbox-summary.c:804
-#: camel/providers/local/camel-mbox-summary.c:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
+#: camel/providers/local/camel-mbox-summary.c:611
+#: camel/providers/local/camel-mbox-summary.c:773
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "不能關閉來源資料夾 %s ： %s"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "無法關閉暫存資料夾： %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:650
+#: camel/providers/local/camel-mbox-summary.c:631
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "無法將資料夾：%s 重新命名"
 
+# camel/providers/local/camel-mbox-summary.c:549
+# camel/providers/local/camel-mbox-summary.c:557
+# camel/providers/local/camel-mbox-summary.c:746
+# camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:723
+#: camel/providers/local/camel-mbox-summary.c:912
+#: camel/providers/local/camel-mbox-summary.c:920
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "摘要與資料夾不協調，即使經過同步"
+
 # camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/local/camel-mbox-summary.c:873
-#: camel/providers/local/camel-spool-summary.c:544
-#: camel/providers/local/camel-spool-summary.c:1110
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "不明的錯誤：%s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+# camel/providers/local/camel-mbox-summary.c:655
+#: camel/providers/local/camel-mbox-summary.c:882
+#, fuzzy, c-format
+msgid "Could not store folder: %s"
+msgstr "無法將資料夾：%s 重新命名"
+
+# camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:973
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "寫入暫存郵箱時發生錯誤：%s"
+
+# camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-mbox-summary.c:990
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "寫入暫存郵箱失敗：%s：%s"
+
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr ""
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "無法將郵件儲存到 mh 資料夾： %s： %s"
 
 # camel/providers/local/camel-mh-store.c:110
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-mh-store.c:229
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' 不是一個目錄。"
 
 # camel/providers/local/camel-mh-summary.c:218
-#: camel/providers/local/camel-mh-summary.c:218
+#: camel/providers/local/camel-mh-summary.c:243
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "無法開啟 MH 目錄路徑：%s：%s"
 
-# camel/providers/local/camel-mbox-folder.c:259
-#: camel/providers/local/camel-spool-folder.c:512
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
-msgstr "無法將郵件增加到 spool 檔案： %s： %s"
+#: camel/providers/local/camel-spool-store.c:116
+#, fuzzy, c-format
+msgid "Spool `%s' cannot be opened: %s"
+msgstr "排程資料夾不能重新命名"
 
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
-msgstr "排程器 `%s' 不存在或不是一個合法的檔案"
+# camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-spool-store.c:128
+#, fuzzy, c-format
+msgid "Spool `%s' is not a regular file or directory"
+msgstr "儲存根目錄 %s 不是合法的目錄"
 
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: camel/providers/local/camel-spool-store.c:141
+#: camel/providers/local/camel-spool-store.c:145
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "資料夾 `%s/%s' 不存在。"
 
+#: camel/providers/local/camel-spool-store.c:162
+msgid "Store does not support an INBOX"
+msgstr ""
+
 # camel/providers/local/camel-local-store.c:183
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:174
 #, c-format
 msgid "Spool mail file %s"
 msgstr "排程郵件檔案 %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:174
+#, fuzzy, c-format
+msgid "Spool folder tree %s"
+msgstr "排程資料夾不能重新命名"
+
+#: camel/providers/local/camel-spool-store.c:182
 msgid "Spool folders cannot be renamed"
 msgstr "排程資料夾不能重新命名"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:190
 msgid "Spool folders cannot be deleted"
 msgstr "排程資料夾不能刪除"
 
 # camel/camel-movemail.c:158
-#: camel/providers/local/camel-spool-summary.c:788
-#: camel/providers/local/camel-spool-summary.c:797
-#: camel/providers/local/camel-spool-summary.c:806
+#: camel/providers/local/camel-spool-summary.c:181
+#: camel/providers/local/camel-spool-summary.c:190
+#: camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "無法與暫存資料夾同步 %s：%s"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: camel/providers/local/camel-spool-summary.c:821
+#: camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "無法與排程資料夾同步 %s：%s"
 
-#: camel/providers/local/camel-spool-summary.c:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/providers/local/camel-spool-summary.c:244
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -8356,58 +11134,6 @@ msgstr ""
 "不能同步排程資料夾 %s: %s\n"
 "資料夾可能損毀，複製儲存於 `%s'"
 
-# camel/camel-provider.c:140
-#: camel/providers/local/camel-spool-summary.c:940
-#, fuzzy, c-format
-msgid "Could not file: %s: %s"
-msgstr "不能載入 %s：%s"
-
-# camel/providers/nntp/camel-nntp-auth.c:45
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "請輸入 %s@%s 的 NNTP 密碼"
-
-# camel/providers/nntp/camel-nntp-auth.c:66
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "伺服器拒絕的使用者名稱"
-
-# camel/providers/nntp/camel-nntp-auth.c:72
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "傳送使用者名稱到伺服器失敗"
-
-# camel/providers/nntp/camel-nntp-auth.c:81
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "伺服器拒絕的使用者名稱/密碼"
-
-# camel/providers/nntp/camel-nntp-folder.c:115
-#: camel/providers/nntp/camel-nntp-folder.c:115
-#, c-format
-msgid "Message %s not found."
-msgstr "找不到郵件 %s"
-
-# camel/providers/nntp/camel-nntp-grouplist.c:45
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "無法從伺服器取得群組清單"
-
-# camel/providers/nntp/camel-nntp-grouplist.c:94
-# camel/providers/nntp/camel-nntp-grouplist.c:103
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "無法載入 %s： %s 的群組清單檔案"
-
-# camel/providers/nntp/camel-nntp-grouplist.c:153
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "無法儲存 %s： %s 的群組清單檔案"
-
 # camel/providers/nntp/camel-nntp-provider.c:42
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
@@ -8418,107 +11144,172 @@ msgstr "USENET 新聞"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "這是讀取與發信至 USERNET 新聞群組的供應者。"
 
-# camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/nntp/camel-nntp-store.c:230
+# camel/providers/imap/camel-imap-folder.c:172
+#: camel/providers/nntp/camel-nntp-store.c:151
+#, fuzzy, c-format
+msgid "Could not read greeting from %s: %s"
+msgstr "不能建立目錄 %s： %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:163
 #, c-format
-msgid "Could not open directory for news server: %s"
-msgstr "無法開啟新聞伺服器：%s 的目錄"
+msgid "NNTP server %s returned error code %d: %s"
+msgstr ""
 
 # camel/providers/nntp/camel-nntp-store.c:286
-#: camel/providers/nntp/camel-nntp-store.c:296
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "經由 %s 的 USENET 新聞"
 
 # camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/nntp/camel-nntp-store.c:303
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "這個選項將會使用純文字的密碼驗證 NNTP 伺服器"
 
-# camel/providers/nntp/camel-nntp-store.c:325
-# camel/providers/nntp/camel-nntp-store.c:488
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:495
-#, c-format
-msgid "Unable to open or create .newsrc file for %s: %s"
-msgstr "不能夠開啟或建立給 %s： %s 的 .newsrc 檔案"
+# camel/providers/imap/camel-imap-store.c:803
+# mail/mail-local.c:334
+#: camel/providers/nntp/camel-nntp-summary.c:234
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "沒有這個資料夾 %s"
+
+# camel/camel-movemail.c:306
+#: camel/providers/nntp/camel-nntp-summary.c:238
+#, fuzzy, c-format
+msgid "Could not get group: %s"
+msgstr "不能建立導管：%s"
+
+# camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/nntp/camel-nntp-summary.c:344
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "IMAP 指令失敗： %s"
+
+# mail/mail-ops.c:992
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
+#, fuzzy, c-format
+msgid "%s: Scanning new messages"
+msgstr "掃描新郵件"
+
+# camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/nntp/camel-nntp-summary.c:520
+#, fuzzy, c-format
+msgid "Unknown server response: %s"
+msgstr "不明的錯誤：%s"
+
+# ui/evolution-mail.xml.h:2
+#: camel/providers/nntp/camel-nntp-summary.c:566
+#, fuzzy
+msgid "Use cancel"
+msgstr "取消"
+
+# camel/camel-remote-store.c:337
+# camel/camel-remote-store.c:399
+# camel/camel-remote-store.c:470
+# camel/providers/imap/camel-imap-command.c:287
+#: camel/providers/nntp/camel-nntp-summary.c:568
+#, fuzzy, c-format
+msgid "Operation failed: %s"
+msgstr "行動已取消"
 
 # camel/providers/pop3/camel-pop3-folder.c:149
-#: camel/providers/pop3/camel-pop3-folder.c:175
+#: camel/providers/pop3/camel-pop3-folder.c:272
 msgid "Retrieving POP summary"
 msgstr "取回 POP 的摘要"
 
-# camel/providers/pop3/camel-pop3-folder.c:155
-#: camel/providers/pop3/camel-pop3-folder.c:181
-#, c-format
-msgid "Could not check POP server for new messages: %s"
-msgstr "無法檢查於 POP 伺服器的新郵件：%s "
+# camel/camel-remote-store.c:337
+# camel/camel-remote-store.c:399
+# camel/camel-remote-store.c:470
+# camel/providers/imap/camel-imap-command.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:446
+#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:522
+#, fuzzy
+msgid "User cancelled"
+msgstr "行動已取消"
 
-# camel/providers/pop3/camel-pop3-folder.c:199
-#: camel/providers/pop3/camel-pop3-folder.c:228
-msgid "Could not open folder: message listing was incomplete."
-msgstr "無法開啟資料夾：不完整的郵件清單。"
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Cannot get POP summary: %s"
+msgstr "無法取得資料夾：%s：%s"
 
 # mail/message-browser.c:199
-#: camel/providers/pop3/camel-pop3-folder.c:252
+#: camel/providers/pop3/camel-pop3-folder.c:325
 msgid "Expunging deleted messages"
 msgstr "清空刪除的郵件"
 
-# camel/providers/pop3/camel-pop3-folder.c:303
-#: camel/providers/pop3/camel-pop3-folder.c:328
-#, c-format
-msgid "Could not fetch message: %s"
-msgstr "不能接收郵件：%s"
-
-# camel/providers/pop3/camel-pop3-folder.c:320
-#: camel/providers/pop3/camel-pop3-folder.c:344
-#, c-format
-msgid "Could not retrieve message from POP server %s: %s"
-msgstr "無法從 POP 伺服器接收郵件 %s： %s"
-
 # camel/providers/pop3/camel-pop3-folder.c:292
-#: camel/providers/pop3/camel-pop3-folder.c:367
+#: camel/providers/pop3/camel-pop3-folder.c:420
 #, c-format
 msgid "No message with uid %s"
 msgstr "沒有郵件具有這個 uid %s"
 
 # camel/providers/pop3/camel-pop3-folder.c:296
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#. Sigh, most of the crap in this function is so that the cancel button
+#. returns the proper exception code.  Sigh.
+#: camel/providers/pop3/camel-pop3-folder.c:427
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "接收 POP 郵件 %d"
 
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/pop3/camel-pop3-folder.c:448
+#: camel/providers/pop3/camel-pop3-folder.c:507
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:524
+#, fuzzy, c-format
+msgid "Cannot get message %s: %s"
+msgstr ""
+"無法取得郵件： %s\n"
+" %s"
+
+# camel/camel-sasl-login.c:127
+#: camel/providers/pop3/camel-pop3-folder.c:514
+#, fuzzy
+msgid "Unknown reason"
+msgstr "不明的降水"
+
 # camel/providers/pop3/camel-pop3-provider.c:37
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
 msgstr "郵件儲存空間"
 
 # camel/providers/pop3/camel-pop3-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "在伺服器保留郵件備份"
 
 # camel/providers/pop3/camel-pop3-provider.c:41
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "刪除 %s 天後的郵件"
 
 # camel/providers/pop3/camel-pop3-provider.c:48
 # mail/mail-config.glade.h:51
-#: camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
 # camel/providers/imap/camel-imap-provider.c:65
-#: camel/providers/pop3/camel-pop3-provider.c:52
+#: camel/providers/pop3/camel-pop3-provider.c:54
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "用於連線到 POP 伺服器並下載郵件。"
 
 # camel/providers/pop3/camel-pop3-provider.c:69
-#: camel/providers/pop3/camel-pop3-provider.c:69
+#: camel/providers/pop3/camel-pop3-provider.c:71
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -8527,7 +11318,7 @@ msgstr ""
 "方式。"
 
 # camel/providers/pop3/camel-pop3-provider.c:79
-#: camel/providers/pop3/camel-pop3-provider.c:79
+#: camel/providers/pop3/camel-pop3-provider.c:81
 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 "
@@ -8536,55 +11327,25 @@ msgstr ""
 "這個選項將會使用加密的密碼經由 APOP 通訊協定連線到 POP 伺服器。不過就算伺服器"
 "聲稱能夠支援，但對於所有使用者來講都未必一定可行。"
 
-# camel/providers/pop3/camel-pop3-provider.c:91
-#: camel/providers/pop3/camel-pop3-provider.c:91
-msgid ""
-"This will connect to the POP server and use Kerberos 4 to authenticate to it."
-msgstr "這將會使用 Kerberos 4 的驗證方法連線到 POP  伺服器。"
-
-# camel/providers/pop3/camel-pop3-store.c:199
-#: camel/providers/pop3/camel-pop3-store.c:198
-#, c-format
-msgid "Could not authenticate to KPOP server: %s"
-msgstr "無法驗證登入 KPOP 伺服器：%s"
-
-# camel/providers/pop3/camel-pop3-store.c:215
-#: camel/providers/pop3/camel-pop3-store.c:214
-#, c-format
-msgid "Could not connect to server: %s"
-msgstr "不能夠連線到伺服器：%s"
-
-# camel/providers/pop3/camel-pop3-store.c:322
-#: camel/providers/pop3/camel-pop3-store.c:321
-#, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "不能夠連線到 %s 上的 POP 伺服器。"
-
-# camel/providers/pop3/camel-pop3-store.c:361
-#: camel/providers/pop3/camel-pop3-store.c:360
-#, c-format
-msgid "%sPlease enter the POP3 password for %s@%s"
-msgstr "%s 請輸入給 %s@%s 的 POP3 密碼"
-
 # camel/providers/pop3/camel-pop3-store.c:379
-#: camel/providers/pop3/camel-pop3-store.c:378
-#, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending username: %s"
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
+#, fuzzy, c-format
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "不能夠連線到 POP 伺服器。\n"
 "傳送使用者名稱時發生錯誤：%s"
 
-# camel/providers/pop3/camel-pop3-store.c:382
-# camel/providers/pop3/camel-pop3-store.c:419
-#: camel/providers/pop3/camel-pop3-store.c:381
-#: camel/providers/pop3/camel-pop3-store.c:418
-msgid "(Unknown)"
-msgstr "(不明)"
+# camel/providers/pop3/camel-pop3-store.c:322
+#: camel/providers/pop3/camel-pop3-store.c:351
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "不能夠連線到 %s 上的 POP 伺服器。"
 
 # camel/providers/pop3/camel-pop3-store.c:409
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:392
+#: camel/providers/pop3/camel-pop3-store.c:495
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8592,8 +11353,31 @@ msgstr ""
 "不能夠連線到 POP 伺服器。\n"
 "對於所要求的驗證機制沒有支援。"
 
+# camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/pop3/camel-pop3-store.c:408
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "IMAP 指令失敗： %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:419
+msgid "SASL Protocol error"
+msgstr ""
+
+# shell/e-storage.c:467
+#: camel/providers/pop3/camel-pop3-store.c:434
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "輸出/入錯誤"
+
+# camel/providers/pop3/camel-pop3-store.c:361
+#: camel/providers/pop3/camel-pop3-store.c:455
+#, fuzzy, c-format
+msgid "%sPlease enter the POP password for %s@%s"
+msgstr "%s 請輸入給 %s@%s 的 POP3 密碼"
+
 # camel/providers/pop3/camel-pop3-store.c:417
-#: camel/providers/pop3/camel-pop3-store.c:416
+#: camel/providers/pop3/camel-pop3-store.c:507
+#: camel/providers/pop3/camel-pop3-store.c:511
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8603,21 +11387,15 @@ msgstr ""
 "傳送密碼時發生錯誤：%s"
 
 # camel/providers/pop3/camel-pop3-store.c:484
-#: camel/providers/pop3/camel-pop3-store.c:483
+#: camel/providers/pop3/camel-pop3-store.c:604
 #, c-format
 msgid "No such folder `%s'."
 msgstr "沒有這個資料夾 `%s'。"
 
-# camel/providers/imap/camel-imap-command.c:232
-#: camel/providers/pop3/camel-pop3-store.c:566
-#, fuzzy, c-format
-msgid "Unexpected response from POP server: %s"
-msgstr "從 IMAP 伺服器傳回不當的回應： %s"
-
 # camel/providers/sendmail/camel-sendmail-provider.c:37
 # mail/mail-config.glade.h:67
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8628,60 +11406,61 @@ msgid ""
 "system."
 msgstr "將遞送的郵件交給本地端系統上的 \"sendmail\" 程式處理。"
 
+# camel/camel-url.c:289
+#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#, fuzzy
+msgid "Could not parse recipient list"
+msgstr "不能分析 URL `%s'"
+
 # camel/providers/sendmail/camel-sendmail-transport.c:107
-#: camel/providers/sendmail/camel-sendmail-transport.c:106
+#: camel/providers/sendmail/camel-sendmail-transport.c:120
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "不能建立導管到 \"sendmail\" 程式：  %s：郵件無法傳送"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:124
-#: camel/providers/sendmail/camel-sendmail-transport.c:123
+#: camel/providers/sendmail/camel-sendmail-transport.c:137
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "無法另外再啟動一個 sendmail 行程： %s：郵件無法傳送"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:150
-#: camel/providers/sendmail/camel-sendmail-transport.c:149
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not send message: %s"
 msgstr "郵件無法傳送： %s"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:163
-#: camel/providers/sendmail/camel-sendmail-transport.c:162
+#: camel/providers/sendmail/camel-sendmail-transport.c:178
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail 回傳關閉訊息 %s：郵件無法傳送"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:170
-#: camel/providers/sendmail/camel-sendmail-transport.c:169
+#: camel/providers/sendmail/camel-sendmail-transport.c:185
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "不能執行 %s： 郵件無法傳送。"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:175
-#: camel/providers/sendmail/camel-sendmail-transport.c:174
+#: camel/providers/sendmail/camel-sendmail-transport.c:190
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail 由於狀況 %d 關閉： 郵件無法傳送。"
 
-# camel/providers/sendmail/camel-sendmail-transport.c:194
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
-msgid "Could not find 'From' address in message"
-msgstr "在郵件內找不到寄件者的電郵地址"
-
 # camel/providers/sendmail/camel-sendmail-transport.c:247
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: camel/providers/sendmail/camel-sendmail-transport.c:204
 msgid "sendmail"
 msgstr "sendmail"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:249
-#: camel/providers/sendmail/camel-sendmail-transport.c:248
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 msgid "Mail delivery via the sendmail program"
 msgstr "經由 sendmail 程式傳送郵件"
 
 # camel/providers/smtp/camel-smtp-provider.c:38
 # mail/mail-config.glade.h:62
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -8691,150 +11470,177 @@ msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "使用 SMTP 通訊協定連線到遠端的 mailhub 來傳送郵件。\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:168
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "語法錯誤，不認識的指令"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "參數內的語法錯誤"
 
 # camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "指令沒有實作"
 
 # camel/providers/smtp/camel-smtp-transport.c:174
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "指令的參數沒有實作"
 
 # camel/providers/smtp/camel-smtp-transport.c:176
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "系統狀況，或者是系統的求助說明回應"
 
 # camel/providers/smtp/camel-smtp-transport.c:178
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "求助說明訊息"
 
 # camel/providers/smtp/camel-smtp-transport.c:180
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "服務已就緒"
 
 # camel/providers/smtp/camel-smtp-transport.c:182
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "此服務將傳輸通道關閉"
 
 # camel/providers/smtp/camel-smtp-transport.c:184
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "此服務仍未可用，傳輸通道關閉"
 
 # camel/providers/smtp/camel-smtp-transport.c:186
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr " 所要求的郵件動作已成功完成"
 
 # camel/providers/smtp/camel-smtp-transport.c:188
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr "不是本地端的使用者；將會轉寄至 <轉寄路徑>"
 
 # camel/providers/smtp/camel-smtp-transport.c:190
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "所要求的郵件動作無法執行：郵箱仍未可用"
 
 # camel/providers/smtp/camel-smtp-transport.c:192
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "所要求的動作無法執行：郵箱仍未可用"
 
 # camel/providers/smtp/camel-smtp-transport.c:194
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "所要求的動作已放棄：正在處理錯誤"
 
 # camel/providers/smtp/camel-smtp-transport.c:196
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "不是本地端的使用者；請嘗試使用 <轉寄路徑>"
 
 # camel/providers/smtp/camel-smtp-transport.c:198
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr "所要求的動作無法執行：系統的儲存空間不足"
 
 # camel/providers/smtp/camel-smtp-transport.c:200
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "所要求的郵件動作已放棄：超出可供儲存空間的限制"
 
 # camel/providers/smtp/camel-smtp-transport.c:202
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "所要求的動作已放棄：不允許的郵箱名稱"
 
 # camel/providers/smtp/camel-smtp-transport.c:204
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "請開始輸入郵件的資料；<CRLF>.<CRLF> 結束撰寫郵件"
 
 # camel/providers/smtp/camel-smtp-transport.c:206
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "執行失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:210
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "需要密碼傳送"
 
 # camel/providers/smtp/camel-smtp-transport.c:212
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "驗證機制太弱了"
 
 # camel/providers/smtp/camel-smtp-transport.c:214
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr "所要求的驗證機制必須要加密處理"
 
 # camel/providers/smtp/camel-smtp-transport.c:216
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr "臨時驗證失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "要求驗證"
 
 # camel/providers/smtp/camel-smtp-transport.c:313
-#: camel/providers/smtp/camel-smtp-transport.c:314
+#: camel/providers/smtp/camel-smtp-transport.c:302
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "傳回 Welcome 發生錯誤：%s： 可能是非嚴重的錯誤"
 
+# camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:337
+#: camel/providers/smtp/camel-smtp-transport.c:379
+#, fuzzy, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr ""
+"不能夠連線到 POP 伺服器。\n"
+"傳送使用者名稱時發生錯誤：%s"
+
+# camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:338
+#, fuzzy
+msgid "server does not appear to support SSL"
+msgstr "資料夾好像已經損毀並且不能復原。"
+
+# camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:352
+#, fuzzy, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "RSET 的要求逾時：%s"
+
+# camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:367
+#, fuzzy
+msgid "STARTTLS response error"
+msgstr "傳回 RSET 的回應錯誤： %s"
+
 # camel/providers/smtp/camel-smtp-transport.c:356
-#: camel/providers/smtp/camel-smtp-transport.c:376
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+#: camel/providers/smtp/camel-smtp-transport.c:461
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP 伺服器 %s 不支援所要求的驗證類別 %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:395
-#: camel/providers/smtp/camel-smtp-transport.c:415
+#: camel/providers/smtp/camel-smtp-transport.c:499
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s 請輸入 %s@%s 的 SMTP 密碼"
 
 # camel/providers/smtp/camel-smtp-transport.c:418
-#: camel/providers/smtp/camel-smtp-transport.c:438
+#: camel/providers/smtp/camel-smtp-transport.c:520
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8846,156 +11652,160 @@ msgstr ""
 "\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 伺服器 %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:536
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "經由 %s 傳送 SMTP 郵件"
 
-# camel/providers/smtp/camel-smtp-transport.c:561
-#: camel/providers/smtp/camel-smtp-transport.c:581
-msgid "Cannot send message: sender address not defined."
-msgstr "無法傳送郵件：沒有提供寄件者。"
-
 # camel/providers/smtp/camel-smtp-transport.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:588
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: sender address not valid."
 msgstr "無法傳送郵件：寄件者的地址無效。"
 
 # mail/mail-ops.c:603
-#: camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
 msgid "Sending message"
 msgstr "傳送郵件"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: no recipients defined."
 msgstr "無法傳送郵件：沒有提供收件者。"
 
+# camel/providers/smtp/camel-smtp-transport.c:582
+#: camel/providers/smtp/camel-smtp-transport.c:691
+#, fuzzy
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "無法傳送郵件：沒有提供收件者。"
+
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:841
 msgid "SMTP Greeting"
 msgstr "SMTP 迎接"
 
 # camel/providers/smtp/camel-smtp-transport.c:676
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:872
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "HELO 的要求逾時：%s： 非嚴重的錯誤"
 
 # camel/providers/smtp/camel-smtp-transport.c:695
-#: camel/providers/smtp/camel-smtp-transport.c:726
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "傳回 HELO 的回應錯誤：%s： 非嚴重的錯誤"
 
 # mail/mail-config.glade.h:10
-#: camel/providers/smtp/camel-smtp-transport.c:758
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "SMTP Authentication"
 msgstr "SMTP 驗證"
 
 # camel/providers/smtp/camel-smtp-transport.c:728
-#: camel/providers/smtp/camel-smtp-transport.c:764
+#: camel/providers/smtp/camel-smtp-transport.c:946
 msgid "Error creating SASL authentication object."
 msgstr "建立 SASL 驗證物件時發生錯誤。"
 
 # camel/providers/smtp/camel-smtp-transport.c:743
 # camel/providers/smtp/camel-smtp-transport.c:755
-#: camel/providers/smtp/camel-smtp-transport.c:779
-#: camel/providers/smtp/camel-smtp-transport.c:791
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:975
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH 的要求逾時：%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:764
-#: camel/providers/smtp/camel-smtp-transport.c:800
+#: camel/providers/smtp/camel-smtp-transport.c:984
 msgid "AUTH request failed."
 msgstr "AUTH 要求失敗。"
 
 # camel/providers/smtp/camel-smtp-transport.c:809
-#: camel/providers/smtp/camel-smtp-transport.c:848
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 msgid "Bad authentication response from server.\n"
 msgstr "從伺服器傳回不正確驗證的回應。\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:835
-#: camel/providers/smtp/camel-smtp-transport.c:874
+#: camel/providers/smtp/camel-smtp-transport.c:1070
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM 的要求逾時：%s：郵件無法傳送"
 
 # camel/providers/smtp/camel-smtp-transport.c:854
-#: camel/providers/smtp/camel-smtp-transport.c:893
-#, c-format
-msgid "MAIL FROM response error: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1084
+#, fuzzy
+msgid "MAIL FROM response error"
 msgstr "傳回 MAIL FROM 的回應錯誤：%s： 郵件無法傳送"
 
 # camel/providers/smtp/camel-smtp-transport.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO 的要求逾時：%s：郵件無法傳送"
 
-# camel/providers/smtp/camel-smtp-transport.c:898
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:1124
 #, c-format
-msgid "RCPT TO response error: %s: mail not sent"
-msgstr "傳回 RCPT TO 的回應錯誤：%s： 郵件無法傳送"
+msgid "RCPT TO <%s> failed"
+msgstr ""
 
 # camel/providers/smtp/camel-smtp-transport.c:929
-#: camel/providers/smtp/camel-smtp-transport.c:971
+#: camel/providers/smtp/camel-smtp-transport.c:1160
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA 的要求逾時：%s：郵件無法傳送"
 
-# camel/providers/smtp/camel-smtp-transport.c:948
-#: camel/providers/smtp/camel-smtp-transport.c:990
-#, c-format
-msgid "DATA response error: %s: mail not sent"
-msgstr "傳回 DATA 的回應錯誤：%s： 郵件無法傳送"
+# camel/providers/smtp/camel-smtp-transport.c:1043
+#. we should have gotten instructions on how to use the DATA command:
+#. * 354 Enter mail, end with "." on a line by itself
+#.
+#: camel/providers/smtp/camel-smtp-transport.c:1174
+#, fuzzy
+msgid "DATA response error"
+msgstr "傳回 RSET 的回應錯誤： %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:963
 # camel/providers/smtp/camel-smtp-transport.c:981
-#: camel/providers/smtp/camel-smtp-transport.c:1030
-#: camel/providers/smtp/camel-smtp-transport.c:1048
+#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1232
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA 傳送逾時：郵件傳送中止：%s：郵件無法傳送"
 
-# camel/providers/smtp/camel-smtp-transport.c:1000
-#: camel/providers/smtp/camel-smtp-transport.c:1067
-#, c-format
-msgid "DATA response error: message termination: %s: mail not sent"
-msgstr "傳回 DATA 的回應錯誤：郵件傳送中止：%s： 郵件無法傳送"
+# camel/camel-sasl-kerberos4.c:218
+# camel/providers/imap/camel-imap-store.c:433
+#: camel/providers/smtp/camel-smtp-transport.c:1246
+#, fuzzy
+msgid "DATA termination response error"
+msgstr "來自伺服器的不良許可回應。"
 
 # camel/providers/smtp/camel-smtp-transport.c:1024
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET 的要求逾時：%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:1043
-#: camel/providers/smtp/camel-smtp-transport.c:1110
-#, c-format
-msgid "RSET response error: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1283
+#, fuzzy
+msgid "RSET response error"
 msgstr "傳回 RSET 的回應錯誤： %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:1066
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: camel/providers/smtp/camel-smtp-transport.c:1306
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "QUIT 的要求逾時： %s：非嚴重的錯誤"
 
-# camel/providers/smtp/camel-smtp-transport.c:1085
-#: camel/providers/smtp/camel-smtp-transport.c:1152
-#, c-format
-msgid "QUIT response error: %s: non-fatal"
-msgstr "傳回 QUIT 的回應錯誤： %s：非嚴重的錯誤"
+# camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1320
+#, fuzzy
+msgid "QUIT response error"
+msgstr "傳回 RSET 的回應錯誤： %s"
 
 # composer/e-msg-composer-attachment-bar.c:95
 #: composer/e-msg-composer-attachment-bar.c:101
@@ -9029,22 +11839,22 @@ msgstr "%.1fG"
 # composer/e-msg-composer-attachment-bar.c:332
 # mail/mail-display.c:122
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
 msgid "attachment"
 msgstr "附件"
 
 # composer/e-msg-composer-attachment-bar.c:469
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:506
 msgid "Remove selected items from the attachment list"
 msgstr "移除已選擇的附加檔案"
 
 # composer/e-msg-composer-attachment-bar.c:500
-#: composer/e-msg-composer-attachment-bar.c:531
+#: composer/e-msg-composer-attachment-bar.c:537
 msgid "Add attachment..."
 msgstr "新增附件..."
 
 # composer/e-msg-composer-attachment-bar.c:501
-#: composer/e-msg-composer-attachment-bar.c:532
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Attach a file to the message"
 msgstr "附加檔案至郵件"
 
@@ -9079,12 +11889,12 @@ msgid "MIME type:"
 msgstr "MIME 類別："
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:135
+#: composer/e-msg-composer-select-file.c:156
 msgid "Suggest automatic display of attachment"
 msgstr "建議自動顯示附件"
 
 # composer/e-msg-composer-hdrs.c:324
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:340
 msgid "Click here for the address book"
 msgstr "按這裡新增目錄服務"
 
@@ -9092,7 +11902,7 @@ msgstr "按這裡新增目錄服務"
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:370
 msgid "From:"
 msgstr "寄件者："
 
@@ -9100,7 +11910,7 @@ msgstr "寄件者："
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Reply-To:"
 msgstr "回覆地址："
 
@@ -9108,37 +11918,37 @@ msgstr "回覆地址："
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Subject:"
 msgstr "主旨："
 
 # composer/e-msg-composer-hdrs.c:386
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:401
 msgid "To:"
 msgstr "收件者："
 
 # composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Enter the recipients of the message"
 msgstr "輸入郵件的收件者"
 
 # composer/e-msg-composer-hdrs.c:390
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:405
 msgid "Cc:"
 msgstr "副本："
 
 # composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:406
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸入郵件副本的收件者"
 
 # composer/e-msg-composer-hdrs.c:394
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:409
 msgid "Bcc:"
 msgstr "密件副本："
 
 # composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:410
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9146,13 +11956,19 @@ msgstr "輸入郵件密件副本的收件者"
 
 # composer/e-msg-composer-attachment-bar.c:421
 # ui/evolution-message-composer.xml.h:2
-#: composer/e-msg-composer-select-file.c:228
+#: composer/e-msg-composer-select-file.c:267
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "附加檔案"
 
+# mail/mail-crypto.c:59
+#: composer/e-msg-composer.c:506
+#, fuzzy
+msgid "Could not create a PGP signature context"
+msgstr "無法建立一個 PGP 簽名文本。"
+
 # composer/e-msg-composer.c:805
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:774
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9161,54 +11977,40 @@ msgstr ""
 "讀取檔案時發生錯誤 %s：\n"
 "%s"
 
-# composer/e-msg-composer.c:774
-#: composer/e-msg-composer.c:879
-msgid "Save as..."
-msgstr "另存新檔..."
-
 # widgets/misc/e-messagebox.c:159
-#: composer/e-msg-composer.c:888
+#: composer/e-msg-composer.c:1026
 msgid "Warning!"
 msgstr "警告！"
 
-#: composer/e-msg-composer.c:892
+#: composer/e-msg-composer.c:1030
 msgid "File exists, overwrite?"
 msgstr "檔案已存在，覆蓋它？"
 
 # composer/e-msg-composer.c:785
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:1052
 #, c-format
 msgid "Error saving file: %s"
 msgstr "儲存檔案時發生錯誤：%s"
 
 # composer/e-msg-composer.c:805
-#: composer/e-msg-composer.c:933
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid "Error loading file: %s"
 msgstr "載入檔案時發生錯誤：%s"
 
-# composer/e-msg-composer.c:877
-#: composer/e-msg-composer.c:1004
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"無法開啟這個帳號的草稿資料夾。\n"
-"是否使用預設的草稿資料夾？"
-
 # composer/e-msg-composer.c:785
-#: composer/e-msg-composer.c:1054
+#: composer/e-msg-composer.c:1102
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "存取檔案時發生錯誤：%s"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: composer/e-msg-composer.c:1062
+#: composer/e-msg-composer.c:1110
 msgid "Unable to retrieve message from editor"
 msgstr "無法從編輯器取得郵件"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1069
+#: composer/e-msg-composer.c:1117
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9218,7 +12020,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1124
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9228,7 +12030,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: composer/e-msg-composer.c:1085
+#: composer/e-msg-composer.c:1133
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9238,7 +12040,7 @@ msgstr ""
 " %s"
 
 # importers/pine-importer.c:705
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1235
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9247,7 +12049,7 @@ msgstr ""
 "是否嘗試將它復原？"
 
 # composer/e-msg-composer.c:941
-#: composer/e-msg-composer.c:1341
+#: composer/e-msg-composer.c:1381
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9258,34 +12060,57 @@ msgstr ""
 "是否先將變更儲存？"
 
 # mail/mail-ops.c:1154
-#: composer/e-msg-composer.c:1348
+#: composer/e-msg-composer.c:1388
 msgid "Warning: Modified Message"
 msgstr "警告：變更過的郵件"
 
 # composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1420
 msgid "Open file"
 msgstr "開啟檔案"
 
 # ui/evolution-message-composer.xml.h:49
-#: composer/e-msg-composer.c:1520
+#: composer/e-msg-composer.c:1569
 msgid "Insert File"
 msgstr "插入檔案"
 
+#: composer/e-msg-composer.c:1841
+msgid ""
+"Can't set default signature for this account. Maybe accounts were modified "
+"meanwhile?"
+msgstr ""
+
+# mail/mail-config.glade.h:74
+#: composer/e-msg-composer.c:1878
+#, fuzzy
+msgid "Signature:"
+msgstr "簽名檔："
+
+#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+msgid "Autogenerated"
+msgstr ""
+
+# mail/mail-accounts.c:121
+# mail/mail-accounts.c:165
+#: composer/e-msg-composer.c:1931
+#, fuzzy
+msgid "Set as default"
+msgstr "(預設)"
+
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: composer/e-msg-composer.c:1895 composer/e-msg-composer.c:2336
+#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
 msgid "Compose a message"
 msgstr "編輯郵件"
 
-#: composer/e-msg-composer.c:2353
+#: composer/e-msg-composer.c:2759
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
 # composer/evolution-composer.c:355
-#: composer/e-msg-composer.c:2376
+#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -9294,8 +12119,14 @@ msgstr ""
 "無法建立郵件編輯視窗，因為您仍未在\n"
 "郵件元件內設定任何身份證明。"
 
+#: composer/e-msg-composer.c:3665
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>"
+msgstr ""
+
 # composer/evolution-composer.c:355
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:376
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -9304,21 +12135,21 @@ msgstr ""
 "郵件元件內設定任何身份證明。"
 
 # composer/evolution-composer.c:370
-#: composer/evolution-composer.c:382
+#: composer/evolution-composer.c:391
 msgid "Cannot initialize Evolution's composer."
 msgstr "不能初始化 Evolution 的郵件編輯器。"
 
+# data/evolution.desktop.in.h:2
+#: data/evolution.desktop.in.h:1
+msgid "The Evolution groupware suite"
+msgstr "Evolution 群組套件"
+
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: data/evolution.desktop.in.h:1 shell/main.c:83
-msgid "Evolution"
-msgstr "Evolution"
-
-# data/evolution.desktop.in.h:2
 #: data/evolution.desktop.in.h:2
-msgid "The Evolution groupware suite"
-msgstr "Evolution 群組套件"
+msgid "Ximian Evolution"
+msgstr "Ximian Evolution"
 
 # data/evolution.keys.in.h:1
 #: data/evolution.keys.in.h:1
@@ -9366,17 +12197,38 @@ msgstr "主旨包含"
 msgid "Subject does not contain"
 msgstr "主旨不包含"
 
+# mail/mail-callbacks.c:1144
+# mail/mail-display.c:96
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
+#: mail/mail-display.c:122
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"同一名稱的檔案已經存在。\n"
+"是否複蓋該檔案？"
+
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
 #. Remember the password?
-#: e-util/e-passwords.c:347 mail/mail-session.c:258
+#: e-util/e-passwords.c:363 mail/mail-session.c:269
 msgid "Remember this password"
 msgstr "記下這個密碼"
 
-#: e-util/e-passwords.c:349 mail/mail-session.c:259
+#: e-util/e-passwords.c:365 mail/mail-session.c:270
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
+#: e-util/e-pilot-settings.c:96
+msgid "Sync Private Records:"
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:150
+#: e-util/e-pilot-settings.c:105
+#, fuzzy
+msgid "Sync Categories:"
+msgstr "類別"
+
 # e-util/e-time-utils.c:283
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
@@ -9478,7 +12330,7 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
-#: widgets/misc/e-dateedit.c:1419 widgets/misc/e-dateedit.c:1646
+#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1647
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -9488,7 +12340,7 @@ msgstr "%I:%M %p"
 # widgets/misc/e-dateedit.c:1497
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
-#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1643
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1644
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -9533,11 +12385,7 @@ msgstr "小時"
 msgid "minute"
 msgstr "分"
 
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "秒"
-
-#: filter/filter-datespec.c:86
+#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
 msgid "seconds"
 msgstr "秒"
 
@@ -9615,7 +12463,7 @@ msgid "ago"
 msgstr "前"
 
 # mail/message-list.c:977
-#: filter/filter-datespec.c:711 mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9627,16 +12475,33 @@ msgstr "<按這裏選擇日期>"
 msgid "Filter Rules"
 msgstr "規則"
 
+#: filter/filter-file.c:176
+msgid "You must specify a file name"
+msgstr ""
+
+# camel/providers/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#: filter/filter-file.c:186
+#, fuzzy, c-format
+msgid "File '%s' does not exist or is not a regular file."
+msgstr "排程器 `%s' 不存在或不是一個合法的檔案"
+
+# ui/evolution-message-composer.xml.h:12
+#: filter/filter-file.c:286
+#, fuzzy
+msgid "Choose a file"
+msgstr "開啟舊檔"
+
 #. and now for the action area
-#: filter/filter-filter.c:487
+#: filter/filter-filter.c:488
 msgid "Then"
 msgstr "然後"
 
-#: filter/filter-filter.c:501
+#: filter/filter-filter.c:502
 msgid "Add action"
 msgstr "新增動作"
 
-#: filter/filter-folder.c:156
+#: filter/filter-folder.c:147
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -9646,19 +12511,11 @@ msgstr ""
 "請回頭指定一個有效的資料夾作為接收郵件之用。"
 
 # mail/mail-account-gui.c:682
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:837
+#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
+#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
-#: filter/filter-folder.c:267
-msgid "Enter folder URI"
-msgstr "請輸入資料夾的 URI"
-
-#: filter/filter-folder.c:314
-msgid "<click here to select a folder>"
-msgstr "<按這裏選擇資料夾>"
-
 #: filter/filter-input.c:198
 #, c-format
 msgid ""
@@ -9668,43 +12525,53 @@ msgstr ""
 "正規表示式內有錯誤 '%s'：\n"
 "%s"
 
-#: filter/filter-part.c:488
+#: filter/filter-label.c:158
+msgid "You must specify a label name"
+msgstr ""
+
+#: filter/filter-part.c:518 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "測試"
 
-#: filter/filter-rule.c:708
+# ui/evolution.xml.h:3
+#: filter/filter-rule.c:217
+#, fuzzy
+msgid "You must name this filter."
+msgstr "更改這個資料夾的名稱"
+
+#: filter/filter-rule.c:721
 msgid "Rule name: "
 msgstr "規則名稱："
 
-#: filter/filter-rule.c:712
+#: filter/filter-rule.c:725
 msgid "Untitled"
 msgstr "未命名"
 
-#: filter/filter-rule.c:729
+#: filter/filter-rule.c:742
 msgid "If"
 msgstr "如果"
 
-#: filter/filter-rule.c:747
+#: filter/filter-rule.c:760
 msgid "Execute actions"
 msgstr "執行動作"
 
-#: filter/filter-rule.c:751
+#: filter/filter-rule.c:764
 msgid "if all criteria are met"
 msgstr "如果全部條件符合"
 
-#: filter/filter-rule.c:756
+#: filter/filter-rule.c:769
 msgid "if any criteria are met"
 msgstr "如果任何條件符合"
 
-#: filter/filter-rule.c:767
+#: filter/filter-rule.c:780
 msgid "Add criterion"
 msgstr "新增條件"
 
-#: filter/filter-rule.c:852
+#: filter/filter-rule.c:865
 msgid "incoming"
 msgstr "內送"
 
-#: filter/filter-rule.c:852
+#: filter/filter-rule.c:865
 msgid "outgoing"
 msgstr "外寄"
 
@@ -9748,6 +12615,12 @@ msgstr "包括全部本地端及可用的遠端資料夾"
 msgid "with all local folders"
 msgstr "包括全部本地端的資料夾"
 
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "指定目標"
+
 #: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "指定色彩"
@@ -9760,201 +12633,229 @@ msgstr "指定目標"
 msgid "Attachments"
 msgstr "附加檔案"
 
+# addressbook/printing/e-contact-print.glade.h:36
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "貝里斯"
+
+# addressbook/contact-editor/e-contact-editor.c:1248
 #: filter/libfilter-i18n.h:7
+#, fuzzy
+msgid "Command"
+msgstr "公司電話"
+
+#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "包含"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Copy to Folder"
 msgstr "複製至資料夾"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date received"
 msgstr "收件日期"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:11
 msgid "Date sent"
 msgstr "送件日期"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Deleted"
 msgstr "已刪除"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "does not contain"
 msgstr "不包含"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15
 msgid "does not end with"
 msgstr "不是以此終結"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "does not exist"
 msgstr "不存在"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "不類似"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
 msgid "does not start with"
 msgstr "不是以此開始"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "不存在"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "草稿"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:21
 msgid "ends with"
 msgstr "以此終結"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:22
+msgid "Execute Shell Command"
+msgstr ""
+
+#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "存在"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
 msgid "exists"
 msgstr "存在"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
 msgid "Expression"
 msgstr "詞句"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:26
+msgid "Follow Up"
+msgstr ""
+
+#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "重要"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:28
 msgid "is"
 msgstr "是"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is after"
+msgstr "是之後的"
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "is before"
+msgstr "是之前的"
+
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "is Flagged"
+msgstr "有標幟的"
+
+#: filter/libfilter-i18n.h:32
 msgid "is greater than"
 msgstr "大於"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:33
 msgid "is less than"
 msgstr "小於"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:34
 msgid "is not"
 msgstr "不是"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "is not Flagged"
+msgstr "有標幟的"
+
+#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+msgid "Label"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
 msgid "Mailing list"
 msgstr "郵件列表"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:38
 msgid "Message Body"
 msgstr "郵件內容"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:39
 msgid "Message Header"
 msgstr "郵件檔頭"
 
-#: filter/libfilter-i18n.h:32
-msgid "Message was received"
-msgstr "已接收的郵件"
-
-#: filter/libfilter-i18n.h:33
-msgid "Message was sent"
-msgstr "已傳送的郵件"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:40
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-#: filter/libfilter-i18n.h:35
-msgid "on or after"
-msgstr "到期或之後"
-
-#: filter/libfilter-i18n.h:36
-msgid "on or before"
-msgstr "到期或之前"
+# calendar/gui/event-editor-dialog.glade.h:14
+# calendar/gui/event-editor.c:1588
+#: filter/libfilter-i18n.h:41
+#, fuzzy
+msgid "Play Sound"
+msgstr "播放音效："
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "閱讀"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "收件者"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "正規表示式相配"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "回覆"
 
 # mail/message-list.c:1081
-#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
+#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "目標"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1398
+#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
 msgid "Sender"
 msgstr "寄件者"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:48
 msgid "Set Status"
 msgstr "設定狀態"
 
 # addressbook/printing/e-contact-print.glade.h:36
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:49
 msgid "Size (kB)"
 msgstr "大小 (kB)"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:50
 msgid "sounds like"
 msgstr "類似"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:51
 msgid "Source Account"
 msgstr "來源帳號"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:52
 msgid "Specific header"
 msgstr "指定檔頭"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:53
 msgid "starts with"
 msgstr "以此開始"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:55
 msgid "Stop Processing"
 msgstr "停止處理"
 
 # mail/mail-format.c:767
 # mail/message-list.c:1082
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:904
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "主旨"
 
-#: filter/libfilter-i18n.h:52
-msgid "was after"
-msgstr "是之後的"
-
-#: filter/libfilter-i18n.h:53
-msgid "was before"
-msgstr "是之前的"
-
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "規則"
 
-#: filter/rule-editor.c:278
+#: filter/rule-editor.c:286
 msgid "Add Rule"
 msgstr "新增規則"
 
-#: filter/rule-editor.c:344
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "編輯規則"
 
@@ -9962,7 +12863,13 @@ msgstr "編輯規則"
 msgid "Score Rules"
 msgstr "目標規則"
 
-#: filter/vfolder-rule.c:205
+# ui/evolution.xml.h:3
+#: filter/vfolder-rule.c:204
+#, fuzzy
+msgid "You must name this vfolder."
+msgstr "更改這個資料夾的名稱"
+
+#: filter/vfolder-rule.c:213
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "噢。您需要指定至少一個資料夾做為來源。"
@@ -9973,26 +12880,26 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution 正在匯入您舊有的 Elm 郵件"
 
 # shell/e-shell-importer.c:363
-#: importers/elm-importer.c:96 importers/netscape-importer.c:107
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "匯入..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:109
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "請稍候"
 
 # shell/e-shell-importer.c:371
-#: importers/elm-importer.c:170 importers/netscape-importer.c:692
-#: importers/pine-importer.c:368
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "匯入 %s 為 %s"
 
 # mail/mail-ops.c:599
-#: importers/elm-importer.c:376 importers/netscape-importer.c:785
-#: importers/pine-importer.c:474
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "掃描 %s"
@@ -10000,13 +12907,14 @@ msgstr "掃描 %s"
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: importers/elm-importer.c:527 importers/netscape-importer.c:958
-#: importers/pine-importer.c:637 mail/component-factory.c:100
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/pine-importer.c:637 mail/component-factory.c:102
+#: mail/folder-browser-ui.c:229
 msgid "Mail"
 msgstr "郵件"
 
 # importers/elm-importer.c:561
-#: importers/elm-importer.c:547
+#: importers/elm-importer.c:545
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -10014,17 +12922,12 @@ msgstr ""
 "Evolution 找到 Elm 格式的郵件檔案\n"
 "您是否要將它們匯入至 Evolution？"
 
-#: importers/elm-importer.c:576
+#: importers/elm-importer.c:574
 msgid "Elm"
 msgstr ""
 
-# importers/pine-importer.c:661
-#: importers/evolution-gnomecard-importer.c:229 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "目錄服務"
-
 # importers/netscape-importer.c:847
-#: importers/evolution-gnomecard-importer.c:247
+#: importers/evolution-gnomecard-importer.c:246
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10032,27 +12935,88 @@ msgstr ""
 "Evolution 找到 GnomeCard 檔案。\n"
 "您是否要將它們匯入至 Evolution？"
 
-#: importers/netscape-importer.c:106
+# calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: importers/netscape-importer.c:70
+#, fuzzy, c-format
+msgid "Priority Filter \"%s\""
+msgstr "優先順序(_P)："
+
+#: importers/netscape-importer.c:653
+msgid ""
+"Some of your Netscape email filters are based on\n"
+"email priorities, which are not used in Evolution.\n"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
+
+#: importers/netscape-importer.c:677
+msgid ""
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
+msgstr ""
+
+#: importers/netscape-importer.c:694
+msgid ""
+"Some of your Netscape email filters test the\n"
+"body of emails for (in)equality to a given string,\n"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+msgstr ""
+
+#: importers/netscape-importer.c:1220
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在匯入您舊有的 Netscape 資料"
 
+# camel/camel-store.c:378
+# mail/mail-ops.c:1007
+# mail/mail-ops.c:1014
+# mail/mail-ops.c:1032
+# mail/mail-ops.c:1033
+#. Fill in the new fields
+#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
+#: shell/e-local-storage.c:179
+#, fuzzy
+msgid "Trash"
+msgstr "土耳其文"
+
+# camel/providers/local/camel-local-store.c:183
+#: importers/netscape-importer.c:2021
+#, fuzzy
+msgid "Scanning mail filters"
+msgstr "本地端郵件檔案 %s"
+
 # camel/providers/imap/camel-imap-folder.c:364
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "掃描目錄"
 
-#: importers/netscape-importer.c:897
+#: importers/netscape-importer.c:2040
 msgid "Starting import"
 msgstr "開始匯入"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: importers/netscape-importer.c:963
+#: importers/netscape-importer.c:2126
 msgid "Settings"
 msgstr "設定"
 
+#: importers/netscape-importer.c:2131
+#, fuzzy
+msgid "Mail Filters"
+msgstr "編輯規則"
+
 # importers/netscape-importer.c:847
-#: importers/netscape-importer.c:984
+#: importers/netscape-importer.c:2154
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10085,70 +13049,120 @@ msgstr ""
 msgid "Pine"
 msgstr "列印"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:1
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Configuration control for the Evolution Display Fonts."
+msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Configuration control for the Evolution Mail Accounts."
+msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Configuration control for the Evolution Mailer."
+msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Configuration control for the Evolution Message Composer."
+msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
 msgid "Evolution component for handling mail."
 msgstr "用作處理郵件的 Evolution 元件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
 msgid "Evolution mail composer."
 msgstr "Evolution 郵件編輯器。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Evolution mail executive summary component."
 msgstr "Evolution 郵件功能總管元件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
 msgid "Evolution mail folder display component."
 msgstr "Evolution 郵件資料夾顯示元件。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:5
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution mail folder factory component."
 msgstr "Evolution 郵件資料夾元件工廠。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Factory for the Evolution composer."
 msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:8
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Factory for the Mail Summary component."
 msgstr "用作生產 Evolution 郵件摘要元件的元件工廠。"
 
+# calendar/gui/event-editor-dialog.glade.h:13
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#, fuzzy
+msgid "Font Preferences"
+msgstr "非週期性約會(_N)"
+
+# mail/mail-config.glade.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "帳號"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+msgid "Mail Preferences"
+msgstr ""
+
 # mail/GNOME_Evolution_Mail.oaf.in.h:9
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Mail configuration interface"
 msgstr "郵件組態介面"
 
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+msgid "This Page can be used to configure the Fonts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+msgid "This page can be used to configure E-Mail Accounts"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19
+msgid "This page can be used to configure Mailer preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
+msgid "This page can be used to configure the Composer"
+msgstr ""
+
 # mail/folder-browser.c:871
-#: mail/component-factory.c:100
+#: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "資料夾包含郵件"
 
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr "郵件儲存資料夾(內部的)"
-
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash"
 msgstr "虛擬垃圾桶"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:103
 msgid "Virtual Trash folder"
 msgstr "虛擬垃圾桶資料夾"
 
-# camel/providers/pop3/camel-pop3-store.c:215
-#: mail/component-factory.c:129
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "不能夠連線到伺服器：%s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:119
 msgid "This folder cannot contain messages."
 msgstr "此資料夾不能包含郵件。"
 
@@ -10156,55 +13170,77 @@ msgstr "此資料夾不能包含郵件。"
 # ui/evolution-mail.xml.h:115
 # ui/evolution-task-editor-dialog.xml.h:83
 # ui/evolution.xml.h:60
-#: mail/component-factory.c:432
+#: mail/component-factory.c:404
 msgid "Properties..."
 msgstr "內容..."
 
 # ui/evolution-mail.xml.h:4
-#: mail/component-factory.c:432
+#: mail/component-factory.c:404
 msgid "Change this folder's properties"
 msgstr "變更這個資料夾的內容"
 
-#: mail/component-factory.c:805
+#: mail/component-factory.c:767
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
+# mail/mail-callbacks.c:202
+#: mail/component-factory.c:929
+msgid "You have not set a mail transport method"
+msgstr "您沒有設定郵件傳送方法"
+
+#: mail/component-factory.c:951
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+# mail/mail-ops.c:1154
+#: mail/component-factory.c:957
+#, fuzzy
+msgid "Warning: Unsent Messages"
+msgstr "警告：變更過的郵件"
+
 # ui/evolution-mail.xml.h:109
-#: mail/component-factory.c:973
+#: mail/component-factory.c:998
 msgid "New Mail Message"
 msgstr "新增郵件"
 
 # ui/evolution-mail.xml.h:109
-#: mail/component-factory.c:973
-msgid "New _Mail Message"
-msgstr "新增郵件(_M)"
+#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+msgid "_Mail Message"
+msgstr "郵件訊息(_M)"
 
 # mail/component-factory.c:337
-#: mail/component-factory.c:997
+#: mail/component-factory.c:1025
 msgid "Cannot initialize Evolution's mail component."
 msgstr "不能初始化 Evolution 的 mail 元件。"
 
 # mail/component-factory.c:337
-#: mail/component-factory.c:1006
+#: mail/component-factory.c:1034
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "不能初始化 Evolution 的 mail 元件。"
 
 # mail/component-factory.c:337
-#: mail/component-factory.c:1012
+#: mail/component-factory.c:1040
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "不能初始化 Evolution 的 mail 元件。"
 
+# mail/mail-config.c:1213
+# mail/mail-config.c:1216
+#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#, fuzzy
+msgid "Connecting..."
+msgstr "正在連線至伺服器..."
+
 # mail/component-factory.c:410
-#: mail/component-factory.c:1228
+#: mail/component-factory.c:1277
 msgid "Cannot register storage with shell"
 msgstr "不能以此 shell 註冊儲存空間"
 
 # mail/folder-browser-factory.c:196
-#: mail/folder-browser-ui.c:271
+#: mail/folder-browser-ui.c:344
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" 的內容"
@@ -10212,224 +13248,246 @@ msgstr "\"%s\" 的內容"
 # mail/folder-browser-factory.c:198
 # ui/evolution-event-editor.xml.h:39
 # ui/evolution-task-editor-dialog.xml.h:42
-#: mail/folder-browser-ui.c:273
+#: mail/folder-browser-ui.c:346
 msgid "Properties"
 msgstr "內容"
 
 # mail/mail-display.c:236
-#: mail/folder-browser.c:297 mail/mail-display.c:298
+#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "不能建立暫存目錄： %s"
 
 # calendar/gui/event-editor.c:1558
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d 新的"
 
-#: mail/folder-browser.c:771 mail/folder-browser.c:776
-#: mail/folder-browser.c:798
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:772
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d 隱藏"
 
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:770
+#, c-format
+msgid "%d visible"
+msgstr ""
+
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d 已刪除"
 
 # calendar/gui/event-editor.c:1558
-#: mail/folder-browser.c:800
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d 未傳送"
 
 # calendar/gui/event-editor.c:1558
-#: mail/folder-browser.c:802
+#: mail/folder-browser.c:782
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d 未傳送"
 
-#: mail/folder-browser.c:804
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d 全部"
 
-# ui/evolution-mail.xml.h:102
-#: mail/folder-browser.c:1086
-msgid "Create vFolder from Search"
-msgstr "自搜尋建立虛擬資料夾"
+# ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:1091
+#, fuzzy
+msgid "Create _Virtual Folder From Search..."
+msgstr "從郵件建立虛擬資料夾(_V)"
 
 # mail/folder-browser.c:653
-#: mail/folder-browser.c:1467
+#: mail/folder-browser.c:1649
 msgid "VFolder on _Subject"
 msgstr "從主旨建立虛擬資料夾(_S)"
 
 # mail/folder-browser.c:656
-#: mail/folder-browser.c:1468
+#: mail/folder-browser.c:1650
 msgid "VFolder on Se_nder"
 msgstr "從寄件者建立虛擬資料夾(_N)"
 
 # mail/folder-browser.c:659
-#: mail/folder-browser.c:1469
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Recipients"
 msgstr "從收件者建立虛擬資料夾(_R)"
 
 # mail/folder-browser.c:662
-#: mail/folder-browser.c:1470
+#: mail/folder-browser.c:1652
 msgid "VFolder on Mailing _List"
 msgstr "從郵件清單建立虛擬資料夾(_L)"
 
 # mail/folder-browser.c:668
-#: mail/folder-browser.c:1474
+#: mail/folder-browser.c:1656
 msgid "Filter on Sub_ject"
 msgstr "從主旨建立規則(_J)"
 
 # mail/folder-browser.c:671
-#: mail/folder-browser.c:1475
+#: mail/folder-browser.c:1657
 msgid "Filter on Sen_der"
 msgstr "從寄件者建立規則(_D)"
 
 # mail/folder-browser.c:674
-#: mail/folder-browser.c:1476
+#: mail/folder-browser.c:1658
 msgid "Filter on Re_cipients"
 msgstr "收件者規則(_C)"
 
 # mail/folder-browser.c:677
-#: mail/folder-browser.c:1477
+#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
 msgid "Filter on _Mailing List"
 msgstr "從郵件清單建立規則(_M)"
 
 # ui/evolution-mail.xml.h:66
-#: mail/folder-browser.c:1485 ui/evolution-mail-message.xml.h:95
+#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
-# mail/folder-browser.c:690
-# ui/evolution-calendar.xml.h:43
-# ui/evolution-mail.xml.h:118
-# ui/evolution-tasks.xml.h:8
-#: mail/folder-browser.c:1486 ui/evolution-mail-message.xml.h:104
-msgid "_Save As..."
-msgstr "另存新檔(_S)..."
-
 # mail/folder-browser.c:692
 # ui/evolution-event-editor.xml.h:69
 # ui/evolution-task-editor-dialog.xml.h:82
 # ui/evolution-tasks.xml.h:7
-#: mail/folder-browser.c:1487
+#: mail/folder-browser.c:1679
 msgid "_Print"
 msgstr "列印(_P)"
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/folder-browser.c:1491 ui/evolution-mail-message.xml.h:103
+#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/folder-browser.c:1492 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "回覆至清單(_A)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/folder-browser.c:1493 ui/evolution-mail-message.xml.h:71
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
 # mail/folder-browser.c:701
-#: mail/folder-browser.c:1494
+#: mail/folder-browser.c:1686
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
+#: mail/folder-browser.c:1690
+msgid "Follo_w Up..."
+msgstr ""
+
+# calendar/gui/calendar-model.c:644
+# calendar/gui/calendar-model.c:1180
+# calendar/gui/dialogs/task-editor-dialog.glade.h:6
+# calendar/gui/e-calendar-table.c:421
+#: mail/folder-browser.c:1691
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "已完成"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: mail/folder-browser.c:1692
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "清除"
+
 # mail/folder-browser.c:704
-#: mail/folder-browser.c:1496 ui/evolution-mail-message.xml.h:42
+#. separator here?
+#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1697
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_n)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1498
+#: mail/folder-browser.c:1698
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1499
-msgid "Mark as Unim_portant"
-msgstr "標示成不重要(_I)"
+#: mail/folder-browser.c:1699
+#, fuzzy
+msgid "_Mark as Unimportant"
+msgstr "標示成不重要(_O)"
+
+# mail/folder-browser.c:717
+# ui/evolution-mail.xml.h:121
+#: mail/folder-browser.c:1704
+#, fuzzy
+msgid "U_ndelete"
+msgstr "復原(_U)"
 
 # mail/folder-browser.c:711
-#: mail/folder-browser.c:1503
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1708
+#, fuzzy
+msgid "Mo_ve to Folder..."
 msgstr "移至資料夾(_M)..."
 
 # mail/folder-browser.c:713
-#: mail/folder-browser.c:1504
+#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
 msgid "_Copy to Folder..."
 msgstr "復製至資料夾(_C)..."
 
-# mail/folder-browser.c:717
-# ui/evolution-mail.xml.h:121
-#: mail/folder-browser.c:1506 ui/evolution-mail-message.xml.h:106
-msgid "_Undelete"
-msgstr "復原(_U)"
-
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/folder-browser.c:1510
-msgid "Add Sender to Address Book"
+#: mail/folder-browser.c:1717
+#, fuzzy
+msgid "Add Sender to Address_book"
 msgstr "新增傳送者到目錄服務"
 
 # mail/folder-browser.c:727
-#: mail/folder-browser.c:1513
-msgid "Apply Filters"
+#: mail/folder-browser.c:1721
+#, fuzzy
+msgid "Appl_y Filters"
 msgstr "套用過濾器"
 
 # mail/folder-browser.c:731
-#: mail/folder-browser.c:1515
-msgid "Create Ru_le From Message"
+#: mail/folder-browser.c:1725
+#, fuzzy
+msgid "Crea_te Rule From Message"
 msgstr "從郵件建立規則(_L)"
 
-# mail/folder-browser.c:870
-#: mail/folder-browser.c:1665
-msgid "Filter on Mailing List"
-msgstr "郵件清單的規則"
-
 # mail/folder-browser.c:871
-#: mail/folder-browser.c:1666
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:1990
+#, fuzzy
+msgid "VFolder on M_ailing List"
 msgstr "郵件清單的虛擬資料夾"
 
 # mail/folder-browser.c:873
-#: mail/folder-browser.c:1668
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: mail/folder-browser.c:1992
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
 msgstr "郵件清單的過濾器 (%s)"
 
 # mail/folder-browser.c:874
-#: mail/folder-browser.c:1669
-#, c-format
-msgid "VFolder on Mailing List (%s)"
+#: mail/folder-browser.c:1993
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
 msgstr "郵件清單的虛擬資料夾 (%s)"
 
 # mail/mail-config.glade.h:21
-#: mail/folder-browser.h:26
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Default"
 msgstr "預設值(_F)"
 
 # data/evolution.keys.in.h:2
-#: mail/folder-info.c:64
+#: mail/folder-info.c:71
 msgid "Getting Folder Information"
 msgstr "取得資料夾資訊"
 
@@ -10453,32 +13511,23 @@ msgstr "用作匯入 Outlook Express 4 郵件到 Evolution 的元件工廠"
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "匯入  Outlook Express 4 的檔案到 Evolution。"
 
-#: mail/local-config.glade.h:1
-#, fuzzy
-msgid "Body contents"
-msgstr "內文包含"
-
 # mail/local-config.glade.h:1
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "目前儲存格式："
 
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr ""
-
-# mail/local-config.glade.h:2
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr "信箱格式"
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Index body contents"
+msgstr "內文包含"
 
 # mail/local-config.glade.h:3
-#: mail/local-config.glade.h:5
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "新儲存格式："
 
 # mail/local-config.glade.h:4
-#: mail/local-config.glade.h:6
+#: 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"
@@ -10489,22 +13538,22 @@ msgstr ""
 "所以請小心使用這個功能。"
 
 # mail/local-config.glade.h:7
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
 
 # mail/local-config.glade.h:8
-#: mail/local-config.glade.h:10
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "mbox"
 
 # mail/local-config.glade.h:9
-#: mail/local-config.glade.h:11
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
 # mail/mail-account-editor.c:105
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "您沒有填入所有必須的資訊。"
 
@@ -10516,113 +13565,131 @@ msgstr "Evolution 新聞編輯器"
 
 # mail/mail-account-editor.c:173
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
+#: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution 帳號編輯器"
 
-# mail/mail-crypto.c:59
-#: mail/mail-account-gui.c:962
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "無法建立一個 PGP 簽名文本。"
+# addressbook/gui/component/addressbook-config.c:401
+# mail/mail-config.glade.h:33
+#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+msgid "_Host:"
+msgstr "主機(_H)："
 
-# mail/mail-config.glade.h:74
-#: mail/mail-account-gui.c:1039
-msgid "Save signature"
-msgstr "儲存簽名檔"
+# mail/mail-config.glade.h:80
+#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#, fuzzy
+msgid "User_name:"
+msgstr "使用者名稱(_U)："
 
-# composer/e-msg-composer.c:941
-#: mail/mail-account-gui.c:1045
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"這個簽名檔已變更但仍未儲存。\n"
-"\n"
-"您是否要儲存變更？"
+# addressbook/gui/component/addressbook-config.c:520
+# mail/mail-config.glade.h:53
+#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+msgid "_Path:"
+msgstr "路徑(_P)："
 
-#: mail/mail-account-gui.c:1654
+#: mail/mail-account-gui.c:1818
 msgid "You may not create two accounts with the same name."
 msgstr "您不能用相同的名稱建立兩個帳號。"
 
-# mail/mail-accounts.c:121
-# mail/mail-accounts.c:165
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr "(預設)"
-
-# mail/mail-accounts.c:197
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "停用"
-
-# mail/mail-accounts.c:199
-# mail/mail-config.glade.h:30
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "啟用"
-
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: mail/mail-accounts.c:293
+#: mail/mail-accounts.c:215
 msgid "Are you sure you want to delete this account?"
 msgstr "您確定要刪除這個帳號？"
 
 # shell/e-shortcuts-view.c:265
-#: mail/mail-accounts.c:297
+#: mail/mail-accounts.c:219
 msgid "Don't delete"
 msgstr "不要刪除"
 
 # mail/mail-config.glade.h:41
-#: mail/mail-accounts.c:300
+#: mail/mail-accounts.c:222
 msgid "Really delete account?"
 msgstr "確定刪除帳號？"
 
+# mail/mail-accounts.c:197
+#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
+#: mail/mail-composer-prefs.c:697
+msgid "Disable"
+msgstr "停用"
+
+# mail/mail-accounts.c:199
+# mail/mail-config.glade.h:30
+#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
+#: mail/mail-composer-prefs.c:697
+msgid "Enable"
+msgstr "啟用"
+
 # mail/mail-accounts.c:418
 # mail/mail-accounts.c:422
-#: mail/mail-accounts.c:532 mail/mail-accounts.c:536
+#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
 msgid "Are you sure you want to delete this news account?"
 msgstr "您確定要刪除這個新聞帳號？"
 
-# ui/evolution-mail.xml.h:110
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:790 mail/mail-config.glade.h:42
-msgid "Mail Settings"
-msgstr "郵件設定"
+# mail/mail-accounts.c:199
+# mail/mail-config.glade.h:30
+#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-config.glade.h:53
+msgid "Enabled"
+msgstr "已啟用"
+
+# mail/mail-config.glade.h:5
+#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#, fuzzy
+msgid "Account name"
+msgstr "帳號(_A)："
+
+#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#, fuzzy
+msgid "Protocol"
+msgstr "波多黎各"
 
 # mail/mail-autofilter.c:70
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:78
 #, c-format
 msgid "Mail to %s"
 msgstr "郵件送到 %s"
 
 # mail/mail-autofilter.c:213
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:223
 #, c-format
 msgid "Subject is %s"
 msgstr "主旨是 %s"
 
 # mail/mail-autofilter.c:229
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:239
 #, c-format
 msgid "Mail from %s"
 msgstr "郵件來自 %s "
 
 # mail/mail-autofilter.c:285
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:295
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 郵件列表"
 
 # mail/mail-autofilter.c:335
 # mail/mail-autofilter.c:356
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:355
+#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "新增過濾器規則"
 
+#: mail/mail-autofilter.c:413
+msgid "The following filter rule(s):\n"
+msgstr ""
+
+#: mail/mail-autofilter.c:419
+#, c-format
+msgid ""
+"Used the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
 # mail/mail-callbacks.c:93
-#: mail/mail-callbacks.c:137
+#: mail/mail-callbacks.c:95
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10635,7 +13702,7 @@ msgstr ""
 "是否現在設定？"
 
 # mail/mail-callbacks.c:146
-#: mail/mail-callbacks.c:186
+#: mail/mail-callbacks.c:144
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10644,7 +13711,7 @@ msgstr ""
 "才可以開始撰寫郵件。"
 
 # mail/mail-callbacks.c:158
-#: mail/mail-callbacks.c:200
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10652,13 +13719,8 @@ msgstr ""
 "您必須要先設定一個傳送郵件服務\n"
 "才可以開始撰寫郵件。"
 
-# mail/mail-callbacks.c:202
-#: mail/mail-callbacks.c:230
-msgid "You have not set a mail transport method"
-msgstr "您沒有設定郵件傳送方法"
-
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:265
+#: mail/mail-callbacks.c:196
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10666,13 +13728,13 @@ msgstr ""
 
 # calendar/gui/event-editor-dialog.glade.h:23
 # calendar/gui/event-editor.c:1594
-#: mail/mail-callbacks.c:280
+#: mail/mail-callbacks.c:211
 #, fuzzy
 msgid "Send anyway?"
 msgstr "傳送電子郵件"
 
 # mail/mail-callbacks.c:235
-#: mail/mail-callbacks.c:322
+#: mail/mail-callbacks.c:253
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10680,18 +13742,18 @@ msgstr ""
 "郵件上沒有主旨。\n"
 "是否仍然將郵件送出？"
 
-#: mail/mail-callbacks.c:366
+#: mail/mail-callbacks.c:297
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 "因為您送信的連絡人清單設定為隱藏清單的地址，這個郵件只會包含密件副本收件者。"
 
-#: mail/mail-callbacks.c:370
+#: mail/mail-callbacks.c:301
 msgid "This message contains only Bcc recipients."
 msgstr "這個郵件只包含密件副本收件者。"
 
-#: mail/mail-callbacks.c:374
+#: mail/mail-callbacks.c:305
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10700,49 +13762,53 @@ msgstr ""
 "郵件伺服器加入明顯的檔頭時可能會洩露出收件者。\n"
 "無論如何都要傳送嗎？"
 
-#: mail/mail-callbacks.c:469
-#, fuzzy
-msgid "This message contains invalid recipients:"
-msgstr "這個郵件只包含密件副本收件者。"
-
 # mail/mail-callbacks.c:308
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:417
 msgid "You must specify recipients in order to send this message."
 msgstr "您必須指定收件者才可送出郵件。"
 
 # mail/mail-callbacks.c:351
-#: mail/mail-callbacks.c:600
+#: mail/mail-callbacks.c:499
 msgid "You must configure an account before you can send this email."
 msgstr "您必須要先設定一個帳號才可以傳送這封郵件。"
 
+# composer/e-msg-composer.c:877
+#: mail/mail-callbacks.c:644
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"無法開啟這個帳號的草稿資料夾。\n"
+"是否使用預設的草稿資料夾？"
+
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: mail/mail-callbacks.c:838
+#: mail/mail-callbacks.c:1025
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
-#: mail/mail-callbacks.c:843
+#: mail/mail-callbacks.c:1029
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "在 %a, %Y-%m-%d %H:%M, %%s 寫道："
 
 # mail/mail-callbacks.c:850
-#: mail/mail-callbacks.c:1275 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
 msgid "Move message(s) to"
 msgstr "將郵件移至"
 
 # mail/mail-callbacks.c:852
-#: mail/mail-callbacks.c:1277 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
 msgid "Copy message(s) to"
 msgstr "將郵件複製到"
 
 # mail/mail-callbacks.c:1017
-#: mail/mail-callbacks.c:1747
+#: mail/mail-callbacks.c:2139
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "您確定要編輯全部 %d 封郵件？"
 
 # mail/mail-callbacks.c:1039
-#: mail/mail-callbacks.c:1772
+#: mail/mail-callbacks.c:2164
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10751,7 +13817,7 @@ msgstr ""
 "草稿資料夾內的郵件。"
 
 # mail/mail-callbacks.c:1073
-#: mail/mail-callbacks.c:1811
+#: mail/mail-callbacks.c:2203
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10760,32 +13826,45 @@ msgstr ""
 "內的郵件重傳。"
 
 # mail/mail-callbacks.c:1085
-#: mail/mail-callbacks.c:1825
+#: mail/mail-callbacks.c:2217
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "您確定要重新傳送全部 %d 封郵件？"
 
 # mail/mail-callbacks.c:1106
-#: mail/mail-callbacks.c:1851
+#: mail/mail-callbacks.c:2243
 msgid "No Message Selected"
 msgstr "沒有選定郵件"
 
+# mail/mail-callbacks.c:1140
+# mail/mail-display.c:92
+#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+msgid "Overwrite file?"
+msgstr "覆蓋檔案？"
+
 # mail/mail-callbacks.c:1188
-#: mail/mail-callbacks.c:1945
+#: mail/mail-callbacks.c:2342
 msgid "Save Message As..."
 msgstr "另存郵件..."
 
 # mail/mail-callbacks.c:1190
-#: mail/mail-callbacks.c:1947
+#: mail/mail-callbacks.c:2344
 msgid "Save Messages As..."
 msgstr "另存郵件..."
 
-# widgets/misc/e-messagebox.c:159
-#: mail/mail-callbacks.c:2116 widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "警告"
+# ui/evolution-mail.xml.h:23
+#: mail/mail-callbacks.c:2415
+#, fuzzy
+msgid "Go to next folder with unread messages?"
+msgstr "顯示下一封未閱讀的郵件"
+
+#: mail/mail-callbacks.c:2422
+msgid ""
+"There are no more new messages in this folder.\n"
+"Would you like to go to the next folder?"
+msgstr ""
 
-#: mail/mail-callbacks.c:2123
+#: mail/mail-callbacks.c:2665
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10797,15 +13876,8 @@ msgstr ""
 "\n"
 "確定清除這些郵件？"
 
-# importers/elm-importer.c:528
-# importers/netscape-importer.c:807
-# importers/pine-importer.c:668
-#: mail/mail-callbacks.c:2130
-msgid "Do not ask me again."
-msgstr "不要再顯示這個訊息。"
-
 # mail/mail-callbacks.c:1349
-#: mail/mail-callbacks.c:2238
+#: mail/mail-callbacks.c:2778
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10816,26 +13888,78 @@ msgstr ""
 
 # importers/netscape-importer.c:795
 # mail/mail-callbacks.c:1359
-#: mail/mail-callbacks.c:2250
+#: mail/mail-callbacks.c:2790
 msgid "Filters"
 msgstr "過濾器"
 
+# camel/camel-filter-driver.c:748
+#: mail/mail-callbacks.c:2833
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "正在接收第 %d / %d 封郵件"
+
 # mail/mail-callbacks.c:1407
-#: mail/mail-callbacks.c:2313
+#: mail/mail-callbacks.c:2886
 msgid "Print Message"
 msgstr "列印郵件"
 
+#: mail/mail-callbacks.c:2913
+msgid "US-Letter"
+msgstr ""
+
 # mail/mail-callbacks.c:1454
-#: mail/mail-callbacks.c:2359
+#: mail/mail-callbacks.c:2952
 msgid "Printing of message failed"
 msgstr "列印郵件失敗"
 
 # mail/mail-callbacks.c:1549
-#: mail/mail-callbacks.c:2461
+#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "您確定要用新視窗開啟全部 %d 封郵件？"
 
+#: mail/mail-composer-prefs.c:220
+msgid ""
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:689
+# calendar/gui/e-itip-control.glade.h:6
+# composer/e-msg-composer-attachment.glade.h:3
+#: mail/mail-composer-prefs.c:238 mail/mail-composer-prefs.c:360
+#: mail/mail-composer-prefs.c:408
+#, fuzzy
+msgid " [script]"
+msgstr "描述"
+
+#: mail/mail-composer-prefs.c:301
+msgid "Please specify a valid script name"
+msgstr ""
+
+# addressbook/gui/component/addressbook-storage.c:99
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#, fuzzy
+msgid "Unnamed"
+msgstr "未命名的連絡人"
+
+# ui/evolution-message-composer.xml.h:26
+#: mail/mail-composer-prefs.c:555
+#, fuzzy
+msgid "en"
+msgstr "傳送"
+
+#: mail/mail-composer-prefs.c:861
+#, fuzzy
+msgid "Add script signature"
+msgstr "新增條件"
+
+# mail/mail-config.glade.h:74
+#: mail/mail-composer-prefs.c:862
+#, fuzzy
+msgid "Add Signature"
+msgstr "_HTML 簽名檔："
+
 # mail/mail-config-druid.c:99
 #: mail/mail-config-druid.c:146
 msgid ""
@@ -10888,131 +14012,214 @@ msgstr ""
 
 # mail/mail-config-druid.c:445
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:627
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
+# mail/mail-mt.c:516
+# mail/mail-mt.c:545
+# mail/mail-mt.c:880
+#. red
+#: mail/mail-config.c:76 mail/mail-config.glade.h:139
+#, fuzzy
+msgid "Work"
+msgstr "正在工作"
+
+#. orange
+#: mail/mail-config.c:77 mail/mail-config.glade.h:88
+msgid "Personal"
+msgstr ""
+
+# mail/mail-format.c:762
+# mail/message-list.c:1083
+#. forest green
+#: mail/mail-config.c:78 mail/mail-config.glade.h:130
+#, fuzzy
+msgid "To Do"
+msgstr "多哥"
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#. blue
+#: mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "之後"
+
 # mail/mail-config.glade.h:3
-#: mail/mail-config.c:316
+#: mail/mail-config.c:625
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "帳號"
 
-#: mail/mail-config.c:1643
-#, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
-msgstr ""
-
-# mail/local-config.glade.h:8
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1654
-#, c-format
-msgid "%s: Inbox"
-msgstr "%s: Inbox"
-
-#: mail/mail-config.c:1896
+#: mail/mail-config.c:2555
 msgid "Checking Service"
 msgstr "檢查服務"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: mail/mail-config.c:1967 mail/mail-config.c:1971
+#: mail/mail-config.c:2633 mail/mail-config.c:2637
 msgid "Connecting to server..."
 msgstr "正在連線至伺服器..."
 
-# mail/mail-config.glade.h:1
 #: mail/mail-config.glade.h:1
 #, fuzzy
-msgid " _Check for supported types "
-msgstr " 檢查可支援的類別(_C)"
+msgid " "
+msgstr ", "
 
-# mail/mail-config.glade.h:2
+# mail/mail-config.glade.h:1
 #: mail/mail-config.glade.h:2
-msgid " color"
-msgstr " 色彩"
+#, fuzzy
+msgid " _Check for supported types "
+msgstr " 檢查可支援的類別(_C)"
 
 #: mail/mail-config.glade.h:3
-msgid "(SSL is not supported in this build of evolution)"
+#, fuzzy
+msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(此一版本的 evolution 並不支援 SSL)"
 
 #: mail/mail-config.glade.h:4
+msgid "(SSL is not supported in this build of evolution)"
+msgstr "(此一版本的 evolution 並不支援 SSL)"
+
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "當傳送加密郵件時永遠自我加密"
 
+#: mail/mail-config.glade.h:6
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+msgstr ""
+
 # mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:5
-msgid "Account"
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Account Editor"
 msgstr "帳號"
 
 # mail/mail-config.glade.h:4
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 msgid "Account Information"
 msgstr "帳號資訊"
 
 # mail/mail-config.glade.h:5
-#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:9 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "帳號總管"
 
-# mail/mail-config.glade.h:6
-#: mail/mail-config.glade.h:8
-msgid "Accounts"
-msgstr "帳號"
+#: mail/mail-config.glade.h:10
+#, fuzzy
+msgid "Add Sc_ript"
+msgstr "新增條件"
 
-#: mail/mail-config.glade.h:9
+# mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:11
 #, fuzzy
-msgid "Always _encrypt to myself when sending encrypted mail"
+msgid "Add new signature..."
+msgstr "儲存簽名檔"
+
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "當傳送加密郵件時永遠自我加密"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:14
 #, fuzzy
-msgid "Always _sign outgoing messages when using this account"
+msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "當使用這個帳號時永遠在寄送的郵件上加簽"
 
+#: mail/mail-config.glade.h:16
+msgid "Always _blind carbon-copy (Bcc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:17
+msgid "Always _carbon-copy (Cc) to:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+# composer/e-msg-composer-attachment-bar.c:501
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "Attach original message"
+msgstr "附加檔案至郵件"
+
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
 # mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "驗證"
 
+# mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:22
+#, fuzzy
+msgid "Automatically _detect links"
+msgstr "自動檢查新郵件每隔(_A)"
+
+#: mail/mail-config.glade.h:23
+msgid "Baltic (ISO-8859-13)"
+msgstr ""
+
+#: mail/mail-config.glade.h:24
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+# mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
+#, fuzzy
+msgid "C_haracter set:"
+msgstr "不明的編碼：%s"
+
+# 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:5
+#: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "C_olors"
+msgstr "關閉 (_L)"
+
+#: mail/mail-config.glade.h:27
+msgid "Check spelling while I _type"
+msgstr ""
+
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Checking for New Mail"
 msgstr "檢查新郵件"
 
-# mail/mail-config.glade.h:14
-#: mail/mail-config.glade.h:14
-msgid "Composer"
-msgstr "編輯器"
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Color for _misspelled words:"
+msgstr "今天到期的工作色彩"
+
+# composer/e-msg-composer.c:1526
+# composer/e-msg-composer.c:1871
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "Composing Messages"
+msgstr "編輯郵件"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Configuration"
 msgstr "郵件設定"
 
-# mail/mail-ops.c:1449
-#: mail/mail-config.glade.h:16
-#, fuzzy
-msgid "Confirm when Expunging a folder"
-msgstr "刪除資料夾"
-
 # mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:32
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11029,293 +14236,425 @@ msgstr ""
 "請按 \"完成\" 來儲存您的設定。"
 
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:38
 msgid "De_fault"
 msgstr "預設值(_F)"
 
-# mail/mail-config.glade.h:22
-#: mail/mail-config.glade.h:24
-msgid "Default Forward style is: "
-msgstr "預設的轉寄樣式為："
+# mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Default Behavior"
+msgstr "預設值(_F)"
 
 # mail/mail-config.glade.h:22
-#: mail/mail-config.glade.h:25
-msgid "Default character encoding: "
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Default character _encoding:"
 msgstr "預設編碼："
 
-#: mail/mail-config.glade.h:27
+# mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Deleting Mail"
+msgstr "接收郵件"
+
+#: mail/mail-config.glade.h:44
 msgid "Digital IDs..."
 msgstr "數位 ID..."
 
-# calendar/gui/calendar-summary.c:622
-# mail/mail-config.glade.h:24
-#: mail/mail-config.glade.h:28
-msgid "Display"
-msgstr "顯示"
+# camel/camel-filter-driver.c:671
+#: mail/mail-config.glade.h:45
+#, fuzzy
+msgid "Do not quote original message"
+msgstr "不能開啟郵件"
 
 # mail/mail-config.glade.h:25
-#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "完成"
 
-# mail/mail-config.glade.h:26
-#: mail/mail-config.glade.h:30 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr "草稿"
+# mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:47
+#, fuzzy
+msgid "Drafts _folder:"
+msgstr "草稿匣："
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:48
 msgid "E_nable"
 msgstr "啟用(_E)"
 
-# widgets/misc/e-filter-bar.h:96
-# widgets/misc/e-filter-bar.h:103
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "編輯..."
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Emacs"
+msgstr "東"
 
-# mail/mail-accounts.c:199
-# mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:33
-msgid "Enabled"
-msgstr "已啟用"
+# addressbook/gui/component/addressbook.c:620
+#: mail/mail-config.glade.h:50
+#, fuzzy
+msgid "Email Accounts"
+msgstr "電郵地址包含"
+
+# mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Email _address:"
+msgstr "電子郵件地址："
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Empty _trash folders on exit"
+msgstr "離開時清空垃圾桶資料夾(_E)"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Execute Command..."
+msgstr "執行動作"
+
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Fi_xed -width:"
+msgstr "以此終結"
+
+# mail/folder-browser-factory.c:198
+# ui/evolution-event-editor.xml.h:39
+# ui/evolution-task-editor-dialog.xml.h:42
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Font Properties"
+msgstr "內容"
+
+# mail/mail-ops.c:1154
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "Format messages in _HTML"
+msgstr "已轉寄的郵件"
+
+#: mail/mail-config.glade.h:58
 msgid "Get Digital ID..."
 msgstr "取得數位 ID..."
 
-# mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:35
-msgid "HTML signature file:"
-msgstr "HTML 簽名檔："
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Highlight _quotations with"
+msgstr "強調引文(_H)"
 
 # mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:60
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 # mail/mail-config.glade.h:35
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "身份"
 
-# mail/mail-config.glade.h:36
-#: mail/mail-config.glade.h:38
-msgid "In HTML mail"
-msgstr "HTML 格式郵件"
-
 # mail/mail-config.glade.h:37
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Inline"
 msgstr "正常"
 
 # mail/mail-config.glade.h:38
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:64
 msgid "Kerberos "
 msgstr "Kerberos "
 
+# ui/evolution-contact-editor.xml.h:9
+# ui/evolution-event-editor.xml.h:42
+# ui/evolution-task-editor-dialog.xml.h:52
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Labels and Colors"
+msgstr "儲存後關閉"
+
+# ui/evolution-mail.xml.h:46
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Loading Images"
+msgstr "載入圖片(_I)"
+
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "郵件設定"
 
 # mail/local-config.glade.h:2
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "信箱位置"
 
-# mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:44
-msgid "Make this my _default account"
-msgstr "設為預設帳號(_D)"
+# views/mail/galview.xml.h:4
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Message Composer"
+msgstr "郵件"
+
+# views/mail/galview.xml.h:4
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Message Display"
+msgstr "檢視郵件(_M)"
+
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Microsoft"
+msgstr "密克羅尼西亞"
 
 # addressbook/gui/component/addressbook-config.c:148
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:75
 msgid "NNTP Server:"
 msgstr "NNTP 伺服器："
 
-# mail/mail-config.glade.h:45
-#: mail/mail-config.glade.h:46
-msgid "News"
-msgstr "新聞"
+# mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "New Mail Notification"
+msgstr "郵件設定"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: mail/mail-config.glade.h:79
+#, fuzzy
+msgid "News Servers"
+msgstr "新聞發送伺服器(_N)"
+
+#: mail/mail-config.glade.h:81
+msgid "On Screen fonts"
+msgstr ""
 
 # mail/mail-config.glade.h:47
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "選用的資訊"
 
-#: mail/mail-config.glade.h:50
+# addressbook/gui/widgets/e-addressbook-view.c:708
+#: mail/mail-config.glade.h:84
 #, fuzzy
-msgid "PGP _Key ID:"
+msgid "Or_ganization:"
+msgstr "團體(_Z)："
+
+#: mail/mail-config.glade.h:85
+#, fuzzy
+msgid "PGP/GPG _Key ID:"
 msgstr "PGP 鑰匙 ID："
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 # mail/mail-config.glade.h:54
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "選取顏色"
 
-#: mail/mail-config.glade.h:54
-msgid "Pretty Good Privacy"
-msgstr "相當高的隱私"
-
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:90
 #, fuzzy
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr "當傳送沒有主旨的郵件時顯示提示(_E)"
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_B)"
 
-# ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:56
-msgid "Prompt when sending messages with an _empty subject"
-msgstr "當傳送沒有主旨的郵件時顯示提示(_E)"
+#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "相當高的隱私"
 
-# ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:57
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_B)"
+# ui/evolution-addressbook.xml.h:11
+#: mail/mail-config.glade.h:92
+#, fuzzy
+msgid "Printed Fonts"
+msgstr "列印選定的連絡人"
 
 # mail/mail-config.glade.h:55
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
+# camel/camel-filter-driver.c:671
+#: mail/mail-config.glade.h:94
+#, fuzzy
+msgid "Quote original message"
+msgstr "不能開啟郵件"
+
 # mail/mail-config.glade.h:56
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr "引用"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Re_member this password"
 msgstr "記下這個密碼"
 
+# composer/e-msg-composer-hdrs.c:361
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "回覆地址："
+
 # mail/mail-config.glade.h:57
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "接收郵件"
 
-# mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:62
-msgid "Receiving Mail"
-msgstr "接收郵件"
-
 # mail/mail-config.glade.h:59
-#: mail/mail-config.glade.h:63
-msgid "Receiving Options"
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Receiving _Options"
 msgstr "接收郵件選項"
 
+# addressbook/gui/component/addressbook-config.c:352
+# mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:100
+#, fuzzy
+msgid "Remember this _password"
+msgstr "記下這個密碼"
+
 # mail/mail-config.glade.h:61
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "所須資訊"
 
-#: mail/mail-config.glade.h:66
-msgid "Secure MIME"
-msgstr "安全的 MIME"
-
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:67
-msgid "Security"
+#: mail/mail-config.glade.h:103
+#, fuzzy
+msgid "S_ecurity"
 msgstr "安全性"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
-#: mail/mail-config.glade.h:68
-msgid "Select Filter Log file..."
-msgstr "選擇過濾器記錄檔..."
+#: mail/mail-config.glade.h:104
+#, fuzzy
+msgid "Secure MIME (S/MIME)"
+msgstr "安全的 MIME"
+
+#: mail/mail-config.glade.h:105
+msgid "Select HTML fixed width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:106
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: mail/mail-config.glade.h:107
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: mail/mail-config.glade.h:108
+msgid "Select HTML variable width font for printing"
+msgstr ""
 
 # mail/mail-config.glade.h:63
-#: mail/mail-config.glade.h:69
-msgid "Select PGP binary"
+#: mail/mail-config.glade.h:109
+#, fuzzy
+msgid "Select PGP program"
 msgstr "選擇 PGP 二元檔"
 
 # mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "傳送郵件"
 
-# mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:71
-msgid "Sending Mail"
-msgstr "傳送郵件"
-
-# mail/mail-config.glade.h:68
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "傳送"
-
 # mail/mail-config.glade.h:70
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "傳送郵件資料夾："
 
 # mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "傳送與草稿郵件"
 
 # mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "伺服器要求驗證(_A)"
 
 # mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "伺服器設定"
 
 # mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Server _Type: "
 msgstr "伺服器類別："
 
+# ui/evolution.xml.h:62
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Shortcuts _type:"
+msgstr "功能"
+
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:79
-msgid "Signature file:"
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "Signature #1"
+msgstr "簽名檔："
+
+# mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Signature #2"
 msgstr "簽名檔："
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:120
 msgid "Source"
 msgstr "來源"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:121
 msgid "Source Information"
 msgstr "來源資訊"
 
-# mail/mail-config.glade.h:75
-#: mail/mail-config.glade.h:82
-msgid "Sources"
-msgstr "來源"
+# addressbook/printing/e-contact-print.glade.h:38
+#: mail/mail-config.glade.h:122
+#, fuzzy
+msgid "Specify _filename:"
+msgstr "樣式名稱："
 
-# mail/mail-config.glade.h:76
-#: mail/mail-config.glade.h:83
-msgid "Special Folders"
-msgstr "特別資料夾"
+#: mail/mail-config.glade.h:123
+msgid "Spell Checking Language"
+msgstr ""
+
+#: mail/mail-config.glade.h:124
+msgid "Spell _Checking"
+msgstr ""
 
 # mail/mail-config.glade.h:77
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:125
 msgid "Standard Unix mbox"
 msgstr "標準 Unix mbox"
 
-# mail/mail-config.glade.h:79
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:126
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: mail/mail-config.glade.h:129
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: mail/mail-config.glade.h:131
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+
+# mail/mail-accounts.c:197
+#: mail/mail-config.glade.h:134
 #, fuzzy
-msgid "Use s_ecure connection (SSL)"
-msgstr "使用安全連結 (_SSL)"
+msgid "V_ariable-width:"
+msgstr "變數"
 
 # mail/mail-config.glade.h:81
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:135
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11325,381 +14664,483 @@ msgstr ""
 "\n"
 "按 \"下一步\" 開始。"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "XEmacs"
+msgstr "東"
+
+# mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "_Add Signature"
+msgstr "_HTML 簽名檔："
+
+#: mail/mail-config.glade.h:143
 msgid "_Always load images off the net"
 msgstr "永遠自網路下載圖片(_A)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Always sign outgoing messages when using this account"
 msgstr "當使用這個帳號時永遠在寄送的郵件上加簽"
 
 # mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "驗證類別："
 
+# mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:146
+#, fuzzy
+msgid "_Authentication type: "
+msgstr "驗證類別："
+
 # mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "自動檢查新郵件每隔(_A)"
 
-#: mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "_Automatically insert smiley images"
+msgstr "自動檢查新郵件每隔(_A)"
+
+#: mail/mail-config.glade.h:149
+msgid "_Beep when new mail arrives"
+msgstr ""
+
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "證書 ID："
 
-# mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:97
+# mail/mail-ops.c:1449
+#: mail/mail-config.glade.h:151
 #, fuzzy
-msgid "_Drafts folder:"
-msgstr "草稿匣："
+msgid "_Confirm when expunging a folder"
+msgstr "刪除資料夾"
 
-# mail/mail-config.glade.h:29
-#: mail/mail-config.glade.h:99
-msgid "_Email Address:"
-msgstr "電子郵件地址(_E)："
+# calendar/gui/e-day-view.c:3179
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "_Default signature:"
+msgstr "刪除簽名檔以外的全部事件"
 
-#: mail/mail-config.glade.h:100
-msgid "_Empty trash folders on exit"
-msgstr "離開時清空垃圾桶資料夾(_E)"
+# mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:153
+#, fuzzy
+msgid "_Defaults"
+msgstr "預設值(_F)"
+
+#: mail/mail-config.glade.h:155
+msgid "_Do not notify me when new mail arrives"
+msgstr ""
+
+# mail/mail-accounts.c:199
+# mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:157
+#, fuzzy
+msgid "_Enable"
+msgstr "啟用"
+
+#: mail/mail-config.glade.h:158
+msgid "_Fixed-width:"
+msgstr ""
+
+# ui/evolution-mail.xml.h:34
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_Forward style:"
+msgstr "轉寄方式"
 
 # mail/mail-config.glade.h:31
-#: mail/mail-config.glade.h:101
-msgid "_Full Name:"
+#: mail/mail-config.glade.h:160
+#, fuzzy
+msgid "_Full name:"
 msgstr "全名(_F)："
 
-# mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:102
-msgid "_HTML Signature:"
-msgstr "_HTML 簽名檔："
-
-#: mail/mail-config.glade.h:103
-msgid "_Highlight citations with"
-msgstr "強調引文(_H)"
+# mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:162
+#, fuzzy
+msgid "_HTML Mail"
+msgstr "HTML 格式郵件"
 
-# addressbook/gui/component/addressbook-config.c:401
-# mail/mail-config.glade.h:33
-#: mail/mail-config.glade.h:104
-msgid "_Host:"
-msgstr "主機(_H)："
+# mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:164
+#, fuzzy
+msgid "_Identity"
+msgstr "身份"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:165
 msgid "_Load images if sender is in addressbook"
 msgstr "如果寄件者在目錄服務中就載入圖片(_L)"
 
-#: mail/mail-config.glade.h:106
-msgid "_Log filter actions to:"
-msgstr "記錄過濾器動作至(_L)："
+# mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Make this my default account"
+msgstr "設為預設帳號(_D)"
 
 # ui/evolution-mail.xml.h:51
-#: mail/mail-config.glade.h:107
-msgid "_Mark messages as Read after"
+#: mail/mail-config.glade.h:167
+#, fuzzy
+msgid "_Mark messages as read after"
 msgstr "標示郵件為已閱讀(_M)"
 
 # addressbook/gui/component/addressbook-config.c:686
 # mail/mail-config.glade.h:43
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:168
 msgid "_Name:"
 msgstr "名稱(_N)："
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:169
 msgid "_Never load images off the net"
 msgstr "永遠不自網路下載圖片(_N)"
 
-# addressbook/gui/widgets/e-addressbook-view.c:708
-#: mail/mail-config.glade.h:110
-msgid "_Organization:"
-msgstr "團體(_O)："
-
 # mail/mail-config.glade.h:50
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:170
 msgid "_PGP binary path:"
 msgstr "_PGP 二元碼路徑："
 
-# addressbook/gui/component/addressbook-config.c:520
-# mail/mail-config.glade.h:53
-#: mail/mail-config.glade.h:112
-msgid "_Path:"
-msgstr "路徑(_P)："
+#: mail/mail-config.glade.h:172
+msgid "_Play sound file when new mail arrives"
+msgstr ""
 
-# addressbook/gui/component/addressbook-config.c:352
-# mail/mail-config.glade.h:60
-#: mail/mail-config.glade.h:113
-msgid "_Remember this password"
-msgstr "記下這個密碼(_R)"
+# ui/evolution-mail.xml.h:14
+#: mail/mail-config.glade.h:173
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
+msgstr "當傳送沒有主旨的郵件時顯示提示(_E)"
 
-# mail/mail-config.glade.h:64
-#: mail/mail-config.glade.h:114
-msgid "_Send mail in HTML format by default."
-msgstr "預設使用 HTML 格式傳送郵件(_S)"
+# ui/evolution-mail.xml.h:14
+#: mail/mail-config.glade.h:174
+#, fuzzy
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr "當傳送沒有主旨的郵件時顯示提示(_E)"
 
-# mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:115
+# mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:175
 #, fuzzy
-msgid "_Server Type: "
-msgstr "伺服器類別："
+msgid "_Receiving Mail"
+msgstr "接收郵件"
+
+# mail/message-browser.c:191
+# ui/evolution-mail.xml.h:71
+#: mail/mail-config.glade.h:176
+#, fuzzy
+msgid "_Reply style:"
+msgstr "全部回覆"
+
+#: mail/mail-config.glade.h:177
+msgid "_Restore defaults"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:178
+#, fuzzy
+msgid "_Script:"
+msgstr "安全(_S)"
+
+# ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr "安全(_S)"
+
+# mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:180
+#, fuzzy
+msgid "_Sending Mail"
+msgstr "傳送郵件"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "_Show animated images"
+msgstr "顯示時間為"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:116
-msgid "_Signature file:"
+#: mail/mail-config.glade.h:182
+#, fuzzy
+msgid "_Signatures"
 msgstr "簽名檔(_S)："
 
-# mail/mail-config.glade.h:80
-#: mail/mail-config.glade.h:117
-msgid "_Username:"
-msgstr "使用者名稱(_U)："
+# mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:183
+#, fuzzy
+msgid "_Use secure connection (SSL):"
+msgstr "使用安全連結 (_SSL)"
+
+# mail/mail-accounts.c:197
+#: mail/mail-config.glade.h:184
+#, fuzzy
+msgid "_Variable-width:"
+msgstr "變數"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:185
 #, fuzzy
 msgid "_every"
 msgstr "每"
 
+# mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:186
+#, fuzzy
+msgid "color"
+msgstr " 色彩"
+
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:187
 msgid "description"
 msgstr "描述"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:189
 msgid "newswindow1"
 msgstr "新聞視窗 1"
 
-#: mail/mail-config.glade.h:122
-msgid "placeholder"
-msgstr "空間管理員"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-# mail/mail-config.glade.h:88
-#: mail/mail-config.glade.h:123
-msgid "seconds."
-msgstr "秒"
-
-# mail/mail-crypto.c:59
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr "無法建立一個 PGP 簽名文本。"
-
-# mail/mail-crypto.c:84
-#: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr "無法建立一個 PGP 查証文本。"
-
-# mail/mail-crypto.c:113
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr "不能建立 PGP 加密文本"
-
-# mail/mail-crypto.c:138
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr "不能建立 PGP 解密文本"
+#: mail/mail-config.glade.h:191
+msgid "xxxxxxxxxxxxxxxxxxxx"
+msgstr ""
 
 # mail/mail-crypto.c:169
-#: mail/mail-crypto.c:173
+#: mail/mail-crypto.c:84
 msgid "Could not create a S/MIME signature context."
 msgstr "無法建立一個 S/MIME 簽名文本。"
 
 # mail/mail-crypto.c:251
-#: mail/mail-crypto.c:205
+#: mail/mail-crypto.c:116
 msgid "Could not create a S/MIME certsonly context."
 msgstr "無法建立一個 S/MIME certsonly 文本。"
 
 # mail/mail-crypto.c:225
-#: mail/mail-crypto.c:236
+#: mail/mail-crypto.c:148
 msgid "Could not create a S/MIME encryption context."
 msgstr "無法建立一個 S/MIME 加密文本。"
 
 # mail/mail-crypto.c:225
-#: mail/mail-crypto.c:267
+#: mail/mail-crypto.c:180
 msgid "Could not create a S/MIME envelope context."
 msgstr "無法建立一個 S/MIME 封套文本。"
 
 # mail/mail-crypto.c:251
-#: mail/mail-crypto.c:297
+#: mail/mail-crypto.c:211
 msgid "Could not create a S/MIME decode context."
 msgstr "無法建立一個 S/MIME 解密文本。"
 
 # mail/mail-display.c:196
-#: mail/mail-display.c:243
+#: mail/mail-display.c:279
 msgid "Save Attachment"
 msgstr "儲存附加檔案"
 
+# mail/mail-tools.c:145
+#: mail/mail-display.c:344
+#, fuzzy, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "無法建立暫存 mbox `%s'：%s"
+
 # mail/mail-display.c:297
-#: mail/mail-display.c:350
+#: mail/mail-display.c:390
 msgid "Save to Disk..."
 msgstr "儲存至磁碟..."
 
 # mail/mail-display.c:301
-#: mail/mail-display.c:352
+#: mail/mail-display.c:391
 msgid "View Inline"
 msgstr "檢視 Inline"
 
 # mail/mail-display.c:299
-#: mail/mail-display.c:354
+#: mail/mail-display.c:392
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
 
 # mail/mail-display.c:359
-#: mail/mail-display.c:415
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "檢視 Inline (透過 %s)"
 
 # mail/mail-display.c:363
-#: mail/mail-display.c:419
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "隱藏"
 
 # mail/mail-display.c:336
-#: mail/mail-display.c:440
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "外部檢視器"
 
 # mail/mail-display.c:962
-#: mail/mail-display.c:1133
+#: mail/mail-display.c:1265
 msgid "Loading message content"
 msgstr "正在載入郵件內文"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: mail/mail-display.c:1553
+#, fuzzy
+msgid "Overdue:"
+msgstr "過期的工作(_V)："
+
 # mail/mail-display.c:1256
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1833
 msgid "Open Link in Browser"
 msgstr "在瀏覽器內開啟連結"
 
 # ui/evolution-event-editor.xml.h:14
 # ui/evolution-task-editor-dialog.xml.h:15
-#: mail/mail-display.c:1594
+#: mail/mail-display.c:1834
 msgid "Copy Link Location"
 msgstr "複製連結位址"
 
 # ui/evolution-message-composer.xml.h:21
-#: mail/mail-display.c:1597
+#: mail/mail-display.c:1836
 msgid "Save Link as (FIXME)"
 msgstr "另存目標(FIXME)"
 
 # mail/mail-callbacks.c:1188
-#: mail/mail-display.c:1600
+#: mail/mail-display.c:1838
 msgid "Save Image as..."
 msgstr "另存圖片..."
 
 # mail/mail-format.c:527
-#: mail/mail-format.c:635
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附加檔案"
 
 # mail/mail-format.c:573
-#: mail/mail-format.c:680
+#: mail/mail-format.c:677
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "不能解析 MIME 格式的郵件。只好顯示原始檔。"
 
 # mail/mail-format.c:640
 # mail/message-list.c:1082
-#: mail/mail-format.c:763
+#: mail/mail-format.c:760 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日期"
 
 # mail/mail-config.glade.h:29
-#: mail/mail-format.c:846
+#: mail/mail-format.c:852
 msgid "Bad Address"
 msgstr "不正確的電郵地址"
 
 # mail/mail-format.c:756
 # mail/message-list.c:1082
-#: mail/mail-format.c:886 mail/message-list.etspec.h:3
+#: mail/mail-format.c:895 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "寄件者"
 
 # mail/mail-format.c:759
-#: mail/mail-format.c:889
+#: mail/mail-format.c:899
 msgid "Reply-To"
 msgstr "回覆"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
-#: mail/mail-format.c:893 mail/message-list.etspec.h:10
+#: mail/mail-format.c:904 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "收件者"
 
 # mail/mail-format.c:765
-#: mail/mail-format.c:897
+#: mail/mail-format.c:909
 msgid "Cc"
 msgstr "副本"
 
 # composer/e-msg-composer-hdrs.c:394
-#: mail/mail-format.c:901
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Bcc"
 msgstr "密件副本："
 
+# addressbook/backend/ebook/e-card.c:3428
+#: mail/mail-format.c:945
+#, fuzzy
+msgid "Mailer"
+msgstr ""
+"\n"
+"寄件者: "
+
+# mail/mail-callbacks.c:1188
+#: mail/mail-format.c:1736
+#, fuzzy
+msgid "View messages..."
+msgstr "另存郵件..."
+
 # mail/mail-format.c:1153
-#: mail/mail-format.c:1812
+#: mail/mail-format.c:1832
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "這封是加入了數位簽名的郵件，已証實無訛"
 
-#: mail/mail-format.c:1835
-msgid "Evolution does not recognize this type of signed message."
-msgstr ""
+# mail/mail-crypto.c:84
+#: mail/mail-format.c:1859
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "無法建立一個 PGP 查証文本。"
 
 # mail/mail-format.c:1153
-#: mail/mail-format.c:1843
+#: mail/mail-format.c:1868
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "這封是加入了數位簽名的郵件，已証實無訛"
 
 # mail/mail-format.c:1161
-#: mail/mail-format.c:1851
+#: mail/mail-format.c:1876
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
 
 # mail/mail-format.c:1787
-#: mail/mail-format.c:2067
+#: mail/mail-format.c:2126
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
 # mail/mail-format.c:1799
-#: mail/mail-format.c:2081
+#: mail/mail-format.c:2140
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 \"%s\" 有效的指示"
 
 # mail/mail-format.c:1803
-#: mail/mail-format.c:2086
+#: mail/mail-format.c:2145
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: mail/mail-format.c:2115
+#: mail/mail-format.c:2174
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "遠端資料指示 (%s)"
 
 # mail/mail-format.c:1837
-#: mail/mail-format.c:2123
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (\"%s\" 類型)"
 
 # mail/mail-format.c:1842
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2187
 msgid "Malformed external-body part."
 msgstr "變形的外加本文部分。"
 
+# mail/mail-config.glade.h:76
+#: mail/mail-local.c:538 mail/mail-local.c:540
+#, fuzzy, c-format
+msgid "Local folders/%s"
+msgstr "特別資料夾"
+
 # mail/mail-local.c:812
-#: mail/mail-local.c:626
+#: mail/mail-local.c:670
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "重新載入資料夾"
 
 # mail/mail-local.c:922
-#: mail/mail-local.c:707
+#: mail/mail-local.c:751
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -11709,14 +15150,14 @@ msgstr ""
 "再也無法開啟這個資料夾： %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: mail/mail-local.c:763
+#: mail/mail-local.c:807
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "無法建立資料夾鎖定 %s ： %s"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: mail/mail-local.c:815
+#: mail/mail-local.c:859
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
@@ -11724,18 +15165,18 @@ msgstr ""
 "%s"
 
 # mail/mail-local.c:785
-#: mail/mail-local.c:1281
+#: mail/mail-local.c:1324
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "將資料夾 \"%s\" 格式變更為 \"%s\""
 
-#: mail/mail-local.c:1296
+#: mail/mail-local.c:1339
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
 # mail/mail-local.c:961
-#: mail/mail-local.c:1318
+#: mail/mail-local.c:1361
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -11744,12 +15185,12 @@ msgstr ""
 "您可能需要手動修復它。"
 
 # camel/camel-vtrash-folder.c:109
-#: mail/mail-local.c:1407
+#: mail/mail-local.c:1450
 msgid "You cannot change the format of a non-local folder."
 msgstr "您不能變更非本地端資料夾的格式。"
 
 # executive-summary/component/e-summary-url.c:80
-#: mail/mail-local.c:1416
+#: mail/mail-local.c:1459
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "重新設定 %s"
@@ -11782,149 +15223,128 @@ msgid "Working"
 msgstr "正在工作"
 
 # mail/mail-local.c:812
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:89
 msgid "Filtering Folder"
 msgstr "過濾資料夾"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "接收郵件"
 
-#: mail/mail-ops.c:492 mail/mail-ops.c:521
+#: mail/mail-ops.c:538 mail/mail-ops.c:567
 msgid "However, the message was successfully sent."
 msgstr ""
 
 # mail/mail-ops.c:599
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:603
 #, c-format
 msgid "Sending \"%s\""
 msgstr "傳送 \"%s\""
 
 # mail/mail-ops.c:718
-#: mail/mail-ops.c:677
+#: mail/mail-ops.c:723
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送 %2$d 封郵件中的第 %1$d 封"
 
 # mail/mail-ops.c:737
-#: mail/mail-ops.c:696
+#: mail/mail-ops.c:742
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "在處理 %2$d 封郵件中的第 %1$d 封時失敗"
 
 # mail/mail-ops.c:739
 # mail/mail-send-recv.c:475
-#: mail/mail-ops.c:698 mail/mail-send-recv.c:537
+#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
 msgid "Complete."
 msgstr "完成。"
 
 # mail/mail-ops.c:825
-#: mail/mail-ops.c:791
+#: mail/mail-ops.c:838
 msgid "Saving message to folder"
 msgstr "儲存郵件到資料夾"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Moving messages to %s"
 msgstr "將郵件移到 %s"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:918
 #, c-format
 msgid "Copying messages to %s"
 msgstr "將郵件複製到 %s"
 
-# mail/mail-ops.c:914
-#: mail/mail-ops.c:898
-msgid "Moving"
-msgstr "移動"
-
-# mail/mail-ops.c:917
-#: mail/mail-ops.c:901
-msgid "Copying"
-msgstr "複製"
-
 # mail/mail-ops.c:992
-#: mail/mail-ops.c:1011
+#: mail/mail-ops.c:1025
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃描 \"%s\" 內的資料夾"
 
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
-#. Fill in the new fields
-#: mail/mail-ops.c:1061 shell/e-local-storage.c:178
-#, fuzzy
-msgid "Trash"
-msgstr "土耳其文"
-
 # mail/mail-ops.c:1154
-#: mail/mail-ops.c:1194
+#: mail/mail-ops.c:1208
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1237
+#: mail/mail-ops.c:1251
 #, c-format
 msgid "Opening folder %s"
 msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:1262
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Opening store %s"
 msgstr "開啟貯藏 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1378
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Removing folder %s"
 msgstr "移除資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1472
+#: mail/mail-ops.c:1486
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "建立資料夾 %s"
 
 # mail/mail-local.c:812
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1537
 msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
 # mail/mail-ops.c:1449
-#: mail/mail-ops.c:1559
+#: mail/mail-ops.c:1573
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
 # mail/mail-ops.c:1498
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Retrieving message %s"
 msgstr "取回郵件 %s"
 
 # mail/mail-ops.c:1565
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1689
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "取回郵件 %d 封郵件"
 
 # mail/mail-ops.c:1649
-#: mail/mail-ops.c:1761
+#: mail/mail-ops.c:1775
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "儲存郵件 %d 封郵件"
 
 # mail/mail-ops.c:1728
-#: mail/mail-ops.c:1873
+#: mail/mail-ops.c:1887
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11934,7 +15354,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1915
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11944,12 +15364,12 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1829
-#: mail/mail-ops.c:1975
+#: mail/mail-ops.c:1989
 msgid "Saving attachment"
 msgstr "儲存附件"
 
 # mail/mail-ops.c:1844
-#: mail/mail-ops.c:1991
+#: mail/mail-ops.c:2006
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11959,25 +15379,30 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1872
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2036
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2091
+#: mail/mail-ops.c:2184
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2184
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "中斷與 %s 的連線"
 
+#: mail/mail-ops.c:2265
+#, c-format
+msgid "Executing shell command: %s"
+msgstr ""
+
 # mail/mail-search-dialogue.c:113
-#: mail/mail-search-dialogue.c:113
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
 msgid "_Search"
 msgstr "尋找(_S)"
 
@@ -12027,56 +15452,51 @@ msgid "Cancelling..."
 msgstr "正在取消..."
 
 # mail/mail-config.glade.h:72
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:246
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "伺服器類別："
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:40
-#: mail/mail-send-recv.c:249
+#: mail/mail-send-recv.c:250
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "類型："
 
 # mail/mail-send-recv.c:233
-#: mail/mail-send-recv.c:286
+#: mail/mail-send-recv.c:287
 msgid "Send & Receive Mail"
 msgstr "傳送與接收郵件"
 
 # ui/evolution-mail.xml.h:2
-#: mail/mail-send-recv.c:288
+#: mail/mail-send-recv.c:289
 #, fuzzy
 msgid "Cancel All"
 msgstr "取消"
 
 # mail/mail-send-recv.c:285
-#: mail/mail-send-recv.c:348
+#: mail/mail-send-recv.c:349
 msgid "Updating..."
 msgstr "正在更新..."
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
+#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
 msgid "Waiting..."
 msgstr "正在等待..."
 
-# mail/mail-send-recv.c:471
-#: mail/mail-send-recv.c:533
-msgid "Cancelled."
-msgstr "已取消。"
-
 # mail/mail-session.c:161
-#: mail/mail-session.c:211
+#: mail/mail-session.c:222
 msgid "User canceled operation."
 msgstr "使用者取消動作。"
 
 # camel/camel-smime-context.c:194
-#: mail/mail-session.c:310
+#: mail/mail-session.c:321
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "請輸入 %s 所須的密碼"
@@ -12087,41 +15507,92 @@ msgstr "請輸入 %s 所須的密碼"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: mail/mail-session.c:313
+#: mail/mail-session.c:324
 #, fuzzy
 msgid "Enter Password"
 msgstr "密碼"
 
+# mail/mail-crypto.c:59
+#: mail/mail-signature-editor.c:81
+#, fuzzy, c-format
+msgid "Could not save signature file: %s"
+msgstr "無法建立一個 PGP 簽名文本。"
+
+# mail/mail-config.glade.h:74
+#: mail/mail-signature-editor.c:174
+msgid "Save signature"
+msgstr "儲存簽名檔"
+
+# composer/e-msg-composer.c:941
+#: mail/mail-signature-editor.c:180
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"這個簽名檔已變更但仍未儲存。\n"
+"\n"
+"您是否要儲存變更？"
+
+#: mail/mail-signature-editor.c:378
+msgid "Type the name by which you would like to refer to this signature."
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:686
+# mail/mail-config.glade.h:43
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+msgid "Name:"
+msgstr "名稱："
+
+# mail/mail-config.glade.h:74
+#: mail/mail-signature-editor.c:397
+#, fuzzy
+msgid "Signature hint"
+msgstr "簽名檔："
+
+#: mail/mail-signature-editor.c:407
+msgid ""
+"If you would like to use an old signature, you may import it by opening the "
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
+msgstr ""
+
+# mail/mail-config.glade.h:74
+#: mail/mail-signature-editor.c:416
+#, fuzzy
+msgid "Hide signature hint"
+msgstr "HTML 簽名檔："
+
 # mail/mail-tools.c:219
-#: mail/mail-tools.c:255
+#: mail/mail-tools.c:257
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "轉寄的郵件 - %s"
 
 # mail/mail-ops.c:1154
-#: mail/mail-tools.c:259
+#: mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "轉寄的郵件"
 
 # mail/mail-ops.c:1154
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:399
 msgid "Forwarded Message"
 msgstr "轉寄的郵件"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-vfolder.c:85
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "建立資料夾 %s"
 
 # mail/mail-ops.c:992
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:202
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "掃描 \"%s\" 內的資料夾"
 
-#: mail/mail-vfolder.c:414
+#: mail/mail-vfolder.c:418
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12132,126 +15603,213 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: mail/mail-vfolder.c:723
+#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
+#: my-evolution/e-summary-mail.c:733
 #, fuzzy
 msgid "VFolders"
 msgstr "資料夾"
 
-#: mail/mail-vfolder.c:816
+# camel/providers/imap/camel-imap-provider.c:48
+# shell/e-shell-view.c:552
+#: mail/mail-vfolder.c:784
+#, fuzzy
+msgid "vFolders"
+msgstr "資料夾"
+
+#: mail/mail-vfolder.c:824
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "編輯虛擬資料夾"
 
-#: mail/mail-vfolder.c:832
+#: mail/mail-vfolder.c:840
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
 # mail/mail-vfolder.c:438
-#: mail/mail-vfolder.c:886
+#: mail/mail-vfolder.c:894
 msgid "New VFolder"
 msgstr "新增虛擬資料夾"
 
 # views/mail/galview.xml.h:3
-#: mail/message-browser.c:212
+#: mail/message-browser.c:209
 msgid "(No subject)"
 msgstr "(沒有主旨)"
 
 # widgets/misc/e-messagebox.c:180
-#: mail/message-browser.c:214
+#: mail/message-browser.c:211
 #, c-format
 msgid "%s - Message"
 msgstr "%s - 郵件"
 
 # mail/message-list.c:677
-#: mail/message-list.c:639
+#: mail/message-list.c:720
 msgid "Unseen"
 msgstr "未閱讀"
 
 # mail/message-list.c:678
-#: mail/message-list.c:640
+#: mail/message-list.c:721
 msgid "Seen"
 msgstr "已閱讀"
 
 # mail/message-list.c:679
-#: mail/message-list.c:641
+#: mail/message-list.c:722
 msgid "Answered"
 msgstr "已回覆"
 
 # mail/message-list.c:680
-#: mail/message-list.c:642
+#: mail/message-list.c:723
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
 # mail/message-list.c:681
-#: mail/message-list.c:643
+#: mail/message-list.c:724
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
 # mail/message-list.c:685
-#: mail/message-list.c:647
+#: mail/message-list.c:728
 msgid "Lowest"
 msgstr "最低"
 
 # mail/message-list.c:686
-#: mail/message-list.c:648
+#: mail/message-list.c:729
 msgid "Lower"
 msgstr "低"
 
 # mail/message-list.c:690
-#: mail/message-list.c:652
+#: mail/message-list.c:733
 msgid "Higher"
 msgstr "高"
 
 # mail/message-list.c:691
-#: mail/message-list.c:653
+#: mail/message-list.c:734
 msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:941
-#: mail/message-list.c:903
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "？"
 
 # mail/message-list.c:948
-#: mail/message-list.c:910
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:957
-#: mail/message-list.c:919
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:969
-#: mail/message-list.c:931
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 # mail/message-list.c:979
-#: mail/message-list.c:941
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 # mail/mail-local.c:905
-#: mail/message-list.c:2334
+#: mail/message-list.c:2537
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
-#: mail/message-list.etspec.h:2
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+# calendar/gui/e-calendar-table.c:155
+#: mail/message-list.etspec.h:3
+#, fuzzy
+msgid "Due By"
+msgstr "期限"
+
+# calendar/gui/e-meeting-dialog.glade.h:23
+# mail/message-list.c:1081
+#: mail/message-list.etspec.h:4
+#, fuzzy
+msgid "Flag Status"
+msgstr "狀況"
+
+#: mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "有標幟的"
 
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+# addressbook/gui/component/addressbook-storage.c:99
+#: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "原本的連絡人："
+
 # mail/mail-send-recv.c:236
-#: mail/message-list.etspec.h:4
+#: mail/message-list.etspec.h:9
 msgid "Received"
 msgstr "已接收"
 
 # addressbook/printing/e-contact-print.glade.h:36
-#: mail/message-list.etspec.h:7
+#: mail/message-list.etspec.h:11
 msgid "Size"
 msgstr "大小"
 
+# addressbook/contact-editor/e-contact-editor.c:1246
+#: mail/message-tag-followup.c:57
+#, fuzzy
+msgid "Call"
+msgstr "回撥電話"
+
+# mail/message-browser.c:194
+# ui/evolution-mail.xml.h:33
+#: mail/message-tag-followup.c:58
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "轉寄"
+
+#: mail/message-tag-followup.c:59
+msgid "Follow-Up"
+msgstr ""
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:395
+#: mail/message-tag-followup.c:60
+#, fuzzy
+msgid "For Your Information"
+msgstr "來源資訊"
+
+# mail/message-browser.c:194
+# ui/evolution-mail.xml.h:33
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+msgid "Forward"
+msgstr "轉寄"
+
+#: mail/message-tag-followup.c:62
+msgid "No Response Necessary"
+msgstr ""
+
+# mail/message-browser.c:188
+# ui/evolution-mail.xml.h:70
+#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+msgid "Reply"
+msgstr "回覆"
+
+# mail/message-browser.c:191
+# ui/evolution-mail.xml.h:71
+#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+msgid "Reply to All"
+msgstr "全部回覆"
+
+# calendar/gui/event-editor-dialog.glade.h:15
+#: mail/message-tag-followup.c:66
+#, fuzzy
+msgid "Review"
+msgstr "預覽"
+
+#: mail/message-tag-followup.c:315
+msgid "Flag to Follow Up"
+msgstr ""
+
 # mail/mail-ops.c:992
 #: mail/subscribe-dialog.c:219
 #, c-format
@@ -12279,7 +15837,7 @@ msgstr "取消訂閱至資料夾 \"%s\""
 # mail/subscribe-dialog.c:76
 # shell/e-storage-set-view.c:48
 #: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "資料夾"
 
@@ -12329,36 +15887,11916 @@ msgstr "訂閱(_S)"
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "用作處理摘要的 Evolution 元件。"
-
-#: my-evolution/component-factory.c:44
-msgid "Folder containing the Evolution Summary"
+#, fuzzy
+msgid "Configuration control for the Evolution Summary."
 msgstr "資料夾包含 Evolution 摘要"
 
-# mail/component-factory.c:337
-#: my-evolution/component-factory.c:153
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 #, fuzzy
-msgid "Cannot initialize Evolution's Summary component."
-msgstr "不能初始化 Evolution 的 mail 元件。"
+msgid "Evolution Summary component."
+msgstr "Evolution 郵件編輯器。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "用作生產 Evolution 郵件編輯元件的元件工廠。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#, fuzzy
+msgid "Factory for the Evolution Summary component."
+msgstr "用作生產 Evolution 郵件摘要元件的元件工廠。"
+
+# calendar/gui/gnome-cal.c:234
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#, fuzzy
+msgid "Summary Preferences"
+msgstr "摘要設定"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+msgid "This page can be used to customize the appearance of the Summary page."
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:162
+#: my-evolution/Locations.h:1
+#, fuzzy
+msgid "Aarhus"
+msgstr "提醒"
+
+#: my-evolution/Locations.h:2
+#, fuzzy
+msgid "Abakan"
+msgstr "亞賽拜然"
+
+#: my-evolution/Locations.h:3
+msgid "Abbotsford"
+msgstr ""
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:744
+#: my-evolution/Locations.h:4
+#, fuzzy
+msgid "Aberdeen"
+msgstr "到會者"
+
+#: my-evolution/Locations.h:5
+#, fuzzy
+msgid "Abha"
+msgstr "阿盧巴島"
+
+# addressbook/gui/widgets/e-addressbook-view.c:711
+#: my-evolution/Locations.h:6
+#, fuzzy
+msgid "Abilene"
+msgstr "行動電話"
+
+#: my-evolution/Locations.h:7
+msgid "Abingdon"
+msgstr ""
+
+#: my-evolution/Locations.h:8
+msgid "Abu Dhabi"
+msgstr ""
+
+#: my-evolution/Locations.h:9
+msgid "Abu Dhabi - Bateen"
+msgstr ""
+
+#: my-evolution/Locations.h:10
+msgid "Acajutla"
+msgstr ""
+
+#: my-evolution/Locations.h:11
+msgid "Acapulco"
+msgstr ""
+
+#: my-evolution/Locations.h:12
+#, fuzzy
+msgid "Acarigua"
+msgstr "尼加拉瓜"
+
+#: my-evolution/Locations.h:13
+msgid "Adak"
+msgstr ""
+
+#: my-evolution/Locations.h:14
+#, fuzzy
+msgid "Adana"
+msgstr "阿爾巴尼亞"
+
+#: my-evolution/Locations.h:15
+msgid "Adana/Incirlik"
+msgstr ""
+
+#: my-evolution/Locations.h:16
+msgid "Adelaide"
+msgstr ""
+
+# mail/message-list.c:678
+#: my-evolution/Locations.h:17
+#, fuzzy
+msgid "Aden"
+msgstr "瑞典"
+
+#: my-evolution/Locations.h:18
+#, fuzzy
+msgid "Adrar"
+msgstr "安道爾"
+
+#: my-evolution/Locations.h:19
+msgid "Aeroparque"
+msgstr ""
+
+#: my-evolution/Locations.h:20
+msgid "Aeropuerto del Norte"
+msgstr ""
+
+# camel/camel-sasl-anonymous.c:33
+#: my-evolution/Locations.h:21
+#, fuzzy
+msgid "Afonsos"
+msgstr "匿名"
+
+#: my-evolution/Locations.h:22
+#, fuzzy
+msgid "Africa"
+msgstr "南非"
+
+#: my-evolution/Locations.h:23
+msgid "Afyon"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:24
+#: my-evolution/Locations.h:24
+#, fuzzy
+msgid "Agen"
+msgstr "阿根廷"
+
+#: my-evolution/Locations.h:25
+#, fuzzy
+msgid "Aguascaliantes"
+msgstr "澳大利亞"
+
+#: my-evolution/Locations.h:26
+msgid "Ahmadabad"
+msgstr ""
+
+#: my-evolution/Locations.h:27
+msgid "Ahwaz"
+msgstr ""
+
+#: my-evolution/Locations.h:28
+msgid "Ainsworth"
+msgstr ""
+
+#: my-evolution/Locations.h:29
+msgid "Air Force"
+msgstr ""
+
+#: my-evolution/Locations.h:30
+msgid "Ajaccio/Campo dell'Oro"
+msgstr ""
+
+#: my-evolution/Locations.h:31
+msgid "Akeno Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:32
+msgid "Akita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:33
+msgid "Akron"
+msgstr ""
+
+#: my-evolution/Locations.h:34
+msgid "Akrotiri"
+msgstr ""
+
+#: my-evolution/Locations.h:35
+#, fuzzy
+msgid "Alabama"
+msgstr "阿爾巴尼亞"
+
+#: my-evolution/Locations.h:36
+msgid "Al Ahsa"
+msgstr ""
+
+#: my-evolution/Locations.h:37
+msgid "Al Ain"
+msgstr ""
+
+#: my-evolution/Locations.h:38
+msgid "Alamogordo"
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:162
+#: my-evolution/Locations.h:39
+#, fuzzy
+msgid "Alamosa"
+msgstr "提醒"
+
+# calendar/gui/e-calendar-table.c:162
+#: my-evolution/Locations.h:40
+#, fuzzy
+msgid "Alaska"
+msgstr "提醒"
+
+#: my-evolution/Locations.h:41
+msgid "Al Baha"
+msgstr ""
+
+#: my-evolution/Locations.h:43
+#, fuzzy
+msgid "Albany"
+msgstr "阿爾巴尼亞"
+
+#: my-evolution/Locations.h:44
+#, fuzzy
+msgid "Albenga"
+msgstr "阿爾巴尼亞"
+
+#: my-evolution/Locations.h:45
+#, fuzzy
+msgid "Alberta"
+msgstr "阿爾及利亞"
+
+#: my-evolution/Locations.h:46
+msgid "Alborg"
+msgstr ""
+
+#: my-evolution/Locations.h:47
+msgid "Albuquerque"
+msgstr ""
+
+# shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: my-evolution/Locations.h:48
+#, fuzzy
+msgid "Alderney"
+msgstr "資料夾名稱："
+
+#: my-evolution/Locations.h:49
+msgid "Alesund"
+msgstr ""
+
+#: my-evolution/Locations.h:50
+#, fuzzy
+msgid "Alexandria"
+msgstr "阿爾巴尼亞"
+
+#: my-evolution/Locations.h:51
+msgid "Alexandria-Esler"
+msgstr ""
+
+#: my-evolution/Locations.h:52
+msgid "Alexandria/Nouzha"
+msgstr ""
+
+#: my-evolution/Locations.h:53
+msgid "Alexandroupolis"
+msgstr ""
+
+#: my-evolution/Locations.h:55
+#, fuzzy
+msgid "Alghero"
+msgstr "阿爾及利亞"
+
+#: my-evolution/Locations.h:56
+#, fuzzy
+msgid "Algona"
+msgstr "安哥拉"
+
+#: my-evolution/Locations.h:57
+msgid "Alicante"
+msgstr ""
+
+#: my-evolution/Locations.h:58
+msgid "Alice"
+msgstr ""
+
+#: my-evolution/Locations.h:59
+msgid "Alice Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:60
+msgid "Al-Jouf"
+msgstr ""
+
+#: my-evolution/Locations.h:61
+msgid "Allentown"
+msgstr ""
+
+# widgets/misc/e-filter-bar.h:97
+# widgets/misc/e-filter-bar.h:104
+#: my-evolution/Locations.h:62
+#, fuzzy
+msgid "Alliance"
+msgstr "進階"
+
+# calendar/gui/e-calendar-table.c:162
+#: my-evolution/Locations.h:63
+#, fuzzy
+msgid "Alma"
+msgstr "提醒"
+
+#: my-evolution/Locations.h:64
+#, fuzzy
+msgid "Almeria"
+msgstr "阿爾及利亞"
+
+#: my-evolution/Locations.h:65
+#, fuzzy
+msgid "Alpena"
+msgstr "阿爾巴尼亞"
+
+#: my-evolution/Locations.h:66
+msgid "Al Qaysumah"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:67
+#, fuzzy
+msgid "Alta"
+msgstr "馬爾他"
+
+#: my-evolution/Locations.h:68
+#, fuzzy
+msgid "Altamira"
+msgstr "阿爾巴尼亞"
+
+# ui/evolution.xml.h:41
+#: my-evolution/Locations.h:69
+#, fuzzy
+msgid "Alton"
+msgstr "執行(_A)"
+
+#: my-evolution/Locations.h:70
+msgid "Altoona"
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:162
+#: my-evolution/Locations.h:71
+#, fuzzy
+msgid "Alturas"
+msgstr "提醒"
+
+#: my-evolution/Locations.h:72
+msgid "Altus"
+msgstr ""
+
+#: my-evolution/Locations.h:73
+msgid "Amami Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:74
+msgid "Amapala"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:701
+#: my-evolution/Locations.h:75
+#, fuzzy
+msgid "Amarillo"
+msgstr "電子郵件"
+
+#: my-evolution/Locations.h:76
+msgid "Amasya"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:12
+#: my-evolution/Locations.h:77
+#, fuzzy
+msgid "Ambler"
+msgstr "會員"
+
+#: my-evolution/Locations.h:78
+#, fuzzy
+msgid "Amelia"
+msgstr "亞美尼亞"
+
+#: my-evolution/Locations.h:79
+#, fuzzy
+msgid "Amendola"
+msgstr "安哥拉"
+
+# importers/netscape-importer.c:795
+# mail/mail-callbacks.c:1359
+#: my-evolution/Locations.h:80
+#, fuzzy
+msgid "Ames"
+msgstr "哩"
+
+#: my-evolution/Locations.h:81
+msgid "Amritsar"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:2
+#: my-evolution/Locations.h:82
+#, fuzzy
+msgid "Amsterdam"
+msgstr "奧地利"
+
+#: my-evolution/Locations.h:83
+#, fuzzy
+msgid "Anadyr"
+msgstr "安道爾"
+
+#: my-evolution/Locations.h:84
+msgid "Anaktuvuk"
+msgstr ""
+
+#: my-evolution/Locations.h:85
+#, fuzzy
+msgid "Anapa"
+msgstr "日本"
+
+#: my-evolution/Locations.h:86
+#, fuzzy
+msgid "Anchorage"
+msgstr "安道爾"
+
+#: my-evolution/Locations.h:87
+msgid "Anchorage - Elmendorf AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:88
+#, fuzzy
+msgid "Ancona"
+msgstr "安哥拉"
+
+#: my-evolution/Locations.h:89
+msgid "Andahuayla"
+msgstr ""
+
+#: my-evolution/Locations.h:90
+#, fuzzy
+msgid "Anderson"
+msgstr "雷暴"
+
+#: my-evolution/Locations.h:91
+#, fuzzy
+msgid "Andoya"
+msgstr "安道爾"
+
+#: my-evolution/Locations.h:92
+#, fuzzy
+msgid "Andravida"
+msgstr "個人"
+
+#: my-evolution/Locations.h:93
+msgid "Andrews AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:94
+msgid "Angleton"
+msgstr ""
+
+#: my-evolution/Locations.h:95
+#, fuzzy
+msgid "Aniak"
+msgstr "亞美尼亞"
+
+#: my-evolution/Locations.h:96
+msgid "Ankara/Esenboga"
+msgstr ""
+
+#: my-evolution/Locations.h:97
+msgid "Ankara/Etimesgut"
+msgstr ""
+
+#: my-evolution/Locations.h:98
+msgid "Annaba"
+msgstr ""
+
+#: my-evolution/Locations.h:99
+msgid "Ann Arbor"
+msgstr ""
+
+#: my-evolution/Locations.h:100
+msgid "Annette"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1242
+# addressbook/gui/widgets/e-addressbook-view.c:733
+#: my-evolution/Locations.h:101
+#, fuzzy
+msgid "Anniston"
+msgstr "阿富汗"
+
+#: my-evolution/Locations.h:102
+#, fuzzy
+msgid "Antalya"
+msgstr "義大利"
+
+# shell/e-shell-importer.c:490
+#: my-evolution/Locations.h:103
+#, fuzzy
+msgid "Antartica"
+msgstr "南極洲"
+
+#: my-evolution/Locations.h:104
+#, fuzzy
+msgid "Antigo"
+msgstr "安哥拉"
+
+#: my-evolution/Locations.h:105
+#, fuzzy
+msgid "Antigua"
+msgstr "安圭拉島"
+
+#: my-evolution/Locations.h:106
+#, fuzzy
+msgid "Antigua and Barbuda"
+msgstr "安地卡及巴布達"
+
+# addressbook/contact-editor/e-contact-editor.c:1242
+# addressbook/gui/widgets/e-addressbook-view.c:733
+#: my-evolution/Locations.h:107
+#, fuzzy
+msgid "Antofagasta"
+msgstr "阿富汗"
+
+#: my-evolution/Locations.h:108
+msgid "Antwerpen/Deurne"
+msgstr ""
+
+#: my-evolution/Locations.h:109
+msgid "Aomori Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:110
+#, fuzzy
+msgid "Apalachicola"
+msgstr "空間管理員"
+
+#: my-evolution/Locations.h:111
+msgid "Appleton"
+msgstr ""
+
+#: my-evolution/Locations.h:112
+#, fuzzy
+msgid "Aquadilla"
+msgstr "安圭拉島"
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:113
+#, fuzzy
+msgid "Aracaju"
+msgstr "澳門"
+
+#: my-evolution/Locations.h:114
+#, fuzzy
+msgid "Arad"
+msgstr "阿盧巴島"
+
+#: my-evolution/Locations.h:115
+#, fuzzy
+msgid "Arar"
+msgstr "阿盧巴島"
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:116
+#, fuzzy
+msgid "Araxos"
+msgstr "寮國"
+
+# shell/e-shell-importer.c:490
+#: my-evolution/Locations.h:117
+#, fuzzy
+msgid "Arcata"
+msgstr "南極洲"
+
+#: my-evolution/Locations.h:118
+msgid "Ardmore"
+msgstr ""
+
+#: my-evolution/Locations.h:119
+#, fuzzy
+msgid "Arequipa"
+msgstr "亞美尼亞"
+
+# calendar/gui/goto-dialog.glade.h:2
+#: my-evolution/Locations.h:121
+#, fuzzy
+msgid "Arica"
+msgstr "奧地利"
+
+# addressbook/printing/e-contact-print.glade.h:24
+#: my-evolution/Locations.h:122
+#, fuzzy
+msgid "Arizona"
+msgstr "阿根廷"
+
+#: my-evolution/Locations.h:123
+msgid "Arkansas"
+msgstr ""
+
+#: my-evolution/Locations.h:124
+msgid "Arkhangelsk"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:24
+#: my-evolution/Locations.h:125
+#, fuzzy
+msgid "Arlington"
+msgstr "紙張方向"
+
+# addressbook/printing/e-contact-print.glade.h:24
+#: my-evolution/Locations.h:126
+#, fuzzy
+msgid "Artigas"
+msgstr "阿根廷"
+
+#: my-evolution/Locations.h:127
+msgid "Asahikawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:128
+msgid "Asahikawa Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:129
+msgid "Ashburnam"
+msgstr ""
+
+#: my-evolution/Locations.h:130
+msgid "Asheville"
+msgstr ""
+
+# calendar/gui/calendar-model.c:1578
+#: my-evolution/Locations.h:131
+#, fuzzy
+msgid "Ashfield"
+msgstr "已指定"
+
+#: my-evolution/Locations.h:132
+msgid "Ashiya Ab"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:133
+#, fuzzy
+msgid "Ashland"
+msgstr "泰國"
+
+# calendar/gui/goto-dialog.glade.h:2
+#: my-evolution/Locations.h:134
+#, fuzzy
+msgid "Asia"
+msgstr "奧地利"
+
+# calendar/gui/e-day-view.c:3162
+# calendar/gui/e-week-view.c:3292
+# ui/evolution-calendar.xml.h:19
+# ui/evolution-message-composer.xml.h:11
+#: my-evolution/Locations.h:135
+#, fuzzy
+msgid "Aspen"
+msgstr "開啟"
+
+#: my-evolution/Locations.h:136
+#, fuzzy
+msgid "Asswan"
+msgstr "助理"
+
+# calendar/gui/goto-dialog.glade.h:2
+#: my-evolution/Locations.h:137
+#, fuzzy
+msgid "Astoria"
+msgstr "奧地利"
+
+#: my-evolution/Locations.h:138
+#, fuzzy
+msgid "Astrakhan"
+msgstr "澳大利亞"
+
+# calendar/gui/goto-dialog.glade.h:2
+#: my-evolution/Locations.h:139
+#, fuzzy
+msgid "Asturias"
+msgstr "奧地利"
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/Locations.h:140
+#, fuzzy
+msgid "Asuncion"
+msgstr "留尼旺"
+
+#: my-evolution/Locations.h:141
+#, fuzzy
+msgid "Athens"
+msgstr "附加檔案"
+
+#: my-evolution/Locations.h:142
+#, fuzzy
+msgid "Athinai"
+msgstr "中國"
+
+#: my-evolution/Locations.h:143
+#, fuzzy
+msgid "Atlanta"
+msgstr "阿爾巴尼亞"
+
+# shell/e-shell-importer.c:490
+#: my-evolution/Locations.h:144
+#, fuzzy
+msgid "Atlantic"
+msgstr "自動"
+
+#: my-evolution/Locations.h:145
+msgid "Atlantic City"
+msgstr ""
+
+#: my-evolution/Locations.h:146
+msgid "Atsugi US NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:147
+msgid "Auburn"
+msgstr ""
+
+#: my-evolution/Locations.h:148
+#, fuzzy
+msgid "Auckland"
+msgstr "冰島"
+
+#: my-evolution/Locations.h:149
+msgid "Augsburg"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:2
+#: my-evolution/Locations.h:150
+#, fuzzy
+msgid "Augusta"
+msgstr "8月"
+
+#: my-evolution/Locations.h:151
+#, fuzzy
+msgid "Aurora"
+msgstr "安道爾"
+
+# calendar/gui/goto-dialog.glade.h:2
+#: my-evolution/Locations.h:152
+#, fuzzy
+msgid "Austin"
+msgstr "奧地利"
+
+#: my-evolution/Locations.h:153
+#, fuzzy
+msgid "Australasia"
+msgstr "澳大利亞"
+
+#: my-evolution/Locations.h:156
+msgid "Avalon"
+msgstr ""
+
+#: my-evolution/Locations.h:157
+msgid "Aviano"
+msgstr ""
+
+#: my-evolution/Locations.h:158
+msgid "Ayacucho"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:177
+#: my-evolution/Locations.h:159
+#, fuzzy
+msgid "Bage"
+msgstr "基礎項目"
+
+#: my-evolution/Locations.h:160
+msgid "Bagotville"
+msgstr ""
+
+#: my-evolution/Locations.h:162
+msgid "Bahia Blanca"
+msgstr ""
+
+#: my-evolution/Locations.h:163
+msgid "Bahias de Huatulco"
+msgstr ""
+
+#: my-evolution/Locations.h:165
+msgid "Baker City"
+msgstr ""
+
+#: my-evolution/Locations.h:166
+msgid "Bakersfield"
+msgstr ""
+
+#: my-evolution/Locations.h:167
+msgid "Bale-Mulhouse"
+msgstr ""
+
+#: my-evolution/Locations.h:168
+msgid "Balikesir"
+msgstr ""
+
+#: my-evolution/Locations.h:169
+msgid "Balikesir/Bandirma"
+msgstr ""
+
+# addressbook/gui/component/addressbook.c:620
+#: my-evolution/Locations.h:170
+#, fuzzy
+msgid "Ball Mountain"
+msgstr "電郵地址包含"
+
+#: my-evolution/Locations.h:171
+#, fuzzy
+msgid "Baltimore"
+msgstr "波羅的海文"
+
+#: my-evolution/Locations.h:172
+msgid "Baltimore-Glen Burnie"
+msgstr ""
+
+#: my-evolution/Locations.h:173
+#, fuzzy
+msgid "Banak"
+msgstr "波札那"
+
+#: my-evolution/Locations.h:174
+#, fuzzy
+msgid "Bandarabbass"
+msgstr "巴貝多"
+
+#: my-evolution/Locations.h:175
+#, fuzzy
+msgid "Bangor"
+msgstr "前"
+
+#: my-evolution/Locations.h:176
+#, fuzzy
+msgid "Baracoa"
+msgstr "巴貝多"
+
+#: my-evolution/Locations.h:177
+msgid "Barbers Point"
+msgstr ""
+
+#: my-evolution/Locations.h:178
+#, fuzzy
+msgid "Barcelona"
+msgstr "馬其頓"
+
+#: my-evolution/Locations.h:179
+#, fuzzy
+msgid "Bardufoss"
+msgstr "巴貝多"
+
+#: my-evolution/Locations.h:180
+msgid "Bar Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:181
+#, fuzzy
+msgid "Bari"
+msgstr "巴林"
+
+#: my-evolution/Locations.h:182
+msgid "Bariloche"
+msgstr ""
+
+#: my-evolution/Locations.h:183
+#, fuzzy
+msgid "Barinas"
+msgstr "巴林"
+
+#: my-evolution/Locations.h:184
+#, fuzzy
+msgid "Barking Sand"
+msgstr "吹沙塵"
+
+# addressbook/gui/component/addressbook-config.c:177
+#: my-evolution/Locations.h:185
+#, fuzzy
+msgid "Barksdale"
+msgstr "基礎項目"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:186
+#, fuzzy
+msgid "Barnaul"
+msgstr "巴西"
+
+#: my-evolution/Locations.h:187
+msgid "Barquisimeto"
+msgstr ""
+
+#: my-evolution/Locations.h:188
+msgid "Barranquilla/Ernestocortissoz"
+msgstr ""
+
+#: my-evolution/Locations.h:189
+msgid "Barrow"
+msgstr ""
+
+#: my-evolution/Locations.h:190
+#, fuzzy
+msgid "Barter Island"
+msgstr "法羅群島"
+
+#: my-evolution/Locations.h:191
+msgid "Bartlesville"
+msgstr ""
+
+#: my-evolution/Locations.h:192
+msgid "Bartow"
+msgstr ""
+
+#: my-evolution/Locations.h:193
+#, fuzzy
+msgid "Bastia"
+msgstr "基本"
+
+#: my-evolution/Locations.h:194
+msgid "Batesville"
+msgstr ""
+
+#: my-evolution/Locations.h:195
+#, fuzzy
+msgid "Batman"
+msgstr "不丹"
+
+#: my-evolution/Locations.h:196
+msgid "Baton Rouge"
+msgstr ""
+
+#: my-evolution/Locations.h:197
+msgid "Battle Creek"
+msgstr ""
+
+# addressbook/gui/component/addressbook.c:619
+#: my-evolution/Locations.h:198
+#, fuzzy
+msgid "Battle Mountain"
+msgstr "姓名包含"
+
+#: my-evolution/Locations.h:199
+#, fuzzy
+msgid "Bauru"
+msgstr "諾魯"
+
+#: my-evolution/Locations.h:200
+#, fuzzy
+msgid "Bayamo"
+msgstr "巴哈馬"
+
+#: my-evolution/Locations.h:201
+msgid "Bayreuth"
+msgstr ""
+
+#: my-evolution/Locations.h:202
+#, fuzzy
+msgid "Beatrice"
+msgstr "波羅的海文"
+
+#: my-evolution/Locations.h:203
+msgid "Beaufort"
+msgstr ""
+
+#: my-evolution/Locations.h:204
+#, fuzzy
+msgid "Beaumont"
+msgstr "月"
+
+#: my-evolution/Locations.h:205
+msgid "Beaumont-Port Arthur"
+msgstr ""
+
+#: my-evolution/Locations.h:206
+msgid "Beauvais-Tille"
+msgstr ""
+
+#: my-evolution/Locations.h:207
+#, fuzzy
+msgid "Beauvechain"
+msgstr "巴林"
+
+# addressbook/printing/e-contact-print.glade.h:36
+#: my-evolution/Locations.h:208
+#, fuzzy
+msgid "Beckley"
+msgstr "貝里斯"
+
+# calendar/gui/event-editor-dialog.glade.h:34
+#: my-evolution/Locations.h:209
+#, fuzzy
+msgid "Bedford"
+msgstr "之前"
+
+# mail/mail-send-recv.c:306
+#: my-evolution/Locations.h:210
+#, fuzzy
+msgid "Beijing"
+msgstr "貝南"
+
+#: my-evolution/Locations.h:211
+#, fuzzy
+msgid "Beirut"
+msgstr "白俄羅斯"
+
+#: my-evolution/Locations.h:212
+msgid "Beja"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:36
+#: my-evolution/Locations.h:213
+#, fuzzy
+msgid "Belem"
+msgstr "貝里斯"
+
+#: my-evolution/Locations.h:214
+msgid "Belfast/Aldergrove"
+msgstr ""
+
+#: my-evolution/Locations.h:215
+msgid "Belfast/Harbour"
+msgstr ""
+
+#: my-evolution/Locations.h:217
+msgid "Belgorod"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:36
+#: my-evolution/Locations.h:219
+#, fuzzy
+msgid "Belleville"
+msgstr "貝里斯"
+
+#: my-evolution/Locations.h:220
+#, fuzzy
+msgid "Bellingham"
+msgstr "吹雹"
+
+#: my-evolution/Locations.h:221
+msgid "Belmar-Farmingdale"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:36
+#: my-evolution/Locations.h:222
+#, fuzzy
+msgid "Belo Horizonte"
+msgstr "貝里斯"
+
+#: my-evolution/Locations.h:223
+msgid "Belo Horizonte Apt"
+msgstr ""
+
+#: my-evolution/Locations.h:224
+msgid "Bemidji"
+msgstr ""
+
+#: my-evolution/Locations.h:225
+#, fuzzy
+msgid "Benbecula"
+msgstr "委內瑞拉"
+
+# mail/mail-send-recv.c:306
+#: my-evolution/Locations.h:226
+#, fuzzy
+msgid "Benina"
+msgstr "貝南"
+
+#: my-evolution/Locations.h:227
+msgid "Benton Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:228
+msgid "Bentonville"
+msgstr ""
+
+#: my-evolution/Locations.h:229
+#, fuzzy
+msgid "Beograd"
+msgstr "重新載入"
+
+#: my-evolution/Locations.h:230
+msgid "Bergamo"
+msgstr ""
+
+# mail/message-list.c:678
+#: my-evolution/Locations.h:231
+#, fuzzy
+msgid "Bergen"
+msgstr "已閱讀"
+
+#: my-evolution/Locations.h:232
+msgid "Bergstrom AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:233
+msgid "Berlevag"
+msgstr ""
+
+# mail/mail-send-recv.c:306
+#: my-evolution/Locations.h:234
+#, fuzzy
+msgid "Berlin"
+msgstr "貝南"
+
+#: my-evolution/Locations.h:235
+msgid "Berlin-Tegel"
+msgstr ""
+
+#: my-evolution/Locations.h:236
+msgid "Berlin-Tempelhof"
+msgstr ""
+
+# mail/mail-send-recv.c:306
+#: my-evolution/Locations.h:237
+#, fuzzy
+msgid "Bern"
+msgstr "貝南"
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: my-evolution/Locations.h:238
+#, fuzzy
+msgid "Bethel"
+msgstr "天氣"
+
+#: my-evolution/Locations.h:239
+msgid "Bethlehem Airport"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:36
+#: my-evolution/Locations.h:240
+#, fuzzy
+msgid "Bettles"
+msgstr "貝里斯"
+
+# calendar/gui/event-editor-dialog.glade.h:10
+#: my-evolution/Locations.h:241
+#, fuzzy
+msgid "Beverly"
+msgstr "每"
+
+#: my-evolution/Locations.h:242
+msgid "Biarritz-Bayonne"
+msgstr ""
+
+#: my-evolution/Locations.h:243
+msgid "Bicycle Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:244
+msgid "Biggin Hill"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+# addressbook/gui/widgets/e-addressbook-view.c:614
+# mail/message-browser.c:199
+# ui/evolution-addressbook.xml.h:9
+# ui/evolution-calendar.xml.h:23
+# ui/evolution-mail.xml.h:65
+# ui/evolution-tasks.xml.h:4
+#: my-evolution/Locations.h:245
+#, fuzzy
+msgid "Big Piney"
+msgstr "列印"
+
+#: my-evolution/Locations.h:246
+msgid "Big River Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:247
+msgid "Bilbao"
+msgstr ""
+
+#: my-evolution/Locations.h:248
+#, fuzzy
+msgid "Billings"
+msgstr "吹微塵"
+
+#: my-evolution/Locations.h:249
+msgid "Billund"
+msgstr ""
+
+#: my-evolution/Locations.h:250
+msgid "Binghamton"
+msgstr ""
+
+#: my-evolution/Locations.h:251
+msgid "Birmingham"
+msgstr ""
+
+#: my-evolution/Locations.h:252
+msgid "Bisha"
+msgstr ""
+
+#: my-evolution/Locations.h:253
+msgid "Bishop"
+msgstr ""
+
+#: my-evolution/Locations.h:254
+msgid "Bismark"
+msgstr ""
+
+#: my-evolution/Locations.h:255
+msgid "Blackpool"
+msgstr ""
+
+#: my-evolution/Locations.h:256
+msgid "Blagoveschensk"
+msgstr ""
+
+# widgets/misc/e-messagebox.c:159
+#: my-evolution/Locations.h:257
+#, fuzzy
+msgid "Blanding"
+msgstr "警告"
+
+#: my-evolution/Locations.h:258
+#, fuzzy
+msgid "Block Island"
+msgstr "科克群島"
+
+#: my-evolution/Locations.h:259
+msgid "Bloemfontein J. B. M. Hertzog "
+msgstr ""
+
+#: my-evolution/Locations.h:260
+#, fuzzy
+msgid "Bloomington"
+msgstr "吹沙塵"
+
+#: my-evolution/Locations.h:261
+msgid "Blue Canyon"
+msgstr ""
+
+#: my-evolution/Locations.h:262
+msgid "Bluefield"
+msgstr ""
+
+#: my-evolution/Locations.h:263
+msgid "Bluefields"
+msgstr ""
+
+#: my-evolution/Locations.h:264
+msgid "Blythe"
+msgstr ""
+
+#: my-evolution/Locations.h:265
+msgid "Boa Vista"
+msgstr ""
+
+#: my-evolution/Locations.h:266
+msgid "Bocas del Toro"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:4
+#: my-evolution/Locations.h:267
+#, fuzzy
+msgid "Bodo"
+msgstr "內文"
+
+#: my-evolution/Locations.h:268
+msgid "Bogota/Eldorado"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:177
+#: my-evolution/Locations.h:269
+#, fuzzy
+msgid "Boise"
+msgstr "基礎項目"
+
+#: my-evolution/Locations.h:271
+msgid "Bologna"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:272
+#, fuzzy
+msgid "Bolzano"
+msgstr "波蘭"
+
+#: my-evolution/Locations.h:273
+msgid "Bombay/Santacruz"
+msgstr ""
+
+# mail/mail-config.glade.h:25
+#: my-evolution/Locations.h:274
+#, fuzzy
+msgid "Boone"
+msgstr "完成"
+
+#: my-evolution/Locations.h:275
+msgid "Bordeaux"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:38
+#: my-evolution/Locations.h:276
+#, fuzzy
+msgid "Borger"
+msgstr "永遠"
+
+#: my-evolution/Locations.h:277
+msgid "Bornholm"
+msgstr ""
+
+#: my-evolution/Locations.h:278
+msgid "Boscombe Down"
+msgstr ""
+
+#: my-evolution/Locations.h:279
+#, fuzzy
+msgid "Bosnia-Herzegovina"
+msgstr "波士尼亞-赫芝格維納"
+
+#: my-evolution/Locations.h:280
+#, fuzzy
+msgid "Boston"
+msgstr "愛沙尼亞"
+
+# mail/subscribe-dialog.c:76
+# shell/e-storage-set-view.c:48
+#: my-evolution/Locations.h:281
+#, fuzzy
+msgid "Boulmer"
+msgstr "資料夾"
+
+# mail/mail-config.glade.h:75
+#: my-evolution/Locations.h:282
+#, fuzzy
+msgid "Bourges"
+msgstr "來源"
+
+#: my-evolution/Locations.h:283
+msgid "Bournemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:284
+#, fuzzy
+msgid "Bowling Green"
+msgstr "吹沙塵"
+
+#: my-evolution/Locations.h:285
+#, fuzzy
+msgid "Bozeman"
+msgstr "韓文"
+
+#: my-evolution/Locations.h:286
+#, fuzzy
+msgid "Bradford"
+msgstr "巴貝多"
+
+#: my-evolution/Locations.h:287
+msgid "Bradshaw Field"
+msgstr ""
+
+#: my-evolution/Locations.h:288
+#, fuzzy
+msgid "Brainerd"
+msgstr "烏克蘭"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:289
+#, fuzzy
+msgid "Brasilia"
+msgstr "巴西"
+
+#: my-evolution/Locations.h:290
+msgid "Brasschaat"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:291
+#, fuzzy
+msgid "Bratislava"
+msgstr "巴西"
+
+# mail/mail-config.glade.h:26
+#: my-evolution/Locations.h:292
+#, fuzzy
+msgid "Bratsk"
+msgstr "草稿"
+
+#: my-evolution/Locations.h:293
+msgid "Braunschweig"
+msgstr ""
+
+# mail/message-list.c:678
+#: my-evolution/Locations.h:295
+#, fuzzy
+msgid "Bremen"
+msgstr "葉門"
+
+#: my-evolution/Locations.h:296
+msgid "Bremerton"
+msgstr ""
+
+#: my-evolution/Locations.h:297
+#, fuzzy
+msgid "Brest"
+msgstr "西"
+
+#: my-evolution/Locations.h:298
+msgid "Bridgeport"
+msgstr ""
+
+#: my-evolution/Locations.h:299
+#, fuzzy
+msgid "Brindisi"
+msgstr "浦隆地"
+
+#: my-evolution/Locations.h:300
+msgid "Brisbane"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:301
+#, fuzzy
+msgid "Bristol"
+msgstr "巴西"
+
+#: my-evolution/Locations.h:302
+msgid "British Columbia"
+msgstr ""
+
+#: my-evolution/Locations.h:303
+msgid "Brno"
+msgstr ""
+
+#: my-evolution/Locations.h:304
+#, fuzzy
+msgid "Broadus"
+msgstr "巴貝多"
+
+#: my-evolution/Locations.h:305
+#, fuzzy
+msgid "Broken Bow"
+msgstr "裂雲"
+
+#: my-evolution/Locations.h:306
+msgid "Bronnoysund"
+msgstr ""
+
+# mail/mail-mt.c:516
+# mail/mail-mt.c:545
+# mail/mail-mt.c:880
+#: my-evolution/Locations.h:307
+#, fuzzy
+msgid "Brookings"
+msgstr "正在工作"
+
+#: my-evolution/Locations.h:308
+msgid "Brooksville"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:5
+#: my-evolution/Locations.h:309
+#, fuzzy
+msgid "Broome"
+msgstr "下："
+
+#: my-evolution/Locations.h:310
+msgid "Brownsville"
+msgstr ""
+
+#: my-evolution/Locations.h:311
+#, fuzzy
+msgid "Brunswick"
+msgstr "浦隆地"
+
+#: my-evolution/Locations.h:312
+msgid "Brussels-National Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:313
+msgid "Bryansk"
+msgstr ""
+
+# views/addressbook/galview.xml.h:2
+#: my-evolution/Locations.h:314
+#, fuzzy
+msgid "Bryce Canyon"
+msgstr "依公司"
+
+#: my-evolution/Locations.h:315
+msgid "Bucaramanga/Palonegro"
+msgstr ""
+
+#: my-evolution/Locations.h:316
+msgid "Bucuresti"
+msgstr ""
+
+#: my-evolution/Locations.h:317
+msgid "Bucuresti-Otopeni"
+msgstr ""
+
+#: my-evolution/Locations.h:318
+msgid "Budapest"
+msgstr ""
+
+#: my-evolution/Locations.h:319
+msgid "Buffalo"
+msgstr ""
+
+#: my-evolution/Locations.h:321
+msgid "Bullfrog"
+msgstr ""
+
+#: my-evolution/Locations.h:322
+#, fuzzy
+msgid "Burbank"
+msgstr "不丹"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: my-evolution/Locations.h:323
+#, fuzzy
+msgid "Burgas"
+msgstr "商務電話"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: my-evolution/Locations.h:324
+#, fuzzy
+msgid "Burley"
+msgstr "土耳其"
+
+#: my-evolution/Locations.h:325
+msgid "Burlington"
+msgstr ""
+
+#: my-evolution/Locations.h:326
+#, fuzzy
+msgid "Burnet"
+msgstr "浦隆地"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: my-evolution/Locations.h:327
+#, fuzzy
+msgid "Burns"
+msgstr "商務電話"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: my-evolution/Locations.h:328
+#, fuzzy
+msgid "Bursa"
+msgstr "商務電話"
+
+#: my-evolution/Locations.h:329
+msgid "Burwell"
+msgstr ""
+
+#: my-evolution/Locations.h:330
+msgid "Butte"
+msgstr ""
+
+#: my-evolution/Locations.h:331
+msgid "Caen-Carpiquet"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: my-evolution/Locations.h:332
+#, fuzzy
+msgid "Cagliari"
+msgstr "行事曆"
+
+# addressbook/contact-editor/e-contact-editor.c:1247
+#: my-evolution/Locations.h:333
+#, fuzzy
+msgid "Cairns"
+msgstr "主席"
+
+# addressbook/contact-editor/e-contact-editor.c:1247
+#: my-evolution/Locations.h:334
+#, fuzzy
+msgid "Cairo"
+msgstr "主席"
+
+#: my-evolution/Locations.h:335
+msgid "Calabozo"
+msgstr ""
+
+#: my-evolution/Locations.h:336
+msgid "Calcutta/Dum Dum"
+msgstr ""
+
+#: my-evolution/Locations.h:337
+msgid "Caldwell"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: my-evolution/Locations.h:338
+#, fuzzy
+msgid "Calgary"
+msgstr "清除"
+
+#: my-evolution/Locations.h:339
+msgid "Cali/Alfonso Bonillaaragon"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: my-evolution/Locations.h:340
+#, fuzzy
+msgid "Caliente"
+msgstr "行事曆"
+
+# ui/evolution-addressbook.xml.h:7
+#: my-evolution/Locations.h:341
+#, fuzzy
+msgid "California"
+msgstr "新喀里多尼亞島"
+
+#: my-evolution/Locations.h:342
+msgid "Calvi-Ste-Catherine"
+msgstr ""
+
+#: my-evolution/Locations.h:343
+#, fuzzy
+msgid "Camaguey"
+msgstr "巴拉圭"
+
+#: my-evolution/Locations.h:344
+msgid "Camarillo"
+msgstr ""
+
+#: my-evolution/Locations.h:345
+msgid "Cambridge"
+msgstr ""
+
+#: my-evolution/Locations.h:346
+#, fuzzy
+msgid "Cameron"
+msgstr "喀麥隆"
+
+# addressbook/contact-editor/e-contact-editor.c:1247
+#: my-evolution/Locations.h:347
+#, fuzzy
+msgid "Camiri"
+msgstr "主席"
+
+# camel/camel-filter-driver.c:694
+# camel/camel-filter-driver.c:793
+#: my-evolution/Locations.h:348
+#, fuzzy
+msgid "Campeche"
+msgstr "完成"
+
+#: my-evolution/Locations.h:349
+#, fuzzy
+msgid "Campinas"
+msgstr "柬埔寨王國"
+
+# ui/evolution-event-editor.xml.h:13
+# ui/evolution-mail.xml.h:8
+# ui/evolution-task-editor-dialog.xml.h:14
+#: my-evolution/Locations.h:350
+#, fuzzy
+msgid "Campo"
+msgstr "公司電話"
+
+#: my-evolution/Locations.h:351
+#, fuzzy
+msgid "Campo Grande"
+msgstr "維德角島"
+
+#: my-evolution/Locations.h:352
+msgid "Camp Stanley/H-207"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: my-evolution/Locations.h:353
+#, fuzzy
+msgid "Canaan"
+msgstr "加拿大"
+
+#: my-evolution/Locations.h:355
+msgid "Canarias/Fuerteventura"
+msgstr ""
+
+#: my-evolution/Locations.h:356
+msgid "Canarias/Gran Canaria"
+msgstr ""
+
+#: my-evolution/Locations.h:357
+msgid "Canarias/Hierro"
+msgstr ""
+
+#: my-evolution/Locations.h:358
+msgid "Canarias/Lanzarote"
+msgstr ""
+
+#: my-evolution/Locations.h:359
+msgid "Canarias/La Palma"
+msgstr ""
+
+#: my-evolution/Locations.h:360
+msgid "Canarias/Tenerife Norte"
+msgstr ""
+
+#: my-evolution/Locations.h:361
+msgid "Canarias/Tenerife Sur"
+msgstr ""
+
+#: my-evolution/Locations.h:362
+msgid "Canberra"
+msgstr ""
+
+# ui/evolution-mail.xml.h:2
+#: my-evolution/Locations.h:363
+#, fuzzy
+msgid "Cancun"
+msgstr "取消"
+
+#: my-evolution/Locations.h:364
+msgid "Cannes-Mandelieu"
+msgstr ""
+
+# ui/evolution-mail.xml.h:2
+#: my-evolution/Locations.h:365
+#, fuzzy
+msgid "Cantwell"
+msgstr "取消"
+
+#: my-evolution/Locations.h:366
+#, fuzzy
+msgid "Cape Girardeau"
+msgstr "維德角島"
+
+#: my-evolution/Locations.h:367
+#, fuzzy
+msgid "Cape Hatteras"
+msgstr "維德角島"
+
+# addressbook/printing/e-contact-print.glade.h:28
+#: my-evolution/Locations.h:368
+#, fuzzy
+msgid "Cape Lisburne"
+msgstr "紙張來源："
+
+#: my-evolution/Locations.h:369
+#, fuzzy
+msgid "Cape Newenham"
+msgstr "維德角島"
+
+#: my-evolution/Locations.h:370
+msgid "Cape Romanzoff"
+msgstr ""
+
+#: my-evolution/Locations.h:371
+msgid "Cape Town D. F. Malan "
+msgstr ""
+
+#: my-evolution/Locations.h:372
+msgid "Capitan Corbeta"
+msgstr ""
+
+#: my-evolution/Locations.h:373
+#, fuzzy
+msgid "Capo Mele"
+msgstr "維德角島"
+
+#: my-evolution/Locations.h:374
+msgid "Caracas La Carlota"
+msgstr ""
+
+#: my-evolution/Locations.h:375
+msgid "Caracas Maiquetia"
+msgstr ""
+
+# ui/evolution-mail.xml.h:2
+#: my-evolution/Locations.h:376
+#, fuzzy
+msgid "Caravelas"
+msgstr "取消工作"
+
+#: my-evolution/Locations.h:377
+#, fuzzy
+msgid "Carbondale"
+msgstr "柬埔寨王國"
+
+# addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: my-evolution/Locations.h:378
+#, fuzzy
+msgid "Cardiff"
+msgstr "名片檢視模式"
+
+# addressbook/contact-editor/e-contact-editor.c:1247
+#: my-evolution/Locations.h:379
+#, fuzzy
+msgid "Caribou"
+msgstr "汽車電話"
+
+# mail/mail-accounts.c:197
+#: my-evolution/Locations.h:380
+#, fuzzy
+msgid "Carlisle"
+msgstr "變數"
+
+# addressbook/contact-editor/e-contact-editor.c:1246
+#: my-evolution/Locations.h:381
+#, fuzzy
+msgid "Carlsbad"
+msgstr "回撥電話"
+
+# addressbook/contact-editor/e-contact-editor.c:1247
+#: my-evolution/Locations.h:382
+#, fuzzy
+msgid "Carroll"
+msgstr "汽車電話"
+
+#: my-evolution/Locations.h:383
+msgid "Cartagena/Rafael Nunez"
+msgstr ""
+
+#: my-evolution/Locations.h:384
+msgid "Casa Granda"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:18
+#: my-evolution/Locations.h:385
+#, fuzzy
+msgid "Cascade"
+msgstr "橫向"
+
+# addressbook/printing/e-contact-print.glade.h:27
+#: my-evolution/Locations.h:386
+#, fuzzy
+msgid "Casper"
+msgstr "使用紙張"
+
+#: my-evolution/Locations.h:387
+#, fuzzy
+msgid "Catacamas"
+msgstr "巴哈馬"
+
+#: my-evolution/Locations.h:388
+#, fuzzy
+msgid "Catania"
+msgstr "克羅埃西亞"
+
+#: my-evolution/Locations.h:390
+msgid "Cayo Largo del Sur"
+msgstr ""
+
+#: my-evolution/Locations.h:391
+msgid "Cazaux"
+msgstr ""
+
+#: my-evolution/Locations.h:392
+msgid "Cecil NAS"
+msgstr ""
+
+# ui/evolution-event-editor.xml.h:8
+# ui/evolution-task-editor-dialog.xml.h:9
+#: my-evolution/Locations.h:393
+#, fuzzy
+msgid "Cedar City"
+msgstr "晴天"
+
+#: my-evolution/Locations.h:394
+msgid "Cedar Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:395
+msgid "Central and South America"
+msgstr ""
+
+#: my-evolution/Locations.h:396
+#, fuzzy
+msgid "Cervia"
+msgstr "阿爾及利亞"
+
+#: my-evolution/Locations.h:397
+msgid "Chacarita"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1247
+#: my-evolution/Locations.h:398
+#, fuzzy
+msgid "Chadron"
+msgstr "查德"
+
+# addressbook/contact-editor/e-contact-editor.c:1247
+#: my-evolution/Locations.h:399
+#, fuzzy
+msgid "Challis"
+msgstr "主席"
+
+#: my-evolution/Locations.h:400
+#, fuzzy
+msgid "Chamberlain"
+msgstr "喀麥隆"
+
+#: my-evolution/Locations.h:401
+#, fuzzy
+msgid "Chambery"
+msgstr "喀麥隆"
+
+# addressbook/contact-editor/e-contact-editor.c:1248
+#: my-evolution/Locations.h:402
+#, fuzzy
+msgid "Champaign"
+msgstr "公司電話"
+
+# calendar/gui/e-itip-control.glade.h:4
+#: my-evolution/Locations.h:403
+#, fuzzy
+msgid "Chandalar Lake"
+msgstr "行事曆訊息"
+
+# addressbook/contact-editor/e-contact-editor.c:1247
+#: my-evolution/Locations.h:404
+#, fuzzy
+msgid "Chandler"
+msgstr "查德"
+
+#: my-evolution/Locations.h:405
+#, fuzzy
+msgid "Chania"
+msgstr "中國"
+
+# ui/evolution-mail.xml.h:2
+#: my-evolution/Locations.h:406
+#, fuzzy
+msgid "Chanute"
+msgstr "取消"
+
+#: my-evolution/Locations.h:407
+#, fuzzy
+msgid "Chariton"
+msgstr "喀麥隆"
+
+#: my-evolution/Locations.h:408
+msgid "Charleroi-Brussels South"
+msgstr ""
+
+#: my-evolution/Locations.h:409
+msgid "Charles City"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:712
+#: my-evolution/Locations.h:410
+#, fuzzy
+msgid "Charleston"
+msgstr "主席"
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:411
+#, fuzzy
+msgid "Charlotte"
+msgstr "美亞特"
+
+#: my-evolution/Locations.h:412
+msgid "Charlottesville"
+msgstr ""
+
+#: my-evolution/Locations.h:413
+msgid "Chatham"
+msgstr ""
+
+#: my-evolution/Locations.h:414
+msgid "Chattanooga"
+msgstr ""
+
+#: my-evolution/Locations.h:415
+msgid "Cheboksary"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:150
+#: my-evolution/Locations.h:416
+#, fuzzy
+msgid "Cheju"
+msgstr "智利"
+
+#: my-evolution/Locations.h:417
+msgid "Chelyabinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:418
+msgid "Chengdu"
+msgstr ""
+
+#: my-evolution/Locations.h:419
+#, fuzzy
+msgid "Cherbourg"
+msgstr "盧森堡"
+
+# addressbook/gui/widgets/e-addressbook-view.c:718
+#: my-evolution/Locations.h:420
+#, fuzzy
+msgid "Cherry Point"
+msgstr "其它電話"
+
+#: my-evolution/Locations.h:421
+msgid "Chetumal"
+msgstr ""
+
+#: my-evolution/Locations.h:422
+msgid "Cheyenne"
+msgstr ""
+
+#: my-evolution/Locations.h:423
+msgid "Chiang Kai Shek"
+msgstr ""
+
+#: my-evolution/Locations.h:424
+msgid "Chia Tung"
+msgstr ""
+
+#: my-evolution/Locations.h:425
+#, fuzzy
+msgid "Chiayi"
+msgstr "中國"
+
+#: my-evolution/Locations.h:426
+msgid "Chicago-DuPage"
+msgstr ""
+
+#: my-evolution/Locations.h:427
+msgid "Chicago-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:428
+msgid "Chicago-Midway"
+msgstr ""
+
+#: my-evolution/Locations.h:429
+msgid "Chicago-O'Hare"
+msgstr ""
+
+#: my-evolution/Locations.h:430
+msgid "Chichijima"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:150
+#: my-evolution/Locations.h:431
+#, fuzzy
+msgid "Chiclayo"
+msgstr "智利"
+
+# addressbook/contact-editor/e-contact-editor.c:1247
+#: my-evolution/Locations.h:432
+#, fuzzy
+msgid "Chico"
+msgstr "主席"
+
+#: my-evolution/Locations.h:433
+msgid "Chicopee Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:434
+#, fuzzy
+msgid "Chievres"
+msgstr "中文"
+
+#: my-evolution/Locations.h:435
+#, fuzzy
+msgid "Chihhang"
+msgstr "中國"
+
+#: my-evolution/Locations.h:436
+msgid "Chihuahua"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:150
+#: my-evolution/Locations.h:437
+#, fuzzy
+msgid "Childress"
+msgstr "智利"
+
+#: my-evolution/Locations.h:439
+#, fuzzy
+msgid "China Lake"
+msgstr "中國"
+
+#: my-evolution/Locations.h:440
+#, fuzzy
+msgid "Chinandega"
+msgstr "中國"
+
+#: my-evolution/Locations.h:441
+msgid "Chinmem/Shatou"
+msgstr ""
+
+#: my-evolution/Locations.h:442
+#, fuzzy
+msgid "Chino"
+msgstr "中國"
+
+#: my-evolution/Locations.h:443
+msgid "Chippewa County"
+msgstr ""
+
+#: my-evolution/Locations.h:444
+#, fuzzy
+msgid "Chita"
+msgstr "中國"
+
+#: my-evolution/Locations.h:445
+msgid "Chitose Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:446
+msgid "Chitose ASDF"
+msgstr ""
+
+#: my-evolution/Locations.h:447
+msgid "Chofu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:448
+msgid "Choluteca"
+msgstr ""
+
+#: my-evolution/Locations.h:449
+msgid "Chongju Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:450
+msgid "Christchurch"
+msgstr ""
+
+#: my-evolution/Locations.h:452
+#, fuzzy
+msgid "Chulitna"
+msgstr "中國"
+
+#: my-evolution/Locations.h:453
+msgid "Churchill"
+msgstr ""
+
+#: my-evolution/Locations.h:454
+msgid "Churchill Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:455
+msgid "Cincinnati"
+msgstr ""
+
+#: my-evolution/Locations.h:456
+msgid "Circle City"
+msgstr ""
+
+#: my-evolution/Locations.h:457
+msgid "Ciudad Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:458
+msgid "Ciudad del Carmen"
+msgstr ""
+
+#: my-evolution/Locations.h:459
+msgid "Ciudad Juarez"
+msgstr ""
+
+#: my-evolution/Locations.h:460
+msgid "Ciudad Obregon"
+msgstr ""
+
+#: my-evolution/Locations.h:461
+msgid "Ciudad Victoria"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: my-evolution/Locations.h:462
+#, fuzzy
+msgid "Clarinda"
+msgstr "加拿大"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: my-evolution/Locations.h:463
+#, fuzzy
+msgid "Clarion"
+msgstr "清除"
+
+#: my-evolution/Locations.h:464
+msgid "Clarksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:465
+msgid "Clayton"
+msgstr ""
+
+#: my-evolution/Locations.h:466
+msgid "Clayton Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:467
+msgid "Clermont-Ferrand"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:468
+#, fuzzy
+msgid "Cleveland"
+msgstr "格陵蘭"
+
+#: my-evolution/Locations.h:469
+msgid "Cleveland/Cuyahoga"
+msgstr ""
+
+#: my-evolution/Locations.h:470
+msgid "Cleveland-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:471
+msgid "Clinton"
+msgstr ""
+
+#: my-evolution/Locations.h:472
+msgid "Clovis-Cannon AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:473
+#, fuzzy
+msgid "Cobija"
+msgstr "哥倫比亞"
+
+#: my-evolution/Locations.h:474
+msgid "Cochabamba"
+msgstr ""
+
+#: my-evolution/Locations.h:475
+msgid "Cocoa Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:476
+#, fuzzy
+msgid "Cocos Island"
+msgstr "科克群島"
+
+# addressbook/printing/e-contact-print.glade.h:4
+#: my-evolution/Locations.h:477
+#, fuzzy
+msgid "Cody"
+msgstr "內文"
+
+#: my-evolution/Locations.h:478
+msgid "Coeur d'Alene"
+msgstr ""
+
+# ui/evolution.xml.h:51
+#: my-evolution/Locations.h:479
+#, fuzzy
+msgid "Cold Bay"
+msgstr "資料夾清單(_F)"
+
+#: my-evolution/Locations.h:480
+#, fuzzy
+msgid "Colima"
+msgstr "哥倫比亞"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:744
+#: my-evolution/Locations.h:481
+#, fuzzy
+msgid "College Station"
+msgstr "所有站臺(_L)："
+
+#: my-evolution/Locations.h:482
+msgid "Colmar-Meyenheim"
+msgstr ""
+
+#: my-evolution/Locations.h:484
+#, fuzzy
+msgid "Colonia"
+msgstr "哥倫比亞"
+
+#: my-evolution/Locations.h:485
+#, fuzzy
+msgid "Colorado"
+msgstr "龍捲風"
+
+#: my-evolution/Locations.h:486
+msgid "Colorado Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:487
+#, fuzzy
+msgid "Columbia"
+msgstr "哥倫比亞"
+
+#: my-evolution/Locations.h:488
+msgid "Columbia-McEntire"
+msgstr ""
+
+#: my-evolution/Locations.h:489
+#, fuzzy
+msgid "Columbus"
+msgstr "哥倫比亞"
+
+#: my-evolution/Locations.h:490
+msgid "Columbus-Fort Benning"
+msgstr ""
+
+#: my-evolution/Locations.h:491
+msgid "Columbus-Gahanna"
+msgstr ""
+
+#: my-evolution/Locations.h:492
+msgid "Columbus-OSU"
+msgstr ""
+
+#: my-evolution/Locations.h:493
+msgid "Columbus-W Point-Starkville"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:150
+#: my-evolution/Locations.h:494
+#, fuzzy
+msgid "Colville"
+msgstr "智利"
+
+#: my-evolution/Locations.h:495
+msgid "Comodoro Rivadavia"
+msgstr ""
+
+# mail/local-config.glade.h:8
+#: my-evolution/Locations.h:496
+#, fuzzy
+msgid "Comox"
+msgstr "mbox"
+
+#: my-evolution/Locations.h:497
+msgid "Conceicao Do Araguaia"
+msgstr ""
+
+# calendar/gui/e-itip-control.c:883
+#: my-evolution/Locations.h:498
+#, fuzzy
+msgid "Concepcion"
+msgstr "取消行動"
+
+# mail/mail-ops.c:917
+#: my-evolution/Locations.h:499
+#, fuzzy
+msgid "Concord"
+msgstr "剛果共和國"
+
+#: my-evolution/Locations.h:500
+msgid "Concordia"
+msgstr ""
+
+#: my-evolution/Locations.h:501
+msgid "Connaught"
+msgstr ""
+
+# ui/evolution-addressbook.xml.h:17
+#: my-evolution/Locations.h:502
+#, fuzzy
+msgid "Connecticut"
+msgstr "連絡人(_C)"
+
+# mail/mail-ops.c:917
+#: my-evolution/Locations.h:503
+#, fuzzy
+msgid "Conroe"
+msgstr "剛果共和國"
+
+#: my-evolution/Locations.h:504
+#, fuzzy
+msgid "Constantine"
+msgstr "包含(_O)："
+
+#: my-evolution/Locations.h:505
+msgid "Copper Harbor"
+msgstr ""
+
+#: my-evolution/Locations.h:506
+#, fuzzy
+msgid "Cordoba"
+msgstr "哥倫比亞"
+
+#: my-evolution/Locations.h:507
+#, fuzzy
+msgid "Cordova"
+msgstr "約旦"
+
+#: my-evolution/Locations.h:508
+msgid "Cork"
+msgstr ""
+
+# ui/evolution-mail.xml.h:5
+#: my-evolution/Locations.h:509
+#, fuzzy
+msgid "Coro"
+msgstr "葛摩"
+
+# ui/evolution-mail.xml.h:5
+#: my-evolution/Locations.h:510
+#, fuzzy
+msgid "Corona"
+msgstr "葛摩"
+
+#: my-evolution/Locations.h:511
+msgid "Corpus Christi"
+msgstr ""
+
+#: my-evolution/Locations.h:512
+msgid "Corpus Christi NAS"
+msgstr ""
+
+# calendar/gui/event-editor.c:754
+#: my-evolution/Locations.h:513
+#, fuzzy
+msgid "Corrientes"
+msgstr "出現"
+
+#: my-evolution/Locations.h:514
+#, fuzzy
+msgid "Corsicana"
+msgstr "哥斯大黎加"
+
+# addressbook/gui/widgets/e-addressbook-view.c:736
+#: my-evolution/Locations.h:515
+#, fuzzy
+msgid "Cortez"
+msgstr "備註"
+
+#: my-evolution/Locations.h:516
+#, fuzzy
+msgid "Corumba"
+msgstr "古巴"
+
+#: my-evolution/Locations.h:518
+msgid "Cotulla"
+msgstr ""
+
+#: my-evolution/Locations.h:519
+msgid "Council Bluffs"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:4
+#: my-evolution/Locations.h:520
+#, fuzzy
+msgid "Coventry"
+msgstr "國家 (_Y)："
+
+# mail/mail-ops.c:917
+#: my-evolution/Locations.h:521
+#, fuzzy
+msgid "Covington"
+msgstr "剛果共和國"
+
+#: my-evolution/Locations.h:522
+msgid "Cozumel"
+msgstr ""
+
+#: my-evolution/Locations.h:523
+#, fuzzy
+msgid "Craig"
+msgstr "克羅埃西亞"
+
+# ui/evolution-mail.xml.h:2
+#: my-evolution/Locations.h:524
+#, fuzzy
+msgid "Cranfield"
+msgstr "取消"
+
+#: my-evolution/Locations.h:525
+msgid "Crescent City"
+msgstr ""
+
+# widgets/misc/e-messagebox.c:173
+#: my-evolution/Locations.h:526
+#, fuzzy
+msgid "Creston"
+msgstr "問題"
+
+# calendar/gui/event-editor-dialog.glade.h:15
+#: my-evolution/Locations.h:527
+#, fuzzy
+msgid "Crestview"
+msgstr "預覽"
+
+#: my-evolution/Locations.h:529
+msgid "Cross City"
+msgstr ""
+
+#: my-evolution/Locations.h:530
+msgid "Crossville"
+msgstr ""
+
+#: my-evolution/Locations.h:531
+#, fuzzy
+msgid "Crotone"
+msgstr "喀麥隆"
+
+#: my-evolution/Locations.h:533
+#, fuzzy
+msgid "Cuba Awrs"
+msgstr "古巴"
+
+#: my-evolution/Locations.h:534
+msgid "Cuernavaca"
+msgstr ""
+
+#: my-evolution/Locations.h:535
+#, fuzzy
+msgid "Cuiaba"
+msgstr "古巴"
+
+# 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:5
+#: my-evolution/Locations.h:536
+#, fuzzy
+msgid "Culdrose"
+msgstr "關閉"
+
+#: my-evolution/Locations.h:537
+msgid "Culiacan"
+msgstr ""
+
+#: my-evolution/Locations.h:538
+#, fuzzy
+msgid "Cumana"
+msgstr "蓋亞納"
+
+#: my-evolution/Locations.h:539
+msgid "Cumberland"
+msgstr ""
+
+#: my-evolution/Locations.h:540
+#, fuzzy
+msgid "Curitiba"
+msgstr "茅利塔尼亞"
+
+#: my-evolution/Locations.h:541
+msgid "Curitiba Apt"
+msgstr ""
+
+# ui/evolution-event-editor.xml.h:15
+# ui/evolution-task-editor-dialog.xml.h:16
+#: my-evolution/Locations.h:542
+#, fuzzy
+msgid "Custer"
+msgstr "剪下"
+
+#: my-evolution/Locations.h:543
+msgid "Cut Bank"
+msgstr ""
+
+#: my-evolution/Locations.h:544
+msgid "Cuzco"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:547
+#, fuzzy
+msgid "Dagali"
+msgstr "馬利"
+
+#: my-evolution/Locations.h:548
+msgid "Daggett"
+msgstr ""
+
+#: my-evolution/Locations.h:549
+msgid "Dalhart"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:550
+#, fuzzy
+msgid "Dalian"
+msgstr "臺灣"
+
+#: my-evolution/Locations.h:551
+msgid "Dallas-Addison"
+msgstr ""
+
+#: my-evolution/Locations.h:552
+msgid "Dallas-Fort Worth"
+msgstr ""
+
+#: my-evolution/Locations.h:553
+msgid "Dallas-Love Field"
+msgstr ""
+
+#: my-evolution/Locations.h:554
+msgid "Dallas-Redbird"
+msgstr ""
+
+#: my-evolution/Locations.h:555
+msgid "Da Nang"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:7
+#: my-evolution/Locations.h:556
+#, fuzzy
+msgid "Danbury"
+msgstr "1月"
+
+#: my-evolution/Locations.h:557
+msgid "Danville"
+msgstr ""
+
+#: my-evolution/Locations.h:558
+msgid "Dar-El-Beida"
+msgstr ""
+
+#: my-evolution/Locations.h:559
+msgid "Davenport"
+msgstr ""
+
+#: my-evolution/Locations.h:560
+msgid "David"
+msgstr ""
+
+#: my-evolution/Locations.h:561
+msgid "Dawadmi"
+msgstr ""
+
+# ui/evolution-calendar.xml.h:7
+#: my-evolution/Locations.h:562
+#, fuzzy
+msgid "Dayton"
+msgstr "天"
+
+#: my-evolution/Locations.h:563
+msgid "Daytona Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:564
+msgid "Dayton-Fairborn"
+msgstr ""
+
+# shell/e-shortcuts-view.c:265
+#: my-evolution/Locations.h:565
+#, fuzzy
+msgid "Dayton-South Airport"
+msgstr "不要匯入"
+
+#: my-evolution/Locations.h:566
+msgid "Dead Horse"
+msgstr ""
+
+#: my-evolution/Locations.h:567
+msgid "Deauville-Saint-Gatien"
+msgstr ""
+
+#: my-evolution/Locations.h:568
+msgid "Decatur"
+msgstr ""
+
+#: my-evolution/Locations.h:569
+msgid "Decimomannu"
+msgstr ""
+
+#: my-evolution/Locations.h:570
+msgid "Decorah"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+# addressbook/gui/widgets/e-addressbook-view.c:616
+# calendar/gui/e-meeting-dialog.glade.h:8
+# calendar/gui/event-editor-dialog.glade.h:9
+# mail/mail-config.glade.h:23
+# mail/message-browser.c:202
+# ui/evolution-addressbook.xml.h:3
+# ui/evolution-event-editor.xml.h:17
+# ui/evolution-mail.xml.h:22
+# ui/evolution-task-editor-dialog.xml.h:18
+#: my-evolution/Locations.h:571
+#, fuzzy
+msgid "Deelen"
+msgstr "刪除"
+
+#: my-evolution/Locations.h:572
+msgid "Dekalb/Peachtree"
+msgstr ""
+
+#: my-evolution/Locations.h:573
+msgid "Delaware"
+msgstr ""
+
+#: my-evolution/Locations.h:574
+msgid "Del Bajio"
+msgstr ""
+
+#: my-evolution/Locations.h:575
+msgid "Del Rio"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+# addressbook/gui/widgets/e-addressbook-view.c:616
+# calendar/gui/e-meeting-dialog.glade.h:8
+# calendar/gui/event-editor-dialog.glade.h:9
+# mail/mail-config.glade.h:23
+# mail/message-browser.c:202
+# ui/evolution-addressbook.xml.h:3
+# ui/evolution-event-editor.xml.h:17
+# ui/evolution-mail.xml.h:22
+# ui/evolution-task-editor-dialog.xml.h:18
+#: my-evolution/Locations.h:576
+#, fuzzy
+msgid "Delta"
+msgstr "刪除"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: my-evolution/Locations.h:577
+#, fuzzy
+msgid "Deming"
+msgstr "會議"
+
+#: my-evolution/Locations.h:578
+msgid "Den Helder/De Kooy"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/Locations.h:579
+#, fuzzy
+msgid "Denison"
+msgstr "留尼旺"
+
+#: my-evolution/Locations.h:581
+#, fuzzy
+msgid "Denton"
+msgstr "黎巴嫩"
+
+# calendar/gui/event-editor-dialog.glade.h:10
+#: my-evolution/Locations.h:582
+#, fuzzy
+msgid "Denver"
+msgstr "每"
+
+#: my-evolution/Locations.h:583
+msgid "Denver-Aurora"
+msgstr ""
+
+#: my-evolution/Locations.h:584
+msgid "Denver-Broomfield"
+msgstr ""
+
+#: my-evolution/Locations.h:585
+msgid "Denver-Cherry Knolls"
+msgstr ""
+
+#: my-evolution/Locations.h:586
+msgid "Desert Rock"
+msgstr ""
+
+# addressbook/backend/ebook/e-card.c:3434
+#: my-evolution/Locations.h:587
+#, fuzzy
+msgid "Des Moines"
+msgstr "時區"
+
+# widgets/misc/e-messagebox.c:173
+#: my-evolution/Locations.h:588
+#, fuzzy
+msgid "Destin"
+msgstr "問題"
+
+#: my-evolution/Locations.h:589
+msgid "Detroit"
+msgstr ""
+
+#: my-evolution/Locations.h:590
+msgid "Detroit Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:591
+msgid "Detroit-Taylor"
+msgstr ""
+
+#: my-evolution/Locations.h:592
+msgid "Detroit/Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:593
+msgid "Devils Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:594
+msgid "Devils Lake (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:595
+#, fuzzy
+msgid "Dhahran"
+msgstr "巴林"
+
+# addressbook/printing/e-contact-print.glade.h:6
+#: my-evolution/Locations.h:596
+#, fuzzy
+msgid "Dickinson"
+msgstr "尺寸："
+
+# mail/mail-config.glade.h:25
+#: my-evolution/Locations.h:597
+#, fuzzy
+msgid "Dijon"
+msgstr "完成"
+
+#: my-evolution/Locations.h:598
+#, fuzzy
+msgid "Dillingham"
+msgstr "漂雹"
+
+# mail/mail-config.glade.h:25
+#: my-evolution/Locations.h:599
+#, fuzzy
+msgid "Dillon"
+msgstr "完成"
+
+# ui/evolution-calendar.xml.h:25
+#: my-evolution/Locations.h:600
+#, fuzzy
+msgid "Dinard"
+msgstr "列印名片"
+
+#: my-evolution/Locations.h:601
+msgid "District of Columbia"
+msgstr ""
+
+#: my-evolution/Locations.h:602
+msgid "Diyarbakir"
+msgstr ""
+
+#: my-evolution/Locations.h:603
+msgid "Dnipropetrovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:604
+msgid "Dobbiaco"
+msgstr ""
+
+#: my-evolution/Locations.h:605
+msgid "Dodge City"
+msgstr ""
+
+#: my-evolution/Locations.h:606
+msgid "Doha"
+msgstr ""
+
+#: my-evolution/Locations.h:607
+#, fuzzy
+msgid "Dole"
+msgstr "角色"
+
+# mail/mail-config.glade.h:25
+#: my-evolution/Locations.h:609
+#, fuzzy
+msgid "Donetsk"
+msgstr "完成"
+
+# ui/evolution-calendar.xml.h:34
+# widgets/misc/e-cell-date-edit.c:229
+# widgets/misc/e-dateedit.c:424
+#: my-evolution/Locations.h:610
+#, fuzzy
+msgid "Dongsha"
+msgstr "東加"
+
+#: my-evolution/Locations.h:611
+msgid "Dongshi"
+msgstr ""
+
+#: my-evolution/Locations.h:612
+#, fuzzy
+msgid "Don Torcuato"
+msgstr "到期或之後"
+
+#: my-evolution/Locations.h:613
+msgid "Dortmund-Wickede"
+msgstr ""
+
+# mail/mail-config.glade.h:25
+#: my-evolution/Locations.h:614
+#, fuzzy
+msgid "Dothan"
+msgstr "完成"
+
+#: my-evolution/Locations.h:615
+msgid "Douglas"
+msgstr ""
+
+# ui/evolution-mail.xml.h:55
+#: my-evolution/Locations.h:616
+#, fuzzy
+msgid "Dover"
+msgstr "移動"
+
+#: my-evolution/Locations.h:617
+msgid "Dresden-Klotzsche"
+msgstr ""
+
+#: my-evolution/Locations.h:618
+msgid "Drummond"
+msgstr ""
+
+#: my-evolution/Locations.h:619
+#, fuzzy
+msgid "Dubai"
+msgstr "古巴"
+
+#: my-evolution/Locations.h:620
+msgid "Dubbo"
+msgstr ""
+
+# calendar/gui/calendar-model.c:360
+# calendar/gui/calendar-model.c:898
+# calendar/gui/e-calendar-table.c:323
+#: my-evolution/Locations.h:621
+#, fuzzy
+msgid "Dublin"
+msgstr "公開"
+
+#: my-evolution/Locations.h:622
+msgid "Du Bois"
+msgstr ""
+
+#: my-evolution/Locations.h:623
+msgid "Dubrovnik"
+msgstr ""
+
+#: my-evolution/Locations.h:624
+msgid "Dubuque"
+msgstr ""
+
+# ui/evolution-calendar.xml.h:7
+#: my-evolution/Locations.h:625
+#, fuzzy
+msgid "Dugway"
+msgstr "天"
+
+# mail/mail-config.glade.h:21
+#: my-evolution/Locations.h:626
+#, fuzzy
+msgid "Duluth"
+msgstr "預設值(_F)"
+
+# mail/mail-config.glade.h:25
+#: my-evolution/Locations.h:627
+#, fuzzy
+msgid "Dundee"
+msgstr "完成"
+
+#: my-evolution/Locations.h:628
+#, fuzzy
+msgid "Durango"
+msgstr "前"
+
+#: my-evolution/Locations.h:629
+msgid "Durango Awrs"
+msgstr ""
+
+#: my-evolution/Locations.h:630
+msgid "Durazno"
+msgstr ""
+
+#: my-evolution/Locations.h:631
+msgid "Durban Louis Botha "
+msgstr ""
+
+#: my-evolution/Locations.h:632
+#, fuzzy
+msgid "Dusseldorf"
+msgstr "塵暴"
+
+#: my-evolution/Locations.h:633
+msgid "Dutch Harbor"
+msgstr ""
+
+# ui/evolution-event-editor.xml.h:56
+# ui/evolution-message-composer.xml.h:44
+# ui/evolution-task-editor-dialog.xml.h:68
+#: my-evolution/Locations.h:634
+#, fuzzy
+msgid "Dyersburg"
+msgstr "除錯(_D)"
+
+# mail/mail-accounts.c:199
+# mail/mail-config.glade.h:30
+#: my-evolution/Locations.h:635
+#, fuzzy
+msgid "Eagle"
+msgstr "啟用"
+
+#: my-evolution/Locations.h:636
+msgid "Eagle Range"
+msgstr ""
+
+#: my-evolution/Locations.h:637
+msgid "East London"
+msgstr ""
+
+#: my-evolution/Locations.h:638
+msgid "East Midlands"
+msgstr ""
+
+#: my-evolution/Locations.h:639
+#, fuzzy
+msgid "East St Louis"
+msgstr "東南東"
+
+#: my-evolution/Locations.h:640
+msgid "Eau Claire"
+msgstr ""
+
+#: my-evolution/Locations.h:642
+msgid "Edinburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:643
+#, fuzzy
+msgid "Edmonton"
+msgstr "月"
+
+#: my-evolution/Locations.h:644
+msgid "Edmonton/Villeneuve"
+msgstr ""
+
+#: my-evolution/Locations.h:645
+msgid "Eduardo Gomes International"
+msgstr ""
+
+#: my-evolution/Locations.h:646
+msgid "Edwards AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:647
+msgid "Egilsstadir"
+msgstr ""
+
+#: my-evolution/Locations.h:648
+msgid "Eglin"
+msgstr ""
+
+#: my-evolution/Locations.h:649
+msgid "Eglington/Londonderry"
+msgstr ""
+
+#: my-evolution/Locations.h:651
+msgid "Eindhoven"
+msgstr ""
+
+#: my-evolution/Locations.h:652
+msgid "Ekofisk"
+msgstr ""
+
+#: my-evolution/Locations.h:653
+msgid "Elazig"
+msgstr ""
+
+#: my-evolution/Locations.h:654
+msgid "El Centro"
+msgstr ""
+
+#: my-evolution/Locations.h:655
+#, fuzzy
+msgid "El Dorado"
+msgstr "龍捲風"
+
+#: my-evolution/Locations.h:656
+msgid "Elefsis"
+msgstr ""
+
+#: my-evolution/Locations.h:657
+msgid "Elfin Cove"
+msgstr ""
+
+#: my-evolution/Locations.h:658
+msgid "Elizabeth City"
+msgstr ""
+
+#: my-evolution/Locations.h:659
+msgid "Elk City"
+msgstr ""
+
+#: my-evolution/Locations.h:660
+msgid "Elkhart"
+msgstr ""
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: my-evolution/Locations.h:661
+#, fuzzy
+msgid "Elkins"
+msgstr "靄"
+
+#: my-evolution/Locations.h:662
+msgid "Elko"
+msgstr ""
+
+#: my-evolution/Locations.h:663
+#, fuzzy
+msgid "Elmira"
+msgstr "厄利垂亞"
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:664
+#, fuzzy
+msgid "El Monte"
+msgstr "月"
+
+#: my-evolution/Locations.h:665
+msgid "El Paso"
+msgstr ""
+
+#: my-evolution/Locations.h:667
+#, fuzzy
+msgid "El Salvador Int."
+msgstr "薩爾瓦多"
+
+#: my-evolution/Locations.h:668
+msgid "Elsenborn"
+msgstr ""
+
+#: my-evolution/Locations.h:669
+msgid "Ely"
+msgstr ""
+
+#: my-evolution/Locations.h:670
+msgid "Emmonak"
+msgstr ""
+
+#: my-evolution/Locations.h:671
+#, fuzzy
+msgid "Emporia"
+msgstr "重要"
+
+#: my-evolution/Locations.h:672
+msgid "Enid"
+msgstr ""
+
+# mail/mail-mt.c:516
+# mail/mail-mt.c:545
+# mail/mail-mt.c:880
+#: my-evolution/Locations.h:673
+#, fuzzy
+msgid "Enid/Woodring"
+msgstr "正在工作"
+
+#: my-evolution/Locations.h:674
+msgid "Enosburg Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:675
+msgid "Ephrata"
+msgstr ""
+
+#: my-evolution/Locations.h:676
+msgid "Ercan"
+msgstr ""
+
+#: my-evolution/Locations.h:677
+#, fuzzy
+msgid "Erie"
+msgstr "厄利垂亞"
+
+#: my-evolution/Locations.h:678
+msgid "Erzurum"
+msgstr ""
+
+#: my-evolution/Locations.h:679
+msgid "Esbjerg"
+msgstr ""
+
+#: my-evolution/Locations.h:680
+msgid "Escanaba"
+msgstr ""
+
+#: my-evolution/Locations.h:681
+msgid "Esfahan"
+msgstr ""
+
+#: my-evolution/Locations.h:682
+msgid "Eskisehir"
+msgstr ""
+
+#: my-evolution/Locations.h:683
+msgid "Estherville"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:9
+#: my-evolution/Locations.h:685
+#, fuzzy
+msgid "Eugene"
+msgstr "6月"
+
+#: my-evolution/Locations.h:686
+#, fuzzy
+msgid "Eureka"
+msgstr "厄利垂亞"
+
+#: my-evolution/Locations.h:687
+msgid "Europe"
+msgstr ""
+
+#: my-evolution/Locations.h:688
+#, fuzzy
+msgid "Evanston"
+msgstr "東"
+
+#: my-evolution/Locations.h:689
+msgid "Evansville"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:10
+#: my-evolution/Locations.h:690
+#, fuzzy
+msgid "Everett"
+msgstr "每"
+
+#: my-evolution/Locations.h:691
+msgid "Evergreen"
+msgstr ""
+
+#: my-evolution/Locations.h:692
+msgid "Evreux-Fauville"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: my-evolution/Locations.h:693
+#, fuzzy
+msgid "Exeter"
+msgstr "天氣"
+
+#: my-evolution/Locations.h:694
+msgid "Ezeiza"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1256
+# addressbook/gui/widgets/e-addressbook-view.c:720
+#: my-evolution/Locations.h:695
+#, fuzzy
+msgid "Fagernes"
+msgstr "呼叫器"
+
+#: my-evolution/Locations.h:696
+msgid "Fairbanks"
+msgstr ""
+
+#: my-evolution/Locations.h:697
+msgid "Fairchild"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:47
+#: my-evolution/Locations.h:698
+#, fuzzy
+msgid "Fairfield"
+msgstr "寄件者(_F)"
+
+# addressbook/printing/e-contact-print.glade.h:8
+#: my-evolution/Locations.h:699
+#, fuzzy
+msgid "Fairmont"
+msgstr "字型"
+
+#: my-evolution/Locations.h:700
+msgid "Fallon"
+msgstr ""
+
+#: my-evolution/Locations.h:701
+msgid "Falls City"
+msgstr ""
+
+#: my-evolution/Locations.h:702
+msgid "Falmouth-Otis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:703
+msgid "Farbanks/Eielson AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:704
+#, fuzzy
+msgid "Fargo"
+msgstr "前"
+
+# mail/mail-accounts.c:197
+#: my-evolution/Locations.h:705
+#, fuzzy
+msgid "Farmingdale"
+msgstr "變數"
+
+#: my-evolution/Locations.h:706
+#, fuzzy
+msgid "Farmington"
+msgstr "凍龍捲風"
+
+# addressbook/contact-editor/e-contact-quick-add.c:276
+# addressbook/gui/widgets/e-addressbook-view.c:700
+#: my-evolution/Locations.h:707
+#, fuzzy
+msgid "Farmville"
+msgstr "姓"
+
+# mail/mail-format.c:756
+# mail/message-list.c:1082
+#: my-evolution/Locations.h:708
+#, fuzzy
+msgid "Faro"
+msgstr "寄件者"
+
+#: my-evolution/Locations.h:709
+msgid "Fayetteville"
+msgstr ""
+
+# ui/evolution-task-editor-dialog.xml.h:24
+#: my-evolution/Locations.h:710
+#, fuzzy
+msgid "Feng Nin"
+msgstr "凍雨"
+
+#: my-evolution/Locations.h:711
+msgid "Fergus Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:712
+msgid "Fernando De Noronha"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:4
+#: my-evolution/Locations.h:713
+#, fuzzy
+msgid "Ferrara"
+msgstr "2月"
+
+# mail/message-list.c:690
+#: my-evolution/Locations.h:714
+#, fuzzy
+msgid "Figari"
+msgstr "奈及利亞"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+# calendar/gui/event-editor.c:479
+#: my-evolution/Locations.h:715
+#, fuzzy
+msgid "Findlay"
+msgstr "星期五"
+
+# ui/evolution-calendar.xml.h:36
+#: my-evolution/Locations.h:717
+#, fuzzy
+msgid "Firenze"
+msgstr "空閒"
+
+#: my-evolution/Locations.h:718
+msgid "Fitchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:719
+msgid "Flagstaff"
+msgstr ""
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: my-evolution/Locations.h:720
+#, fuzzy
+msgid "Flint"
+msgstr "靄"
+
+#: my-evolution/Locations.h:721
+#, fuzzy
+msgid "Flippin"
+msgstr "菲律賓"
+
+# ui/evolution-mail.xml.h:2
+#: my-evolution/Locations.h:722
+#, fuzzy
+msgid "Florence"
+msgstr "法國"
+
+# ui/evolution-calendar.xml.h:36
+#: my-evolution/Locations.h:723
+#, fuzzy
+msgid "Florennes"
+msgstr "空閒"
+
+# addressbook/gui/widgets/e-addressbook-view.c:699
+#: my-evolution/Locations.h:724
+#, fuzzy
+msgid "Flores"
+msgstr "歸檔為"
+
+#: my-evolution/Locations.h:725
+msgid "Florianopolis"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+# calendar/gui/event-editor.c:479
+#: my-evolution/Locations.h:726
+#, fuzzy
+msgid "Florida"
+msgstr "星期五"
+
+# mail/mail-format.c:756
+# mail/message-list.c:1082
+#: my-evolution/Locations.h:727
+#, fuzzy
+msgid "Floro"
+msgstr "寄件者"
+
+#: my-evolution/Locations.h:728
+msgid "Fond Du Lac"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:729
+#, fuzzy
+msgid "Forde/Bringeland"
+msgstr "芬蘭"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: my-evolution/Locations.h:730
+#, fuzzy
+msgid "Forli"
+msgstr "週五(_F)"
+
+# addressbook/printing/e-contact-print.glade.h:10
+#: my-evolution/Locations.h:731
+#, fuzzy
+msgid "Formosa"
+msgstr "格式"
+
+#: my-evolution/Locations.h:732
+msgid "Fortaleza"
+msgstr ""
+
+#: my-evolution/Locations.h:733
+msgid "Fort Belvoir"
+msgstr ""
+
+#: my-evolution/Locations.h:734
+msgid "Fort Benning"
+msgstr ""
+
+#: my-evolution/Locations.h:735
+msgid "Fort Bragg"
+msgstr ""
+
+#: my-evolution/Locations.h:736
+msgid "Fort Campbell"
+msgstr ""
+
+#: my-evolution/Locations.h:737
+msgid "Fort Carson"
+msgstr ""
+
+#: my-evolution/Locations.h:738
+msgid "Fort Collins"
+msgstr ""
+
+#: my-evolution/Locations.h:739
+msgid "Fort Collins/Lovel"
+msgstr ""
+
+#: my-evolution/Locations.h:740
+msgid "Fort Dodge"
+msgstr ""
+
+#: my-evolution/Locations.h:741
+msgid "Fort Drum"
+msgstr ""
+
+# ui/evolution.xml.h:62
+#: my-evolution/Locations.h:742
+#, fuzzy
+msgid "Fort Eustis"
+msgstr "功能"
+
+#: my-evolution/Locations.h:743
+msgid "Fort Greely/Allen AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:744
+msgid "Fort Huachuca"
+msgstr ""
+
+#: my-evolution/Locations.h:745
+msgid "Fort Knox"
+msgstr ""
+
+#: my-evolution/Locations.h:746
+msgid "Fort Lauderdale"
+msgstr ""
+
+#: my-evolution/Locations.h:747
+msgid "Fort Lauderdale (International)"
+msgstr ""
+
+# mail/message-browser.c:194
+# ui/evolution-mail.xml.h:33
+#: my-evolution/Locations.h:748
+#, fuzzy
+msgid "Fort Leonard"
+msgstr "轉寄"
+
+#: my-evolution/Locations.h:749
+msgid "Fort Lewis"
+msgstr ""
+
+#: my-evolution/Locations.h:750
+msgid "Fort Madison"
+msgstr ""
+
+# ui/evolution-mail.xml.h:107
+#: my-evolution/Locations.h:751
+#, fuzzy
+msgid "Fort Meade"
+msgstr "轉寄郵件(_F)"
+
+#: my-evolution/Locations.h:752
+msgid "Fort Myers (Page Field)"
+msgstr ""
+
+#: my-evolution/Locations.h:753
+msgid "Fort Myers (Southwest Florida International)"
+msgstr ""
+
+#: my-evolution/Locations.h:754
+msgid "Fort Polk-Leesville"
+msgstr ""
+
+#: my-evolution/Locations.h:755
+msgid "Fort Riley"
+msgstr ""
+
+#: my-evolution/Locations.h:756
+msgid "Fort Sill"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:10
+#: my-evolution/Locations.h:757
+#, fuzzy
+msgid "Fort Smith"
+msgstr "格式"
+
+# calendar/gui/calendar-model.c:638
+# calendar/gui/calendar-model.c:1176
+# calendar/gui/dialogs/task-editor-dialog.glade.h:14
+# calendar/gui/e-calendar-table.c:419
+#: my-evolution/Locations.h:758
+#, fuzzy
+msgid "Fort Stewart"
+msgstr "未開始"
+
+#: my-evolution/Locations.h:759
+msgid "Fort Stockton"
+msgstr ""
+
+# ui/evolution-mail.xml.h:2
+#: my-evolution/Locations.h:760
+#, fuzzy
+msgid "Fort Wayne"
+msgstr "法國"
+
+#: my-evolution/Locations.h:761
+msgid "Fort Worth-Alliance"
+msgstr ""
+
+#: my-evolution/Locations.h:762
+msgid "Fort Worth-Meacham"
+msgstr ""
+
+#: my-evolution/Locations.h:763
+msgid "Fort Worth NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:764
+msgid "Fourchon"
+msgstr ""
+
+#: my-evolution/Locations.h:765
+msgid "Foz Do Iguacu"
+msgstr ""
+
+#: my-evolution/Locations.h:767
+msgid "Frankfort"
+msgstr ""
+
+#: my-evolution/Locations.h:768
+msgid "Frankfurt/Main"
+msgstr ""
+
+# ui/evolution-mail.xml.h:36
+#: my-evolution/Locations.h:769
+#, fuzzy
+msgid "Franklin"
+msgstr "正常轉寄(_I)"
+
+# addressbook/gui/component/addressbook-config.c:689
+# calendar/gui/e-itip-control.glade.h:6
+# composer/e-msg-composer-attachment.glade.h:3
+#: my-evolution/Locations.h:770
+#, fuzzy
+msgid "Fredericton"
+msgstr "描述"
+
+# ui/evolution-calendar.xml.h:36
+#: my-evolution/Locations.h:771
+#, fuzzy
+msgid "Freeport"
+msgstr "空閒"
+
+#: my-evolution/Locations.h:772
+msgid "Frenchville"
+msgstr ""
+
+#: my-evolution/Locations.h:773
+#, fuzzy
+msgid "Fresno"
+msgstr "凍雪"
+
+#: my-evolution/Locations.h:774
+msgid "Fresno-Chandler"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+# calendar/gui/event-editor.c:479
+#: my-evolution/Locations.h:775
+#, fuzzy
+msgid "Friday Harbor"
+msgstr "星期五"
+
+#: my-evolution/Locations.h:776
+msgid "Friedrichshafen"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: my-evolution/Locations.h:777
+#, fuzzy
+msgid "Frigg"
+msgstr "週五(_F)"
+
+# addressbook/printing/e-contact-print.glade.h:8
+#: my-evolution/Locations.h:778
+#, fuzzy
+msgid "Frontone"
+msgstr "字型"
+
+# addressbook/gui/widgets/e-addressbook-view.c:731
+#: my-evolution/Locations.h:779
+#, fuzzy
+msgid "Frosinone"
+msgstr "專業"
+
+# calendar/gui/goto-dialog.glade.h:4
+#: my-evolution/Locations.h:780
+#, fuzzy
+msgid "Fryeburg"
+msgstr "2月"
+
+#: my-evolution/Locations.h:781
+msgid "Fujairah"
+msgstr ""
+
+#: my-evolution/Locations.h:782
+msgid "Fuji Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:783
+msgid "Fukue Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:784
+msgid "Fukui Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:785
+msgid "Fukuoka Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:786
+msgid "Fullerton"
+msgstr ""
+
+#: my-evolution/Locations.h:787
+msgid "Funchal"
+msgstr ""
+
+#: my-evolution/Locations.h:788
+#, fuzzy
+msgid "FYR Macedonia"
+msgstr "馬其頓"
+
+#: my-evolution/Locations.h:789
+msgid "Gadsden"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:790
+#, fuzzy
+msgid "Gage"
+msgstr "頁"
+
+# calendar/gui/calendar-model.c:647
+# calendar/gui/calendar-model.c:1182
+# calendar/gui/dialogs/task-editor-dialog.glade.h:4
+# calendar/gui/e-calendar-table.c:422
+# camel/camel-service.c:544
+# camel/camel-service.c:580
+#: my-evolution/Locations.h:791
+#, fuzzy
+msgid "Gainesville"
+msgstr "已取消"
+
+#: my-evolution/Locations.h:792
+msgid "Galax-Hillsville"
+msgstr ""
+
+#: my-evolution/Locations.h:793
+msgid "Galbraith Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:794
+msgid "Galeao"
+msgstr ""
+
+#: my-evolution/Locations.h:795
+#, fuzzy
+msgid "Galena"
+msgstr "迦納"
+
+#: my-evolution/Locations.h:796
+msgid "Galesburg"
+msgstr ""
+
+#: my-evolution/Locations.h:797
+#, fuzzy
+msgid "Gallup"
+msgstr "瓜德魯普島"
+
+#: my-evolution/Locations.h:798
+msgid "Galveston"
+msgstr ""
+
+#: my-evolution/Locations.h:799
+#, fuzzy
+msgid "Gambell"
+msgstr "甘比亞"
+
+#: my-evolution/Locations.h:800
+#, fuzzy
+msgid "Gander"
+msgstr "寄件者"
+
+# mail/mail-config.glade.h:35
+#: my-evolution/Locations.h:801
+#, fuzzy
+msgid "Garden City"
+msgstr "身份"
+
+#: my-evolution/Locations.h:802
+msgid "Gary"
+msgstr ""
+
+# calendar/gui/e-day-view.c:570
+# calendar/gui/e-week-view.c:300
+# calendar/gui/print.c:617
+#: my-evolution/Locations.h:803
+#, fuzzy
+msgid "Gassim"
+msgstr "關島"
+
+# addressbook/contact-editor/contact-editor.glade.h:10
+# executive-summary/component/executive-summary-config.glade.h:3
+#: my-evolution/Locations.h:804
+#, fuzzy
+msgid "Gatineau"
+msgstr "幾內亞"
+
+#: my-evolution/Locations.h:805
+msgid "Gaziantep"
+msgstr ""
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: my-evolution/Locations.h:806
+#, fuzzy
+msgid "Gdansk"
+msgstr "工作"
+
+# ui/evolution-calendar.xml.h:36
+#: my-evolution/Locations.h:807
+#, fuzzy
+msgid "Geneve"
+msgstr "希臘"
+
+# addressbook/contact-editor/contact-editor.glade.h:10
+# executive-summary/component/executive-summary-config.glade.h:3
+#: my-evolution/Locations.h:808
+#, fuzzy
+msgid "Genova"
+msgstr "一般"
+
+#: my-evolution/Locations.h:809
+msgid "George Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:810
+msgid "Georgetown"
+msgstr ""
+
+#: my-evolution/Locations.h:813
+#, fuzzy
+msgid "Ghardaia"
+msgstr "迦納"
+
+#: my-evolution/Locations.h:814
+msgid "Ghedi"
+msgstr ""
+
+#: my-evolution/Locations.h:816
+msgid "Gifu Ab"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:817
+#, fuzzy
+msgid "Gila Bend"
+msgstr "芬蘭"
+
+#: my-evolution/Locations.h:818
+msgid "Gillette"
+msgstr ""
+
+#: my-evolution/Locations.h:819
+msgid "Gilze-Rijen"
+msgstr ""
+
+#: my-evolution/Locations.h:820
+msgid "Gioia del Colle"
+msgstr ""
+
+# addressbook/contact-editor/contact-editor.glade.h:10
+# executive-summary/component/executive-summary-config.glade.h:3
+#: my-evolution/Locations.h:821
+#, fuzzy
+msgid "Girona"
+msgstr "幾內亞"
+
+#: my-evolution/Locations.h:822
+#, fuzzy
+msgid "Gizan"
+msgstr "迦納"
+
+#: my-evolution/Locations.h:823
+#, fuzzy
+msgid "Glasgow"
+msgstr "前"
+
+#: my-evolution/Locations.h:824
+#, fuzzy
+msgid "Glendive"
+msgstr "馬爾地夫"
+
+#: my-evolution/Locations.h:825
+msgid "Glens Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:826
+#, fuzzy
+msgid "Goiania"
+msgstr "羅馬尼亞"
+
+#: my-evolution/Locations.h:827
+msgid "Goldsboro"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:828
+#, fuzzy
+msgid "Goodland"
+msgstr "波蘭"
+
+# calendar/gui/e-day-view.c:3153
+# calendar/gui/e-week-view.c:3284
+#: my-evolution/Locations.h:829
+#, fuzzy
+msgid "Goose Bay"
+msgstr "移至今日"
+
+#: my-evolution/Locations.h:830
+msgid "Goteborg (Landvetter)"
+msgstr ""
+
+#: my-evolution/Locations.h:831
+msgid "Goteborg (Save)"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: my-evolution/Locations.h:832
+#, fuzzy
+msgid "Granada"
+msgstr "格瑞那達"
+
+#: my-evolution/Locations.h:833
+msgid "Grand Canyon"
+msgstr ""
+
+#: my-evolution/Locations.h:834
+msgid "Grand Cayman"
+msgstr ""
+
+#: my-evolution/Locations.h:835
+msgid "Grand Forks"
+msgstr ""
+
+#: my-evolution/Locations.h:836
+#, fuzzy
+msgid "Grand Island"
+msgstr "福克蘭群島"
+
+#: my-evolution/Locations.h:837
+msgid "Grand Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:838
+msgid "Grand Junction"
+msgstr ""
+
+#: my-evolution/Locations.h:839
+#, fuzzy
+msgid "Grand Marais"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:840
+msgid "Grand Rapids"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:15
+#: my-evolution/Locations.h:841
+#, fuzzy
+msgid "Grandview"
+msgstr "預覽"
+
+# calendar/gui/calendar-model.c:647
+# calendar/gui/calendar-model.c:1182
+# calendar/gui/dialogs/task-editor-dialog.glade.h:4
+# calendar/gui/e-calendar-table.c:422
+# camel/camel-service.c:544
+# camel/camel-service.c:580
+#: my-evolution/Locations.h:842
+#, fuzzy
+msgid "Grangeville"
+msgstr "已取消"
+
+# mail/mail-config.glade.h:26
+#: my-evolution/Locations.h:843
+#, fuzzy
+msgid "Grants"
+msgstr "草稿"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:844
+#, fuzzy
+msgid "Graz"
+msgstr "巴西"
+
+#: my-evolution/Locations.h:845
+msgid "Great Falls"
+msgstr ""
+
+# ui/evolution-calendar.xml.h:36
+#: my-evolution/Locations.h:847
+#, fuzzy
+msgid "Greeley"
+msgstr "希臘"
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:848
+#, fuzzy
+msgid "Green Bay"
+msgstr "格陵蘭"
+
+#: my-evolution/Locations.h:849
+msgid "Green River"
+msgstr ""
+
+#: my-evolution/Locations.h:850
+msgid "Greensboro"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:851
+#, fuzzy
+msgid "Greenville"
+msgstr "格陵蘭"
+
+#: my-evolution/Locations.h:852
+msgid "Greenville-Spartanburg"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:853
+#, fuzzy
+msgid "Greenwood"
+msgstr "格陵蘭"
+
+#: my-evolution/Locations.h:854
+msgid "Grenoble-Saint-Geoirs"
+msgstr ""
+
+#: my-evolution/Locations.h:855
+msgid "Griffiss AFB"
+msgstr ""
+
+# widgets/misc/e-messagebox.c:159
+#: my-evolution/Locations.h:856
+#, fuzzy
+msgid "Groningen"
+msgstr "警告"
+
+#: my-evolution/Locations.h:857
+msgid "Grosseto"
+msgstr ""
+
+#: my-evolution/Locations.h:858
+msgid "Groton"
+msgstr ""
+
+#: my-evolution/Locations.h:859
+#, fuzzy
+msgid "Guadalajara"
+msgstr "瓜地馬拉"
+
+#: my-evolution/Locations.h:860
+#, fuzzy
+msgid "Guadalupe Pass"
+msgstr "瓜德魯普島"
+
+#: my-evolution/Locations.h:861
+#, fuzzy
+msgid "Guanare"
+msgstr "蓋亞納"
+
+#: my-evolution/Locations.h:862
+msgid "Guangzhou"
+msgstr ""
+
+#: my-evolution/Locations.h:863
+#, fuzzy
+msgid "Guantanamo"
+msgstr "瓜地馬拉"
+
+#: my-evolution/Locations.h:864
+#, fuzzy
+msgid "Guarany"
+msgstr "德國"
+
+# addressbook/contact-editor/contact-editor.glade.h:10
+# executive-summary/component/executive-summary-config.glade.h:3
+#: my-evolution/Locations.h:865
+#, fuzzy
+msgid "Guaratingueta"
+msgstr "幾內亞"
+
+#: my-evolution/Locations.h:866
+msgid "Guarulhos"
+msgstr ""
+
+#: my-evolution/Locations.h:868
+msgid "Guayaquil/Simon Bolivar"
+msgstr ""
+
+# calendar/gui/e-day-view.c:570
+# calendar/gui/e-week-view.c:300
+# calendar/gui/print.c:617
+#: my-evolution/Locations.h:869
+#, fuzzy
+msgid "Guaymas"
+msgstr "關島"
+
+#: my-evolution/Locations.h:870
+#, fuzzy
+msgid "Guernsey"
+msgstr "德國"
+
+# addressbook/contact-editor/contact-editor.glade.h:10
+# executive-summary/component/executive-summary-config.glade.h:3
+#: my-evolution/Locations.h:871
+#, fuzzy
+msgid "Guidonia"
+msgstr "幾內亞"
+
+#: my-evolution/Locations.h:872
+msgid "Gulfport"
+msgstr ""
+
+#: my-evolution/Locations.h:873
+#, fuzzy
+msgid "Gulkana"
+msgstr "蓋亞納"
+
+#: my-evolution/Locations.h:874
+msgid "Gullfax C"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/Locations.h:875
+#, fuzzy
+msgid "Gunnison"
+msgstr "留尼旺"
+
+#: my-evolution/Locations.h:876
+msgid "Gunnison (2)"
+msgstr ""
+
+# addressbook/contact-editor/contact-editor.glade.h:10
+# executive-summary/component/executive-summary-config.glade.h:3
+#: my-evolution/Locations.h:877
+#, fuzzy
+msgid "Guriat"
+msgstr "幾內亞"
+
+#: my-evolution/Locations.h:878
+msgid "Gustavus"
+msgstr ""
+
+#: my-evolution/Locations.h:879
+#, fuzzy
+msgid "Guymon"
+msgstr "蓋亞納"
+
+#: my-evolution/Locations.h:880
+#, fuzzy
+msgid "Habana"
+msgstr "阿爾巴尼亞"
+
+#: my-evolution/Locations.h:881
+msgid "Hachijojima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:882
+msgid "Hachinohe Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:883
+msgid "Hafr Al-Batin"
+msgstr ""
+
+#: my-evolution/Locations.h:884
+msgid "Hagerstown"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#. HAIL
+#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+msgid "Hail"
+msgstr "下冰雹"
+
+#: my-evolution/Locations.h:886
+msgid "Hailey-Sun Valley"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:13
+#: my-evolution/Locations.h:887
+#, fuzzy
+msgid "Haines"
+msgstr "標題"
+
+#: my-evolution/Locations.h:889
+msgid "Hakodate Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:890
+msgid "Halifax"
+msgstr ""
+
+#: my-evolution/Locations.h:891
+msgid "Hamamatsu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:892
+msgid "Hamburg"
+msgstr ""
+
+#: my-evolution/Locations.h:893
+msgid "Hamburg-Finkenwerder"
+msgstr ""
+
+#: my-evolution/Locations.h:894
+#, fuzzy
+msgid "Hamilton"
+msgstr "雹暴"
+
+#: my-evolution/Locations.h:895
+msgid "Hammerfest"
+msgstr ""
+
+#: my-evolution/Locations.h:896
+msgid "Hampton"
+msgstr ""
+
+#: my-evolution/Locations.h:897
+msgid "Hanamaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:898
+msgid "Hancock"
+msgstr ""
+
+#: my-evolution/Locations.h:899
+msgid "Hangzhou"
+msgstr ""
+
+#: my-evolution/Locations.h:900
+msgid "Hanksville"
+msgstr ""
+
+#: my-evolution/Locations.h:901
+msgid "Hannover"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:902
+#, fuzzy
+msgid "Ha Noi"
+msgstr "下冰雹"
+
+#: my-evolution/Locations.h:903
+msgid "Harbor Beach"
+msgstr ""
+
+# widgets/misc/e-messagebox.c:159
+#: my-evolution/Locations.h:904
+#, fuzzy
+msgid "Harlingen"
+msgstr "警告"
+
+#: my-evolution/Locations.h:905
+msgid "Harlowton"
+msgstr ""
+
+#: my-evolution/Locations.h:906
+msgid "Harrisburg"
+msgstr ""
+
+#: my-evolution/Locations.h:907
+msgid "Harrison"
+msgstr ""
+
+#: my-evolution/Locations.h:908
+msgid "Harstad/Narvik/Evenes"
+msgstr ""
+
+#: my-evolution/Locations.h:909
+msgid "Hartford"
+msgstr ""
+
+#: my-evolution/Locations.h:910
+msgid "Hassi-Messaoud"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:13
+#: my-evolution/Locations.h:911
+#, fuzzy
+msgid "Hastings"
+msgstr "標題"
+
+#: my-evolution/Locations.h:912
+msgid "Haugesund"
+msgstr ""
+
+# ui/evolution-event-editor.xml.h:40
+# ui/evolution-message-composer.xml.h:17
+# ui/evolution-task-editor-dialog.xml.h:50
+# widgets/misc/e-filter-bar.c:241
+#: my-evolution/Locations.h:913
+#, fuzzy
+msgid "Havre"
+msgstr "儲存"
+
+# mail/mail-send-recv.c:287
+# mail/mail-send-recv.c:333
+#: my-evolution/Locations.h:914
+#, fuzzy
+msgid "Hawaii"
+msgstr "海地"
+
+#: my-evolution/Locations.h:915
+msgid "Hawthorne"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:11
+#: my-evolution/Locations.h:916
+#, fuzzy
+msgid "Hayden"
+msgstr "頁首"
+
+#: my-evolution/Locations.h:917
+msgid "Hayes River"
+msgstr ""
+
+#: my-evolution/Locations.h:918
+#, fuzzy
+msgid "Hays"
+msgstr "天"
+
+#: my-evolution/Locations.h:919
+msgid "Hayward"
+msgstr ""
+
+#: my-evolution/Locations.h:920
+msgid "Healy River"
+msgstr ""
+
+#: my-evolution/Locations.h:921
+#, fuzzy
+msgid "Helena"
+msgstr "聖赫勒拿島"
+
+#: my-evolution/Locations.h:922
+msgid "Helsinki"
+msgstr ""
+
+#: my-evolution/Locations.h:923
+#, fuzzy
+msgid "Henderson"
+msgstr "寄件者"
+
+#: my-evolution/Locations.h:924
+msgid "Hengchun"
+msgstr ""
+
+#: my-evolution/Locations.h:925
+msgid "Hermosillo"
+msgstr ""
+
+#: my-evolution/Locations.h:926
+msgid "Hibbing"
+msgstr ""
+
+#: my-evolution/Locations.h:927
+msgid "Hickory"
+msgstr ""
+
+#: my-evolution/Locations.h:928
+msgid "Hill City"
+msgstr ""
+
+#: my-evolution/Locations.h:929
+#, fuzzy
+msgid "Hillsboro"
+msgstr "雹暴"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:930
+#, fuzzy
+msgid "Hilo"
+msgstr "下冰雹"
+
+#: my-evolution/Locations.h:931
+msgid "Hinesville"
+msgstr ""
+
+#: my-evolution/Locations.h:932
+msgid "Hiroshima Airport"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:401
+# mail/mail-config.glade.h:33
+#: my-evolution/Locations.h:933
+#, fuzzy
+msgid "Hobart"
+msgstr "主機"
+
+# addressbook/gui/component/addressbook-config.c:401
+# mail/mail-config.glade.h:33
+#: my-evolution/Locations.h:934
+#, fuzzy
+msgid "Hobbs"
+msgstr "主機"
+
+#: my-evolution/Locations.h:935
+msgid "Ho Chi Minh"
+msgstr ""
+
+#: my-evolution/Locations.h:936
+msgid "Hodeidah"
+msgstr ""
+
+#: my-evolution/Locations.h:937
+msgid "Hof"
+msgstr ""
+
+#: my-evolution/Locations.h:938
+msgid "Hoffman"
+msgstr ""
+
+#: my-evolution/Locations.h:939
+msgid "Hofu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:940
+msgid "Hohenems"
+msgstr ""
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: my-evolution/Locations.h:941
+#, fuzzy
+msgid "Holguin"
+msgstr "Evolution"
+
+# addressbook/contact-editor/e-contact-editor.c:1249
+# addressbook/contact-editor/e-contact-editor.c:1311
+#: my-evolution/Locations.h:942
+#, fuzzy
+msgid "Homer"
+msgstr "住家電話"
+
+# calendar/gui/calendar-model.c:644
+# calendar/gui/calendar-model.c:1180
+# calendar/gui/dialogs/task-editor-dialog.glade.h:6
+# calendar/gui/e-calendar-table.c:421
+#: my-evolution/Locations.h:943
+#, fuzzy
+msgid "Homestead AFB"
+msgstr "已完成"
+
+#: my-evolution/Locations.h:944
+#, fuzzy
+msgid "Hondo"
+msgstr "龍捲風"
+
+#: my-evolution/Locations.h:947
+msgid "Honningsvag"
+msgstr ""
+
+#: my-evolution/Locations.h:948
+msgid "Honolulu"
+msgstr ""
+
+#: my-evolution/Locations.h:949
+msgid "Hoonah"
+msgstr ""
+
+#: my-evolution/Locations.h:950
+msgid "Hoquiam"
+msgstr ""
+
+#: my-evolution/Locations.h:951
+msgid "Hot Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:952
+msgid "Houghton Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:953
+#, fuzzy
+msgid "Houlton"
+msgstr "外寄"
+
+# addressbook/contact-editor/e-contact-editor.c:1249
+# addressbook/contact-editor/e-contact-editor.c:1311
+#: my-evolution/Locations.h:954
+#, fuzzy
+msgid "Houma"
+msgstr "住家電話"
+
+#: my-evolution/Locations.h:955
+msgid "Houston-Bush"
+msgstr ""
+
+#: my-evolution/Locations.h:956
+msgid "Houston-Clover"
+msgstr ""
+
+#: my-evolution/Locations.h:957
+msgid "Houston-Ellington Field"
+msgstr ""
+
+#: my-evolution/Locations.h:958
+msgid "Houston-Hobby"
+msgstr ""
+
+#: my-evolution/Locations.h:959
+msgid "Houston-Hooks"
+msgstr ""
+
+# ui/evolution-mail.xml.h:34
+#: my-evolution/Locations.h:960
+#, fuzzy
+msgid "Howard AFB"
+msgstr "轉寄方式"
+
+#: my-evolution/Locations.h:961
+msgid "Hsinchu"
+msgstr ""
+
+#: my-evolution/Locations.h:962
+msgid "Huanuco"
+msgstr ""
+
+#: my-evolution/Locations.h:963
+msgid "Huehuetenango"
+msgstr ""
+
+# mail/mail-display.c:363
+#: my-evolution/Locations.h:964
+#, fuzzy
+msgid "Hulien"
+msgstr "隱藏"
+
+#: my-evolution/Locations.h:965
+msgid "Humberside"
+msgstr ""
+
+#: my-evolution/Locations.h:967
+msgid "Huntington"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:45
+#: my-evolution/Locations.h:968
+#, fuzzy
+msgid "Huntsville"
+msgstr "直至"
+
+#: my-evolution/Locations.h:969
+msgid "Hurlburt"
+msgstr ""
+
+#: my-evolution/Locations.h:970
+#, fuzzy
+msgid "Huron"
+msgstr "小時"
+
+#: my-evolution/Locations.h:971
+msgid "Hutchinson"
+msgstr ""
+
+#: my-evolution/Locations.h:972
+msgid "Hyakuri Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:973
+msgid "Hyannis"
+msgstr ""
+
+#: my-evolution/Locations.h:974
+msgid "Hyderabad"
+msgstr ""
+
+#: my-evolution/Locations.h:975
+msgid "Hyeres-Le Palyvestre"
+msgstr ""
+
+#: my-evolution/Locations.h:976
+#, fuzzy
+msgid "Iasi"
+msgstr "基本"
+
+#: my-evolution/Locations.h:977
+#, fuzzy
+msgid "Ibiza"
+msgstr "印度"
+
+#: my-evolution/Locations.h:979
+msgid "Ichikawa"
+msgstr ""
+
+#: my-evolution/Locations.h:980
+#, fuzzy
+msgid "Idaho"
+msgstr "印度"
+
+#: my-evolution/Locations.h:981
+msgid "Idaho Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:982
+msgid "Iguazu"
+msgstr ""
+
+#: my-evolution/Locations.h:983
+msgid "Iki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:984
+#, fuzzy
+msgid "Ilan"
+msgstr "冰島"
+
+# mail/mail-config.glade.h:37
+#: my-evolution/Locations.h:985
+#, fuzzy
+msgid "Iliamna"
+msgstr "正常"
+
+#: my-evolution/Locations.h:986
+msgid "Illinois"
+msgstr ""
+
+#: my-evolution/Locations.h:987
+#, fuzzy
+msgid "Imperial"
+msgstr "英制(_I)"
+
+#: my-evolution/Locations.h:988
+#, fuzzy
+msgid "Imperial (2)"
+msgstr "英制(_I)"
+
+#: my-evolution/Locations.h:989
+#, fuzzy
+msgid "Imperial Beach"
+msgstr "英制(_I)"
+
+#: my-evolution/Locations.h:990
+#, fuzzy
+msgid "In Amenas"
+msgstr "亞美尼亞"
+
+#: my-evolution/Locations.h:992
+#, fuzzy
+msgid "Indiana"
+msgstr "印度"
+
+#: my-evolution/Locations.h:993
+msgid "Indianapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:994
+msgid "Indian Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:995
+msgid "Innsbruck"
+msgstr ""
+
+#: my-evolution/Locations.h:996
+msgid "International Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:997
+msgid "Intracoastal"
+msgstr ""
+
+# calendar/gui/calendar-model.c:641
+# calendar/gui/calendar-model.c:1178
+# calendar/gui/dialogs/task-editor-dialog.glade.h:11
+# calendar/gui/e-calendar-table.c:420
+#: my-evolution/Locations.h:998
+#, fuzzy
+msgid "Inverness"
+msgstr "進行中"
+
+#: my-evolution/Locations.h:999
+msgid "Inyokern"
+msgstr ""
+
+# widgets/misc/e-cell-date-edit.c:221
+# widgets/misc/e-dateedit.c:418
+#: my-evolution/Locations.h:1000
+#, fuzzy
+msgid "Iowa"
+msgstr "挪威"
+
+#: my-evolution/Locations.h:1001
+msgid "Iowa City"
+msgstr ""
+
+#: my-evolution/Locations.h:1002
+msgid "Iqaluit"
+msgstr ""
+
+#: my-evolution/Locations.h:1003
+msgid "Iquique/Diego Arac"
+msgstr ""
+
+#: my-evolution/Locations.h:1004
+msgid "Iquitos"
+msgstr ""
+
+# widgets/misc/e-messagebox.c:152
+#: my-evolution/Locations.h:1005
+#, fuzzy
+msgid "Iraklion"
+msgstr "資料"
+
+#: my-evolution/Locations.h:1006
+msgid "Iran, Islamic Republic of"
+msgstr ""
+
+# calendar/gui/gnome-cal.c:236
+#: my-evolution/Locations.h:1008
+#, fuzzy
+msgid "Iron Mountain"
+msgstr "備註包含"
+
+#: my-evolution/Locations.h:1009
+msgid "Ironwood"
+msgstr ""
+
+#: my-evolution/Locations.h:1010
+msgid "Iruma Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1011
+msgid "Islamabad"
+msgstr ""
+
+#: my-evolution/Locations.h:1012
+msgid "Isle of Man"
+msgstr ""
+
+#: my-evolution/Locations.h:1013
+msgid "Islip"
+msgstr ""
+
+#: my-evolution/Locations.h:1014
+#, fuzzy
+msgid "Istanbul"
+msgstr "義大利"
+
+#: my-evolution/Locations.h:1015
+msgid "Itaituba"
+msgstr ""
+
+#: my-evolution/Locations.h:1017
+msgid "Ithaca"
+msgstr ""
+
+#: my-evolution/Locations.h:1018
+msgid "Ivano-Frankivsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1019
+msgid "Iwakuni MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1020
+msgid "Iwojima"
+msgstr ""
+
+#: my-evolution/Locations.h:1021
+msgid "Ixtapa"
+msgstr ""
+
+#: my-evolution/Locations.h:1022
+msgid "Izmir/Adnan Menderes"
+msgstr ""
+
+#: my-evolution/Locations.h:1023
+msgid "Izmir/Cigli"
+msgstr ""
+
+#: my-evolution/Locations.h:1024
+msgid "Izmit"
+msgstr ""
+
+# importers/elm-importer.c:512
+# importers/netscape-importer.c:780
+# importers/pine-importer.c:646
+# shell/e-shell-importer.c:653
+# shell/importer/import.glade.h:4
+#: my-evolution/Locations.h:1025
+#, fuzzy
+msgid "Izumo Airport"
+msgstr "匯入"
+
+#: my-evolution/Locations.h:1026
+msgid "Jackson"
+msgstr ""
+
+#: my-evolution/Locations.h:1027
+msgid "Jacksonville"
+msgstr ""
+
+#: my-evolution/Locations.h:1028
+msgid "Jacksonville-Craig Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1029
+msgid "Jacksonville NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1030
+msgid "Jaffrey"
+msgstr ""
+
+#: my-evolution/Locations.h:1032
+msgid "Jamestown"
+msgstr ""
+
+#: my-evolution/Locations.h:1033
+#, fuzzy
+msgid "Janesville"
+msgstr "日文"
+
+#: my-evolution/Locations.h:1034
+msgid "Jan Smuts"
+msgstr ""
+
+#: my-evolution/Locations.h:1036
+msgid "Jeddah King Abdul Aziz International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1037
+msgid "Jefferson City"
+msgstr ""
+
+#: my-evolution/Locations.h:1038
+msgid "Jerez"
+msgstr ""
+
+#: my-evolution/Locations.h:1039
+msgid "Jersey"
+msgstr ""
+
+#: my-evolution/Locations.h:1040
+msgid "Jinotega"
+msgstr ""
+
+#: my-evolution/Locations.h:1041
+msgid "Johan A. Pengel"
+msgstr ""
+
+#: my-evolution/Locations.h:1042
+msgid "Johnstown"
+msgstr ""
+
+#: my-evolution/Locations.h:1043
+msgid "Jonesboro"
+msgstr ""
+
+# mail/mail-mt.c:516
+# mail/mail-mt.c:545
+# mail/mail-mt.c:880
+#: my-evolution/Locations.h:1044
+#, fuzzy
+msgid "Jonkoping"
+msgstr "正在工作"
+
+# mail/mail-ops.c:917
+#: my-evolution/Locations.h:1045
+#, fuzzy
+msgid "Joplin"
+msgstr "複製"
+
+#: my-evolution/Locations.h:1047
+msgid "Juanjui"
+msgstr ""
+
+#: my-evolution/Locations.h:1048
+msgid "Juan Santamaria"
+msgstr ""
+
+#: my-evolution/Locations.h:1049
+#, fuzzy
+msgid "Juigalpa"
+msgstr "日本"
+
+# calendar/gui/goto-dialog.glade.h:8
+#: my-evolution/Locations.h:1050
+#, fuzzy
+msgid "Jujuy"
+msgstr "7月"
+
+# calendar/gui/calendar-model.c:360
+# calendar/gui/calendar-model.c:898
+# calendar/gui/e-calendar-table.c:323
+#: my-evolution/Locations.h:1051
+#, fuzzy
+msgid "Juliaca"
+msgstr "公開"
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/Locations.h:1052
+#, fuzzy
+msgid "Junction"
+msgstr "留尼旺"
+
+# calendar/gui/goto-dialog.glade.h:9
+#: my-evolution/Locations.h:1053
+#, fuzzy
+msgid "Juneau"
+msgstr "6月"
+
+#: my-evolution/Locations.h:1054
+msgid "Kadena Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1055
+msgid "Kagoshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1056
+msgid "Kahului"
+msgstr ""
+
+#: my-evolution/Locations.h:1057
+msgid "Kailua-Kona"
+msgstr ""
+
+#: my-evolution/Locations.h:1058
+msgid "Kake"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1059
+#, fuzzy
+msgid "Kalamata"
+msgstr "馬爾他"
+
+#: my-evolution/Locations.h:1060
+msgid "Kalamazoo"
+msgstr ""
+
+#: my-evolution/Locations.h:1061
+msgid "Kalispell"
+msgstr ""
+
+#: my-evolution/Locations.h:1062
+msgid "Kamigoto"
+msgstr ""
+
+#: my-evolution/Locations.h:1063
+msgid "Kaneohe"
+msgstr ""
+
+#: my-evolution/Locations.h:1064
+msgid "Kangshan"
+msgstr ""
+
+#: my-evolution/Locations.h:1065
+msgid "Kanoya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1066
+msgid "Kansai International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1067
+msgid "Kansas"
+msgstr ""
+
+#: my-evolution/Locations.h:1068
+msgid "Kansas City"
+msgstr ""
+
+#: my-evolution/Locations.h:1069
+msgid "Kansas City-Gladstone"
+msgstr ""
+
+#: my-evolution/Locations.h:1070
+msgid "Kaohsiung"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1071
+#, fuzzy
+msgid "Karachi"
+msgstr "3月"
+
+# shell/e-shortcuts-view.c:137
+#: my-evolution/Locations.h:1072
+#, fuzzy
+msgid "Karup"
+msgstr "組別"
+
+#: my-evolution/Locations.h:1073
+msgid "Kassel-Calden"
+msgstr ""
+
+#: my-evolution/Locations.h:1074
+msgid "Kasumigaura Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1075
+msgid "Kasuminome Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1076
+msgid "Katowice"
+msgstr ""
+
+#: my-evolution/Locations.h:1077
+msgid "Kavala"
+msgstr ""
+
+#: my-evolution/Locations.h:1078
+msgid "Kayseri"
+msgstr ""
+
+#: my-evolution/Locations.h:1079
+#, fuzzy
+msgid "Kazan"
+msgstr "哈薩克"
+
+#: my-evolution/Locations.h:1080
+#, fuzzy
+msgid "Kearney"
+msgstr "肯亞"
+
+# mail/message-list.c:678
+#: my-evolution/Locations.h:1081
+#, fuzzy
+msgid "Keene"
+msgstr "已閱讀"
+
+#: my-evolution/Locations.h:1082
+msgid "Kefallinia"
+msgstr ""
+
+#: my-evolution/Locations.h:1083
+msgid "Keflavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1084
+#, fuzzy
+msgid "Kenai"
+msgstr "肯亞"
+
+#: my-evolution/Locations.h:1085
+#, fuzzy
+msgid "Kenosha"
+msgstr "肯亞"
+
+#: my-evolution/Locations.h:1086
+#, fuzzy
+msgid "Kentucky"
+msgstr "肯亞"
+
+#: my-evolution/Locations.h:1087
+msgid "Keokuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1088
+msgid "Kerkira"
+msgstr ""
+
+#: my-evolution/Locations.h:1089
+#, fuzzy
+msgid "Kerman"
+msgstr "德國"
+
+#: my-evolution/Locations.h:1090
+msgid "Ketchikan"
+msgstr ""
+
+#: my-evolution/Locations.h:1091
+#, fuzzy
+msgid "Key West"
+msgstr "西"
+
+#: my-evolution/Locations.h:1092
+msgid "Key West NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1093
+msgid "Khabarovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1094
+msgid "Khamis Mushait"
+msgstr ""
+
+#: my-evolution/Locations.h:1095
+msgid "Kharkiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1096
+#, fuzzy
+msgid "Kikai Island"
+msgstr "科克群島"
+
+#: my-evolution/Locations.h:1097
+msgid "Killeen"
+msgstr ""
+
+#: my-evolution/Locations.h:1098
+msgid "Killeen-Ft Hood"
+msgstr ""
+
+#: my-evolution/Locations.h:1099
+msgid "Killeen-Gray AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:1100
+msgid "King Khaled International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1101
+msgid "Kingman"
+msgstr ""
+
+#: my-evolution/Locations.h:1102
+msgid "King Salmon"
+msgstr ""
+
+#: my-evolution/Locations.h:1103
+msgid "Kingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1104
+msgid "Kingsville"
+msgstr ""
+
+#: my-evolution/Locations.h:1105
+msgid "Kinloss"
+msgstr ""
+
+#: my-evolution/Locations.h:1106
+msgid "Kinston"
+msgstr ""
+
+#: my-evolution/Locations.h:1107
+msgid "Kirkenes"
+msgstr ""
+
+#: my-evolution/Locations.h:1108
+msgid "Kirksville"
+msgstr ""
+
+#: my-evolution/Locations.h:1109
+msgid "Kiruna"
+msgstr ""
+
+#: my-evolution/Locations.h:1110
+msgid "Kisarazu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1111
+msgid "Kishineu"
+msgstr ""
+
+#: my-evolution/Locations.h:1112
+msgid "Kitakyushu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1113
+msgid "Klagenfurt"
+msgstr ""
+
+#: my-evolution/Locations.h:1114
+msgid "Klamath Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1115
+msgid "Klawock"
+msgstr ""
+
+#: my-evolution/Locations.h:1116
+msgid "Kleine Brogel"
+msgstr ""
+
+#: my-evolution/Locations.h:1117
+msgid "Kliningrad"
+msgstr ""
+
+#: my-evolution/Locations.h:1118
+msgid "Knoxville"
+msgstr ""
+
+#: my-evolution/Locations.h:1119
+msgid "Knoxville-Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:1120
+msgid "Kobenhavn/Kastrup"
+msgstr ""
+
+#: my-evolution/Locations.h:1121
+msgid "Kobenhavn/Roskilde"
+msgstr ""
+
+#: my-evolution/Locations.h:1122
+msgid "Kochi Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1123
+msgid "Kodiak"
+msgstr ""
+
+#: my-evolution/Locations.h:1124
+msgid "Kogalniceanu"
+msgstr ""
+
+#: my-evolution/Locations.h:1125
+msgid "Kogalym"
+msgstr ""
+
+#: my-evolution/Locations.h:1126
+msgid "Koksijde"
+msgstr ""
+
+#: my-evolution/Locations.h:1127
+msgid "Kolding/Vandrup"
+msgstr ""
+
+#: my-evolution/Locations.h:1128
+msgid "Koln/Bonn"
+msgstr ""
+
+#: my-evolution/Locations.h:1129
+msgid "Komatsu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1130
+msgid "Komatsujima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1131
+#, fuzzy
+msgid "Konya"
+msgstr "肯亞"
+
+#: my-evolution/Locations.h:1132
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#: my-evolution/Locations.h:1133
+#, fuzzy
+msgid "Korea, Republic of"
+msgstr "捷克"
+
+#: my-evolution/Locations.h:1134
+msgid "Kos"
+msgstr ""
+
+#: my-evolution/Locations.h:1135
+msgid "Kotzebue"
+msgstr ""
+
+#: my-evolution/Locations.h:1136
+#, fuzzy
+msgid "Kozani"
+msgstr "韓文"
+
+#: my-evolution/Locations.h:1137
+msgid "Krakow"
+msgstr ""
+
+#: my-evolution/Locations.h:1138
+msgid "Krasnodar"
+msgstr ""
+
+#: my-evolution/Locations.h:1139
+msgid "Krasnoyarsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1140
+msgid "Kristiansand/Kjevik"
+msgstr ""
+
+#: my-evolution/Locations.h:1141
+msgid "Kristiansund/Kvernberget"
+msgstr ""
+
+#: my-evolution/Locations.h:1142
+msgid "Kryviy Rig/Lozovatka"
+msgstr ""
+
+#: my-evolution/Locations.h:1143
+msgid "Kumamoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1144
+#, fuzzy
+msgid "Kunming"
+msgstr "內送"
+
+#: my-evolution/Locations.h:1145
+msgid "Kushiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1147
+msgid "Kyyiv/Boryspil"
+msgstr ""
+
+#: my-evolution/Locations.h:1148
+msgid "Kyyiv/Zhulyany"
+msgstr ""
+
+#: my-evolution/Locations.h:1149
+msgid "La Ceiba"
+msgstr ""
+
+#: my-evolution/Locations.h:1150
+#, fuzzy
+msgid "Laconia"
+msgstr "馬其頓"
+
+#: my-evolution/Locations.h:1151
+msgid "La Coruna"
+msgstr ""
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1152
+#, fuzzy
+msgid "La Crosse"
+msgstr "寮國"
+
+#: my-evolution/Locations.h:1153
+msgid "La Esperanza"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1154
+#, fuzzy
+msgid "Lafayette"
+msgstr "美亞特"
+
+#: my-evolution/Locations.h:1155
+msgid "La Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1156
+#, fuzzy
+msgid "Lahaina"
+msgstr "巴林"
+
+# addressbook/contact-editor/e-contact-editor.c:1256
+# addressbook/gui/widgets/e-addressbook-view.c:720
+#: my-evolution/Locations.h:1157
+#, fuzzy
+msgid "Lahore"
+msgstr "呼叫器"
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1158
+#, fuzzy
+msgid "Lajes"
+msgstr "寮國"
+
+#: my-evolution/Locations.h:1159
+msgid "La Junta"
+msgstr ""
+
+#: my-evolution/Locations.h:1160
+msgid "Lake Charles"
+msgstr ""
+
+#: my-evolution/Locations.h:1161
+msgid "Lake Hood"
+msgstr ""
+
+#: my-evolution/Locations.h:1162
+msgid "Lakehurst"
+msgstr ""
+
+#: my-evolution/Locations.h:1163
+#, fuzzy
+msgid "Lakeland"
+msgstr "愛爾蘭"
+
+#: my-evolution/Locations.h:1164
+msgid "Lake Tahoe"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:15
+#: my-evolution/Locations.h:1165
+#, fuzzy
+msgid "Lakeview"
+msgstr "預覽"
+
+# addressbook/gui/widgets/e-addressbook-view.c:732
+#: my-evolution/Locations.h:1166
+#, fuzzy
+msgid "Lamar"
+msgstr "緬甸"
+
+# ui/evolution-mail.xml.h:109
+#: my-evolution/Locations.h:1167
+#, fuzzy
+msgid "La Mesa"
+msgstr "郵件訊息(_M)"
+
+#: my-evolution/Locations.h:1168
+#, fuzzy
+msgid "Lamezia"
+msgstr "甘比亞"
+
+#: my-evolution/Locations.h:1169
+#, fuzzy
+msgid "Lamoni"
+msgstr "黎巴嫩"
+
+#: my-evolution/Locations.h:1170
+msgid "Lampedusa"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:732
+#: my-evolution/Locations.h:1171
+#, fuzzy
+msgid "Lanai"
+msgstr "語言"
+
+# addressbook/printing/e-contact-print.glade.h:18
+#: my-evolution/Locations.h:1172
+#, fuzzy
+msgid "Lancaster"
+msgstr "橫向"
+
+#: my-evolution/Locations.h:1173
+#, fuzzy
+msgid "Lander"
+msgstr "寄件者"
+
+# addressbook/gui/widgets/e-addressbook-view.c:732
+#: my-evolution/Locations.h:1174
+#, fuzzy
+msgid "Langebaanweg"
+msgstr "語言"
+
+#: my-evolution/Locations.h:1175
+msgid "Langley AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1176
+#, fuzzy
+msgid "Lannion"
+msgstr "黎巴嫩"
+
+# widgets/misc/e-messagebox.c:159
+#: my-evolution/Locations.h:1177
+#, fuzzy
+msgid "Lansing"
+msgstr "警告"
+
+#: my-evolution/Locations.h:1178
+msgid "Lanzhou"
+msgstr ""
+
+#: my-evolution/Locations.h:1179
+msgid "La Paz"
+msgstr ""
+
+#: my-evolution/Locations.h:1180
+msgid "La Paz/Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1181
+msgid "Laramie"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1256
+# addressbook/gui/widgets/e-addressbook-view.c:720
+#: my-evolution/Locations.h:1182
+#, fuzzy
+msgid "Laredo"
+msgstr "呼叫器"
+
+#: my-evolution/Locations.h:1183
+#, fuzzy
+msgid "Larnaka"
+msgstr "斯里蘭卡"
+
+#: my-evolution/Locations.h:1184
+#, fuzzy
+msgid "La Romana"
+msgstr "羅馬尼亞"
+
+#: my-evolution/Locations.h:1185
+msgid "Las Americas"
+msgstr ""
+
+#: my-evolution/Locations.h:1186
+msgid "Las Tunas"
+msgstr ""
+
+#: my-evolution/Locations.h:1187
+msgid "Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1188
+#, fuzzy
+msgid "Latina"
+msgstr "拉脫維亞"
+
+#: my-evolution/Locations.h:1189
+msgid "Latrobe"
+msgstr ""
+
+#: my-evolution/Locations.h:1190
+msgid "Laughlin"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1256
+# addressbook/gui/widgets/e-addressbook-view.c:720
+#: my-evolution/Locations.h:1191
+#, fuzzy
+msgid "Laurel"
+msgstr "呼叫器"
+
+#: my-evolution/Locations.h:1192
+#, fuzzy
+msgid "La Verne"
+msgstr "維德角島"
+
+#: my-evolution/Locations.h:1193
+msgid "Lawrence"
+msgstr ""
+
+#: my-evolution/Locations.h:1194
+#, fuzzy
+msgid "Lawton"
+msgstr "黎巴嫩"
+
+#: my-evolution/Locations.h:1195
+msgid "Leadville"
+msgstr ""
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1196
+#, fuzzy
+msgid "Learmouth"
+msgstr "賴索托"
+
+#: my-evolution/Locations.h:1198
+msgid "Lecce"
+msgstr ""
+
+#: my-evolution/Locations.h:1199
+msgid "Leeds and Bradford"
+msgstr ""
+
+#: my-evolution/Locations.h:1200
+#, fuzzy
+msgid "Leesburg"
+msgstr "盧森堡"
+
+#: my-evolution/Locations.h:1201
+msgid "Leeuwarden"
+msgstr ""
+
+#: my-evolution/Locations.h:1202
+msgid "Le Havre-Octeville"
+msgstr ""
+
+#: my-evolution/Locations.h:1203
+msgid "Leipzig-Schkeuditz"
+msgstr ""
+
+#: my-evolution/Locations.h:1204
+msgid "Leknes"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1205
+#, fuzzy
+msgid "Le Mans"
+msgstr "主管"
+
+#: my-evolution/Locations.h:1206
+#, fuzzy
+msgid "Le Marine"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:1207
+#, fuzzy
+msgid "Lemmon"
+msgstr "黎巴嫩"
+
+# addressbook/gui/component/select-names/e-select-names-popup.c:161
+# composer/e-msg-composer-attachment-bar.c:468
+# shell/e-shortcuts-view.c:265
+# shell/e-shortcuts-view.c:388
+#: my-evolution/Locations.h:1208
+#, fuzzy
+msgid "Lemoore"
+msgstr "移除"
+
+#: my-evolution/Locations.h:1209
+msgid "Leticia/Vasquez Cobo"
+msgstr ""
+
+#: my-evolution/Locations.h:1210
+msgid "Le Touquet"
+msgstr ""
+
+#: my-evolution/Locations.h:1211
+#, fuzzy
+msgid "Leuchars"
+msgstr "年"
+
+#: my-evolution/Locations.h:1212
+#, fuzzy
+msgid "Lewisburg"
+msgstr "盧森堡"
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1213
+#, fuzzy
+msgid "Lewiston"
+msgstr "賴索托"
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1214
+#, fuzzy
+msgid "Lewistown"
+msgstr "賴索托"
+
+#: my-evolution/Locations.h:1215
+#, fuzzy
+msgid "Lexington"
+msgstr "黎巴嫩"
+
+#: my-evolution/Locations.h:1216
+#, fuzzy
+msgid "Liberal"
+msgstr "賴比瑞亞"
+
+#: my-evolution/Locations.h:1218
+#, fuzzy
+msgid "Libya"
+msgstr "賴比瑞亞"
+
+#: my-evolution/Locations.h:1219
+msgid "Lichtenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1220
+msgid "Lidgerwood"
+msgstr ""
+
+# mail/message-list.c:690
+#: my-evolution/Locations.h:1221
+#, fuzzy
+msgid "Liege"
+msgstr "尼日"
+
+#: my-evolution/Locations.h:1222
+#, fuzzy
+msgid "Lihue"
+msgstr "紐威島"
+
+#: my-evolution/Locations.h:1223
+msgid "Lille-Lesquin"
+msgstr ""
+
+#: my-evolution/Locations.h:1224
+msgid "Lima-Callao"
+msgstr ""
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1225
+#, fuzzy
+msgid "Limnos"
+msgstr "寮國"
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1226
+#, fuzzy
+msgid "Limoges"
+msgstr "最低"
+
+#: my-evolution/Locations.h:1227
+#, fuzzy
+msgid "Limon"
+msgstr "月"
+
+#: my-evolution/Locations.h:1228
+#, fuzzy
+msgid "Lincoln"
+msgstr "內送"
+
+#: my-evolution/Locations.h:1229
+msgid "Linz"
+msgstr ""
+
+#: my-evolution/Locations.h:1230
+#, fuzzy
+msgid "Lisboa"
+msgstr "賴比瑞亞"
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: my-evolution/Locations.h:1231
+#, fuzzy
+msgid "Lista"
+msgstr "靄"
+
+#: my-evolution/Locations.h:1232
+#, fuzzy
+msgid "Litchfield"
+msgstr "小冰雹"
+
+#: my-evolution/Locations.h:1234
+msgid "Little Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1235
+msgid "Little Rock AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1236
+msgid "Livermore"
+msgstr ""
+
+#: my-evolution/Locations.h:1237
+msgid "Liverpool"
+msgstr ""
+
+#: my-evolution/Locations.h:1238
+msgid "Livingston"
+msgstr ""
+
+#: my-evolution/Locations.h:1239
+msgid "Ljubljana"
+msgstr ""
+
+# camel/camel-sasl-login.c:32
+#: my-evolution/Locations.h:1240
+#, fuzzy
+msgid "Logan"
+msgstr "NT 登錄"
+
+#: my-evolution/Locations.h:1241
+msgid "Lolland Falster"
+msgstr ""
+
+# ui/evolution-event-editor.xml.h:13
+# ui/evolution-mail.xml.h:8
+# ui/evolution-task-editor-dialog.xml.h:14
+#: my-evolution/Locations.h:1242
+#, fuzzy
+msgid "Lompoc"
+msgstr "公司電話"
+
+#: my-evolution/Locations.h:1243
+#, fuzzy
+msgid "London"
+msgstr "黎巴嫩"
+
+#: my-evolution/Locations.h:1244
+msgid "London/City"
+msgstr ""
+
+#: my-evolution/Locations.h:1245
+msgid "London/Gatwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1246
+msgid "London/Heathrow"
+msgstr ""
+
+#: my-evolution/Locations.h:1247
+msgid "London/Stansted"
+msgstr ""
+
+#: my-evolution/Locations.h:1248
+#, fuzzy
+msgid "Londrina"
+msgstr "宏都拉斯"
+
+#: my-evolution/Locations.h:1249
+msgid "Lone Rock"
+msgstr ""
+
+#: my-evolution/Locations.h:1250
+msgid "Long Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1251
+msgid "Longview"
+msgstr ""
+
+#: my-evolution/Locations.h:1252
+msgid "Lorient-Lann-Bihoue"
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:162
+#: my-evolution/Locations.h:1253
+#, fuzzy
+msgid "Los Alamos"
+msgstr "提醒"
+
+#: my-evolution/Locations.h:1254
+msgid "Los Angeles"
+msgstr ""
+
+#: my-evolution/Locations.h:1255
+msgid "Los Mochis"
+msgstr ""
+
+#: my-evolution/Locations.h:1256
+msgid "Lossiemouth"
+msgstr ""
+
+#: my-evolution/Locations.h:1257
+msgid "Louisville"
+msgstr ""
+
+#: my-evolution/Locations.h:1258
+msgid "Louisville-Standiford Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1259
+#, fuzzy
+msgid "Lousiana"
+msgstr "波札那"
+
+#: my-evolution/Locations.h:1260
+msgid "Lovelock"
+msgstr ""
+
+#: my-evolution/Locations.h:1261
+msgid "Lubbock"
+msgstr ""
+
+#: my-evolution/Locations.h:1262
+msgid "Lubeck-Blankensee"
+msgstr ""
+
+#: my-evolution/Locations.h:1263
+msgid "Lufkin"
+msgstr ""
+
+#: my-evolution/Locations.h:1264
+#, fuzzy
+msgid "Lugano"
+msgstr "黎巴嫩"
+
+#: my-evolution/Locations.h:1265
+msgid "Luqa"
+msgstr ""
+
+#: my-evolution/Locations.h:1266
+#, fuzzy
+msgid "Luton"
+msgstr "外寄"
+
+#: my-evolution/Locations.h:1268
+msgid "Luxeuil"
+msgstr ""
+
+#: my-evolution/Locations.h:1269
+#, fuzzy
+msgid "Luxor"
+msgstr "盧森堡"
+
+#: my-evolution/Locations.h:1270
+#, fuzzy
+msgid "Lviv"
+msgstr "拉脫維亞"
+
+#: my-evolution/Locations.h:1271
+msgid "Lynchburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1272
+msgid "Lyneham"
+msgstr ""
+
+#: my-evolution/Locations.h:1273
+msgid "Lyon-Bron"
+msgstr ""
+
+#: my-evolution/Locations.h:1274
+msgid "Lyon-Satolas"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1275
+#, fuzzy
+msgid "Maastricht"
+msgstr "3月"
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1276
+#, fuzzy
+msgid "Macae"
+msgstr "澳門"
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1277
+#, fuzzy
+msgid "Macapa"
+msgstr "澳門"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1278
+#, fuzzy
+msgid "Maceio"
+msgstr "摩納哥"
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1279
+#, fuzzy
+msgid "Macon"
+msgstr "主管"
+
+#: my-evolution/Locations.h:1280
+#, fuzzy
+msgid "Madinah"
+msgstr "馬其頓"
+
+#: my-evolution/Locations.h:1281
+#, fuzzy
+msgid "Madison"
+msgstr "馬爾地夫"
+
+#: my-evolution/Locations.h:1282
+msgid "Madras/Minambakkam"
+msgstr ""
+
+#: my-evolution/Locations.h:1283
+msgid "Madrid (Barajas)"
+msgstr ""
+
+#: my-evolution/Locations.h:1284
+msgid "Madrid (Cuatro Vientos)"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: my-evolution/Locations.h:1285
+#, fuzzy
+msgid "Magadan"
+msgstr "加拿大"
+
+#: my-evolution/Locations.h:1286
+msgid "Magdalena"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1287
+#, fuzzy
+msgid "Maine"
+msgstr "主管"
+
+#: my-evolution/Locations.h:1288
+msgid "Makhachkala"
+msgstr ""
+
+#: my-evolution/Locations.h:1289
+msgid "Makkah"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1290
+#, fuzzy
+msgid "Makung"
+msgstr "主管"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1291
+#, fuzzy
+msgid "Malad City"
+msgstr "馬拉威"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1292
+#, fuzzy
+msgid "Malaga"
+msgstr "馬爾他"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1293
+#, fuzzy
+msgid "Malatya"
+msgstr "馬爾他"
+
+#: my-evolution/Locations.h:1294
+msgid "Maldonado/Punta Est"
+msgstr ""
+
+#: my-evolution/Locations.h:1295
+msgid "Malmo/Sturup"
+msgstr ""
+
+#: my-evolution/Locations.h:1297
+msgid "Mammoth Lakes"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:732
+#: my-evolution/Locations.h:1298
+#, fuzzy
+msgid "Managua"
+msgstr "主管"
+
+#: my-evolution/Locations.h:1299
+#, fuzzy
+msgid "Manassas"
+msgstr "馬來西亞"
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1300
+#, fuzzy
+msgid "Manaus"
+msgstr "澳門"
+
+# mail/mail-search.c:319
+#: my-evolution/Locations.h:1301
+#, fuzzy
+msgid "Manchester"
+msgstr "符合的資料："
+
+#: my-evolution/Locations.h:1302
+msgid "Mangilsan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1303
+msgid "Manhattan"
+msgstr ""
+
+#: my-evolution/Locations.h:1304
+#, fuzzy
+msgid "Manisa"
+msgstr "馬其頓"
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: my-evolution/Locations.h:1305
+#, fuzzy
+msgid "Manistee"
+msgstr "靄"
+
+# ui/evolution.xml.h:22
+#: my-evolution/Locations.h:1306
+#, fuzzy
+msgid "Manitoba"
+msgstr "主工具列"
+
+#: my-evolution/Locations.h:1307
+msgid "Manitowoc"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1308
+#, fuzzy
+msgid "Mankato"
+msgstr "摩納哥"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1309
+#, fuzzy
+msgid "Mansfield"
+msgstr "郵件"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1310
+#, fuzzy
+msgid "Manta"
+msgstr "馬爾他"
+
+#: my-evolution/Locations.h:1311
+msgid "Manzanillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1312
+#, fuzzy
+msgid "Maraba"
+msgstr "茅利塔尼亞"
+
+#: my-evolution/Locations.h:1313
+msgid "Maracaibo-La Chinita"
+msgstr ""
+
+#: my-evolution/Locations.h:1314
+msgid "Maracay-B.A.Sucre"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1315
+#, fuzzy
+msgid "Marathon"
+msgstr "3月"
+
+#: my-evolution/Locations.h:1316
+msgid "Mar Del Plata"
+msgstr ""
+
+#: my-evolution/Locations.h:1317
+#, fuzzy
+msgid "Margarita"
+msgstr "茅利塔尼亞"
+
+#: my-evolution/Locations.h:1318
+#, fuzzy
+msgid "Marianna"
+msgstr "茅利塔尼亞"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1319
+#, fuzzy
+msgid "Marib"
+msgstr "郵件"
+
+#: my-evolution/Locations.h:1320
+msgid "Maribor"
+msgstr ""
+
+#: my-evolution/Locations.h:1321
+#, fuzzy
+msgid "Marietta"
+msgstr "茅利塔尼亞"
+
+#: my-evolution/Locations.h:1322
+msgid "Marino di Ravenna"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:21
+#: my-evolution/Locations.h:1323
+#, fuzzy
+msgid "Marion"
+msgstr "邊界"
+
+#: my-evolution/Locations.h:1324
+msgid "Marion-Wytheville"
+msgstr ""
+
+#: my-evolution/Locations.h:1325
+#, fuzzy
+msgid "Marquette"
+msgstr "法屬馬丁尼克"
+
+#: my-evolution/Locations.h:1326
+msgid "Marseille-Provence"
+msgstr ""
+
+#: my-evolution/Locations.h:1327
+msgid "Marseilles"
+msgstr ""
+
+#: my-evolution/Locations.h:1328
+#, fuzzy
+msgid "Marshall"
+msgstr "馬紹爾群島"
+
+#: my-evolution/Locations.h:1329
+#, fuzzy
+msgid "Marshalltown"
+msgstr "馬紹爾群島"
+
+#: my-evolution/Locations.h:1330
+msgid "Marshfield"
+msgstr ""
+
+# mail/mail-format.c:640
+# mail/message-list.c:1082
+#: my-evolution/Locations.h:1331
+#, fuzzy
+msgid "Marte"
+msgstr "日期"
+
+# mail/folder-browser.c:706
+#: my-evolution/Locations.h:1332
+#, fuzzy
+msgid "Marthas Vineyard"
+msgstr "標示成未閱讀(_n)"
+
+# addressbook/printing/e-contact-print.glade.h:21
+#: my-evolution/Locations.h:1333
+#, fuzzy
+msgid "Martinsburg"
+msgstr "邊界"
+
+#: my-evolution/Locations.h:1334
+#, fuzzy
+msgid "Martinsville"
+msgstr "法屬馬丁尼克"
+
+#: my-evolution/Locations.h:1335
+#, fuzzy
+msgid "Maryland"
+msgstr "愛爾蘭"
+
+#: my-evolution/Locations.h:1336
+msgid "Marysville"
+msgstr ""
+
+#: my-evolution/Locations.h:1337
+msgid "Marysville-Beale AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1338
+msgid "Mashhad"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1339
+#, fuzzy
+msgid "Masirah"
+msgstr "3月"
+
+#: my-evolution/Locations.h:1340
+msgid "Mason City"
+msgstr ""
+
+#: my-evolution/Locations.h:1341
+msgid "Massachusetts"
+msgstr ""
+
+#: my-evolution/Locations.h:1342
+#, fuzzy
+msgid "Massena"
+msgstr "馬其頓"
+
+# ui/evolution-mail.xml.h:5
+#: my-evolution/Locations.h:1343
+#, fuzzy
+msgid "Matamoros"
+msgstr "葛摩"
+
+#: my-evolution/Locations.h:1344
+msgid "Matsumoto Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1345
+msgid "Matsushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1346
+msgid "Matsuyama Airport"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1347
+#, fuzzy
+msgid "Mattoon"
+msgstr "主管"
+
+# addressbook/gui/widgets/e-addressbook-view.c:732
+#: my-evolution/Locations.h:1348
+#, fuzzy
+msgid "Mayaguez"
+msgstr "主管"
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1349
+#, fuzzy
+msgid "Mayport"
+msgstr "美亞特"
+
+#: my-evolution/Locations.h:1350
+#, fuzzy
+msgid "Mazatlan"
+msgstr "哈薩克"
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1351
+#, fuzzy
+msgid "Mazu"
+msgstr "澳門"
+
+#: my-evolution/Locations.h:1352
+msgid "McAlester"
+msgstr ""
+
+#: my-evolution/Locations.h:1353
+msgid "McAllen"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1354
+#, fuzzy
+msgid "McCall"
+msgstr "郵件"
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1355
+#, fuzzy
+msgid "McCarthy"
+msgstr "3月"
+
+#: my-evolution/Locations.h:1356
+#, fuzzy
+msgid "McClellan"
+msgstr "冰島"
+
+# ui/evolution-event-editor.xml.h:13
+# ui/evolution-mail.xml.h:8
+# ui/evolution-task-editor-dialog.xml.h:14
+#: my-evolution/Locations.h:1357
+#, fuzzy
+msgid "McComb"
+msgstr "公司電話"
+
+#: my-evolution/Locations.h:1358
+msgid "McCook"
+msgstr ""
+
+#: my-evolution/Locations.h:1359
+msgid "McGrath"
+msgstr ""
+
+#: my-evolution/Locations.h:1360
+msgid "Mc Gregor"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:10
+#: my-evolution/Locations.h:1361
+#, fuzzy
+msgid "Meacham"
+msgstr "3月"
+
+# calendar/gui/event-editor-dialog.glade.h:34
+#: my-evolution/Locations.h:1362
+#, fuzzy
+msgid "Medford"
+msgstr "之前"
+
+#: my-evolution/Locations.h:1363
+msgid "Medicine Lodge"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1364
+#, fuzzy
+msgid "Mehamn"
+msgstr "主管"
+
+#: my-evolution/Locations.h:1365
+msgid "Mekoryuk"
+msgstr ""
+
+#: my-evolution/Locations.h:1366
+msgid "Melbourne"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1367
+#, fuzzy
+msgid "Melfa"
+msgstr "馬爾他"
+
+#: my-evolution/Locations.h:1368
+msgid "Melilla"
+msgstr ""
+
+#: my-evolution/Locations.h:1369
+msgid "Memambetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1370
+msgid "Memphis"
+msgstr ""
+
+#: my-evolution/Locations.h:1371
+msgid "Memphis-NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1372
+#, fuzzy
+msgid "Mendoza"
+msgstr "馬其頓"
+
+#: my-evolution/Locations.h:1373
+msgid "Mene Grande"
+msgstr ""
+
+#: my-evolution/Locations.h:1374
+msgid "Menominee"
+msgstr ""
+
+#: my-evolution/Locations.h:1375
+msgid "Menorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1376
+msgid "Merced"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+# calendar/gui/event-editor.c:479
+#: my-evolution/Locations.h:1377
+#, fuzzy
+msgid "Merida"
+msgstr "星期五"
+
+#: my-evolution/Locations.h:1378
+msgid "Meridian"
+msgstr ""
+
+#: my-evolution/Locations.h:1379
+msgid "Meridian-Lauderdale"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:47
+#: my-evolution/Locations.h:1380
+#, fuzzy
+msgid "Merril Field"
+msgstr "寄件者(_F)"
+
+#: my-evolution/Locations.h:1381
+msgid "Mersa Matruh"
+msgstr ""
+
+#: my-evolution/Locations.h:1382
+msgid "Mesa-Falcon Field"
+msgstr ""
+
+#: my-evolution/Locations.h:1383
+msgid "Metabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1384
+msgid "Metz-Frescaty"
+msgstr ""
+
+#: my-evolution/Locations.h:1385
+#, fuzzy
+msgid "Mexicali"
+msgstr "墨西哥"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1387
+#, fuzzy
+msgid "Miami"
+msgstr "郵件"
+
+#: my-evolution/Locations.h:1388
+msgid "Miami-Kendall"
+msgstr ""
+
+#: my-evolution/Locations.h:1389
+msgid "Miami-Opa Locka"
+msgstr ""
+
+#: my-evolution/Locations.h:1390
+msgid "Michigan"
+msgstr ""
+
+# addressbook/contact-editor/fullname.glade.h:15
+#: my-evolution/Locations.h:1391
+#, fuzzy
+msgid "Middle East"
+msgstr "中名(_M)："
+
+#: my-evolution/Locations.h:1392
+#, fuzzy
+msgid "Middleton Island"
+msgstr "索羅門群島"
+
+# addressbook/contact-editor/fullname.glade.h:15
+#: my-evolution/Locations.h:1393
+#, fuzzy
+msgid "Middletown"
+msgstr "中名(_M)："
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1394
+#, fuzzy
+msgid "Midland"
+msgstr "芬蘭"
+
+#: my-evolution/Locations.h:1395
+msgid "Miho Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1396
+msgid "Milano/Linate"
+msgstr ""
+
+#: my-evolution/Locations.h:1397
+msgid "Milano/Malpensa"
+msgstr ""
+
+# shell/e-shell-importer.c:555
+#: my-evolution/Locations.h:1398
+#, fuzzy
+msgid "Miles City"
+msgstr "檔案類別："
+
+# calendar/gui/event-editor-dialog.glade.h:37
+#: my-evolution/Locations.h:1399
+#, fuzzy
+msgid "Milford"
+msgstr "發生"
+
+#: my-evolution/Locations.h:1400
+msgid "Millinocket"
+msgstr ""
+
+#: my-evolution/Locations.h:1401
+msgid "Millville"
+msgstr ""
+
+# mail/mail-autofilter.c:70
+#: my-evolution/Locations.h:1402
+#, fuzzy
+msgid "Milton"
+msgstr "郵件送到 %s"
+
+#: my-evolution/Locations.h:1403
+msgid "Milwaukee"
+msgstr ""
+
+#: my-evolution/Locations.h:1404
+msgid "Milwaukee-Timmerman"
+msgstr ""
+
+#: my-evolution/Locations.h:1405
+msgid "Minamitorishima"
+msgstr ""
+
+#: my-evolution/Locations.h:1406
+#, fuzzy
+msgid "Minatitlan"
+msgstr "茅利塔尼亞"
+
+#: my-evolution/Locations.h:1407
+#, fuzzy
+msgid "Minchumina"
+msgstr "內送"
+
+#: my-evolution/Locations.h:1408
+msgid "Mineralnye Vody"
+msgstr ""
+
+#: my-evolution/Locations.h:1409
+msgid "Mineral Wells"
+msgstr ""
+
+#: my-evolution/Locations.h:1410
+msgid "Minneapolis"
+msgstr ""
+
+#: my-evolution/Locations.h:1411
+msgid "Minneapolis [2]"
+msgstr ""
+
+#: my-evolution/Locations.h:1412
+msgid "Minneapolis [3]"
+msgstr ""
+
+#: my-evolution/Locations.h:1413
+#, fuzzy
+msgid "Minnesota"
+msgstr "密克羅尼西亞"
+
+#: my-evolution/Locations.h:1414
+msgid "Minocqua"
+msgstr ""
+
+#: my-evolution/Locations.h:1415
+#, fuzzy
+msgid "Minot"
+msgstr "不是"
+
+#: my-evolution/Locations.h:1416
+msgid "Minot AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1417
+msgid "Misawa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1418
+msgid "Mississippi"
+msgstr ""
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: my-evolution/Locations.h:1419
+#, fuzzy
+msgid "Missoula"
+msgstr "Miss"
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: my-evolution/Locations.h:1420
+#, fuzzy
+msgid "Missouri"
+msgstr "Miss"
+
+# mail/mail-search.c:319
+#: my-evolution/Locations.h:1421
+#, fuzzy
+msgid "Mitchell"
+msgstr "符合的資料："
+
+#: my-evolution/Locations.h:1422
+#, fuzzy
+msgid "Mitilini"
+msgstr "郵件列表"
+
+#: my-evolution/Locations.h:1423
+msgid "Miyakejima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1424
+msgid "Miyazaki Airport"
+msgstr ""
+
+# calendar/gui/print.c:362
+#: my-evolution/Locations.h:1425
+#, fuzzy
+msgid "Moa"
+msgstr "一"
+
+# addressbook/gui/widgets/e-addressbook-view.c:711
+#: my-evolution/Locations.h:1426
+#, fuzzy
+msgid "Mobile Downtown"
+msgstr "行動電話"
+
+#: my-evolution/Locations.h:1427
+msgid "Mobile Regional Airport"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1253
+#: my-evolution/Locations.h:1428
+#, fuzzy
+msgid "Mobridge"
+msgstr "行動電話"
+
+#: my-evolution/Locations.h:1429
+#, fuzzy
+msgid "Modesto"
+msgstr "中霧"
+
+#: my-evolution/Locations.h:1430
+msgid "Mo I Rana"
+msgstr ""
+
+# ui/evolution-mail.xml.h:55
+#: my-evolution/Locations.h:1431
+#, fuzzy
+msgid "Mojave"
+msgstr "移動"
+
+# addressbook/contact-editor/e-contact-editor.c:1253
+#: my-evolution/Locations.h:1432
+#, fuzzy
+msgid "Molde"
+msgstr "行動電話"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1433
+#, fuzzy
+msgid "Moldova"
+msgstr "星期一"
+
+#: my-evolution/Locations.h:1434
+msgid "Moline-Quad Cities"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1435
+#, fuzzy
+msgid "Molokai"
+msgstr "馬拉威"
+
+#: my-evolution/Locations.h:1436
+msgid "Mombetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1437
+msgid "Monchengladbach"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1438
+#, fuzzy
+msgid "Monclova"
+msgstr "摩納哥"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1439
+#, fuzzy
+msgid "Moncton"
+msgstr "摩納哥"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1440
+#, fuzzy
+msgid "Monida"
+msgstr "星期一"
+
+#: my-evolution/Locations.h:1441
+msgid "Monpellier-Mediterrannee"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1442
+#, fuzzy
+msgid "Monroe"
+msgstr "摩納哥"
+
+# addressbook/gui/widgets/e-addressbook-view.c:732
+#: my-evolution/Locations.h:1443
+#, fuzzy
+msgid "Montague"
+msgstr "主管"
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:1444
+#, fuzzy
+msgid "Montana"
+msgstr "月"
+
+#: my-evolution/Locations.h:1445
+msgid "Mont-de-Marsan"
+msgstr ""
+
+#: my-evolution/Locations.h:1446
+msgid "Monte Argentario"
+msgstr ""
+
+#: my-evolution/Locations.h:1447
+#, fuzzy
+msgid "Monte Bisbino"
+msgstr "中雪"
+
+#: my-evolution/Locations.h:1448
+msgid "Monte Calamita"
+msgstr ""
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:1449
+#, fuzzy
+msgid "Monte Cimone"
+msgstr "月檢視"
+
+#: my-evolution/Locations.h:1450
+#, fuzzy
+msgid "Montego Bay"
+msgstr "蒙古"
+
+#: my-evolution/Locations.h:1451
+msgid "Monte Malanotte"
+msgstr ""
+
+#: my-evolution/Locations.h:1452
+#, fuzzy
+msgid "Monterey"
+msgstr "蒙瑟拉特島"
+
+#: my-evolution/Locations.h:1453
+#, fuzzy
+msgid "Monterrey"
+msgstr "蒙瑟拉特島"
+
+#: my-evolution/Locations.h:1454
+msgid "Monte Scuro"
+msgstr ""
+
+#: my-evolution/Locations.h:1455
+msgid "Monte Terminillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1456
+msgid "Montevideo/Carrasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1457
+#, fuzzy
+msgid "Montgomery"
+msgstr "蒙瑟拉特島"
+
+#: my-evolution/Locations.h:1458
+msgid "Montgomery-Maxwell AFB"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:1459
+#, fuzzy
+msgid "Monticello"
+msgstr "摩納哥"
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:1460
+#, fuzzy
+msgid "Montpelier"
+msgstr "月檢視"
+
+#: my-evolution/Locations.h:1461
+msgid "Montreal Dorval"
+msgstr ""
+
+#: my-evolution/Locations.h:1462
+msgid "Montreal Mirabel"
+msgstr ""
+
+#: my-evolution/Locations.h:1463
+msgid "Montreal Saint-Hubert"
+msgstr ""
+
+#: my-evolution/Locations.h:1464
+#, fuzzy
+msgid "Montrose"
+msgstr "蒙瑟拉特島"
+
+#: my-evolution/Locations.h:1465
+msgid "Montrose (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:1466
+#, fuzzy
+msgid "Morelia"
+msgstr "蒙古"
+
+# addressbook/gui/widgets/e-addressbook-view.c:708
+#: my-evolution/Locations.h:1467
+#, fuzzy
+msgid "Morgantown"
+msgstr "團體"
+
+# addressbook/contact-editor/e-contact-editor.c:1257
+#: my-evolution/Locations.h:1468
+#, fuzzy
+msgid "Moriarty"
+msgstr "首要的"
+
+#: my-evolution/Locations.h:1470
+msgid "Morristown"
+msgstr ""
+
+#: my-evolution/Locations.h:1471
+msgid "Moscow Domodedovo"
+msgstr ""
+
+#: my-evolution/Locations.h:1472
+msgid "Moscow Sheremetyevo"
+msgstr ""
+
+#: my-evolution/Locations.h:1473
+msgid "Moses Lake"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1253
+#: my-evolution/Locations.h:1474
+#, fuzzy
+msgid "Mosinee"
+msgstr "行動電話"
+
+#: my-evolution/Locations.h:1475
+msgid "Mosjoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1476
+msgid "Moultrie"
+msgstr ""
+
+#: my-evolution/Locations.h:1477
+msgid "Mountain Home"
+msgstr ""
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:1478
+#, fuzzy
+msgid "Mountain View"
+msgstr "月檢視"
+
+#: my-evolution/Locations.h:1479
+msgid "Mount Clemens"
+msgstr ""
+
+#: my-evolution/Locations.h:1480
+msgid "Mount Holly"
+msgstr ""
+
+#: my-evolution/Locations.h:1481
+#, fuzzy
+msgid "Mount Shasta"
+msgstr "東南"
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:1482
+#, fuzzy
+msgid "Mount Vernon"
+msgstr "月檢視"
+
+#: my-evolution/Locations.h:1483
+msgid "Mount Wilson"
+msgstr ""
+
+#: my-evolution/Locations.h:1484
+msgid "Mt Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:1485
+msgid "Mugla/Dalaman"
+msgstr ""
+
+#: my-evolution/Locations.h:1486
+msgid "Muir"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:1487
+#, fuzzy
+msgid "Mullan"
+msgstr "主管"
+
+#: my-evolution/Locations.h:1488
+msgid "Mullen"
+msgstr ""
+
+#: my-evolution/Locations.h:1489
+msgid "Munchen"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:9
+#: my-evolution/Locations.h:1490
+#, fuzzy
+msgid "Muncie"
+msgstr "6月"
+
+#: my-evolution/Locations.h:1491
+msgid "Munster/Osnabruck"
+msgstr ""
+
+#: my-evolution/Locations.h:1492
+#, fuzzy
+msgid "Murcia"
+msgstr "茅利塔尼亞"
+
+#: my-evolution/Locations.h:1493
+msgid "Murmansk"
+msgstr ""
+
+# addressbook/contact-editor/fullname.glade.h:11
+#: my-evolution/Locations.h:1494
+#, fuzzy
+msgid "Mus"
+msgstr "Ms."
+
+#: my-evolution/Locations.h:1495
+#, fuzzy
+msgid "Muscatine"
+msgstr "法屬馬丁尼克"
+
+#: my-evolution/Locations.h:1496
+msgid "Muscle Shoals"
+msgstr ""
+
+#: my-evolution/Locations.h:1497
+msgid "Muskegon"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:8
+#: my-evolution/Locations.h:1498
+#, fuzzy
+msgid "Mykonos"
+msgstr "節"
+
+#: my-evolution/Locations.h:1499
+msgid "Myrtle Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:1500
+msgid "Nabesna/Devil Mt."
+msgstr ""
+
+#: my-evolution/Locations.h:1501
+msgid "Nacogdoches"
+msgstr ""
+
+#: my-evolution/Locations.h:1502
+msgid "Nagasaki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1503
+msgid "Nagoya Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1504
+msgid "Nagpur Sonegaon"
+msgstr ""
+
+#: my-evolution/Locations.h:1505
+msgid "Naha Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1506
+#, fuzzy
+msgid "Najran"
+msgstr "巴林"
+
+#: my-evolution/Locations.h:1507
+msgid "Nakashibetsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1508
+msgid "Nalchik"
+msgstr ""
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1509
+#, fuzzy
+msgid "Namsos"
+msgstr "寮國"
+
+#: my-evolution/Locations.h:1510
+msgid "Nancy-Essey"
+msgstr ""
+
+#: my-evolution/Locations.h:1511
+msgid "Nancy-Ochey"
+msgstr ""
+
+#: my-evolution/Locations.h:1512
+msgid "Nankishirahama Airport"
+msgstr ""
+
+# widgets/misc/e-messagebox.c:159
+#: my-evolution/Locations.h:1513
+#, fuzzy
+msgid "Nanning"
+msgstr "警告"
+
+#: my-evolution/Locations.h:1514
+msgid "Nantes Adlantique"
+msgstr ""
+
+#: my-evolution/Locations.h:1515
+msgid "Nantucket"
+msgstr ""
+
+# mail/message-browser.c:188
+# ui/evolution-mail.xml.h:70
+#: my-evolution/Locations.h:1516
+#, fuzzy
+msgid "Napa"
+msgstr "尼泊爾"
+
+# mail/mail-config.glade.h:45
+#: my-evolution/Locations.h:1517
+#, fuzzy
+msgid "Naples"
+msgstr "新聞"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1518
+#, fuzzy
+msgid "Napoli"
+msgstr "馬利"
+
+# addressbook/gui/widgets/e-addressbook-view.c:734
+#: my-evolution/Locations.h:1519
+#, fuzzy
+msgid "Narvik"
+msgstr "暱稱"
+
+#: my-evolution/Locations.h:1520
+msgid "Nasa Shuttle"
+msgstr ""
+
+#: my-evolution/Locations.h:1521
+msgid "Nashua"
+msgstr ""
+
+#: my-evolution/Locations.h:1522
+msgid "Nashville"
+msgstr ""
+
+#: my-evolution/Locations.h:1523
+msgid "Nassau"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: my-evolution/Locations.h:1524
+#, fuzzy
+msgid "Natal"
+msgstr "卡達"
+
+# mail/mail-search.c:319
+#: my-evolution/Locations.h:1525
+#, fuzzy
+msgid "Natchez"
+msgstr "符合的資料："
+
+#: my-evolution/Locations.h:1526
+msgid "Nawabshah"
+msgstr ""
+
+# ui/evolution-tasks.xml.h:3
+#: my-evolution/Locations.h:1527
+#, fuzzy
+msgid "Nebraska"
+msgstr "新增工作"
+
+#: my-evolution/Locations.h:1528
+msgid "Needles"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: my-evolution/Locations.h:1529
+#, fuzzy
+msgid "Nenana"
+msgstr "格瑞那達"
+
+#: my-evolution/Locations.h:1531
+msgid "Neuquen"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: my-evolution/Locations.h:1532
+#, fuzzy
+msgid "Nevada"
+msgstr "格瑞那達"
+
+# ui/evolution-tasks.xml.h:3
+#: my-evolution/Locations.h:1533
+#, fuzzy
+msgid "Newark"
+msgstr "新增工作"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: my-evolution/Locations.h:1534
+#, fuzzy
+msgid "New Bedford"
+msgstr "新聞發送伺服器"
+
+# ui/evolution.xml.h:59
+#: my-evolution/Locations.h:1535
+#, fuzzy
+msgid "New Bern"
+msgstr "新增資料夾(_N)"
+
+#: my-evolution/Locations.h:1536
+msgid "New Braunfels"
+msgstr ""
+
+#: my-evolution/Locations.h:1537
+msgid "New Brunswick"
+msgstr ""
+
+#: my-evolution/Locations.h:1538
+msgid "Newburgh"
+msgstr ""
+
+# mail/mail-config.glade.h:45
+#: my-evolution/Locations.h:1539
+#, fuzzy
+msgid "Newcastle"
+msgstr "新聞"
+
+#: my-evolution/Locations.h:1540
+#, fuzzy
+msgid "New Delhi/Palam"
+msgstr "紐西蘭"
+
+#: my-evolution/Locations.h:1541
+#, fuzzy
+msgid "Newfoundland"
+msgstr "紐西蘭"
+
+#: my-evolution/Locations.h:1542
+msgid "New Hampshire"
+msgstr ""
+
+# ui/evolution-addressbook.xml.h:7
+#: my-evolution/Locations.h:1543
+#, fuzzy
+msgid "New Haven"
+msgstr "新喀里多尼亞島"
+
+# ui/evolution-addressbook.xml.h:7
+#: my-evolution/Locations.h:1544
+#, fuzzy
+msgid "New Iberia"
+msgstr "新喀里多尼亞島"
+
+# widgets/misc/e-messagebox.c:180
+#: my-evolution/Locations.h:1545
+#, fuzzy
+msgid "New Jersey"
+msgstr "新郵件"
+
+#: my-evolution/Locations.h:1546
+#, fuzzy
+msgid "New Mexico"
+msgstr "墨西哥"
+
+#: my-evolution/Locations.h:1547
+#, fuzzy
+msgid "New Orleans"
+msgstr "紐西蘭"
+
+#: my-evolution/Locations.h:1548
+msgid "New Orleans-Lakefront"
+msgstr ""
+
+#: my-evolution/Locations.h:1549
+msgid "New Orleans NAS"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:736
+#: my-evolution/Locations.h:1550
+#, fuzzy
+msgid "Newport"
+msgstr "北"
+
+#: my-evolution/Locations.h:1551
+msgid "Newport News"
+msgstr ""
+
+#: my-evolution/Locations.h:1552
+msgid "New Port Richey"
+msgstr ""
+
+# ui/evolution.xml.h:59
+#: my-evolution/Locations.h:1553
+#, fuzzy
+msgid "New River"
+msgstr "新增資料夾(_N)"
+
+#: my-evolution/Locations.h:1554
+msgid "New Tokyo International Airport"
+msgstr ""
+
+# ui/evolution-calendar.xml.h:40
+# ui/evolution-event-editor.xml.h:66
+# ui/evolution-task-editor-dialog.xml.h:79
+# ui/evolution.xml.h:58
+#: my-evolution/Locations.h:1555
+#, fuzzy
+msgid "Newton"
+msgstr "新增"
+
+# ui/evolution.xml.h:59
+#: my-evolution/Locations.h:1556
+#, fuzzy
+msgid "New York"
+msgstr "新增資料夾(_N)"
+
+#: my-evolution/Locations.h:1557
+msgid "New York-JFK Arpt"
+msgstr ""
+
+#: my-evolution/Locations.h:1558
+msgid "New York-La Guardia"
+msgstr ""
+
+#: my-evolution/Locations.h:1560
+msgid "Niagara Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1562
+msgid "Nice-Cote d'Azur"
+msgstr ""
+
+#: my-evolution/Locations.h:1563
+msgid "Niigata Airport"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:6
+#: my-evolution/Locations.h:1564
+#, fuzzy
+msgid "Nimes-Garons"
+msgstr "尺寸："
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:1565
+#, fuzzy
+msgid "Nipawin"
+msgstr "西班牙"
+
+#: my-evolution/Locations.h:1566
+#, fuzzy
+msgid "Nis"
+msgstr "是"
+
+#: my-evolution/Locations.h:1567
+msgid "Nizhny Novgorod"
+msgstr ""
+
+#: my-evolution/Locations.h:1568
+msgid "N Las Vegas"
+msgstr ""
+
+#: my-evolution/Locations.h:1569
+msgid "N Myrtle Beach"
+msgstr ""
+
+# calendar/gui/calendar-model.c:499
+# calendar/gui/calendar-model.c:1068
+# calendar/gui/calendar-model.c:1574
+# calendar/gui/dialogs/task-editor-dialog.glade.h:13
+# calendar/gui/e-calendar-table.c:346
+# mail/message-list.c:688
+#: my-evolution/Locations.h:1570
+#, fuzzy
+msgid "Nogales"
+msgstr "普通"
+
+# addressbook/gui/component/addressbook-config.glade.h:5
+#: my-evolution/Locations.h:1571
+#, fuzzy
+msgid "Nome"
+msgstr "名稱"
+
+#: my-evolution/Locations.h:1572
+#, fuzzy
+msgid "Norfolk"
+msgstr "諾福克群島"
+
+#: my-evolution/Locations.h:1574
+#, fuzzy
+msgid "Norfolk NAS"
+msgstr "諾福克群島"
+
+# mail/mail-mt.c:516
+# mail/mail-mt.c:545
+# mail/mail-mt.c:880
+#: my-evolution/Locations.h:1575
+#, fuzzy
+msgid "Norrkoping"
+msgstr "正在工作"
+
+# addressbook/contact-editor/contact-editor.glade.h:12
+#: my-evolution/Locations.h:1576
+#, fuzzy
+msgid "North Adams"
+msgstr "東北"
+
+# addressbook/gui/widgets/e-addressbook-view.c:736
+#: my-evolution/Locations.h:1577
+#, fuzzy
+msgid "North Bend"
+msgstr "北"
+
+#: my-evolution/Locations.h:1578
+msgid "North Carolina"
+msgstr ""
+
+# widgets/misc/e-cell-date-edit.c:221
+# widgets/misc/e-dateedit.c:418
+#: my-evolution/Locations.h:1579
+#, fuzzy
+msgid "North Conway"
+msgstr "挪威"
+
+# addressbook/contact-editor/contact-editor.glade.h:12
+#: my-evolution/Locations.h:1580
+#, fuzzy
+msgid "North Dakota"
+msgstr "東北"
+
+#: my-evolution/Locations.h:1581
+msgid "Northeast Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1582
+msgid "North Kingstown"
+msgstr ""
+
+# addressbook/contact-editor/contact-editor.glade.h:12
+#: my-evolution/Locations.h:1583
+#, fuzzy
+msgid "North Platte"
+msgstr "東北"
+
+# widgets/misc/e-cell-date-edit.c:221
+# widgets/misc/e-dateedit.c:418
+#: my-evolution/Locations.h:1584
+#, fuzzy
+msgid "Northway"
+msgstr "挪威"
+
+#: my-evolution/Locations.h:1585
+#, fuzzy
+msgid "Northwest Territories"
+msgstr "法屬南部屬地"
+
+# addressbook/gui/widgets/e-addressbook-view.c:736
+#: my-evolution/Locations.h:1587
+#, fuzzy
+msgid "Norwich"
+msgstr "北"
+
+# widgets/misc/e-cell-date-edit.c:221
+# widgets/misc/e-dateedit.c:418
+#: my-evolution/Locations.h:1588
+#, fuzzy
+msgid "Norwood"
+msgstr "挪威"
+
+# addressbook/gui/widgets/e-addressbook-view.c:736
+#: my-evolution/Locations.h:1589
+#, fuzzy
+msgid "Notodden"
+msgstr "備註"
+
+#: my-evolution/Locations.h:1590
+msgid "Novara/Cameri"
+msgstr ""
+
+#: my-evolution/Locations.h:1591
+msgid "Nova Scotia"
+msgstr ""
+
+#: my-evolution/Locations.h:1592
+msgid "Novosibirsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1593
+msgid "Nueva Gerona"
+msgstr ""
+
+#: my-evolution/Locations.h:1594
+msgid "Nueva Ocotepeque"
+msgstr ""
+
+# calendar/gui/calendar-model.c:638
+# calendar/gui/calendar-model.c:1176
+# calendar/gui/dialogs/task-editor-dialog.glade.h:14
+# calendar/gui/e-calendar-table.c:419
+#: my-evolution/Locations.h:1595
+#, fuzzy
+msgid "Nuevo Laredo"
+msgstr "未開始"
+
+#: my-evolution/Locations.h:1596
+msgid "Nurnberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1597
+msgid "Nyutabaru Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1598
+msgid "Oahu"
+msgstr ""
+
+#: my-evolution/Locations.h:1599
+msgid "Oak Harbor"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1600
+#, fuzzy
+msgid "Oakland"
+msgstr "泰國"
+
+#: my-evolution/Locations.h:1601
+#, fuzzy
+msgid "Oaxaca"
+msgstr "牙買加"
+
+#: my-evolution/Locations.h:1602
+msgid "Oberpfaffenhofen"
+msgstr ""
+
+#: my-evolution/Locations.h:1603
+msgid "Obihiro Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1604
+#, fuzzy
+msgid "Ocala"
+msgstr "帛琉群島"
+
+#: my-evolution/Locations.h:1605
+#, fuzzy
+msgid "Oceanside"
+msgstr "冰島"
+
+# addressbook/gui/component/addressbook-config.c:179
+#: my-evolution/Locations.h:1606
+#, fuzzy
+msgid "Odense"
+msgstr "一"
+
+#: my-evolution/Locations.h:1607
+msgid "Odesa"
+msgstr ""
+
+# mail/message-list.c:678
+#: my-evolution/Locations.h:1608
+#, fuzzy
+msgid "Oelwen"
+msgstr "已閱讀"
+
+# calendar/gui/e-day-view.c:3162
+# calendar/gui/e-week-view.c:3292
+# ui/evolution-calendar.xml.h:19
+# ui/evolution-message-composer.xml.h:11
+#: my-evolution/Locations.h:1609
+#, fuzzy
+msgid "Ogden"
+msgstr "開啟"
+
+#: my-evolution/Locations.h:1610
+msgid "Ogden-Hill AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1611
+msgid "Ogdensburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1612
+msgid "Ohio"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1254
+# addressbook/contact-editor/e-contact-editor.c:1312
+#: my-evolution/Locations.h:1613
+#, fuzzy
+msgid "Ohrid"
+msgstr "其它電話"
+
+#: my-evolution/Locations.h:1614
+msgid "Oita Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1615
+#, fuzzy
+msgid "Ojika Island"
+msgstr "科克群島"
+
+#: my-evolution/Locations.h:1616
+msgid "Okayama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1617
+msgid "Oki Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1618
+msgid "Okinoerabu"
+msgstr ""
+
+#: my-evolution/Locations.h:1619
+msgid "Oklahoma"
+msgstr ""
+
+#: my-evolution/Locations.h:1620
+msgid "Oklahoma City"
+msgstr ""
+
+#: my-evolution/Locations.h:1621
+msgid "Oklahoma City-Bethany"
+msgstr ""
+
+#: my-evolution/Locations.h:1622
+msgid "Oklahoma City-Midwest City"
+msgstr ""
+
+#: my-evolution/Locations.h:1623
+#, fuzzy
+msgid "Okushiri Island"
+msgstr "英屬維爾京群島"
+
+# addressbook/contact-editor/e-contact-editor.c:1254
+# addressbook/contact-editor/e-contact-editor.c:1312
+#: my-evolution/Locations.h:1624
+#, fuzzy
+msgid "Olathe"
+msgstr "其它電話"
+
+#: my-evolution/Locations.h:1625
+msgid "Olathe/Ind."
+msgstr ""
+
+#: my-evolution/Locations.h:1626
+#, fuzzy
+msgid "Olbia"
+msgstr "阿爾巴尼亞"
+
+#: my-evolution/Locations.h:1627
+msgid "Olympia"
+msgstr ""
+
+#: my-evolution/Locations.h:1628
+#, fuzzy
+msgid "Omaha"
+msgstr "阿曼"
+
+#: my-evolution/Locations.h:1629
+msgid "Omaha-Bellevue"
+msgstr ""
+
+#: my-evolution/Locations.h:1630
+#, fuzzy
+msgid "Omak"
+msgstr "阿曼"
+
+#: my-evolution/Locations.h:1632
+msgid "Ominato Ab"
+msgstr ""
+
+# calendar/gui/alarm-notify/alarm-queue.c:890
+# calendar/gui/alarm-notify/alarm-queue.c:945
+#: my-evolution/Locations.h:1633
+#, fuzzy
+msgid "Omsk"
+msgstr "確定"
+
+#: my-evolution/Locations.h:1634
+msgid "O'Neill"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:24
+#: my-evolution/Locations.h:1635
+#, fuzzy
+msgid "Ontario"
+msgstr "紙張方向"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:744
+#: my-evolution/Locations.h:1636
+#, fuzzy
+msgid "Oostende"
+msgstr "到會者"
+
+#: my-evolution/Locations.h:1637
+#, fuzzy
+msgid "Oran"
+msgstr "阿曼"
+
+#: my-evolution/Locations.h:1638
+msgid "Oran/Es Senia"
+msgstr ""
+
+# ui/evolution-mail.xml.h:2
+#: my-evolution/Locations.h:1639
+#, fuzzy
+msgid "Orange"
+msgstr "法國"
+
+#: my-evolution/Locations.h:1640
+msgid "Orange City"
+msgstr ""
+
+#: my-evolution/Locations.h:1641
+msgid "Ord-Sharp"
+msgstr ""
+
+# addressbook/backend/ebook/e-card.c:3458
+#: my-evolution/Locations.h:1642
+#, fuzzy
+msgid "Oregon"
+msgstr "團體"
+
+#: my-evolution/Locations.h:1643
+msgid "Orenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1644
+#, fuzzy
+msgid "Orland"
+msgstr "愛爾蘭"
+
+#: my-evolution/Locations.h:1645
+#, fuzzy
+msgid "Orlando"
+msgstr "愛爾蘭"
+
+#: my-evolution/Locations.h:1646
+msgid "Orlando (Orlando International)"
+msgstr ""
+
+#: my-evolution/Locations.h:1647
+msgid "Orsta-Volda"
+msgstr ""
+
+# executive-summary/test-service/rdf-summary.c:512
+# executive-summary/test-service/rdf-summary.c:549
+# executive-summary/test-service/rdf-summary.c:594
+# widgets/misc/e-messagebox.c:166
+#: my-evolution/Locations.h:1648
+#, fuzzy
+msgid "Oruro"
+msgstr "錯誤"
+
+#: my-evolution/Locations.h:1649
+msgid "Osaka International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1650
+msgid "Osan Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1651
+#, fuzzy
+msgid "Oscoda"
+msgstr "秒"
+
+#: my-evolution/Locations.h:1652
+msgid "Oseberg A"
+msgstr ""
+
+#: my-evolution/Locations.h:1653
+msgid "Oshima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:1654
+msgid "Oshkosh"
+msgstr ""
+
+#: my-evolution/Locations.h:1655
+msgid "Oslo/Gardenmoen"
+msgstr ""
+
+#: my-evolution/Locations.h:1656
+#, fuzzy
+msgid "Ostrava"
+msgstr "澳大利亞"
+
+#: my-evolution/Locations.h:1657
+msgid "Ottawa"
+msgstr ""
+
+#: my-evolution/Locations.h:1658
+msgid "Ottumwa"
+msgstr ""
+
+#: my-evolution/Locations.h:1659
+msgid "Owensboro"
+msgstr ""
+
+#: my-evolution/Locations.h:1660
+#, fuzzy
+msgid "Owyhee"
+msgstr "週"
+
+# calendar/gui/event-editor-dialog.glade.h:37
+#: my-evolution/Locations.h:1661
+#, fuzzy
+msgid "Oxford"
+msgstr "發生"
+
+#: my-evolution/Locations.h:1662
+msgid "Oxnard"
+msgstr ""
+
+#: my-evolution/Locations.h:1663
+msgid "Ozark"
+msgstr ""
+
+#: my-evolution/Locations.h:1664
+msgid "Ozuki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1665
+msgid "Paderborn-Haxterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:1666
+msgid "Padova"
+msgstr ""
+
+#: my-evolution/Locations.h:1667
+msgid "Paducah"
+msgstr ""
+
+#: my-evolution/Locations.h:1668
+msgid "Paekado"
+msgstr ""
+
+#: my-evolution/Locations.h:1669
+msgid "Paengnyongdo Ab"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:1670
+#, fuzzy
+msgid "Paganella"
+msgstr "頁"
+
+#: my-evolution/Locations.h:1673
+msgid "Pa Kuei/Bakuai"
+msgstr ""
+
+#: my-evolution/Locations.h:1674
+#, fuzzy
+msgid "Palacios"
+msgstr "帛琉群島"
+
+# addressbook/printing/e-contact-print.glade.h:27
+#: my-evolution/Locations.h:1675
+#, fuzzy
+msgid "Palermo"
+msgstr "使用紙張"
+
+#: my-evolution/Locations.h:1676
+msgid "Palma de Mallorca"
+msgstr ""
+
+#: my-evolution/Locations.h:1677
+#, fuzzy
+msgid "Palmdale"
+msgstr "帛琉群島"
+
+# addressbook/contact-editor/e-contact-editor.c:1256
+# addressbook/gui/widgets/e-addressbook-view.c:720
+#: my-evolution/Locations.h:1678
+#, fuzzy
+msgid "Palmer"
+msgstr "呼叫器"
+
+# ui/evolution-mail.xml.h:110
+#: my-evolution/Locations.h:1679
+#, fuzzy
+msgid "Palm Springs"
+msgstr "郵件設定"
+
+#: my-evolution/Locations.h:1680
+msgid "Palo Alto"
+msgstr ""
+
+#: my-evolution/Locations.h:1681
+#, fuzzy
+msgid "Pamplona"
+msgstr "帛琉群島"
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: my-evolution/Locations.h:1683
+#, fuzzy
+msgid "Panama City"
+msgstr "巴拿馬"
+
+# calendar/gui/calendar-model.c:647
+# calendar/gui/calendar-model.c:1182
+# calendar/gui/dialogs/task-editor-dialog.glade.h:4
+# calendar/gui/e-calendar-table.c:422
+# camel/camel-service.c:544
+# camel/camel-service.c:580
+#: my-evolution/Locations.h:1684
+#, fuzzy
+msgid "Pantelleria"
+msgstr "已取消"
+
+# addressbook/printing/e-contact-print.glade.h:27
+#: my-evolution/Locations.h:1685
+#, fuzzy
+msgid "Papa"
+msgstr "使用紙張"
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:1686
+#, fuzzy
+msgid "Paphos"
+msgstr "寮國"
+
+# addressbook/printing/e-contact-print.glade.h:21
+#: my-evolution/Locations.h:1688
+#, fuzzy
+msgid "Paris"
+msgstr "邊界"
+
+#: my-evolution/Locations.h:1689
+msgid "Paris/Charles De Gaulle"
+msgstr ""
+
+#: my-evolution/Locations.h:1690
+msgid "Paris/Le Bourget"
+msgstr ""
+
+#: my-evolution/Locations.h:1691
+#, fuzzy
+msgid "Paris/Orly"
+msgstr "局部有飛沫"
+
+#: my-evolution/Locations.h:1692
+msgid "Parkersburg"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:165
+# camel/camel-sasl-plain.c:32
+# camel/providers/imap/camel-imap-provider.c:80
+# camel/providers/nntp/camel-nntp-store.c:291
+# camel/providers/pop3/camel-pop3-provider.c:67
+# mail/mail-config.glade.h:52
+#: my-evolution/Locations.h:1693
+#, fuzzy
+msgid "Pasco"
+msgstr "密碼"
+
+#: my-evolution/Locations.h:1694
+msgid "Paso De Los Libres"
+msgstr ""
+
+#: my-evolution/Locations.h:1695
+msgid "Paso Robles"
+msgstr ""
+
+#: my-evolution/Locations.h:1696
+msgid "Passo dei Giovi"
+msgstr ""
+
+#: my-evolution/Locations.h:1697
+msgid "Passo della Cisa"
+msgstr ""
+
+#: my-evolution/Locations.h:1698
+msgid "Passo Resia"
+msgstr ""
+
+#: my-evolution/Locations.h:1699
+msgid "Passo Rolle"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:2
+#: my-evolution/Locations.h:1700
+#, fuzzy
+msgid "Patna"
+msgstr "巴拿馬"
+
+#: my-evolution/Locations.h:1701
+msgid "Patterson"
+msgstr ""
+
+#: my-evolution/Locations.h:1702
+msgid "Patuxent River"
+msgstr ""
+
+#: my-evolution/Locations.h:1703
+msgid "Pau/Pyrenees"
+msgstr ""
+
+#: my-evolution/Locations.h:1704
+msgid "Paxson"
+msgstr ""
+
+#: my-evolution/Locations.h:1705
+#, fuzzy
+msgid "Paysandu"
+msgstr "大沙塵"
+
+# calendar/gui/event-editor-dialog.glade.h:14
+# calendar/gui/event-editor.c:1588
+#: my-evolution/Locations.h:1706
+#, fuzzy
+msgid "Payson"
+msgstr "播放音效："
+
+# widgets/misc/e-messagebox.c:173
+#: my-evolution/Locations.h:1707
+#, fuzzy
+msgid "Pellston"
+msgstr "問題"
+
+#: my-evolution/Locations.h:1708
+#, fuzzy
+msgid "Pelotas"
+msgstr "重新載入"
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/Locations.h:1709
+#, fuzzy
+msgid "Pendleton"
+msgstr "選擇："
+
+#: my-evolution/Locations.h:1710
+msgid "Pennsylvania"
+msgstr ""
+
+#: my-evolution/Locations.h:1711
+msgid "Penn Yan"
+msgstr ""
+
+#: my-evolution/Locations.h:1712
+msgid "Pensacola"
+msgstr ""
+
+#: my-evolution/Locations.h:1713
+msgid "Pensacola NAS"
+msgstr ""
+
+#: my-evolution/Locations.h:1714
+msgid "People's Republic of China"
+msgstr ""
+
+#: my-evolution/Locations.h:1715
+#, fuzzy
+msgid "Peoria"
+msgstr "喬治亞"
+
+#: my-evolution/Locations.h:1716
+msgid "Pequot Lakes"
+msgstr ""
+
+#: my-evolution/Locations.h:1717
+msgid "Pereira/Matecana"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1257
+#: my-evolution/Locations.h:1718
+#, fuzzy
+msgid "Perm"
+msgstr "首要的"
+
+#: my-evolution/Locations.h:1719
+msgid "Perpignan-Rivesaltes"
+msgstr ""
+
+#: my-evolution/Locations.h:1720
+msgid "Perry-Foley"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:27
+#: my-evolution/Locations.h:1721
+#, fuzzy
+msgid "Perth"
+msgstr "秘魯"
+
+# addressbook/printing/e-contact-print.glade.h:27
+#: my-evolution/Locations.h:1723
+#, fuzzy
+msgid "Perugia"
+msgstr "秘魯"
+
+#: my-evolution/Locations.h:1724
+msgid "Pescara"
+msgstr ""
+
+#: my-evolution/Locations.h:1725
+msgid "Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1726
+msgid "Petropavlovsk-Kamchatsky"
+msgstr ""
+
+#: my-evolution/Locations.h:1727
+msgid "Petrozavodsk"
+msgstr ""
+
+#: my-evolution/Locations.h:1728
+msgid "Philadelphia"
+msgstr ""
+
+#: my-evolution/Locations.h:1729
+#, fuzzy
+msgid "Philip"
+msgstr "菲律賓"
+
+#: my-evolution/Locations.h:1730
+#, fuzzy
+msgid "Philipsburg"
+msgstr "菲律賓"
+
+#: my-evolution/Locations.h:1731
+#, fuzzy
+msgid "Phillips"
+msgstr "菲律賓"
+
+#: my-evolution/Locations.h:1732
+msgid "Phoenix"
+msgstr ""
+
+#: my-evolution/Locations.h:1733
+msgid "Phoenix-Deer Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:1734
+msgid "Phoenix-Goodyear"
+msgstr ""
+
+#: my-evolution/Locations.h:1735
+msgid "Phoenix-Luke AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1736
+msgid "Piacenza"
+msgstr ""
+
+#: my-evolution/Locations.h:1737
+msgid "Pian Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:1738
+msgid "Piedras Negras"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+# addressbook/gui/widgets/e-addressbook-view.c:614
+# mail/message-browser.c:199
+# ui/evolution-addressbook.xml.h:9
+# ui/evolution-calendar.xml.h:23
+# ui/evolution-mail.xml.h:65
+# ui/evolution-tasks.xml.h:4
+#: my-evolution/Locations.h:1739
+#, fuzzy
+msgid "Pierre"
+msgstr "列印"
+
+#: my-evolution/Locations.h:1740
+msgid "Pietersburg"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:15
+#: my-evolution/Locations.h:1741
+#, fuzzy
+msgid "Pikeville"
+msgstr "預覽"
+
+# importers/pine-importer.c:723
+#: my-evolution/Locations.h:1742
+#, fuzzy
+msgid "Pine Bluff"
+msgstr "Pine 郵件"
+
+#: my-evolution/Locations.h:1743
+msgid "Pingtung North"
+msgstr ""
+
+#: my-evolution/Locations.h:1744
+msgid "Pingtung South"
+msgstr ""
+
+#: my-evolution/Locations.h:1745
+msgid "Pirassununga"
+msgstr ""
+
+#: my-evolution/Locations.h:1746
+#, fuzzy
+msgid "Pisa"
+msgstr "是"
+
+#: my-evolution/Locations.h:1747
+msgid "Pisco"
+msgstr ""
+
+#: my-evolution/Locations.h:1748
+msgid "Pittsburgh"
+msgstr ""
+
+#: my-evolution/Locations.h:1749
+msgid "Pittsburgh-West Mifflin"
+msgstr ""
+
+#: my-evolution/Locations.h:1750
+msgid "Plattsburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1751
+msgid "Plovdiv"
+msgstr ""
+
+#: my-evolution/Locations.h:1752
+#, fuzzy
+msgid "Plymouth"
+msgstr "月"
+
+#: my-evolution/Locations.h:1753
+msgid "Pocatello"
+msgstr ""
+
+#: my-evolution/Locations.h:1754
+msgid "Pocos De Caldas"
+msgstr ""
+
+#: my-evolution/Locations.h:1755
+msgid "Podgorica"
+msgstr ""
+
+#: my-evolution/Locations.h:1756
+#, fuzzy
+msgid "Podgorica Titograd"
+msgstr "局部有龍捲風"
+
+#: my-evolution/Locations.h:1757
+msgid "Pohang Ab"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+# addressbook/gui/widgets/e-addressbook-view.c:615
+#: my-evolution/Locations.h:1758
+#, fuzzy
+msgid "Point Hope"
+msgstr "列印信封"
+
+# calendar/gui/e-calendar-table.c:159
+#: my-evolution/Locations.h:1759
+#, fuzzy
+msgid "Point Lay"
+msgstr "列印摘要"
+
+# mail/mail-callbacks.c:1407
+#: my-evolution/Locations.h:1760
+#, fuzzy
+msgid "Point Mugu"
+msgstr "列印郵件"
+
+#: my-evolution/Locations.h:1761
+msgid "Point Piedras Blanca"
+msgstr ""
+
+# importers/netscape-importer.c:795
+# mail/mail-callbacks.c:1359
+#: my-evolution/Locations.h:1762
+#, fuzzy
+msgid "Poitiers"
+msgstr "過濾器"
+
+#: my-evolution/Locations.h:1764
+msgid "Pompano Beach"
+msgstr ""
+
+# views/addressbook/galview.xml.h:3
+#: my-evolution/Locations.h:1765
+#, fuzzy
+msgid "Ponca City"
+msgstr "電話清單"
+
+# mail/mail-config.glade.h:25
+#: my-evolution/Locations.h:1766
+#, fuzzy
+msgid "Ponce"
+msgstr "完成"
+
+#: my-evolution/Locations.h:1767
+msgid "Ponta Pora"
+msgstr ""
+
+# ui/evolution-addressbook.xml.h:17
+#: my-evolution/Locations.h:1768
+#, fuzzy
+msgid "Pontiac"
+msgstr "連絡人(_C)"
+
+#: my-evolution/Locations.h:1769
+msgid "Pope AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1770
+msgid "Poplar Bluff"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1771
+#, fuzzy
+msgid "Poprad"
+msgstr "波蘭"
+
+# calendar/gui/print.c:1156
+#: my-evolution/Locations.h:1772
+#, fuzzy
+msgid "Port Alexander"
+msgstr "列印行事曆"
+
+#: my-evolution/Locations.h:1773
+msgid "Port Alsworth"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+# addressbook/gui/widgets/e-addressbook-view.c:615
+#: my-evolution/Locations.h:1774
+#, fuzzy
+msgid "Port Angeles"
+msgstr "列印信封"
+
+#: my-evolution/Locations.h:1775
+msgid "Port-Au-Prince"
+msgstr ""
+
+#: my-evolution/Locations.h:1776
+msgid "Port Elizabeth"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:15
+#: my-evolution/Locations.h:1777
+#, fuzzy
+msgid "Porterville"
+msgstr "預覽"
+
+# ui/evolution-calendar.xml.h:25
+#: my-evolution/Locations.h:1778
+#, fuzzy
+msgid "Port Hardy"
+msgstr "列印名片"
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1779
+#, fuzzy
+msgid "Port Hedland"
+msgstr "波蘭"
+
+#: my-evolution/Locations.h:1780
+msgid "Port Heiden"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1781
+#, fuzzy
+msgid "Portland"
+msgstr "波蘭"
+
+# addressbook/gui/component/addressbook-config.c:409
+#: my-evolution/Locations.h:1782
+#, fuzzy
+msgid "Porto"
+msgstr "通訊埠(_P)："
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: my-evolution/Locations.h:1783
+#, fuzzy
+msgid "Porto Alegre"
+msgstr "進度"
+
+#: my-evolution/Locations.h:1784
+msgid "Porto Alegre Apt"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:29
+#: my-evolution/Locations.h:1785
+#, fuzzy
+msgid "Portoroz"
+msgstr "縱向"
+
+# addressbook/printing/e-contact-print.glade.h:29
+#: my-evolution/Locations.h:1786
+#, fuzzy
+msgid "Porto Santo"
+msgstr "縱向"
+
+#: my-evolution/Locations.h:1787
+msgid "Porto Velho"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:29
+#: my-evolution/Locations.h:1788
+#, fuzzy
+msgid "Port Said"
+msgstr "縱向"
+
+#: my-evolution/Locations.h:1789
+msgid "Portsmouth"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1791
+#, fuzzy
+msgid "Posadas"
+msgstr "波蘭"
+
+#: my-evolution/Locations.h:1792
+msgid "Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:1793
+msgid "Poughkeepsie"
+msgstr ""
+
+#: my-evolution/Locations.h:1794
+msgid "Pownal"
+msgstr ""
+
+#: my-evolution/Locations.h:1795
+#, fuzzy
+msgid "Poza Rica"
+msgstr "哥斯大黎加"
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1796
+#, fuzzy
+msgid "Poznan"
+msgstr "波蘭"
+
+#: my-evolution/Locations.h:1797
+#, fuzzy
+msgid "Praha"
+msgstr "巴拉圭"
+
+#: my-evolution/Locations.h:1798
+#, fuzzy
+msgid "Pratica di Mare"
+msgstr "局部毛毛雨"
+
+#: my-evolution/Locations.h:1799
+msgid "Prescott"
+msgstr ""
+
+# calendar/gui/print.c:1321
+# mail/mail-callbacks.c:1447
+# ui/evolution-addressbook.xml.h:10
+# ui/evolution-calendar.xml.h:24
+#: my-evolution/Locations.h:1800
+#, fuzzy
+msgid "Presidente Prudente"
+msgstr "預覽列印"
+
+#: my-evolution/Locations.h:1801
+msgid "Presque Isle"
+msgstr ""
+
+#: my-evolution/Locations.h:1802
+msgid "Prestwick"
+msgstr ""
+
+#: my-evolution/Locations.h:1803
+#, fuzzy
+msgid "Pretoria"
+msgstr "喬治亞"
+
+# calendar/gui/event-editor-dialog.glade.h:15
+#: my-evolution/Locations.h:1804
+#, fuzzy
+msgid "Preveza"
+msgstr "預覽"
+
+# ui/evolution-calendar.xml.h:25
+#: my-evolution/Locations.h:1805
+#, fuzzy
+msgid "Price-Carbon"
+msgstr "皮特康"
+
+# camel/providers/smtp/camel-smtp-transport.c:206
+#: my-evolution/Locations.h:1806
+#, fuzzy
+msgid "Pristina"
+msgstr "繁體"
+
+# addressbook/contact-editor/fulladdr.glade.h:10
+#: my-evolution/Locations.h:1807
+#, fuzzy
+msgid "Providence"
+msgstr "州/省 (_S)："
+
+# calendar/gui/event-editor-dialog.glade.h:15
+#: my-evolution/Locations.h:1808
+#, fuzzy
+msgid "Provincetown"
+msgstr "預覽"
+
+#: my-evolution/Locations.h:1809
+#, fuzzy
+msgid "Provo"
+msgstr "專業"
+
+#: my-evolution/Locations.h:1810
+msgid "Pskov"
+msgstr ""
+
+#: my-evolution/Locations.h:1811
+#, fuzzy
+msgid "Pucallpa"
+msgstr "帛琉群島"
+
+#: my-evolution/Locations.h:1812
+msgid "Pudahuel"
+msgstr ""
+
+# calendar/gui/calendar-model.c:360
+# calendar/gui/calendar-model.c:898
+# calendar/gui/e-calendar-table.c:323
+#: my-evolution/Locations.h:1813
+#, fuzzy
+msgid "Puebla"
+msgstr "公開"
+
+# calendar/gui/calendar-model.c:360
+# calendar/gui/calendar-model.c:898
+# calendar/gui/e-calendar-table.c:323
+#: my-evolution/Locations.h:1814
+#, fuzzy
+msgid "Pueblo"
+msgstr "公開"
+
+#: my-evolution/Locations.h:1815
+#, fuzzy
+msgid "Puerto Barrios"
+msgstr "波多黎各"
+
+#: my-evolution/Locations.h:1816
+msgid "Puerto Cabezas"
+msgstr ""
+
+#: my-evolution/Locations.h:1817
+#, fuzzy
+msgid "Puerto Escondido"
+msgstr "波多黎各"
+
+#: my-evolution/Locations.h:1818
+#, fuzzy
+msgid "Puerto Lempira"
+msgstr "波多黎各"
+
+#: my-evolution/Locations.h:1819
+#, fuzzy
+msgid "Puerto Limon"
+msgstr "波多黎各"
+
+#: my-evolution/Locations.h:1820
+#, fuzzy
+msgid "Puerto Maldonado"
+msgstr "局部有龍捲風"
+
+#: my-evolution/Locations.h:1821
+#, fuzzy
+msgid "Puerto Montt"
+msgstr "波多黎各"
+
+#: my-evolution/Locations.h:1822
+#, fuzzy
+msgid "Puerto Plata"
+msgstr "波多黎各"
+
+# calendar/gui/e-calendar-table.c:159
+#: my-evolution/Locations.h:1824
+#, fuzzy
+msgid "Puerto Suarez"
+msgstr "列印摘要"
+
+#: my-evolution/Locations.h:1825
+msgid "Puerto Vallarta"
+msgstr ""
+
+#: my-evolution/Locations.h:1826
+#, fuzzy
+msgid "Pula"
+msgstr "帛琉群島"
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1827
+#, fuzzy
+msgid "Pullman"
+msgstr "波蘭"
+
+#: my-evolution/Locations.h:1828
+msgid "Punta Arenas"
+msgstr ""
+
+# calendar/gui/print.c:1156
+#: my-evolution/Locations.h:1829
+#, fuzzy
+msgid "Punta Cana"
+msgstr "列印行事曆"
+
+#: my-evolution/Locations.h:1830
+msgid "Punta Gorda"
+msgstr ""
+
+#: my-evolution/Locations.h:1831
+msgid "Puntilla Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:1832
+msgid "Pusan/Kimhae"
+msgstr ""
+
+#: my-evolution/Locations.h:1833
+msgid "Pyongtaek Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:1834
+msgid "Pyongyang"
+msgstr ""
+
+# widgets/misc/e-messagebox.c:173
+#: my-evolution/Locations.h:1836
+#, fuzzy
+msgid "Quantico"
+msgstr "問題"
+
+# mail/mail-format.c:767
+# mail/message-list.c:1082
+#: my-evolution/Locations.h:1837
+#, fuzzy
+msgid "Quebec"
+msgstr "主旨"
+
+#: my-evolution/Locations.h:1838
+msgid "Quebec City"
+msgstr ""
+
+#: my-evolution/Locations.h:1839
+msgid "Queretaro"
+msgstr ""
+
+#: my-evolution/Locations.h:1840
+msgid "Quillayute"
+msgstr ""
+
+#: my-evolution/Locations.h:1841
+#, fuzzy
+msgid "Quimper"
+msgstr "英制(_I)"
+
+#: my-evolution/Locations.h:1842
+msgid "Quincy"
+msgstr ""
+
+#: my-evolution/Locations.h:1843
+msgid "Quito/Mariscal Sucre"
+msgstr ""
+
+#: my-evolution/Locations.h:1844
+msgid "Rabat"
+msgstr ""
+
+#: my-evolution/Locations.h:1845
+msgid "Raduzhny"
+msgstr ""
+
+#: my-evolution/Locations.h:1846
+msgid "Rafha"
+msgstr ""
+
+#: my-evolution/Locations.h:1847
+msgid "Raleigh-Durham"
+msgstr ""
+
+#: my-evolution/Locations.h:1848
+msgid "Randolph AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1849
+#, fuzzy
+msgid "Rapid City"
+msgstr "回覆"
+
+#: my-evolution/Locations.h:1850
+msgid "Rapid City-Ellsworth AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1851
+msgid "Ras Al Khaimah"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:1852
+#, fuzzy
+msgid "Rawlins"
+msgstr "下雨"
+
+# addressbook/printing/e-contact-print.glade.h:13
+#: my-evolution/Locations.h:1853
+#, fuzzy
+msgid "Reading"
+msgstr "標題"
+
+#: my-evolution/Locations.h:1854
+#, fuzzy
+msgid "Rebun Island"
+msgstr "波維特島"
+
+# mail/mail-send-recv.c:236
+#: my-evolution/Locations.h:1855
+#, fuzzy
+msgid "Recife"
+msgstr "已接收"
+
+#: my-evolution/Locations.h:1856
+msgid "Red Bluff"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:13
+#: my-evolution/Locations.h:1857
+#, fuzzy
+msgid "Redding"
+msgstr "標題"
+
+#: my-evolution/Locations.h:1858
+#, fuzzy
+msgid "Redig"
+msgstr "閱讀"
+
+# calendar/gui/event-editor-dialog.glade.h:20
+#: my-evolution/Locations.h:1859
+#, fuzzy
+msgid "Redmond"
+msgstr "提醒"
+
+#: my-evolution/Locations.h:1860
+msgid "Red Oak"
+msgstr ""
+
+#: my-evolution/Locations.h:1861
+msgid "Redwood Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:1862
+msgid "Reggio Calabria"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/Locations.h:1863
+#, fuzzy
+msgid "Regina"
+msgstr "地區"
+
+#: my-evolution/Locations.h:1864
+msgid "Reims-Champagne"
+msgstr ""
+
+# ui/evolution.xml.h:61
+#: my-evolution/Locations.h:1865
+#, fuzzy
+msgid "Rennes"
+msgstr "重新命名"
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/Locations.h:1866
+#, fuzzy
+msgid "Reno"
+msgstr "留尼旺"
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/Locations.h:1867
+#, fuzzy
+msgid "Renton"
+msgstr "留尼旺"
+
+#: my-evolution/Locations.h:1868
+msgid "Resistencia"
+msgstr ""
+
+#: my-evolution/Locations.h:1869
+#, fuzzy
+msgid "Reus"
+msgstr "規則"
+
+# mail/message-browser.c:188
+# ui/evolution-mail.xml.h:70
+#: my-evolution/Locations.h:1870
+#, fuzzy
+msgid "Reyes"
+msgstr "回覆"
+
+#: my-evolution/Locations.h:1871
+msgid "Reykjavik"
+msgstr ""
+
+#: my-evolution/Locations.h:1872
+#, fuzzy
+msgid "Reynosa"
+msgstr "重新載入"
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1873
+#, fuzzy
+msgid "Rhinelander"
+msgstr "芬蘭"
+
+#: my-evolution/Locations.h:1874
+#, fuzzy
+msgid "Rhode Island"
+msgstr "法羅群島"
+
+#: my-evolution/Locations.h:1875
+#, fuzzy
+msgid "Riberalta"
+msgstr "直布羅陀"
+
+#: my-evolution/Locations.h:1876
+msgid "Richmond"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:734
+#: my-evolution/Locations.h:1877
+#, fuzzy
+msgid "Rickenbacker"
+msgstr "暱稱"
+
+# mail/mail-send-recv.c:287
+# mail/mail-send-recv.c:333
+#: my-evolution/Locations.h:1878
+#, fuzzy
+msgid "Rieti"
+msgstr "海地"
+
+#: my-evolution/Locations.h:1879
+#, fuzzy
+msgid "Rifle"
+msgstr "角色"
+
+#: my-evolution/Locations.h:1880
+#, fuzzy
+msgid "Rijeka"
+msgstr "閱讀"
+
+#: my-evolution/Locations.h:1881
+#, fuzzy
+msgid "Rimini"
+msgstr "羅馬尼亞"
+
+#: my-evolution/Locations.h:1882
+msgid "Rio De Janeiro"
+msgstr ""
+
+#: my-evolution/Locations.h:1883
+msgid "Rio Gallegos"
+msgstr ""
+
+#: my-evolution/Locations.h:1884
+msgid "Rio Grande"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:1885
+#, fuzzy
+msgid "Rioja"
+msgstr "無線電電話"
+
+#: my-evolution/Locations.h:1886
+#, fuzzy
+msgid "Rio / Jacarepagua"
+msgstr "尼加拉瓜"
+
+#: my-evolution/Locations.h:1887
+msgid "Rionegro/J.M.Cordova"
+msgstr ""
+
+#: my-evolution/Locations.h:1888
+#, fuzzy
+msgid "Rishiri Island"
+msgstr "英屬維爾京群島"
+
+#: my-evolution/Locations.h:1889
+msgid "Rivas"
+msgstr ""
+
+#: my-evolution/Locations.h:1890
+#, fuzzy
+msgid "Rivera"
+msgstr "賴比瑞亞"
+
+#: my-evolution/Locations.h:1891
+msgid "Riverside"
+msgstr ""
+
+#: my-evolution/Locations.h:1892
+msgid "Riverside/March AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1893
+msgid "Riverton"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:1894
+#, fuzzy
+msgid "Rivne"
+msgstr "下雨"
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: my-evolution/Locations.h:1895
+#, fuzzy
+msgid "Rivolto"
+msgstr "Evolution"
+
+#: my-evolution/Locations.h:1896
+#, fuzzy
+msgid "Riyadh"
+msgstr "閱讀"
+
+#: my-evolution/Locations.h:1897
+msgid "Roanoke"
+msgstr ""
+
+#: my-evolution/Locations.h:1898
+#, fuzzy
+msgid "Roatan"
+msgstr "克羅埃西亞"
+
+# calendar/gui/event-editor-dialog.glade.h:34
+#: my-evolution/Locations.h:1899
+#, fuzzy
+msgid "Robore"
+msgstr "之前"
+
+#: my-evolution/Locations.h:1900
+msgid "Rochester"
+msgstr ""
+
+#: my-evolution/Locations.h:1901
+msgid "Rockford"
+msgstr ""
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:1902
+#, fuzzy
+msgid "Rockland"
+msgstr "波蘭"
+
+#: my-evolution/Locations.h:1903
+msgid "Rockport"
+msgstr ""
+
+#: my-evolution/Locations.h:1904
+msgid "Rock Springs"
+msgstr ""
+
+#: my-evolution/Locations.h:1905
+msgid "Rocky Mount"
+msgstr ""
+
+#: my-evolution/Locations.h:1906
+#, fuzzy
+msgid "Rodos"
+msgstr "會議室"
+
+# camel/providers/imap/camel-imap-provider.c:48
+# shell/e-shell-view.c:552
+#: my-evolution/Locations.h:1907
+#, fuzzy
+msgid "Rogers"
+msgstr "資料夾"
+
+#: my-evolution/Locations.h:1908
+#, fuzzy
+msgid "Roma/Ciampino"
+msgstr "羅馬尼亞"
+
+#: my-evolution/Locations.h:1909
+msgid "Roma/Fiumicino"
+msgstr ""
+
+#: my-evolution/Locations.h:1911
+msgid "Roma/Urbe"
+msgstr ""
+
+#: my-evolution/Locations.h:1912
+msgid "Rome-Russell"
+msgstr ""
+
+#: my-evolution/Locations.h:1913
+msgid "Ronchi de' Legionari"
+msgstr ""
+
+#: my-evolution/Locations.h:1914
+msgid "Ronneby"
+msgstr ""
+
+#: my-evolution/Locations.h:1915
+msgid "Roosevelt"
+msgstr ""
+
+#: my-evolution/Locations.h:1916
+#, fuzzy
+msgid "Roros"
+msgstr "會議室"
+
+#: my-evolution/Locations.h:1917
+msgid "Rorvik/Ryum"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:1918
+#, fuzzy
+msgid "Rosario"
+msgstr "無線電電話"
+
+#: my-evolution/Locations.h:1919
+msgid "Roseburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1920
+#, fuzzy
+msgid "Roseglen"
+msgstr "角色"
+
+# addressbook/gui/component/addressbook-config.c:401
+# mail/mail-config.glade.h:33
+#: my-evolution/Locations.h:1921
+#, fuzzy
+msgid "Rost"
+msgstr "主機"
+
+#: my-evolution/Locations.h:1922
+msgid "Rostov-Na-Donu"
+msgstr ""
+
+#: my-evolution/Locations.h:1923
+msgid "Roswell"
+msgstr ""
+
+#: my-evolution/Locations.h:1924
+msgid "Rotterdam"
+msgstr ""
+
+#: my-evolution/Locations.h:1925
+msgid "Rouen-Valle de Seine"
+msgstr ""
+
+#: my-evolution/Locations.h:1926
+msgid "Ruidoso-Sierra Blanca"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:18
+#: my-evolution/Locations.h:1927
+#, fuzzy
+msgid "Rurrenabaque"
+msgstr "週期性"
+
+#: my-evolution/Locations.h:1928
+msgid "Russell"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:2
+#: my-evolution/Locations.h:1929
+#, fuzzy
+msgid "Russia"
+msgstr "奧地利"
+
+#: my-evolution/Locations.h:1930
+#, fuzzy
+msgid "Rutland"
+msgstr "不丹"
+
+#: my-evolution/Locations.h:1931
+msgid "Rygge"
+msgstr ""
+
+#: my-evolution/Locations.h:1932
+msgid "Rzeszow"
+msgstr ""
+
+#: my-evolution/Locations.h:1933
+msgid "Saarbrucken"
+msgstr ""
+
+#: my-evolution/Locations.h:1934
+msgid "Sabine Pass"
+msgstr ""
+
+# composer/e-msg-composer-attachment.glade.h:1
+# mail/mail-config.glade.h:9
+# mail/message-list.c:1081
+#: my-evolution/Locations.h:1935
+#, fuzzy
+msgid "Sacramento"
+msgstr "附件"
+
+#: my-evolution/Locations.h:1936
+msgid "Sacramento-Woodland"
+msgstr ""
+
+#: my-evolution/Locations.h:1937
+msgid "Safford-Municipal Airport"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:1938
+#, fuzzy
+msgid "Saginaw"
+msgstr "西班牙"
+
+#: my-evolution/Locations.h:1939
+msgid "Saint Anthony"
+msgstr ""
+
+#: my-evolution/Locations.h:1940
+msgid "Saint-Brieuc-Armor"
+msgstr ""
+
+#: my-evolution/Locations.h:1941
+msgid "Saint-Dizier-Robinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1942
+msgid "Saint-Etienne-Boutheon"
+msgstr ""
+
+#: my-evolution/Locations.h:1943
+#, fuzzy
+msgid "Saint Mary's"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:1944
+#, fuzzy
+msgid "Saint Mawgan"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:1945
+msgid "Saint-Nazaire-Montoir"
+msgstr ""
+
+#: my-evolution/Locations.h:1946
+#, fuzzy
+msgid "Saint Paul"
+msgstr "聖露西亞"
+
+# calendar/gui/print.c:362
+#: my-evolution/Locations.h:1947
+#, fuzzy
+msgid "Saiq"
+msgstr "六"
+
+#: my-evolution/Locations.h:1948
+#, fuzzy
+msgid "Salalah"
+msgstr "颮"
+
+# ui/evolution-event-editor.xml.h:40
+# ui/evolution-message-composer.xml.h:17
+# ui/evolution-task-editor-dialog.xml.h:50
+# widgets/misc/e-filter-bar.c:241
+#: my-evolution/Locations.h:1949
+#, fuzzy
+msgid "Salem"
+msgstr "儲存"
+
+# calendar/gui/calendar-model.c:499
+# calendar/gui/calendar-model.c:1068
+# calendar/gui/calendar-model.c:1574
+# calendar/gui/dialogs/task-editor-dialog.glade.h:13
+# calendar/gui/e-calendar-table.c:346
+# mail/message-list.c:688
+#: my-evolution/Locations.h:1950
+#, fuzzy
+msgid "Salida"
+msgstr "索馬利亞"
+
+#: my-evolution/Locations.h:1951
+msgid "Salida-Harriet"
+msgstr ""
+
+# calendar/gui/calendar-model.c:499
+# calendar/gui/calendar-model.c:1068
+# calendar/gui/calendar-model.c:1574
+# calendar/gui/dialogs/task-editor-dialog.glade.h:13
+# calendar/gui/e-calendar-table.c:346
+# mail/message-list.c:688
+#: my-evolution/Locations.h:1952
+#, fuzzy
+msgid "Salina"
+msgstr "索馬利亞"
+
+# calendar/gui/calendar-model.c:499
+# calendar/gui/calendar-model.c:1068
+# calendar/gui/calendar-model.c:1574
+# calendar/gui/dialogs/task-editor-dialog.glade.h:13
+# calendar/gui/e-calendar-table.c:346
+# mail/message-list.c:688
+#: my-evolution/Locations.h:1953
+#, fuzzy
+msgid "Salinas"
+msgstr "索馬利亞"
+
+#: my-evolution/Locations.h:1954
+msgid "Salisbury"
+msgstr ""
+
+#: my-evolution/Locations.h:1955
+#, fuzzy
+msgid "Salmon"
+msgstr "薩摩亞群島"
+
+#: my-evolution/Locations.h:1956
+msgid "Salmon (2)"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:1957
+#, fuzzy
+msgid "Salta"
+msgstr "馬爾他"
+
+#: my-evolution/Locations.h:1958
+msgid "Saltillo"
+msgstr ""
+
+#: my-evolution/Locations.h:1959
+msgid "Salt Lake City"
+msgstr ""
+
+# ui/evolution-addressbook.xml.h:12
+#: my-evolution/Locations.h:1960
+#, fuzzy
+msgid "Salto"
+msgstr "停止"
+
+#: my-evolution/Locations.h:1961
+msgid "Salt point"
+msgstr ""
+
+#: my-evolution/Locations.h:1962
+#, fuzzy
+msgid "Salvador"
+msgstr "薩爾瓦多"
+
+#: my-evolution/Locations.h:1963
+msgid "Salzburg"
+msgstr ""
+
+#: my-evolution/Locations.h:1964
+#, fuzzy
+msgid "Samara"
+msgstr "薩摩亞群島"
+
+#: my-evolution/Locations.h:1965
+#, fuzzy
+msgid "Samos"
+msgstr "薩摩亞群島"
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:1966
+#, fuzzy
+msgid "Samsun"
+msgstr "沙塵"
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:1967
+#, fuzzy
+msgid "Sana'A"
+msgstr "沙塵"
+
+#: my-evolution/Locations.h:1968
+msgid "San Andres Isla/Sesquicentenario"
+msgstr ""
+
+#: my-evolution/Locations.h:1969
+#, fuzzy
+msgid "San Angelo"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:1970
+msgid "San Antonio"
+msgstr ""
+
+#: my-evolution/Locations.h:1971
+msgid "San Antonio Del Tachira"
+msgstr ""
+
+#: my-evolution/Locations.h:1972
+msgid "San Antonio-Kelly AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:1973
+msgid "San Antonio-Stinson"
+msgstr ""
+
+#: my-evolution/Locations.h:1974
+#, fuzzy
+msgid "San Carlos"
+msgstr "聖馬利諾"
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:1975
+#, fuzzy
+msgid "Sandane"
+msgstr "沙塵"
+
+#: my-evolution/Locations.h:1976
+#, fuzzy
+msgid "Sandberg"
+msgstr "寄件者"
+
+#: my-evolution/Locations.h:1977
+#, fuzzy
+msgid "Sanderson"
+msgstr "沙暴"
+
+#: my-evolution/Locations.h:1978
+#, fuzzy
+msgid "San Diego"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:1979
+msgid "San Diego-Brown"
+msgstr ""
+
+#: my-evolution/Locations.h:1980
+msgid "San Diego-Miramar"
+msgstr ""
+
+#: my-evolution/Locations.h:1981
+msgid "San Diego-Montgomery"
+msgstr ""
+
+#: my-evolution/Locations.h:1982
+msgid "San Diego-North Island"
+msgstr ""
+
+#: my-evolution/Locations.h:1983
+msgid "San Diego-Santee"
+msgstr ""
+
+#: my-evolution/Locations.h:1984
+msgid "Sandnessjoen/Stokka"
+msgstr ""
+
+#: my-evolution/Locations.h:1985
+#, fuzzy
+msgid "Sand Point"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:1986
+msgid "San Fernando De Apure"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:1987
+#, fuzzy
+msgid "Sanford"
+msgstr "沙塵"
+
+#: my-evolution/Locations.h:1988
+#, fuzzy
+msgid "San Francisco"
+msgstr "聖馬利諾"
+
+# addressbook/printing/e-contact-print.glade.h:35
+#: my-evolution/Locations.h:1989
+#, fuzzy
+msgid "Sangju"
+msgstr "網底"
+
+#: my-evolution/Locations.h:1990
+msgid "San Ignacio De Velasco"
+msgstr ""
+
+#: my-evolution/Locations.h:1991
+#, fuzzy
+msgid "San Joaquin"
+msgstr "聖馬利諾"
+
+# ui/evolution-contact-editor.xml.h:9
+# ui/evolution-event-editor.xml.h:42
+# ui/evolution-task-editor-dialog.xml.h:52
+#: my-evolution/Locations.h:1992
+#, fuzzy
+msgid "San Jose"
+msgstr "儲存後關閉"
+
+#: my-evolution/Locations.h:1993
+msgid "San Jose De Chiquitos"
+msgstr ""
+
+#: my-evolution/Locations.h:1994
+msgid "San Jose del Cabo"
+msgstr ""
+
+#: my-evolution/Locations.h:1995
+msgid "San Jose-Santa Clara"
+msgstr ""
+
+#: my-evolution/Locations.h:1996
+#, fuzzy
+msgid "San Juan"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:1997
+msgid "Sankt-Peterburg"
+msgstr ""
+
+# calendar/gui/calendar-model.c:499
+# calendar/gui/calendar-model.c:1068
+# calendar/gui/calendar-model.c:1574
+# calendar/gui/dialogs/task-editor-dialog.glade.h:13
+# calendar/gui/e-calendar-table.c:346
+# mail/message-list.c:688
+#: my-evolution/Locations.h:1998
+#, fuzzy
+msgid "Sanliurfa"
+msgstr "索馬利亞"
+
+#: my-evolution/Locations.h:1999
+msgid "San Luis Obispo"
+msgstr ""
+
+#: my-evolution/Locations.h:2000
+msgid "San Luis Potosi"
+msgstr ""
+
+#: my-evolution/Locations.h:2001
+#, fuzzy
+msgid "San Miguel"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:2002
+#, fuzzy
+msgid "San Nicholas Island"
+msgstr "諾福克群島"
+
+#: my-evolution/Locations.h:2003
+#, fuzzy
+msgid "San Salvador"
+msgstr "薩爾瓦多"
+
+#: my-evolution/Locations.h:2004
+#, fuzzy
+msgid "San Sebastian"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:2005
+#, fuzzy
+msgid "Santa Ana"
+msgstr "聖露西亞"
+
+#: my-evolution/Locations.h:2006
+msgid "Santa Barbara"
+msgstr ""
+
+#: my-evolution/Locations.h:2007
+msgid "Santa Cruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2008
+msgid "Santa Fe"
+msgstr ""
+
+#: my-evolution/Locations.h:2009
+#, fuzzy
+msgid "Santa Maria"
+msgstr "聖馬利諾"
+
+#: my-evolution/Locations.h:2010
+msgid "Santa Marta/Simon Bolivar"
+msgstr ""
+
+#: my-evolution/Locations.h:2011
+#, fuzzy
+msgid "Santa Monica"
+msgstr "聖露西亞"
+
+#: my-evolution/Locations.h:2012
+#, fuzzy
+msgid "Santander"
+msgstr "寄件者"
+
+#: my-evolution/Locations.h:2013
+#, fuzzy
+msgid "Santarem"
+msgstr "沙暴"
+
+#: my-evolution/Locations.h:2014
+msgid "Santa Rosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2015
+msgid "Santa Rosa de Copan"
+msgstr ""
+
+#: my-evolution/Locations.h:2016
+#, fuzzy
+msgid "Santiago"
+msgstr "聖露西亞"
+
+#: my-evolution/Locations.h:2017
+msgid "Santiago de Cuba"
+msgstr ""
+
+#: my-evolution/Locations.h:2018
+msgid "Santiago Del Estero"
+msgstr ""
+
+#: my-evolution/Locations.h:2019
+#, fuzzy
+msgid "Santorini"
+msgstr "沙暴"
+
+#: my-evolution/Locations.h:2020
+#, fuzzy
+msgid "Santos"
+msgstr "沙暴"
+
+#: my-evolution/Locations.h:2021
+msgid "Sao Jose Dos Campo"
+msgstr ""
+
+#: my-evolution/Locations.h:2022
+#, fuzzy
+msgid "Sao Luiz"
+msgstr "聖露西亞"
+
+#: my-evolution/Locations.h:2023
+msgid "Sao Paulo"
+msgstr ""
+
+#: my-evolution/Locations.h:2024
+msgid "Sapporo Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2025
+msgid "Sarajevo"
+msgstr ""
+
+#: my-evolution/Locations.h:2026
+msgid "Saranac Lake"
+msgstr ""
+
+#: my-evolution/Locations.h:2027
+#, fuzzy
+msgid "Sarasota"
+msgstr "薩摩亞群島"
+
+#: my-evolution/Locations.h:2028
+msgid "Saratov"
+msgstr ""
+
+#: my-evolution/Locations.h:2029
+#, fuzzy
+msgid "Sarzana"
+msgstr "斯里蘭卡"
+
+#: my-evolution/Locations.h:2030
+msgid "Saskatchewan"
+msgstr ""
+
+#: my-evolution/Locations.h:2031
+msgid "Saskatoon"
+msgstr ""
+
+#: my-evolution/Locations.h:2032
+msgid "Sauce Viejo"
+msgstr ""
+
+#: my-evolution/Locations.h:2034
+msgid "Sault Ste Marie"
+msgstr ""
+
+#: my-evolution/Locations.h:2035
+msgid "Savannah"
+msgstr ""
+
+#: my-evolution/Locations.h:2036
+msgid "Savannah-Hunter AAF"
+msgstr ""
+
+#: my-evolution/Locations.h:2037
+msgid "Sawyer AFB"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:2038
+#, fuzzy
+msgid "Sayun"
+msgstr "沙塵"
+
+# calendar/gui/e-meeting-dialog.glade.h:23
+# mail/message-list.c:1081
+#: my-evolution/Locations.h:2039
+#, fuzzy
+msgid "Scatsta"
+msgstr "狀況"
+
+#: my-evolution/Locations.h:2040
+msgid "Schaffen"
+msgstr ""
+
+#: my-evolution/Locations.h:2041
+msgid "Schenectady"
+msgstr ""
+
+#: my-evolution/Locations.h:2042
+msgid "Scilly Isles"
+msgstr ""
+
+#: my-evolution/Locations.h:2043
+msgid "Scottsbluff"
+msgstr ""
+
+#: my-evolution/Locations.h:2044
+msgid "Scottsdale"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:708
+#: my-evolution/Locations.h:2045
+#, fuzzy
+msgid "Scranton"
+msgstr "團體"
+
+#: my-evolution/Locations.h:2046
+msgid "Seattle"
+msgstr ""
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: my-evolution/Locations.h:2047
+#, fuzzy
+msgid "Seattle-Boeing"
+msgstr "設定"
+
+# calendar/gui/calendar-model.c:499
+# calendar/gui/calendar-model.c:1068
+# calendar/gui/calendar-model.c:1574
+# calendar/gui/dialogs/task-editor-dialog.glade.h:13
+# calendar/gui/e-calendar-table.c:346
+# mail/message-list.c:688
+#: my-evolution/Locations.h:2048
+#, fuzzy
+msgid "Sedalia"
+msgstr "索馬利亞"
+
+# mail/message-list.c:678
+#: my-evolution/Locations.h:2049
+#, fuzzy
+msgid "Seeb"
+msgstr "已閱讀"
+
+#: my-evolution/Locations.h:2050
+msgid "Selanik"
+msgstr ""
+
+#: my-evolution/Locations.h:2051
+#, fuzzy
+msgid "Sendai Airport"
+msgstr "開始匯入"
+
+#: my-evolution/Locations.h:2052
+msgid "Seoul E Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2053
+msgid "Seoul/Kimp'O International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2054
+msgid "Seoul/Yongdungp'O Rokaf Wc"
+msgstr ""
+
+#: my-evolution/Locations.h:2055
+msgid "Sept-Iles"
+msgstr ""
+
+#: my-evolution/Locations.h:2056
+msgid "Seul Choix Pt"
+msgstr ""
+
+#: my-evolution/Locations.h:2057
+msgid "Sevilla"
+msgstr ""
+
+# addressbook/gui/search/e-addressbook-search-dialog.c:158
+# mail/mail-search.c:242
+#: my-evolution/Locations.h:2058
+#, fuzzy
+msgid "Seward"
+msgstr "尋找"
+
+#: my-evolution/Locations.h:2059
+msgid "Sexton Summit"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:35
+#: my-evolution/Locations.h:2060
+#, fuzzy
+msgid "Shanghai"
+msgstr "網底"
+
+#: my-evolution/Locations.h:2061
+msgid "Shannon"
+msgstr ""
+
+# addressbook/gui/search/e-addressbook-search-dialog.c:158
+# mail/mail-search.c:242
+#: my-evolution/Locations.h:2062
+#, fuzzy
+msgid "Sharjah"
+msgstr "尋找"
+
+#: my-evolution/Locations.h:2063
+msgid "Sharm El Sheikhintl"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+# calendar/gui/event-editor.c:480
+#: my-evolution/Locations.h:2064
+#, fuzzy
+msgid "Sharurah"
+msgstr "星期六"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+# calendar/gui/event-editor.c:480
+#: my-evolution/Locations.h:2065
+#, fuzzy
+msgid "Shawbury"
+msgstr "星期六"
+
+# calendar/gui/e-calendar-table.c:154
+#: my-evolution/Locations.h:2066
+#, fuzzy
+msgid "Shearwater"
+msgstr "開始日期"
+
+#: my-evolution/Locations.h:2067
+msgid "Sheboygan"
+msgstr ""
+
+# mail/message-list.c:678
+#: my-evolution/Locations.h:2068
+#, fuzzy
+msgid "Sheldon"
+msgstr "瑞典"
+
+#: my-evolution/Locations.h:2069
+msgid "Shelter Cove"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:34
+#: my-evolution/Locations.h:2070
+#, fuzzy
+msgid "Shelton"
+msgstr "選擇："
+
+#: my-evolution/Locations.h:2071
+msgid "Shenandoah"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: my-evolution/Locations.h:2072
+#, fuzzy
+msgid "Sheridan"
+msgstr "蘇丹"
+
+#: my-evolution/Locations.h:2073
+msgid "Sherman-Denison"
+msgstr ""
+
+#: my-evolution/Locations.h:2074
+msgid "Shimofusa Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2075
+msgid "Shingle Point"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:36
+#: my-evolution/Locations.h:2076
+#, fuzzy
+msgid "Shiraz"
+msgstr "大小"
+
+#: my-evolution/Locations.h:2077
+msgid "Shishmaref"
+msgstr ""
+
+#: my-evolution/Locations.h:2078
+msgid "Shizuhama Ab"
+msgstr ""
+
+# mail/message-list.c:1081
+#: my-evolution/Locations.h:2079
+#, fuzzy
+msgid "Shoreham"
+msgstr "目標"
+
+#: my-evolution/Locations.h:2080
+#, fuzzy
+msgid "Show Low"
+msgstr "淺雪"
+
+#: my-evolution/Locations.h:2081
+msgid "Shreveport Downtown"
+msgstr ""
+
+#: my-evolution/Locations.h:2082
+msgid "Shreveport Regional"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:36
+#: my-evolution/Locations.h:2083
+#, fuzzy
+msgid "Sidney"
+msgstr "大小"
+
+#: my-evolution/Locations.h:2084
+msgid "Sigonella"
+msgstr ""
+
+#: my-evolution/Locations.h:2085
+msgid "Siloam Springs"
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:54
+#: my-evolution/Locations.h:2086
+#, fuzzy
+msgid "Silver City"
+msgstr "安全性"
+
+# camel/providers/sendmail/camel-sendmail-provider.c:37
+# mail/mail-config.glade.h:67
+#: my-evolution/Locations.h:2087
+#, fuzzy
+msgid "Sindal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2089
+msgid "Sioux City"
+msgstr ""
+
+#: my-evolution/Locations.h:2090
+msgid "Sioux Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2091
+msgid "Sitka"
+msgstr ""
+
+#: my-evolution/Locations.h:2092
+msgid "Sivas"
+msgstr ""
+
+#: my-evolution/Locations.h:2093
+msgid "Sivrihisar"
+msgstr ""
+
+#: my-evolution/Locations.h:2094
+msgid "Skagway"
+msgstr ""
+
+#: my-evolution/Locations.h:2095
+msgid "Skiathos"
+msgstr ""
+
+#: my-evolution/Locations.h:2096
+msgid "Skien/Geiteryggen"
+msgstr ""
+
+# ui/evolution-event-editor.xml.h:40
+# ui/evolution-message-composer.xml.h:17
+# ui/evolution-task-editor-dialog.xml.h:50
+# widgets/misc/e-filter-bar.c:241
+#: my-evolution/Locations.h:2097
+#, fuzzy
+msgid "Skive"
+msgstr "儲存"
+
+# ui/evolution-addressbook.xml.h:12
+#: my-evolution/Locations.h:2098
+#, fuzzy
+msgid "Skopje"
+msgstr "停止"
+
+# mail/mail-config.glade.h:68
+#: my-evolution/Locations.h:2099
+#, fuzzy
+msgid "Skwentna"
+msgstr "傳送"
+
+# ui/evolution-message-composer.xml.h:26
+#: my-evolution/Locations.h:2100
+#, fuzzy
+msgid "Slana"
+msgstr "沙塵"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: my-evolution/Locations.h:2103
+#, fuzzy
+msgid "Smithers"
+msgstr "陣雨"
+
+#: my-evolution/Locations.h:2104
+msgid "Smyrna"
+msgstr ""
+
+#: my-evolution/Locations.h:2105
+#, fuzzy
+msgid "Snowshoe Lake"
+msgstr "陣雪"
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:2106
+#, fuzzy
+msgid "Sochi"
+msgstr "南"
+
+# mail/message-list.c:1081
+#: my-evolution/Locations.h:2107
+#, fuzzy
+msgid "Socorro"
+msgstr "目標"
+
+# mail/message-list.c:1081
+#: my-evolution/Locations.h:2108
+#, fuzzy
+msgid "Socotra"
+msgstr "目標"
+
+#: my-evolution/Locations.h:2109
+#, fuzzy
+msgid "Soda Springs"
+msgstr "米雪"
+
+# calendar/gui/calendar-model.c:499
+# calendar/gui/calendar-model.c:1068
+# calendar/gui/calendar-model.c:1574
+# calendar/gui/dialogs/task-editor-dialog.glade.h:13
+# calendar/gui/e-calendar-table.c:346
+# mail/message-list.c:688
+#: my-evolution/Locations.h:2110
+#, fuzzy
+msgid "Sofia"
+msgstr "索馬利亞"
+
+# camel/providers/sendmail/camel-sendmail-provider.c:37
+# mail/mail-config.glade.h:67
+#: my-evolution/Locations.h:2111
+#, fuzzy
+msgid "Sogndal"
+msgstr "Sendmail"
+
+#: my-evolution/Locations.h:2112
+#, fuzzy
+msgid "Soldotna"
+msgstr "斯洛凡尼亞"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: my-evolution/Locations.h:2113
+#, fuzzy
+msgid "Somerset"
+msgstr "陣雨"
+
+#: my-evolution/Locations.h:2114
+#, fuzzy
+msgid "Sonderborg"
+msgstr "寄件者"
+
+#: my-evolution/Locations.h:2115
+msgid "Songmu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2116
+msgid "Sorkjosen"
+msgstr ""
+
+#: my-evolution/Locations.h:2118
+#, fuzzy
+msgid "Southampton"
+msgstr "東南"
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:2119
+#, fuzzy
+msgid "South Bend"
+msgstr "南"
+
+#: my-evolution/Locations.h:2120
+#, fuzzy
+msgid "South Carolina"
+msgstr "南非"
+
+#: my-evolution/Locations.h:2121
+#, fuzzy
+msgid "South Dakota"
+msgstr "東南"
+
+# ui/evolution-calendar.xml.h:15
+#: my-evolution/Locations.h:2122
+#, fuzzy
+msgid "Southend"
+msgstr "南"
+
+#: my-evolution/Locations.h:2123
+#, fuzzy
+msgid "South Marsh Island"
+msgstr "馬紹爾群島"
+
+#: my-evolution/Locations.h:2124
+msgid "South Timbalier"
+msgstr ""
+
+#: my-evolution/Locations.h:2126
+msgid "Sparrevohn"
+msgstr ""
+
+#: my-evolution/Locations.h:2127
+#, fuzzy
+msgid "Spencer"
+msgstr "寄件者"
+
+#: my-evolution/Locations.h:2128
+msgid "Spickard"
+msgstr ""
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: my-evolution/Locations.h:2129
+#, fuzzy
+msgid "Split"
+msgstr "靄"
+
+#: my-evolution/Locations.h:2130
+#, fuzzy
+msgid "Spokane"
+msgstr "煙"
+
+#: my-evolution/Locations.h:2131
+msgid "Spokane-Parkwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2132
+msgid "Springbok"
+msgstr ""
+
+#: my-evolution/Locations.h:2133
+#, fuzzy
+msgid "Springfield"
+msgstr "簡體"
+
+#: my-evolution/Locations.h:2134
+msgid "Stampede Pass"
+msgstr ""
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#: my-evolution/Locations.h:2135
+#, fuzzy
+msgid "State College"
+msgstr "完成日期："
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: my-evolution/Locations.h:2136
+#, fuzzy
+msgid "Stauning"
+msgstr "設定"
+
+#: my-evolution/Locations.h:2137
+msgid "Staunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2138
+msgid "Stavanger/Sola"
+msgstr ""
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: my-evolution/Locations.h:2139
+#, fuzzy
+msgid "Staverton"
+msgstr "設定"
+
+# ui/evolution-addressbook.xml.h:12
+#: my-evolution/Locations.h:2140
+#, fuzzy
+msgid "Stavropol"
+msgstr "停止"
+
+#: my-evolution/Locations.h:2141
+msgid "St Cloud"
+msgstr ""
+
+#: my-evolution/Locations.h:2142
+msgid "Steamboat Springs"
+msgstr ""
+
+# calendar/gui/e-meeting-dialog.glade.h:21
+#: my-evolution/Locations.h:2143
+#, fuzzy
+msgid "Stephenville"
+msgstr "塞席爾"
+
+#: my-evolution/Locations.h:2144
+#, fuzzy
+msgid "St. George"
+msgstr "聖赫勒拿島"
+
+#: my-evolution/Locations.h:2145
+msgid "Stillwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2146
+msgid "St. John's"
+msgstr ""
+
+#: my-evolution/Locations.h:2147
+msgid "St Johnsbury"
+msgstr ""
+
+# ui/evolution-addressbook.xml.h:12
+#: my-evolution/Locations.h:2148
+#, fuzzy
+msgid "St Joseph"
+msgstr "停止"
+
+#: my-evolution/Locations.h:2149
+#, fuzzy
+msgid "St Louis"
+msgstr "聖露西亞"
+
+#: my-evolution/Locations.h:2150
+msgid "St Louis-Spirit"
+msgstr ""
+
+#: my-evolution/Locations.h:2151
+msgid "Stockholm (Arlanda)"
+msgstr ""
+
+#: my-evolution/Locations.h:2152
+msgid "Stockholm (Bromma)"
+msgstr ""
+
+#: my-evolution/Locations.h:2153
+msgid "Stockton"
+msgstr ""
+
+#: my-evolution/Locations.h:2154
+msgid "Stokmarknes/Skagen"
+msgstr ""
+
+#: my-evolution/Locations.h:2155
+msgid "Stord/Sorstokken"
+msgstr ""
+
+#: my-evolution/Locations.h:2156
+#, fuzzy
+msgid "Storm Lake"
+msgstr "斯里蘭卡"
+
+# widgets/misc/e-cell-date-edit.c:221
+# widgets/misc/e-dateedit.c:418
+#: my-evolution/Locations.h:2157
+#, fuzzy
+msgid "Stornoway"
+msgstr "挪威"
+
+# calendar/gui/e-meeting-dialog.glade.h:23
+# mail/message-list.c:1081
+#: my-evolution/Locations.h:2158
+#, fuzzy
+msgid "St Paul"
+msgstr "狀況"
+
+#: my-evolution/Locations.h:2159
+msgid "St Petersburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2160
+msgid "St Petersburg / Clearwater"
+msgstr ""
+
+#: my-evolution/Locations.h:2161
+msgid "Strasbourg"
+msgstr ""
+
+#: my-evolution/Locations.h:2162
+msgid "Strevell"
+msgstr ""
+
+#: my-evolution/Locations.h:2163
+#, fuzzy
+msgid "St Simon's Island"
+msgstr "索羅門群島"
+
+#: my-evolution/Locations.h:2164
+msgid "Stumpy Point"
+msgstr ""
+
+# mail/mail-config.glade.h:68
+#: my-evolution/Locations.h:2165
+#, fuzzy
+msgid "Sturgeon Bay"
+msgstr "傳送者："
+
+#: my-evolution/Locations.h:2166
+msgid "Stuttgart"
+msgstr ""
+
+# mail/message-list.c:1081
+#: my-evolution/Locations.h:2167
+#, fuzzy
+msgid "Sucre"
+msgstr "目標"
+
+#: my-evolution/Locations.h:2168
+#, fuzzy
+msgid "Sumburgh"
+msgstr "盧森堡"
+
+# calendar/gui/e-calendar-table.c:159
+#: my-evolution/Locations.h:2169
+#, fuzzy
+msgid "Sumter"
+msgstr "摘要"
+
+#: my-evolution/Locations.h:2170
+msgid "Sumter (2)"
+msgstr ""
+
+#: my-evolution/Locations.h:2171
+msgid "Sundsvall-Harnosand"
+msgstr ""
+
+#: my-evolution/Locations.h:2172
+msgid "Sungshan/Taipei"
+msgstr ""
+
+#: my-evolution/Locations.h:2173
+msgid "Superior"
+msgstr ""
+
+# ui/evolution-addressbook.xml.h:12
+#: my-evolution/Locations.h:2175
+#, fuzzy
+msgid "Sutton"
+msgstr "停止"
+
+#: my-evolution/Locations.h:2176
+msgid "Suwon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2177
+msgid "Svalbard"
+msgstr ""
+
+#: my-evolution/Locations.h:2178
+msgid "Svolvaer/Helle"
+msgstr ""
+
+#: my-evolution/Locations.h:2180
+msgid "Swift Current"
+msgstr ""
+
+#: my-evolution/Locations.h:2182
+msgid "Sydney"
+msgstr ""
+
+#: my-evolution/Locations.h:2183
+msgid "Syktyvkar"
+msgstr ""
+
+#: my-evolution/Locations.h:2184
+msgid "Sympheropol"
+msgstr ""
+
+#: my-evolution/Locations.h:2185
+msgid "Syracuse"
+msgstr ""
+
+#: my-evolution/Locations.h:2186
+msgid "Szczecin"
+msgstr ""
+
+#: my-evolution/Locations.h:2187
+msgid "Szombathely"
+msgstr ""
+
+# camel/providers/smtp/camel-smtp-transport.c:206
+#: my-evolution/Locations.h:2188
+#, fuzzy
+msgid "Tabatinga"
+msgstr "繁體"
+
+#: my-evolution/Locations.h:2189
+msgid "Tabriz"
+msgstr ""
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: my-evolution/Locations.h:2190
+#, fuzzy
+msgid "Tabuk"
+msgstr "工作"
+
+#: my-evolution/Locations.h:2191
+msgid "Tachikawa Ab"
+msgstr ""
+
+# ui/evolution-calendar.xml.h:34
+# widgets/misc/e-cell-date-edit.c:229
+# widgets/misc/e-dateedit.c:424
+#: my-evolution/Locations.h:2192
+#, fuzzy
+msgid "Tacna"
+msgstr "東加"
+
+#: my-evolution/Locations.h:2193
+msgid "Tacoma"
+msgstr ""
+
+#: my-evolution/Locations.h:2194
+msgid "Tacoma-Lakewood"
+msgstr ""
+
+#: my-evolution/Locations.h:2195
+msgid "Tacuarembo"
+msgstr ""
+
+#: my-evolution/Locations.h:2196
+msgid "Taegu"
+msgstr ""
+
+#: my-evolution/Locations.h:2197
+msgid "Taegu Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2198
+#, fuzzy
+msgid "Taejon"
+msgstr "然後"
+
+#: my-evolution/Locations.h:2199
+msgid "Tahoe Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2200
+msgid "Taichung"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2201
+#, fuzzy
+msgid "Taif"
+msgstr "臺灣"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2202
+#, fuzzy
+msgid "Tainan"
+msgstr "臺灣"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2204
+#, fuzzy
+msgid "Taiyuan"
+msgstr "臺灣"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2205
+#, fuzzy
+msgid "Taiz"
+msgstr "臺灣"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2206
+#, fuzzy
+msgid "Tajima"
+msgstr "臺灣"
+
+#: my-evolution/Locations.h:2207
+msgid "Takamatsu Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2208
+msgid "Talara"
+msgstr ""
+
+#: my-evolution/Locations.h:2209
+msgid "Talkeetna"
+msgstr ""
+
+#: my-evolution/Locations.h:2210
+msgid "Tallahassee"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2211
+#, fuzzy
+msgid "Tallinn"
+msgstr "臺灣"
+
+#: my-evolution/Locations.h:2212
+msgid "Tamanrasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2213
+msgid "Tamanrasset/Aguenna"
+msgstr ""
+
+#: my-evolution/Locations.h:2214
+#, fuzzy
+msgid "Tampa"
+msgstr "薩摩亞群島"
+
+#: my-evolution/Locations.h:2215
+msgid "Tampa-Macdill AFB"
+msgstr ""
+
+# addressbook/printing/e-contact-print.glade.h:27
+#: my-evolution/Locations.h:2216
+#, fuzzy
+msgid "Tampere"
+msgstr "使用紙張"
+
+#: my-evolution/Locations.h:2217
+msgid "Tampico"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2218
+#, fuzzy
+msgid "Tanana"
+msgstr "臺灣"
+
+#: my-evolution/Locations.h:2219
+msgid "Tanegashima Airport"
+msgstr ""
+
+# mail/message-list.c:685
+#: my-evolution/Locations.h:2220
+#, fuzzy
+msgid "Taos"
+msgstr "寮國"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2221
+#, fuzzy
+msgid "Taoyuan"
+msgstr "臺灣"
+
+#: my-evolution/Locations.h:2222
+msgid "Tapachula"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2223
+#, fuzzy
+msgid "Taranto"
+msgstr "臺灣"
+
+#: my-evolution/Locations.h:2224
+#, fuzzy
+msgid "Tarbes"
+msgstr "測試"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2225
+#, fuzzy
+msgid "Tarija"
+msgstr "臺灣"
+
+#: my-evolution/Locations.h:2226
+msgid "Tarvisio"
+msgstr ""
+
+# camel/providers/smtp/camel-smtp-transport.c:206
+#: my-evolution/Locations.h:2227
+#, fuzzy
+msgid "Tatalina"
+msgstr "繁體"
+
+#: my-evolution/Locations.h:2228
+msgid "Tateyama Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2229
+msgid "Taunton"
+msgstr ""
+
+#: my-evolution/Locations.h:2230
+msgid "Tebessa"
+msgstr ""
+
+#: my-evolution/Locations.h:2231
+msgid "Tees-Side"
+msgstr ""
+
+#: my-evolution/Locations.h:2232
+msgid "Tegucigalpa"
+msgstr ""
+
+#: my-evolution/Locations.h:2233
+msgid "Tehran-Mehrabad"
+msgstr ""
+
+#: my-evolution/Locations.h:2234
+#, fuzzy
+msgid "Tela"
+msgstr "托克勞群島"
+
+# addressbook/contact-editor/e-contact-editor.c:1259
+# addressbook/gui/widgets/e-addressbook-view.c:722
+#: my-evolution/Locations.h:2235
+#, fuzzy
+msgid "Temple"
+msgstr "電報"
+
+#: my-evolution/Locations.h:2236
+msgid "Tennessee"
+msgstr ""
+
+#: my-evolution/Locations.h:2237
+msgid "Tepic"
+msgstr ""
+
+#: my-evolution/Locations.h:2238
+msgid "Teresina"
+msgstr ""
+
+#: my-evolution/Locations.h:2239
+msgid "Terre Haute"
+msgstr ""
+
+#: my-evolution/Locations.h:2240
+msgid "Terrell"
+msgstr ""
+
+#: my-evolution/Locations.h:2241
+msgid "Teterboro"
+msgstr ""
+
+#: my-evolution/Locations.h:2242
+msgid "Texarkana"
+msgstr ""
+
+#: my-evolution/Locations.h:2243
+#, fuzzy
+msgid "Texas"
+msgstr "測試"
+
+# calendar/gui/e-meeting-dialog.glade.h:21
+#: my-evolution/Locations.h:2244
+#, fuzzy
+msgid "The Dalles"
+msgstr "塞席爾"
+
+#: my-evolution/Locations.h:2245
+msgid "Thessaloniki"
+msgstr ""
+
+#: my-evolution/Locations.h:2246
+msgid "Thief River Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2247
+msgid "Thiruvananthapuram"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:730
+#: my-evolution/Locations.h:2248
+#, fuzzy
+msgid "Thisted"
+msgstr "頭銜"
+
+#: my-evolution/Locations.h:2249
+msgid "Thompson Falls"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+# calendar/gui/event-editor.c:478
+#: my-evolution/Locations.h:2250
+#, fuzzy
+msgid "Thumrait"
+msgstr "星期四"
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2251
+#, fuzzy
+msgid "Tianjin"
+msgstr "臺灣"
+
+#: my-evolution/Locations.h:2252
+#, fuzzy
+msgid "Tijuana"
+msgstr "立陶宛"
+
+#: my-evolution/Locations.h:2253
+msgid "Timisoara"
+msgstr ""
+
+#: my-evolution/Locations.h:2254
+msgid "Tin City"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2255
+#, fuzzy
+msgid "Tirana"
+msgstr "臺灣"
+
+# addressbook/gui/widgets/e-addressbook-view.c:730
+#: my-evolution/Locations.h:2256
+#, fuzzy
+msgid "Tiree"
+msgstr "時間"
+
+#: my-evolution/Locations.h:2257
+msgid "Tirgu Mures"
+msgstr ""
+
+#: my-evolution/Locations.h:2258
+msgid "Tiruchchirapalli"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:730
+#: my-evolution/Locations.h:2259
+#, fuzzy
+msgid "Titusville"
+msgstr "頭銜"
+
+# calendar/gui/calendar-model.c:363
+# calendar/gui/calendar-model.c:900
+# calendar/gui/e-calendar-table.c:324
+#: my-evolution/Locations.h:2260
+#, fuzzy
+msgid "Tivat"
+msgstr "私人"
+
+#: my-evolution/Locations.h:2261
+msgid "Tlemcen Zenata"
+msgstr ""
+
+#: my-evolution/Locations.h:2262
+msgid "Tobias Bolanos"
+msgstr ""
+
+#: my-evolution/Locations.h:2263
+msgid "Tocumen"
+msgstr ""
+
+#: my-evolution/Locations.h:2264
+msgid "Togiak Village"
+msgstr ""
+
+#: my-evolution/Locations.h:2265
+msgid "Tokachi GSDF"
+msgstr ""
+
+#: my-evolution/Locations.h:2266
+#, fuzzy
+msgid "Tokunoshima Island"
+msgstr "聖誕島"
+
+#: my-evolution/Locations.h:2267
+msgid "Tokushima Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2268
+msgid "Tokyo Heliport"
+msgstr ""
+
+#: my-evolution/Locations.h:2269
+msgid "Tokyo International Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2270
+msgid "Tokyo New International Airport"
+msgstr ""
+
+# ui/evolution.xml.h:31
+#: my-evolution/Locations.h:2271
+#, fuzzy
+msgid "Toledo"
+msgstr "切換"
+
+#: my-evolution/Locations.h:2272
+#, fuzzy
+msgid "Toluca"
+msgstr "托克勞群島"
+
+# ui/evolution-calendar.xml.h:34
+# widgets/misc/e-cell-date-edit.c:229
+# widgets/misc/e-dateedit.c:424
+#: my-evolution/Locations.h:2273
+#, fuzzy
+msgid "Tonopah"
+msgstr "東加"
+
+#: my-evolution/Locations.h:2274
+#, fuzzy
+msgid "Topeka"
+msgstr "托克勞群島"
+
+#: my-evolution/Locations.h:2275
+msgid "Topeka-Forbes Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2276
+msgid "Torino/Bric Della Croce"
+msgstr ""
+
+#: my-evolution/Locations.h:2277
+msgid "Torino/Caselle"
+msgstr ""
+
+#: my-evolution/Locations.h:2278
+#, fuzzy
+msgid "Toronto"
+msgstr "龍捲風"
+
+# addressbook/printing/e-contact-print.glade.h:39
+#: my-evolution/Locations.h:2279
+#, fuzzy
+msgid "Torp"
+msgstr "上："
+
+# ui/evolution-mail.xml.h:2
+#: my-evolution/Locations.h:2280
+#, fuzzy
+msgid "Torrance"
+msgstr "法國"
+
+#: my-evolution/Locations.h:2281
+#, fuzzy
+msgid "Torreon"
+msgstr "韓文"
+
+#: my-evolution/Locations.h:2282
+#, fuzzy
+msgid "Tottori Airport"
+msgstr "開始匯入"
+
+# 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:5
+#: my-evolution/Locations.h:2283
+#, fuzzy
+msgid "Toulouse"
+msgstr "關閉"
+
+#: my-evolution/Locations.h:2284
+msgid "Toul-Rosieres"
+msgstr ""
+
+#: my-evolution/Locations.h:2285
+msgid "Tours-St-Symphorien"
+msgstr ""
+
+#: my-evolution/Locations.h:2286
+msgid "Toussus-Le Noble"
+msgstr ""
+
+#: my-evolution/Locations.h:2287
+msgid "Townsville"
+msgstr ""
+
+#: my-evolution/Locations.h:2288
+msgid "Toyama Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2289
+#, fuzzy
+msgid "Trabzon"
+msgstr "加彭"
+
+#: my-evolution/Locations.h:2290
+#, fuzzy
+msgid "Trapani"
+msgstr "日本"
+
+#: my-evolution/Locations.h:2291
+msgid "Traverse City"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1259
+# addressbook/gui/widgets/e-addressbook-view.c:722
+#: my-evolution/Locations.h:2292
+#, fuzzy
+msgid "Trelew"
+msgstr "電報"
+
+# addressbook/printing/e-contact-print.glade.h:24
+#: my-evolution/Locations.h:2293
+#, fuzzy
+msgid "Trenton"
+msgstr "紙張方向"
+
+# mail/message-browser.c:207
+# ui/evolution-event-editor.xml.h:33
+# ui/evolution-mail.xml.h:64
+# ui/evolution-task-editor-dialog.xml.h:36
+#: my-evolution/Locations.h:2294
+#, fuzzy
+msgid "Trevico"
+msgstr "上一步"
+
+#: my-evolution/Locations.h:2295
+msgid "Treviso/Istrana"
+msgstr ""
+
+#: my-evolution/Locations.h:2296
+msgid "Treviso/S.Angelo"
+msgstr ""
+
+#: my-evolution/Locations.h:2297
+#, fuzzy
+msgid "Trieste"
+msgstr "測試"
+
+#: my-evolution/Locations.h:2298
+#, fuzzy
+msgid "Trinidad"
+msgstr "龍捲風"
+
+#: my-evolution/Locations.h:2299
+msgid "Tripoli"
+msgstr ""
+
+#: my-evolution/Locations.h:2300
+msgid "Tromso/Langnes"
+msgstr ""
+
+#: my-evolution/Locations.h:2301
+msgid "Trondheim/Vaernes"
+msgstr ""
+
+#: my-evolution/Locations.h:2302
+msgid "Troutdale"
+msgstr ""
+
+#: my-evolution/Locations.h:2303
+msgid "Troyes/Barberey"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: my-evolution/Locations.h:2304
+#, fuzzy
+msgid "Truckee"
+msgstr "土耳其"
+
+#: my-evolution/Locations.h:2305
+msgid "Truth or Consequences"
+msgstr ""
+
+#: my-evolution/Locations.h:2306
+msgid "Tsuiki Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2307
+msgid "Tsushima Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2308
+msgid "Tucson"
+msgstr ""
+
+#: my-evolution/Locations.h:2309
+msgid "Tucson-Davis AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2310
+msgid "Tucuman"
+msgstr ""
+
+#: my-evolution/Locations.h:2311
+msgid "Tucumcari"
+msgstr ""
+
+#: my-evolution/Locations.h:2312
+msgid "Tucurui"
+msgstr ""
+
+#: my-evolution/Locations.h:2313
+msgid "Tulancingo"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+# calendar/gui/event-editor.c:476
+#: my-evolution/Locations.h:2314
+#, fuzzy
+msgid "Tulcea"
+msgstr "星期二"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+# calendar/gui/event-editor.c:476
+#: my-evolution/Locations.h:2315
+#, fuzzy
+msgid "Tulsa"
+msgstr "星期二"
+
+# mail/mail-config.glade.h:78
+#: my-evolution/Locations.h:2316
+#, fuzzy
+msgid "Tupelo"
+msgstr "類別"
+
+# camel/camel-store.c:378
+# mail/mail-ops.c:1007
+# mail/mail-ops.c:1014
+# mail/mail-ops.c:1032
+# mail/mail-ops.c:1033
+#: my-evolution/Locations.h:2317
+#, fuzzy
+msgid "Turaif"
+msgstr "土耳其文"
+
+# camel/camel-store.c:378
+# mail/mail-ops.c:1007
+# mail/mail-ops.c:1014
+# mail/mail-ops.c:1032
+# mail/mail-ops.c:1033
+#: my-evolution/Locations.h:2318
+#, fuzzy
+msgid "Turin"
+msgstr "土耳其文"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: my-evolution/Locations.h:2320
+#, fuzzy
+msgid "Turku"
+msgstr "土耳其"
+
+#: my-evolution/Locations.h:2321
+msgid "Tuscaloosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2322
+msgid "Tuxtla Gutierrez"
+msgstr ""
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: my-evolution/Locations.h:2323
+#, fuzzy
+msgid "Twenthe"
+msgstr "暫訂"
+
+#: my-evolution/Locations.h:2324
+msgid "Twentynine Palms"
+msgstr ""
+
+#: my-evolution/Locations.h:2325
+msgid "Twin Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2326
+#, fuzzy
+msgid "Tyler"
+msgstr "年"
+
+#: my-evolution/Locations.h:2327
+msgid "Tyndall AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2328
+#, fuzzy
+msgid "Tyumen"
+msgstr "然後"
+
+#: my-evolution/Locations.h:2329
+msgid "Uberaba"
+msgstr ""
+
+#: my-evolution/Locations.h:2330
+msgid "Ufa"
+msgstr ""
+
+#: my-evolution/Locations.h:2331
+msgid "Ukiah"
+msgstr ""
+
+#: my-evolution/Locations.h:2333
+msgid "Ulan-Ude"
+msgstr ""
+
+#: my-evolution/Locations.h:2334
+msgid "Ulsan"
+msgstr ""
+
+#: my-evolution/Locations.h:2335
+msgid "Ulyanovsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2336
+msgid "Umea"
+msgstr ""
+
+#: my-evolution/Locations.h:2337
+msgid "Umiat"
+msgstr ""
+
+#: my-evolution/Locations.h:2338
+msgid "Unalakleet"
+msgstr ""
+
+#: my-evolution/Locations.h:2339
+#, fuzzy
+msgid "United Arab Emirates "
+msgstr "阿拉伯聯合大公國"
+
+# mail/message-list.c:677
+#: my-evolution/Locations.h:2342
+#, fuzzy
+msgid "Unst"
+msgstr "未閱讀"
+
+#: my-evolution/Locations.h:2343
+msgid "Upington"
+msgstr ""
+
+#: my-evolution/Locations.h:2344
+#, fuzzy
+msgid "Uruapan"
+msgstr "日本"
+
+#: my-evolution/Locations.h:2345
+#, fuzzy
+msgid "Uruguaiana"
+msgstr "烏拉圭"
+
+#: my-evolution/Locations.h:2347
+msgid "Urumqi"
+msgstr ""
+
+# calendar/gui/event-editor.c:608
+#: my-evolution/Locations.h:2348
+#, fuzzy
+msgid "Utah"
+msgstr " "
+
+#: my-evolution/Locations.h:2349
+msgid "Utica"
+msgstr ""
+
+#: my-evolution/Locations.h:2350
+msgid "Utrecht/Soesterberg"
+msgstr ""
+
+#: my-evolution/Locations.h:2351
+msgid "Utsunomiya Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2352
+msgid "Uzhgorod"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1258
+# addressbook/gui/widgets/e-addressbook-view.c:721
+#: my-evolution/Locations.h:2353
+#, fuzzy
+msgid "Vadso"
+msgstr "無線電電話"
+
+# mail/mail-accounts.c:197
+#: my-evolution/Locations.h:2354
+#, fuzzy
+msgid "Vaerlose"
+msgstr "變數"
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: my-evolution/Locations.h:2355
+#, fuzzy
+msgid "Vagar"
+msgstr "卡達"
+
+#: my-evolution/Locations.h:2356
+msgid "Valdez 2"
+msgstr ""
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: my-evolution/Locations.h:2357
+#, fuzzy
+msgid "Valdosta"
+msgstr "馬爾他"
+
+#: my-evolution/Locations.h:2358
+msgid "Valdosta-Moody AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2359
+#, fuzzy
+msgid "Valencia"
+msgstr "斯洛凡尼亞"
+
+# mail/mail-display.c:301
+#: my-evolution/Locations.h:2360
+#, fuzzy
+msgid "Valentine"
+msgstr "檢視 Inline"
+
+#: my-evolution/Locations.h:2361
+msgid "Valera*"
+msgstr ""
+
+#: my-evolution/Locations.h:2362
+msgid "Valkenburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2363
+msgid "Valley"
+msgstr ""
+
+#: my-evolution/Locations.h:2364
+msgid "Valparaiso"
+msgstr ""
+
+#: my-evolution/Locations.h:2365
+msgid "Valparaiso-Eglin AFB"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:11
+#: my-evolution/Locations.h:2366
+#, fuzzy
+msgid "Van"
+msgstr "主管"
+
+#: my-evolution/Locations.h:2367
+msgid "Vancouver"
+msgstr ""
+
+# ui/evolution-mail.xml.h:2
+#: my-evolution/Locations.h:2368
+#, fuzzy
+msgid "Vandel"
+msgstr "取消"
+
+#: my-evolution/Locations.h:2369
+msgid "Vandenberg AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2370
+msgid "Vandenberg Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2371
+msgid "Van Nuys"
+msgstr ""
+
+#: my-evolution/Locations.h:2372
+#, fuzzy
+msgid "Varadero"
+msgstr "巴貝多"
+
+#: my-evolution/Locations.h:2373
+msgid "Varanasi/Babatpur"
+msgstr ""
+
+#: my-evolution/Locations.h:2374
+#, fuzzy
+msgid "Varna"
+msgstr "萬那杜"
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: my-evolution/Locations.h:2375
+#, fuzzy
+msgid "Vasteras"
+msgstr "之後"
+
+#: my-evolution/Locations.h:2376
+msgid "Vaxjo"
+msgstr ""
+
+#: my-evolution/Locations.h:2377
+#, fuzzy
+msgid "Venezia"
+msgstr "委內瑞拉"
+
+#: my-evolution/Locations.h:2379
+#, fuzzy
+msgid "Venice"
+msgstr "Unicode"
+
+#: my-evolution/Locations.h:2380
+msgid "Veracruz"
+msgstr ""
+
+#: my-evolution/Locations.h:2381
+msgid "Vermillion"
+msgstr ""
+
+#: my-evolution/Locations.h:2382
+#, fuzzy
+msgid "Vermont"
+msgstr "月"
+
+# addressbook/contact-editor/contact-editor.glade.h:10
+# executive-summary/component/executive-summary-config.glade.h:3
+#: my-evolution/Locations.h:2383
+#, fuzzy
+msgid "Vernal"
+msgstr "一般"
+
+#: my-evolution/Locations.h:2384
+msgid "Vero Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2385
+#, fuzzy
+msgid "Vicenza"
+msgstr "委內瑞拉"
+
+#: my-evolution/Locations.h:2386
+msgid "Vichy-Charmeil"
+msgstr ""
+
+#: my-evolution/Locations.h:2387
+msgid "Vichy-Rolla"
+msgstr ""
+
+#: my-evolution/Locations.h:2388
+msgid "Vicksburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2389
+msgid "Victoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2391
+msgid "Vigo"
+msgstr ""
+
+# shell/e-shell-importer.c:540
+#: my-evolution/Locations.h:2392
+#, fuzzy
+msgid "Vilhena"
+msgstr "檔案名稱："
+
+#: my-evolution/Locations.h:2393
+msgid "Villacoublay"
+msgstr ""
+
+#: my-evolution/Locations.h:2394
+msgid "Villafranca"
+msgstr ""
+
+#: my-evolution/Locations.h:2395
+msgid "Villahermosa"
+msgstr ""
+
+#: my-evolution/Locations.h:2396
+msgid "Villamontes"
+msgstr ""
+
+#: my-evolution/Locations.h:2397
+msgid "Villa Reynolds"
+msgstr ""
+
+#: my-evolution/Locations.h:2398
+msgid "Vilnius"
+msgstr ""
+
+#: my-evolution/Locations.h:2399
+msgid "Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2400
+msgid "Virginia Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2401
+msgid "Virginia Tech Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2402
+msgid "Viru-Viru"
+msgstr ""
+
+#: my-evolution/Locations.h:2403
+#, fuzzy
+msgid "Visalia"
+msgstr "澳大利亞"
+
+#: my-evolution/Locations.h:2404
+msgid "Visby"
+msgstr ""
+
+#: my-evolution/Locations.h:2405
+msgid "Viterbo"
+msgstr ""
+
+#: my-evolution/Locations.h:2406
+msgid "Vitoria"
+msgstr ""
+
+#: my-evolution/Locations.h:2407
+msgid "Vladikavkaz"
+msgstr ""
+
+#: my-evolution/Locations.h:2408
+msgid "Vladivostok"
+msgstr ""
+
+#: my-evolution/Locations.h:2409
+#, fuzzy
+msgid "Vlieland"
+msgstr "愛爾蘭"
+
+#: my-evolution/Locations.h:2410
+msgid "Vojens/Skrydstrup"
+msgstr ""
+
+#: my-evolution/Locations.h:2411
+msgid "Volgograd"
+msgstr ""
+
+#: my-evolution/Locations.h:2412
+#, fuzzy
+msgid "Volkel"
+msgstr "托克勞群島"
+
+# ui/evolution-message-composer.xml.h:47
+#: my-evolution/Locations.h:2413
+#, fuzzy
+msgid "Volk Field"
+msgstr "寄件者(_F)"
+
+#: my-evolution/Locations.h:2414
+msgid "Voronezh"
+msgstr ""
+
+#: my-evolution/Locations.h:2415
+#, fuzzy
+msgid "Voslau"
+msgstr "托克勞群島"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+# calendar/gui/event-editor.c:475
+#: my-evolution/Locations.h:2416
+#, fuzzy
+msgid "Waco"
+msgstr "摩納哥"
+
+#: my-evolution/Locations.h:2417
+msgid "Wadi Al Dawasser Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2418
+msgid "Wainwright"
+msgstr ""
+
+#: my-evolution/Locations.h:2419
+msgid "Wakefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2420
+msgid "Wakkanai Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2421
+msgid "Walla Walla"
+msgstr ""
+
+#: my-evolution/Locations.h:2422
+#, fuzzy
+msgid "Wallops Island"
+msgstr "馬紹爾群島"
+
+#: my-evolution/Locations.h:2423
+msgid "Walnut Ridge"
+msgstr ""
+
+# widgets/misc/e-messagebox.c:159
+#: my-evolution/Locations.h:2424
+#, fuzzy
+msgid "Warner Robins"
+msgstr "警告"
+
+#: my-evolution/Locations.h:2425
+msgid "Warroad"
+msgstr ""
+
+#: my-evolution/Locations.h:2426
+msgid "Warszawa"
+msgstr ""
+
+#: my-evolution/Locations.h:2427
+msgid "Washington"
+msgstr ""
+
+#: my-evolution/Locations.h:2428
+msgid "Washington/Dulles"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: my-evolution/Locations.h:2429
+#, fuzzy
+msgid "Waterbury"
+msgstr "天氣"
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: my-evolution/Locations.h:2430
+#, fuzzy
+msgid "Waterloo"
+msgstr "天氣"
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: my-evolution/Locations.h:2431
+#, fuzzy
+msgid "Watertown"
+msgstr "天氣"
+
+# calendar/gui/e-calendar-table.c:150
+#: my-evolution/Locations.h:2432
+#, fuzzy
+msgid "Waterville"
+msgstr "類別"
+
+#: my-evolution/Locations.h:2433
+msgid "Waukesha"
+msgstr ""
+
+#: my-evolution/Locations.h:2434
+#, fuzzy
+msgid "Wausau"
+msgstr "萬那杜"
+
+#: my-evolution/Locations.h:2435
+msgid "Waycross"
+msgstr ""
+
+#: my-evolution/Locations.h:2436
+msgid "Waynesboro"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:727
+#: my-evolution/Locations.h:2437
+#, fuzzy
+msgid "Webster City"
+msgstr "網址"
+
+# calendar/gui/print.c:362
+#: my-evolution/Locations.h:2438
+#, fuzzy
+msgid "Wejh"
+msgstr "三"
+
+#: my-evolution/Locations.h:2439
+msgid "Wellington"
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#: my-evolution/Locations.h:2440
+#, fuzzy
+msgid "Wenatchee"
+msgstr "天氣"
+
+#: my-evolution/Locations.h:2441
+#, fuzzy
+msgid "Wendover"
+msgstr "寄件者"
+
+#: my-evolution/Locations.h:2442
+msgid "West Atlanta"
+msgstr ""
+
+#: my-evolution/Locations.h:2443
+#, fuzzy
+msgid "West Burke"
+msgstr "西歐字母"
+
+# addressbook/contact-editor/contact-editor.glade.h:12
+#: my-evolution/Locations.h:2444
+#, fuzzy
+msgid "Westerland"
+msgstr "荷蘭"
+
+#: my-evolution/Locations.h:2445
+#, fuzzy
+msgid "Westfield"
+msgstr "西"
+
+#: my-evolution/Locations.h:2446
+msgid "Westhampton"
+msgstr ""
+
+#: my-evolution/Locations.h:2447
+msgid "West Palm Beach"
+msgstr ""
+
+#: my-evolution/Locations.h:2448
+msgid "West Virginia"
+msgstr ""
+
+#: my-evolution/Locations.h:2449
+msgid "West Yellowstone"
+msgstr ""
+
+#: my-evolution/Locations.h:2450
+msgid "West Yellowstone (2)"
+msgstr ""
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#: my-evolution/Locations.h:2451
+#, fuzzy
+msgid "Wheeling"
+msgstr "會議"
+
+#: my-evolution/Locations.h:2452
+#, fuzzy
+msgid "Whidbey Island"
+msgstr "聖誕島"
+
+#: my-evolution/Locations.h:2453
+msgid "Whitefield"
+msgstr ""
+
+#: my-evolution/Locations.h:2454
+msgid "White Plains"
+msgstr ""
+
+#: my-evolution/Locations.h:2455
+msgid "White Sulphur"
+msgstr ""
+
+#: my-evolution/Locations.h:2456
+msgid "Whittier"
+msgstr ""
+
+#: my-evolution/Locations.h:2457
+msgid "Wichita"
+msgstr ""
+
+#: my-evolution/Locations.h:2458
+msgid "Wichita Falls"
+msgstr ""
+
+#: my-evolution/Locations.h:2459
+msgid "Wichita-Jabara"
+msgstr ""
+
+#: my-evolution/Locations.h:2460
+msgid "Wichita-McConnell AFB"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:734
+#: my-evolution/Locations.h:2461
+#, fuzzy
+msgid "Wick"
+msgstr "暱稱"
+
+# calendar/gui/print.c:362
+#: my-evolution/Locations.h:2462
+#, fuzzy
+msgid "Wien"
+msgstr "三"
+
+#: my-evolution/Locations.h:2463
+msgid "Wildwood"
+msgstr ""
+
+#: my-evolution/Locations.h:2464
+msgid "Wilkes - Barre"
+msgstr ""
+
+#: my-evolution/Locations.h:2465
+msgid "Williams Field"
+msgstr ""
+
+#: my-evolution/Locations.h:2466
+msgid "Williamsport"
+msgstr ""
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: my-evolution/Locations.h:2467
+#, fuzzy
+msgid "Williston"
+msgstr "靄"
+
+#: my-evolution/Locations.h:2468
+msgid "Willoughby"
+msgstr ""
+
+#: my-evolution/Locations.h:2469
+msgid "Willow Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2470
+msgid "Wilmington"
+msgstr ""
+
+#: my-evolution/Locations.h:2471
+#, fuzzy
+msgid "Winchester"
+msgstr "列支敦斯登"
+
+#: my-evolution/Locations.h:2472
+#, fuzzy
+msgid "Windsor"
+msgstr "沙暴"
+
+#: my-evolution/Locations.h:2473
+msgid "Windsor Locks"
+msgstr ""
+
+#: my-evolution/Locations.h:2474
+msgid "Wink"
+msgstr ""
+
+#: my-evolution/Locations.h:2475
+msgid "Winnemucca"
+msgstr ""
+
+#: my-evolution/Locations.h:2476
+msgid "Winnipeg"
+msgstr ""
+
+#: my-evolution/Locations.h:2477
+#, fuzzy
+msgid "Winslow"
+msgstr "現在"
+
+#: my-evolution/Locations.h:2478
+msgid "Winston-Salem"
+msgstr ""
+
+#: my-evolution/Locations.h:2479
+msgid "Winter Haven"
+msgstr ""
+
+# addressbook/gui/component/addressbook-config.c:165
+# camel/camel-sasl-plain.c:32
+# camel/providers/imap/camel-imap-provider.c:80
+# camel/providers/nntp/camel-nntp-store.c:291
+# camel/providers/pop3/camel-pop3-provider.c:67
+# mail/mail-config.glade.h:52
+#: my-evolution/Locations.h:2480
+#, fuzzy
+msgid "Winter Park"
+msgstr "密碼"
+
+#: my-evolution/Locations.h:2481
+msgid "Wiscasset"
+msgstr ""
+
+#: my-evolution/Locations.h:2482
+#, fuzzy
+msgid "Wisconsin"
+msgstr "密克羅尼西亞"
+
+#: my-evolution/Locations.h:2483
+msgid "Wisconsin Rapids"
+msgstr ""
+
+#: my-evolution/Locations.h:2484
+#, fuzzy
+msgid "Wise"
+msgstr "是"
+
+#: my-evolution/Locations.h:2485
+msgid "Woensdrecht"
+msgstr ""
+
+#: my-evolution/Locations.h:2486
+msgid "Wolf Point"
+msgstr ""
+
+#: my-evolution/Locations.h:2487
+#, fuzzy
+msgid "Woong Cheon"
+msgstr "香港"
+
+# addressbook/printing/e-contact-print.glade.h:9
+#: my-evolution/Locations.h:2488
+#, fuzzy
+msgid "Wooster"
+msgstr "頁尾："
+
+# calendar/gui/event-editor-dialog.glade.h:38
+#: my-evolution/Locations.h:2489
+#, fuzzy
+msgid "Worcester"
+msgstr "永遠"
+
+# addressbook/contact-editor/fulladdr.glade.h:5
+#: my-evolution/Locations.h:2490
+#, fuzzy
+msgid "Worland"
+msgstr "波蘭"
+
+# mail/mail-mt.c:516
+# mail/mail-mt.c:545
+# mail/mail-mt.c:880
+#: my-evolution/Locations.h:2491
+#, fuzzy
+msgid "Worthington"
+msgstr "正在工作"
+
+#: my-evolution/Locations.h:2492
+msgid "Wrangell"
+msgstr ""
+
+#: my-evolution/Locations.h:2493
+msgid "Wrightstown / Mcguire AFB"
+msgstr ""
+
+#: my-evolution/Locations.h:2494
+msgid "Wuchia Observatory"
+msgstr ""
+
+# mail/mail-mt.c:516
+# mail/mail-mt.c:545
+# mail/mail-mt.c:880
+#: my-evolution/Locations.h:2495
+#, fuzzy
+msgid "Wyoming"
+msgstr "正在工作"
+
+# addressbook/gui/widgets/e-addressbook-view.c:730
+#: my-evolution/Locations.h:2496
+#, fuzzy
+msgid "Xiamen"
+msgstr "時間"
+
+#: my-evolution/Locations.h:2497
+msgid "Yacuiba"
+msgstr ""
+
+#: my-evolution/Locations.h:2498
+msgid "Yakima"
+msgstr ""
+
+#: my-evolution/Locations.h:2499
+msgid "Yakushima"
+msgstr ""
+
+#: my-evolution/Locations.h:2500
+msgid "Yakutat"
+msgstr ""
+
+#: my-evolution/Locations.h:2501
+msgid "Yakutsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2502
+msgid "Yamagata Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2503
+msgid "Yamaguchi Ube Airport"
+msgstr ""
+
+#: my-evolution/Locations.h:2504
+msgid "Yankton"
+msgstr ""
+
+# shell/e-shortcuts-view.c:265
+#: my-evolution/Locations.h:2505
+#, fuzzy
+msgid "Yao Airport"
+msgstr "不要匯入"
+
+#: my-evolution/Locations.h:2506
+msgid "Yechon Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2507
+msgid "Yekaterinburg"
+msgstr ""
+
+#: my-evolution/Locations.h:2508
+msgid "Yellowknife"
+msgstr ""
+
+#: my-evolution/Locations.h:2509
+msgid "Yellowstone"
+msgstr ""
+
+# mail/local-config.glade.h:8
+#: my-evolution/Locations.h:2511
+#, fuzzy
+msgid "Yenbo"
+msgstr "Inbox"
+
+#: my-evolution/Locations.h:2512
+msgid "Yeoju Range"
+msgstr ""
+
+#: my-evolution/Locations.h:2513
+msgid "Yeonpyeungdo"
+msgstr ""
+
+#: my-evolution/Locations.h:2514
+msgid "Yeovilton"
+msgstr ""
+
+#: my-evolution/Locations.h:2515
+msgid "Yokosuka Fwf"
+msgstr ""
+
+#: my-evolution/Locations.h:2516
+msgid "Yokota Ab"
+msgstr ""
+
+#: my-evolution/Locations.h:2517
+msgid "Yongsan/H-208 Hp"
+msgstr ""
+
+#: my-evolution/Locations.h:2518
+msgid "Yoro"
+msgstr ""
+
+#: my-evolution/Locations.h:2519
+msgid "Yosu"
+msgstr ""
+
+#: my-evolution/Locations.h:2520
+msgid "Youngstown"
+msgstr ""
+
+#: my-evolution/Locations.h:2521
+msgid "Ypsilanti"
+msgstr ""
+
+#: my-evolution/Locations.h:2523
+msgid "Yukon"
+msgstr ""
+
+#: my-evolution/Locations.h:2524
+msgid "Yuma MCAS"
+msgstr ""
+
+#: my-evolution/Locations.h:2525
+msgid "Yurimaguas"
+msgstr ""
+
+#: my-evolution/Locations.h:2526
+msgid "Yuzhno-Sakhalinsk"
+msgstr ""
+
+#: my-evolution/Locations.h:2527
+msgid "Zacatecas"
+msgstr ""
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: my-evolution/Locations.h:2528
+#, fuzzy
+msgid "Zadar"
+msgstr "行事曆"
+
+# addressbook/printing/e-contact-print.glade.h:25
+#: my-evolution/Locations.h:2529
+#, fuzzy
+msgid "Zagreb"
+msgstr "頁"
+
+#: my-evolution/Locations.h:2530
+msgid "Zakinthos"
+msgstr ""
+
+#: my-evolution/Locations.h:2531
+msgid "Zama Airfield"
+msgstr ""
+
+# calendar/gui/calendar-model.c:647
+# calendar/gui/calendar-model.c:1182
+# calendar/gui/dialogs/task-editor-dialog.glade.h:4
+# calendar/gui/e-calendar-table.c:422
+# camel/camel-service.c:544
+# camel/camel-service.c:580
+#: my-evolution/Locations.h:2532
+#, fuzzy
+msgid "Zanesville"
+msgstr "已取消"
+
+#: my-evolution/Locations.h:2533
+#, fuzzy
+msgid "Zaragoza"
+msgstr "巴拉圭"
+
+#: my-evolution/Locations.h:2534
+msgid "Zell Am See"
+msgstr ""
+
+#: my-evolution/Locations.h:2535
+msgid "Zuni Pueblo"
+msgstr ""
+
+# camel/camel-store.c:378
+# mail/mail-ops.c:1007
+# mail/mail-ops.c:1014
+# mail/mail-ops.c:1032
+# mail/mail-ops.c:1033
+#: my-evolution/Locations.h:2536
+#, fuzzy
+msgid "Zurich"
+msgstr "土耳其文"
+
+#: my-evolution/component-factory.c:51
+msgid "Folder containing the Evolution Summary"
+msgstr "資料夾包含 Evolution 摘要"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: my-evolution/e-summary-calendar.c:340 my-evolution/e-summary-calendar.c:358
+#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
 msgid "Appointments"
 msgstr "約會"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: my-evolution/e-summary-calendar.c:341
+#: my-evolution/e-summary-calendar.c:366
 msgid "No appointments"
 msgstr "無約會"
 
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-#: my-evolution/e-summary-calendar.c:377
+#: my-evolution/e-summary-calendar.c:400
 #, fuzzy
 msgid "%k:%M %d %B"
 msgstr "%k%M %d %B"
@@ -12366,74 +27804,97 @@ msgstr "%k%M %d %B"
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-#: my-evolution/e-summary-calendar.c:379
+#: my-evolution/e-summary-calendar.c:402
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
+# addressbook/gui/component/addressbook-config.c:689
+# calendar/gui/e-itip-control.glade.h:6
+# composer/e-msg-composer-attachment.glade.h:3
+#: my-evolution/e-summary-calendar.c:420
+#, fuzzy
+msgid "No description"
+msgstr "描述"
+
 # calendar/gui/e-calendar-table.c:159
-#: my-evolution/e-summary-mail.c:129
+#: my-evolution/e-summary-mail.c:152
 msgid "Mail summary"
 msgstr "郵件摘要"
 
+# mail/mail-config.glade.h:76
+#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
+#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#, fuzzy
+msgid "Local Folders"
+msgstr "特別資料夾"
+
 #. translators: Put a list of codes for locations you want to see in
 #. My Evolution by default here. You can find the list of all
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:80
-#: my-evolution/e-summary-weather.c:661
+#: my-evolution/e-summary-preferences.c:108
+#: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:444
+#: my-evolution/e-summary-preferences.c:578
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com 每日一字"
 
-#: my-evolution/e-summary-preferences.c:467
+#: my-evolution/e-summary-preferences.c:599
 msgid "Quotes of the Day"
 msgstr "每日一文"
 
-#: my-evolution/e-summary-preferences.c:946
+#: my-evolution/e-summary-preferences.c:867
 msgid "Add a news feed"
 msgstr "新增新聞發送伺服器"
 
-#: my-evolution/e-summary-preferences.c:954
+#: my-evolution/e-summary-preferences.c:875
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "輸入您希望新增新聞發送伺服器網址"
 
-# addressbook/gui/component/addressbook-config.c:686
-# mail/mail-config.glade.h:43
-#: my-evolution/e-summary-preferences.c:958
-msgid "Name:"
-msgstr "名稱："
-
-# calendar/gui/gnome-cal.c:234
-#: my-evolution/e-summary-preferences.c:1504
-msgid "Summary Settings"
-msgstr "摘要設定"
-
 # shell/e-shell-importer.c:404
-#: my-evolution/e-summary-rdf.c:296 my-evolution/e-summary-rdf.c:381
-#: my-evolution/e-summary-rdf.c:415
+#: my-evolution/e-summary-rdf.c:304
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>下載 RDF 時發生錯誤</b>"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: my-evolution/e-summary-rdf.c:528
+#: my-evolution/e-summary-rdf.c:448
 msgid "News Feed"
 msgstr "新聞發送伺服器"
 
+#: my-evolution/e-summary-shown.c:536
+msgid "All"
+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
+# calendar/gui/event-editor-dialog.glade.h:2
+# mail/mail-config.glade.h:7
+#. Fixme: nice GFX version
+#: my-evolution/e-summary-shown.c:545
+#, fuzzy
+msgid "Add"
+msgstr "新增(_A)"
+
+#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "下雪"
+
 # ui/evolution-tasks.xml.h:3
-#: my-evolution/e-summary-tasks.c:248
+#: my-evolution/e-summary-tasks.c:251
 msgid "No tasks"
 msgstr "無工作"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: my-evolution/e-summary-tasks.c:287
+#: my-evolution/e-summary-tasks.c:291
 #, fuzzy
 msgid "(No Description)"
 msgstr "描述："
@@ -12442,48 +27903,49 @@ msgstr "描述："
 msgid "My Weather"
 msgstr "我的天氣"
 
-#: my-evolution/e-summary-weather.c:348
-msgid "<dd><b>The weather server could not be contacted</b></dd>"
-msgstr "<dd><b>無法連繫天氣伺服器</b></dd>"
+#: my-evolution/e-summary-weather.c:279
+#, fuzzy
+msgid "There was an error downloading data for"
+msgstr "下載新聞發送伺服器時發生錯誤"
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#: my-evolution/e-summary-weather.c:559
+#: my-evolution/e-summary-weather.c:501
 msgid "Weather"
 msgstr "天氣"
 
-# addressbook/printing/e-contact-print.glade.h:34
-#: my-evolution/e-summary-weather.c:722
-msgid "Regions"
-msgstr "地區"
-
 # widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #: my-evolution/e-summary.c:193
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
+#: my-evolution/e-summary.c:488
+#, fuzzy
+msgid "Please wait..."
+msgstr "請稍候"
+
 # calendar/gui/e-calendar-table.c:159
-#: my-evolution/e-summary.c:575 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:580 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "列印摘要"
 
 # mail/mail-callbacks.c:1454
-#: my-evolution/e-summary.c:621
+#: my-evolution/e-summary.c:626
 msgid "Printing of Summary failed"
 msgstr "列印摘要失敗"
 
 # wombat/wombat.c:198
-#: my-evolution/main.c:66
+#: my-evolution/main.c:139
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "執行摘要元件不能初始化 Bonobo。\n"
 
 #: my-evolution/metar.c:29
-msgid "蚌"
-msgstr "蚌"
+msgid " F"
+msgstr ""
 
 #: my-evolution/metar.c:29
-msgid "蚓"
-msgstr "蚓"
+msgid " C"
+msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:8
 #: my-evolution/metar.c:33
@@ -12928,14 +28390,6 @@ msgstr "漂冰粒"
 msgid "Freezing ice pellets"
 msgstr "凍冰粒"
 
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#. HAIL
-#: my-evolution/metar.c:217
-msgid "Hail"
-msgstr "下冰雹"
-
 #: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr "附近地區冰雹"
@@ -13710,195 +29164,199 @@ msgstr "吹塵旋"
 msgid "Drifting dust whirls"
 msgstr "漂塵旋"
 
-# addressbook/gui/component/select-names/e-select-names-popup.c:161
-# composer/e-msg-composer-attachment-bar.c:468
-# shell/e-shortcuts-view.c:265
-# shell/e-shortcuts-view.c:388
-#: my-evolution/my-evolution.glade.h:1
-msgid " _Remove"
-msgstr "移除(_R)"
-
 # mail/message-list.c:679
-#: my-evolution/my-evolution.glade.h:2
+#: my-evolution/my-evolution.glade.h:1
 #, fuzzy
 msgid "Add n_ews feed"
 msgstr "新增新聞發送伺服器(_N)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
-#: my-evolution/my-evolution.glade.h:3
-msgid "Al_l stations:"
-msgstr "所有站臺(_L)："
-
-# shell/e-shell-importer.c:601
-#: my-evolution/my-evolution.glade.h:4
-msgid "All _folders:"
-msgstr "全部資料夾(_A)："
+#: my-evolution/my-evolution.glade.h:2
+msgid "C_elsius"
+msgstr ""
 
 # mail/message-list.c:679
-#: my-evolution/my-evolution.glade.h:5
-msgid "All news _feeds:"
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "Delete news feed"
 msgstr "所有新聞發送伺服器(_F)："
 
-#: my-evolution/my-evolution.glade.h:6
-msgid "C_elcius"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:8
+#: my-evolution/my-evolution.glade.h:5
 msgid "How many days should the calendar display at once?"
 msgstr "行事曆每次顯示多少天？"
 
-#: my-evolution/my-evolution.glade.h:9
+#: my-evolution/my-evolution.glade.h:6
 msgid "Ma_x number of items shown:"
 msgstr "最多可顯示的項目個數(_X)："
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: my-evolution/my-evolution.glade.h:10
+#: my-evolution/my-evolution.glade.h:7
 msgid "News Feed Settings"
 msgstr "新聞發送伺服器設定"
 
-#: my-evolution/my-evolution.glade.h:11
+#: my-evolution/my-evolution.glade.h:8
 msgid "One mont_h"
 msgstr "一個月(_H)"
 
 # calendar/gui/event-editor.c:1550
-#: my-evolution/my-evolution.glade.h:12
+#: my-evolution/my-evolution.glade.h:9
 msgid "One w_eek"
 msgstr "一週(_E)"
 
-#: my-evolution/my-evolution.glade.h:13
+#: my-evolution/my-evolution.glade.h:10
 msgid "R_efresh time (seconds):"
 msgstr "重新整理時間(秒)(_E)："
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:11
 msgid "Refresh _time (seconds):"
 msgstr "重新整理時間(秒)(_T)："
 
 # addressbook/printing/e-contact-print.glade.h:11
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:12
 msgid "S_how full path for folders"
 msgstr "顯示資料夾的完整路徑(_H)"
 
 # widgets/misc/e-filter-bar.h:95
 # widgets/misc/e-filter-bar.h:102
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:13
 msgid "Show _all tasks"
 msgstr "顯示全部工作(_A)"
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:14
 msgid "Show _today's tasks"
 msgstr "顯示今天的工作(_T)"
 
-#: my-evolution/my-evolution.glade.h:18
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show temperatures in:"
 msgstr ""
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:16
 msgid "Tasks "
 msgstr "工作"
 
 # ui/evolution-event-editor.xml.h:9
 # ui/evolution-task-editor-dialog.xml.h:10
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:17
 msgid "Weather settings"
 msgstr "天氣設定"
 
-# ui/evolution.xml.h:14
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Display folders:"
-msgstr "顯示資料夾(_D)："
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Display stations:"
-msgstr "顯示站臺(_D)："
-
-# calendar/gui/calendar-summary.c:622
-# mail/mail-config.glade.h:24
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Displayed feeds:"
-msgstr "顯示新聞發送伺服器(_D)："
-
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
 msgstr ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 # calendar/gui/event-editor.c:479
-#: my-evolution/my-evolution.glade.h:26
+#: my-evolution/my-evolution.glade.h:19
 msgid "_Five days"
 msgstr "五天(_F)"
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:20
 msgid "_Mail"
 msgstr "郵件(_M)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: my-evolution/my-evolution.glade.h:28
+#: my-evolution/my-evolution.glade.h:21
 msgid "_News Feeds"
 msgstr "新聞發送伺服器(_N)"
 
 # calendar/gui/event-editor.c:1545
-#: my-evolution/my-evolution.glade.h:29
+#: my-evolution/my-evolution.glade.h:22
 msgid "_One day"
 msgstr "一天(_O)"
 
 # calendar/gui/e-meeting-dialog.glade.h:21
-#: my-evolution/my-evolution.glade.h:30
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Schedule"
 msgstr "行程表(_S)"
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#: my-evolution/my-evolution.glade.h:31
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Weather"
 msgstr "天氣(_W)"
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "Configuration control for Evolution folder settings."
+msgstr ""
+
+# ui/evolution-mail.xml.h:110
+#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#, fuzzy
+msgid "Folder Settings"
+msgstr "郵件設定"
+
+# shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 msgid "The Evolution shell."
 msgstr "Evolution shell。"
 
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+msgid "This page can be used to configure various folder settings"
+msgstr ""
+
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "顯示詳細資料"
 
 # calendar/gui/e-itip-control.c:883
-#: shell/e-activity-handler.c:202
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "取消行動"
 
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: shell/e-folder-dnd-bridge.c:52
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"無法刪除資料夾：\n"
+"%s"
+
+# mail/subscribe-dialog.c:76
+# shell/e-storage-set-view.c:48
+#: shell/e-folder-list.c:312
+#, fuzzy
+msgid "Add a Folder"
+msgstr "資料夾"
+
+# mail/mail-config.glade.h:26
+#: shell/e-local-storage.c:174
+msgid "Drafts"
+msgstr "草稿"
+
 # mail/local-config.glade.h:8
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
 msgid "Inbox"
 msgstr "Inbox"
 
-#: shell/e-local-storage.c:175
+#: shell/e-local-storage.c:176
 msgid "Outbox"
 msgstr ""
 
-# mail/mail-config.glade.h:76
-#: shell/e-local-storage.c:636
-#, fuzzy
-msgid "Local Folders"
-msgstr "特別資料夾"
+# mail/mail-config.glade.h:68
+#: shell/e-local-storage.c:177
+msgid "Sent"
+msgstr "傳送"
 
 # shell/e-setup.c:118
 # shell/e-setup.c:191
-#: shell/e-setup.c:124
+#: shell/e-setup.c:126
 msgid "Evolution installation"
 msgstr "安裝 Evolution"
 
 # shell/e-setup.c:122
-#: shell/e-setup.c:128
+#: shell/e-setup.c:130
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -13907,17 +29365,17 @@ msgstr ""
 "到您的 Evolution 個人目錄"
 
 # shell/e-setup.c:123
-#: shell/e-setup.c:129
+#: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "請按 \"確認\" 安裝檔案，或按 \"取消\" 離開。"
 
 # shell/e-setup.c:163
-#: shell/e-setup.c:169
+#: shell/e-setup.c:171
 msgid "Could not update files correctly"
 msgstr "不能正確地更新檔案"
 
 # shell/e-setup.c:215
-#: shell/e-setup.c:192
+#: shell/e-setup.c:194
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13929,7 +29387,7 @@ msgstr ""
 "錯誤：%s"
 
 # composer/e-msg-composer.c:1165
-#: shell/e-setup.c:207
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13938,8 +29396,35 @@ msgstr ""
 "複製資料夾到 `%s' 時\n"
 "發生錯誤。"
 
+# camel/camel-session.c:479
+#: shell/e-setup.c:282
+#, fuzzy, c-format
+msgid ""
+"Evolution could not create directory\n"
+"%s:\n"
+"%s"
+msgstr ""
+"不能建立目錄 %s：\n"
+"%s"
+
+#: shell/e-setup.c:300
+#, c-format
+msgid ""
+"Directory %s\n"
+"does not have the right permissions. Please make it\n"
+"readable and executable and restart Evolution."
+msgstr ""
+
+#: shell/e-setup.c:306
+#, c-format
+msgid ""
+"File %s\n"
+"should be removed to allow Evolution to work correctly.\n"
+"Please remove this file and restart Evolution."
+msgstr ""
+
 # shell/e-setup.c:255
-#: shell/e-setup.c:281
+#: shell/e-setup.c:329
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13950,7 +29435,7 @@ msgstr ""
 "請移動這個檔案到其它地方\n"
 "以便 Evolution 能夠安裝使用者檔案。"
 
-#: shell/e-setup.c:295
+#: shell/e-setup.c:343
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -13965,7 +29450,7 @@ msgstr ""
 "您是否要移除這個目錄？"
 
 # shell/e-setup.c:267
-#: shell/e-setup.c:320
+#: shell/e-setup.c:368
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13976,60 +29461,93 @@ msgstr ""
 "請移動這個目錄到其它地方\n"
 "以便 Evolution 能夠安裝使用者檔案。"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: shell/e-shell-about-box.c:40
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:152
+#: shell/e-shell-config-autocompletion.c:106
 #, fuzzy
-msgid "Evolution "
-msgstr "Evolution"
+msgid "Extra Completion folders"
+msgstr "完成日期"
 
-# shell/e-shell-view-menu.c:230
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "版權 1999, 2000, 2001 Ximian, Inc."
+# shell/e-shell-importer.c:601
+#: shell/e-shell-config-default-folders.c:133
+#, fuzzy
+msgid "Select Default Folder"
+msgstr "選擇資料夾"
 
-#: shell/e-shell-about-box.c:43
-msgid "Brought to you by"
+# mail/mail-config.glade.h:76
+#: shell/e-shell-config-folder-settings.c:71
+#, fuzzy
+msgid "Default Folders"
+msgstr "特別資料夾"
+
+# mail/mail-local.c:812
+#: shell/e-shell-config-folder-settings.c:74
+#, fuzzy
+msgid "Offline Folders"
+msgstr "過濾資料夾"
+
+# mail/mail-config.glade.h:76
+#: shell/e-shell-config-folder-settings.c:77
+#, fuzzy
+msgid "Autocompletion Folders"
+msgstr "特別資料夾"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: shell/e-shell-folder-commands.c:140
+#, fuzzy, c-format
+msgid "Cannot copy folder: %s"
+msgstr "無法取得資料夾：%s：%s"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: shell/e-shell-folder-commands.c:143
+#, fuzzy, c-format
+msgid "Cannot move folder: %s"
 msgstr ""
+"無法刪除資料夾：\n"
+"%s"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "無法自行移開資料夾。"
 
 # shell/e-setup.c:230
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "無法自行複製資料夾。"
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:206
 msgid "Cannot move a folder into one of its descendants."
 msgstr "不能將資料夾移至其子資料夾之中。"
 
-#: shell/e-shell-folder-commands.c:307
+#: shell/e-shell-folder-commands.c:321
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "指定要複製資料夾 \"%s\" 進去的資料夾："
 
 # ui/evolution.xml.h:7
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:325
 msgid "Copy folder"
 msgstr "複製資料夾"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:365
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "指定要移動資料夾 \"%s\"進去的資料夾："
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:369
 msgid "Move folder"
 msgstr "移動資料夾"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:393
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -14049,17 +29567,16 @@ msgstr ""
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
 msgid "Delete \"%s\""
 msgstr "刪除"
 
-# calendar/gui/dialogs/delete-comp.c:93
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+# ui/evolution.xml.h:47
+#: shell/e-shell-folder-commands.c:407
 #, fuzzy, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
-msgstr "您確定要刪除這個資料夾 '%s'？"
+msgid "Really delete folder \"%s\"?"
+msgstr "刪除資料夾 '%s'"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
@@ -14074,7 +29591,7 @@ msgstr ""
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: shell/e-shell-folder-commands.c:536
+#: shell/e-shell-folder-commands.c:535
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "重新命名資料夾 '%s'"
@@ -14088,13 +29605,13 @@ msgstr "重新命名資料夾 '%s'"
 
 # shell/e-shell-folder-creation-dialog.c:156
 #: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:148
+#: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "指定的資料夾名稱不合法： %s"
 
 # shell/e-shell-folder-creation-dialog.c:99
-#: shell/e-shell-folder-creation-dialog.c:111
+#: shell/e-shell-folder-creation-dialog.c:125
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -14104,12 +29621,12 @@ msgstr ""
 "%s"
 
 # shell/e-shell-folder-creation-dialog.c:263
-#: shell/e-shell-folder-creation-dialog.c:267
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - 新增資料夾"
 
 # shell/e-shell-folder-selection-dialog.c:96
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:97
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -14118,13 +29635,13 @@ msgstr ""
 "所要求的動作。"
 
 # shell/e-shell-folder-selection-dialog.c:328
-#: shell/e-shell-folder-selection-dialog.c:359
+#: shell/e-shell-folder-selection-dialog.c:374
 msgid "New..."
 msgstr "新增..."
 
 # shell/e-shell-folder-title-bar.c:459
 # shell/e-shell-folder-title-bar.c:460
-#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
+#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
 msgid "(Untitled)"
 msgstr "(未命名)"
 
@@ -14145,7 +29662,7 @@ msgstr ""
 "\n"
 "若您不清楚檔案類別，請選擇 \"自動\"。Evolution 會嘗試找出適當的處理方法。"
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:757
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -14174,20 +29691,35 @@ msgstr ""
 "匯入 %s\n"
 "匯入項目 %d。"
 
+# mail/mail-account-gui.c:682
+#: shell/e-shell-importer.c:366
+#, fuzzy
+msgid "Select importer"
+msgstr "選擇資料夾"
+
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: shell/e-shell-importer.c:397
+#: shell/e-shell-importer.c:498
 #, c-format
 msgid "File %s does not exist"
 msgstr "檔案 %s 不存在"
 
-#: shell/e-shell-importer.c:409
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: shell/e-shell-importer.c:509
 msgid "You may only import to local folders"
 msgstr ""
 
 # shell/e-shell-importer.c:353
-#: shell/e-shell-importer.c:424
+#: shell/e-shell-importer.c:524
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -14197,12 +29729,12 @@ msgstr ""
 "%s"
 
 # shell/e-shell-importer.c:363
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:534
 msgid "Importing"
 msgstr "匯入"
 
 # shell/e-shell-importer.c:371
-#: shell/e-shell-importer.c:442
+#: shell/e-shell-importer.c:542
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -14212,19 +29744,19 @@ msgstr ""
 "正在啟動 %s"
 
 # shell/e-shell-importer.c:384
-#: shell/e-shell-importer.c:455
+#: shell/e-shell-importer.c:555
 #, c-format
 msgid "Error starting %s"
 msgstr "啟動 %s 時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: shell/e-shell-importer.c:474
+#: shell/e-shell-importer.c:574
 #, c-format
 msgid "Error loading %s"
 msgstr "載入 %s 時發生錯誤"
 
 # shell/e-shell-importer.c:419
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:591
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -14234,37 +29766,37 @@ msgstr ""
 "正在匯入項目 1。"
 
 # shell/e-shell-importer.c:490
-#: shell/e-shell-importer.c:561
+#: shell/e-shell-importer.c:645
 msgid "Automatic"
 msgstr "自動"
 
 # shell/e-shell-importer.c:540
-#: shell/e-shell-importer.c:612
+#: shell/e-shell-importer.c:696
 msgid "Filename:"
 msgstr "檔案名稱："
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: shell/e-shell-importer.c:617
+#: shell/e-shell-importer.c:701
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
 # shell/e-shell-importer.c:555
-#: shell/e-shell-importer.c:627
+#: shell/e-shell-importer.c:711
 msgid "File type:"
 msgstr "檔案類別："
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:736
 msgid "Import data and settings from older programs"
 msgstr ""
 
 # ui/evolution.xml.h:21
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:740
 #, fuzzy
 msgid "Import a single file"
 msgstr "匯入外部檔案格式"
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:586
+#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14272,23 +29804,23 @@ msgstr ""
 "請稍候...\n"
 "正在掃描現存的設定"
 
-#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:589
+#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
 msgid "Starting Intelligent Importers"
 msgstr "啟動智慧型匯入服務"
 
 # composer/e-msg-composer-hdrs.c:355
-#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:712
+#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "寄件者："
 
 # shell/e-shell-importer.c:601
-#: shell/e-shell-importer.c:1014
+#: shell/e-shell-importer.c:1100
 msgid "Select folder"
 msgstr "選擇資料夾"
 
 # shell/e-shell-importer.c:602
-#: shell/e-shell-importer.c:1015
+#: shell/e-shell-importer.c:1101
 msgid "Select a destination folder for importing this data"
 msgstr "選擇目的資料夾用作匯入這些資料"
 
@@ -14297,15 +29829,77 @@ msgstr "選擇目的資料夾用作匯入這些資料"
 # importers/pine-importer.c:646
 # shell/e-shell-importer.c:653
 # shell/importer/import.glade.h:4
-#: shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "匯入"
 
 # shell/e-shell-offline-handler.c:554
-#: shell/e-shell-offline-handler.c:572
+#: shell/e-shell-offline-handler.c:582
 msgid "Closing connections..."
 msgstr "關閉連線..."
 
+# camel/providers/local/camel-mbox-summary.c:502
+# camel/providers/local/camel-mbox-summary.c:703
+# mail/mail-ops.c:1397
+#: shell/e-shell-offline-sync.c:161
+#, fuzzy, c-format
+msgid ""
+"Error synchronizing \"%s\":\n"
+"%s"
+msgstr "同步處理 '%s'"
+
+# camel/camel-filter-driver.c:690
+# camel/camel-filter-driver.c:788
+#: shell/e-shell-offline-sync.c:239
+#, fuzzy
+msgid "Syncing Folder"
+msgstr "同步處理資料夾"
+
+# camel/providers/local/camel-mbox-summary.c:502
+# camel/providers/local/camel-mbox-summary.c:703
+# mail/mail-ops.c:1397
+#. Prepare the dialog.
+#: shell/e-shell-offline-sync.c:317
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\" (%d of %d) ..."
+msgstr "同步處理 '%s'"
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: shell/e-shell-settings-dialog.c:290
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution"
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#: shell/e-shell-shared-folder-picker-dialog.c:352
+#, fuzzy
+msgid "Opening Folder"
+msgstr "開啟資料夾 %s"
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#: shell/e-shell-shared-folder-picker-dialog.c:359
+#, fuzzy, c-format
+msgid "Opening Folder \"%s\""
+msgstr "開啟資料夾 %s"
+
+# mail/mail-display.c:299
+#: shell/e-shell-shared-folder-picker-dialog.c:364
+#, fuzzy, c-format
+msgid "in \"%s\" ..."
+msgstr "在 %s 內開啟..."
+
+# shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-shared-folder-picker-dialog.c:523
+#, fuzzy
+msgid "Cannot find open the specified shared folder."
+msgstr ""
+"無法建立指定的資料夾：\n"
+"%s"
+
 #: shell/e-shell-startup-wizard.c:159
 #, fuzzy, c-format
 msgid ""
@@ -14322,6 +29916,16 @@ msgstr ""
 "無法啟動 Evolution Mailer 精靈界面\n"
 "%s"
 
+# ui/evolution-calendar.xml.h:40
+# ui/evolution-event-editor.xml.h:66
+# ui/evolution-task-editor-dialog.xml.h:79
+# ui/evolution.xml.h:58
+#: shell/e-shell-user-creatable-items-handler.c:537
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: widgets/misc/e-charset-picker.c:104
+msgid "New"
+msgstr "新增"
+
 # camel/camel-pgp-context.c:1073
 #: shell/e-shell-utils.c:114
 msgid "No folder name specified."
@@ -14341,103 +29945,101 @@ msgid "'.' and '..' are reserved folder names."
 msgstr "'.' 和 '..' 是資料夾保留名稱。"
 
 # shell/e-shell-view-menu.c:179
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy was not found in your $PATH."
 msgstr "經由 $PATH 所指定的路徑也找不到 Bug buddy 程式。"
 
 # shell/e-shell-view-menu.c:185
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:186
 msgid "Bug buddy could not be run."
 msgstr "無法執行 Bug buddy。"
 
 # ui/evolution.xml.h:1
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:230
 #, fuzzy
 msgid "About Ximian Evolution"
 msgstr "關於 Ximian Evolution..."
 
 # shell/e-shell-view-menu.c:410
-#: shell/e-shell-view-menu.c:409
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "移至資料夾..."
 
 # shell/e-shell-view-menu.c:411
-#: shell/e-shell-view-menu.c:410
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "選擇您想開啟的資料夾"
 
 # shell/e-shortcuts-view.c:292
-#: shell/e-shell-view-menu.c:530
+#: shell/e-shell-view-menu.c:594
 msgid "Create a new shortcut"
 msgstr "新增一個捷徑"
 
 # shell/e-shell-view-menu.c:411
-#: shell/e-shell-view-menu.c:531
+#: shell/e-shell-view-menu.c:595
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "選擇您想捷徑對應到的資料夾："
 
-#: shell/e-shell-view-menu.c:562
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-
-# camel/camel-filter-driver.c:871
-#: shell/e-shell-view-menu.c:570
-#, fuzzy, c-format
-msgid "Error executing %s."
-msgstr "執行過濾器發生錯誤： %s: %s"
-
 # shell/e-shell-view-menu.c:590
-#: shell/e-shell-view-menu.c:672
+#: shell/e-shell-view-menu.c:762
 #, fuzzy
 msgid "_Work Online"
 msgstr "線上工作"
 
 # ui/evolution.xml.h:66
-#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
 # ui/evolution.xml.h:39
-#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "離線工作"
 
 # shell/e-shell-view.c:149
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(沒有資料夾顯示)"
 
-#: shell/e-shell-view.c:1574
+#: shell/e-shell-view.c:1818
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
 # shell/e-storage.c:178
-#: shell/e-shell-view.c:1576
+#: shell/e-shell-view.c:1820
 msgid "(None)"
 msgstr "(沒有)"
 
-#: shell/e-shell-view.c:1623
+#: shell/e-shell-view.c:1867
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Ximian Evolution 目前為線上工作。按這裡改為離線工作。"
 
-#: shell/e-shell-view.c:1630
+#: shell/e-shell-view.c:1874
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution 現正離線中。"
 
-#: shell/e-shell-view.c:1636
+#: shell/e-shell-view.c:1880
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Ximian Evolution 目前是離線工作。按這裡改為線上工作。"
 
+#: shell/e-shell.c:171
+#, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 # shell/e-shell.c:392
-#: shell/e-shell.c:651
+#: shell/e-shell.c:765
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "無法設定本地端的儲存空間 -- %s"
 
-#: shell/e-shell.c:1659
+#: shell/e-shell.c:1853
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -14447,20 +30049,20 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: shell/e-shell.c:1886
+#: shell/e-shell.c:2156
 msgid "Invalid arguments"
 msgstr "無效的參數"
 
-#: shell/e-shell.c:1888
+#: shell/e-shell.c:2158
 msgid "Cannot register on OAF"
 msgstr "不能於 OAF 註冊"
 
-#: shell/e-shell.c:1890
+#: shell/e-shell.c:2160
 msgid "Configuration Database not found"
 msgstr "找不到組態資料庫"
 
 # shell/e-storage.c:461
-#: shell/e-shell.c:1892 shell/e-storage.c:500
+#: shell/e-shell.c:2162 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "一般錯誤"
 
@@ -14490,107 +30092,107 @@ msgid "Don't remove"
 msgstr "不要移除"
 
 # shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "重新命名功能群組"
 
 # shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "更改選定功能群組的名稱做："
 
 # shell/e-shortcuts-view.c:276
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:232
 msgid "_Small Icons"
 msgstr "小圖示(_S)"
 
 # shell/e-shortcuts-view.c:277
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:233
 msgid "Show the shortcuts as small icons"
 msgstr "以小圖示顯示功能項目"
 
 # shell/e-shortcuts-view.c:279
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:235
 msgid "_Large Icons"
 msgstr "大圖示(_L)"
 
 # shell/e-shortcuts-view.c:280
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:236
 msgid "Show the shortcuts as large icons"
 msgstr "以大圖示顯示功能項目"
 
 # shell/e-shortcuts-view.c:291
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:247
 msgid "_New Group..."
 msgstr "新增群組(_N)..."
 
 # shell/e-shortcuts-view.c:292
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:248
 msgid "Create a new shortcut group"
 msgstr "新增功能群組"
 
 # shell/e-shortcuts-view.c:294
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:250
 msgid "_Remove this Group..."
 msgstr "移除這個群組(_R)..."
 
 # shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:251
 msgid "Remove this shortcut group"
 msgstr "移除這個功能群組"
 
 # shell/e-shortcuts-view.c:294
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:253
 msgid "Re_name this Group..."
 msgstr "重新命名這個群組(_N)..."
 
 # shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:254
 msgid "Rename this shortcut group"
 msgstr "更改這個功能群組的名稱"
 
 # shell/e-shortcuts-view.c:300
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:259
 msgid "_Hide the Shortcut Bar"
 msgstr "隱藏功能列(_H)"
 
 # shell/e-shortcuts-view.c:301
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:260
 msgid "Hide the shortcut bar"
 msgstr "隱藏功能列"
 
 # shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:379
 msgid "Rename shortcut"
 msgstr "重新命名功能"
 
 # shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:372
+#: shell/e-shortcuts-view.c:380
 msgid "Rename selected shortcut to:"
 msgstr "更改選定功能的名稱做："
 
 # ui/evolution.xml.h:26
-#: shell/e-shortcuts-view.c:384
+#: shell/e-shortcuts-view.c:392
 msgid "Open the folder linked to this shortcut"
 msgstr "開啟連結至這個功能的資料夾"
 
 # ui/evolution.xml.h:25
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
 msgid "Open in New _Window"
 msgstr "在新視窗開啟(_W)"
 
 # ui/evolution-mail.xml.h:59
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:394
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "使用新視窗開啟連結至這個功能的資料夾"
 
 # ui/evolution.xml.h:61
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "_Rename"
 msgstr "重新命名(_R)"
 
 # shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:397
 msgid "Rename this shortcut"
 msgstr "更改這個功能的名稱"
 
@@ -14598,101 +30200,89 @@ msgstr "更改這個功能的名稱"
 # composer/e-msg-composer-attachment-bar.c:468
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Re_move"
 msgstr "移除(_M)"
 
 # shell/e-shortcuts-view.c:388
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:399
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "將功能項目從功能列移除"
 
 # shell/e-shortcuts.c:381
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "儲存功能項目時發生錯誤。"
 
 # ui/evolution.xml.h:62
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "功能"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: shell/e-storage-set-view.c:658
-#, fuzzy, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
 msgstr ""
-"無法刪除資料夾：\n"
-"%s"
-
-# shell/e-storage.c:178
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(沒有名稱)"
 
 # shell/e-storage.c:459
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "沒有錯誤"
 
 # shell/e-storage.c:463
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "相同名稱的資料夾已經存在"
 
 # shell/e-storage.c:465
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "所指定的資料夾類別是無效的"
 
 # shell/e-storage.c:467
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "輸出/入錯誤"
 
 # shell/e-storage.c:469
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "沒有足夠空間去建立資料夾"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr ""
 
 # shell/e-storage.c:471
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "找不到指定的資料夾"
 
 # shell/e-storage.c:473
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "這個儲存空間的功能仍未實作"
 
 # shell/e-storage.c:477
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "行動不支援"
 
 # shell/e-storage.c:479
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "這個儲存空間不支援所指定的類別"
 
 # shell/e-storage.c:471
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "指定的資料夾不能編輯或移動"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "不能把資料夾置於其子資料夾之下"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "無法建立資料夾鎖定 %s ： %s"
@@ -14711,24 +30301,56 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+#: shell/evolution-folder-selector-button.c:86
+msgid "<click here to select a folder>"
+msgstr "<按這裏選擇資料夾>"
+
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#: shell/evolution-shell-component-utils.c:124
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr "不明的錯誤"
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+
 # shell/e-storage.c:467
-#: shell/evolution-shell-component.c:1009
+#: shell/evolution-shell-component.c:1083
 #, fuzzy
 msgid "CORBA error"
 msgstr "輸出/入錯誤"
 
-#: shell/evolution-shell-component.c:1011
+#: shell/evolution-shell-component.c:1085
 msgid "Interrupted"
 msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: shell/evolution-shell-component.c:1013
+#: shell/evolution-shell-component.c:1087
 #, fuzzy
 msgid "Invalid argument"
 msgstr "無效的參數"
 
-#: shell/evolution-shell-component.c:1015
+#: shell/evolution-shell-component.c:1089
 msgid "Already has an owner"
 msgstr ""
 
@@ -14746,94 +30368,72 @@ msgstr ""
 # widgets/misc/e-dateedit.c:432
 # widgets/misc/e-dateedit.c:1341
 # widgets/misc/e-dateedit.c:1456
-#: shell/evolution-shell-component.c:1017
+#: shell/evolution-shell-component.c:1091
 #, fuzzy
 msgid "No owner"
 msgstr "無"
 
 # calendar/gui/calendar-commands.c:266
-#: shell/evolution-shell-component.c:1019
+#: shell/evolution-shell-component.c:1093
 #, fuzzy
 msgid "Not found"
 msgstr "找不到名片"
 
 # mail/mail-config.glade.h:1
-#: shell/evolution-shell-component.c:1021
+#: shell/evolution-shell-component.c:1095
 #, fuzzy
 msgid "Unsupported type"
 msgstr " 檢查可支援的類別(_C)"
 
-#: shell/evolution-shell-component.c:1023
+#: shell/evolution-shell-component.c:1097
 msgid "Unsupported schema"
 msgstr ""
 
 # mail/mail-session.c:161
-#: shell/evolution-shell-component.c:1025
+#: shell/evolution-shell-component.c:1099
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "使用者取消動作。"
 
 # shell/e-storage.c:467
-#: shell/evolution-shell-component.c:1027
+#: shell/evolution-shell-component.c:1101
 #, fuzzy
 msgid "Internal error"
 msgstr "其它錯誤"
 
-#: shell/evolution-shell-component.c:1031
+#: shell/evolution-shell-component.c:1105
 #, fuzzy
 msgid "Exists"
 msgstr "存在"
 
 # mail/mail-config.glade.h:37
-#: shell/evolution-shell-component.c:1033
+#: shell/evolution-shell-component.c:1107
 #, fuzzy
 msgid "Invalid URI"
 msgstr "不合法"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: shell/evolution-shell-component.c:1037
+#: shell/evolution-shell-component.c:1111
 #, fuzzy
 msgid "Has subfolders"
 msgstr "沒有這個資料夾 %s"
 
 # mail/mail-callbacks.c:1106
-#: shell/evolution-shell-component.c:1039
+#: shell/evolution-shell-component.c:1113
 #, fuzzy
 msgid "No space left"
 msgstr "沒有選定郵件"
 
-#: shell/evolution-shell-component.c:1041
+#: shell/evolution-shell-component.c:1115
 msgid "Old owner has died"
 msgstr ""
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
-#: shell/evolution-shell-component-utils.c:124
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr "不明的錯誤"
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
+# shell/e-shell-importer.c:555
+#: shell/evolution-test-component.c:49
+#, fuzzy
+msgid "Test type"
+msgstr "檔案類別："
 
 # shell/e-shell-offline-handler.c:554
 #: shell/glade/e-active-connection-dialog.glade.h:1
@@ -14978,381 +30578,395 @@ msgstr "不要再顯示這個訊息"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution 可以自下列檔案匯入資料："
 
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: shell/main.c:91
+msgid "Evolution"
+msgstr "Evolution"
+
 # ui/evolution.xml.h:17
-#: shell/main.c:89
+#: shell/main.c:97
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolution 視窗(_W)"
 
+#: shell/main.c:222
+#, fuzzy, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Ximian Evolution groupware suite.\n"
+"\n"
+"This version of Ximian Evolution is not yet complete. It's getting close,\n"
+"but some features are either unfinished or don't work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall,\n"
+"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+"嗨。感謝您花時間下載\n"
+"Ximian Evolution 群體軟體套餐。\n"
+"\n"
+"Ximian Evolution 尚未完成。它已經很接近了，但有些地方\n"
+"的功能失效或只有一半的功能可以運作。\n"
+"\n"
+"如果您找到 bug，請把它們回報到 bugzilla.ximian.com。\n"
+"這個產品沒有任何保證，而其本意並不是要惹\n"
+"任何人震怒。\n"
+"\n"
+"我們希望您享受我們努力工作的成果，也\n"
+"熱切地期待您的貢獻！\n"
+
+# shell/main.c:107
+#: shell/main.c:245
+msgid ""
+"Thanks\n"
+"The Ximian Evolution Team\n"
+msgstr ""
+"多謝\n"
+"Ximian Evolution 小組\n"
+
+# importers/elm-importer.c:528
+# importers/netscape-importer.c:807
+# importers/pine-importer.c:668
+#: shell/main.c:254
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "不要再顯示這個訊息"
+
 # shell/main.c:138
-#: shell/main.c:210
+#: shell/main.c:347
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "無法存取 Ximian Evolution shell。"
 
 # shell/main.c:138
-#: shell/main.c:219
+#: shell/main.c:356
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "無法初始化 Ximian Evolution shell： %s"
 
 # shell/main.c:184
-#: shell/main.c:289
+#: shell/main.c:437
 msgid "Disable splash screen"
 msgstr "停用顯著效果螢幕"
 
+#: shell/main.c:438
+#, fuzzy
+msgid "Start in offline mode"
+msgstr "開始匯入"
+
+#: shell/main.c:439
+#, fuzzy
+msgid "Start in online mode"
+msgstr "啟動智慧型匯入服務"
+
 # shell/main.c:185
-#: shell/main.c:290
+#: shell/main.c:440
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 
+#: shell/main.c:458
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
 # shell/main.c:217
-#: shell/main.c:332
+#: shell/main.c:488
 msgid "Cannot initialize the Bonobo component system."
 msgstr "無法初始化 Bonobo 元件系統。"
 
 # composer/e-msg-composer.c:805
+#: tools/evolution-addressbook-abuse.c:80
 #: tools/evolution-addressbook-export.c:36
 #: tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
 msgstr "載入檔案時發生錯誤：%s"
 
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr ""
-
 # ui/evolution-message-composer.xml.h:49
+#: tools/evolution-addressbook-abuse.c:111
 #: tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
 msgstr "插入檔案"
 
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr ""
+
 # camel/camel-pgp-context.c:1073
 #: tools/evolution-addressbook-import.c:80
 #, fuzzy
 msgid "No filename provided."
 msgstr "沒有指定資料夾名稱。"
 
-# ui/evolution-event-editor.xml.h:13
-# ui/evolution-mail.xml.h:8
-# ui/evolution-task-editor-dialog.xml.h:14
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy"
-msgstr "複製"
+# ui/evolution-mail.xml.h:9
+#: ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "複製已選定的郵件到另一個資料夾"
 
 # ui/evolution-event-editor.xml.h:14
 # ui/evolution-task-editor-dialog.xml.h:15
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "複製選定範圍"
 
+# mail/folder-browser.c:713
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "復製至資料夾(_C)..."
+
 # ui/evolution-addressbook.xml.h:2
-#: ui/evolution-addressbook.xml.h:4
+#: ui/evolution-addressbook.xml.h:6
 msgid "Create new contact"
 msgstr "新增連絡人"
 
 # ui/evolution-addressbook.xml.h:2
-#: ui/evolution-addressbook.xml.h:5
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create new contact list"
 msgstr "新增連絡人清單"
 
-# ui/evolution-event-editor.xml.h:15
-# ui/evolution-task-editor-dialog.xml.h:16
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:6
-msgid "Cut"
-msgstr "剪下"
-
 # ui/evolution-event-editor.xml.h:16
 # ui/evolution-task-editor-dialog.xml.h:17
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "剪下選定範圍"
 
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:11
 msgid "Delete selected contacts"
 msgstr "刪除選定的連絡人"
 
-# mail/mail-config.glade.h:45
-#: ui/evolution-addressbook.xml.h:12
-msgid "New List"
-msgstr "新增清單"
+# ui/evolution-mail.xml.h:56
+#: ui/evolution-addressbook.xml.h:13
+#, fuzzy
+msgid "Move Contact(s) to Another Folder..."
+msgstr "將選定的郵件移至另一個資料夾"
 
-# ui/evolution-event-editor.xml.h:30
-# ui/evolution-task-editor-dialog.xml.h:33
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "貼上"
+# mail/folder-browser.c:711
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "移至資料夾(_M)..."
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "貼上剪貼板"
 
 # ui/evolution-calendar.xml.h:22
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:17
 msgid "Previews the contacts to be printed"
 msgstr "預覽將要列印的連絡人"
 
 # ui/evolution-addressbook.xml.h:11
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:20
 msgid "Print selected contacts"
 msgstr "列印選定的連絡人"
 
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:22
 msgid "Save selected contacts as a VCard."
 msgstr "將選定的連絡人儲存為 VCard。"
 
 # ui/evolution-event-editor.xml.h:48
 # ui/evolution-task-editor-dialog.xml.h:57
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:23
 msgid "Select All"
 msgstr "全選"
 
 # ui/evolution-addressbook.xml.h:15
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:24
 msgid "Select all contacts"
 msgstr "選擇全部連絡人"
 
-# ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "傳送郵件給連絡人(_M)..."
-
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send a mess to the selected contacts."
 msgstr "傳送郵件給選定的連絡人。"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:26
 msgid "Send message to contact"
 msgstr "傳送郵件給連絡人"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
 # addressbook/gui/widgets/e-addressbook-view.c:612
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:27
 msgid "Send selected contacts to another person."
 msgstr "傅送選定連絡人給其他使用者。"
 
 # ui/evolution-addressbook.xml.h:12
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop"
 msgstr "停止"
 
 # ui/evolution-addressbook.xml.h:13
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "Stop Loading"
 msgstr "停止載入"
 
+#: ui/evolution-addressbook.xml.h:30
+#, fuzzy
+msgid "View the current contact"
+msgstr "目前時間"
+
 # ui/evolution.xml.h:41
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
 msgid "_Actions"
 msgstr "執行(_A)"
 
-# ui/evolution-addressbook.xml.h:16
-#: ui/evolution-addressbook.xml.h:30
-msgid "_Addressbook Sources..."
-msgstr "目錄服務來源(_A)..."
-
 # ui/evolution-addressbook.xml.h:17
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Contact"
-msgstr "連絡人(_C)"
-
-# ui/evolution-addressbook.xml.h:17
-#: ui/evolution-addressbook.xml.h:32
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact List"
 msgstr "連絡人清單(_C)"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:24
 # calendar/gui/event-editor-dialog.glade.h:29
-#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "連絡人轉寄(_F)..."
 
-# ui/evolution-addressbook.xml.h:18
-# ui/evolution-calendar.xml.h:42
-# ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "列印(_P)..."
+# mail/folder-browser.c:711
+#: ui/evolution-addressbook.xml.h:38
+msgid "_Move to Folder..."
+msgstr "移至資料夾(_M)..."
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Save as VCard"
 msgstr "儲存成 VCard 檔案格式(_S)"
 
 # ui/evolution-addressbook.xml.h:19
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Search for Contacts"
 msgstr "尋找連絡人(_S)"
 
 # ui/evolution-event-editor.xml.h:72
 # ui/evolution-task-editor-dialog.xml.h:86
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Select All"
 msgstr "全選(_S)"
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "組態行事曆的設定值"
-
-# ui/evolution-calendar.xml.h:4
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "新增一個全天要事(_E)"
-
-# ui/evolution-tasks.xml.h:2
-#: ui/evolution-calendar.xml.h:5
-msgid "Create a New _Task"
-msgstr "建立一個新的工作(_T)"
-
-# ui/evolution-calendar.xml.h:5
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "新增一個約會(_N)"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create an event for the whole day"
-msgstr "建立一個整天的事件"
+# ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:45
+#, fuzzy
+msgid "_Send Message to Contact..."
+msgstr "傳送郵件給連絡人(_M)..."
 
 # ui/evolution-calendar.xml.h:7
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "天"
 
 # ui/evolution-event-editor.xml.h:18
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "刪除這個約會"
 
 # ui/evolution-calendar.xml.h:8
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "移至"
 
 # ui/evolution-calendar.xml.h:9
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "向後"
 
 # ui/evolution-calendar.xml.h:10
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "向前"
 
 # ui/evolution-calendar.xml.h:11
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "移至日期(_D)"
 
 # ui/evolution-calendar.xml.h:13
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "移至指定日期"
 
 # calendar/gui/e-day-view.c:3153
 # calendar/gui/e-week-view.c:3284
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "移至今日"
 
 # ui/evolution-calendar.xml.h:15
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "月"
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
-#: ui/evolution-calendar.xml.h:21
-msgid "New Appointment"
-msgstr "新增約會"
-
-# ui/evolution-tasks.xml.h:3
-#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
-msgid "New Task"
-msgstr "新增工作"
-
 # ui/evolution-calendar.xml.h:22
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "預覽將要列印的行事曆內容"
 
 # ui/evolution-event-editor.xml.h:34
 # ui/evolution-task-editor-dialog.xml.h:37
-#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "預覽列印(_V)"
 
 # ui/evolution-calendar.xml.h:26
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "列印這個行事曆"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "發佈此行事曆的 空閒/忙碌 資訊"
 
 # ui/evolution-calendar.xml.h:30
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "顯示一天"
 
 # ui/evolution-calendar.xml.h:31
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "顯示一個月"
 
 # ui/evolution-calendar.xml.h:32
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "顯示一週"
 
 # ui/evolution-calendar.xml.h:33
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "顯示工作週"
 
 # ui/evolution-calendar.xml.h:36
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "週"
 
-# ui/evolution-calendar.xml.h:37
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "約會(_A)..."
-
-# ui/evolution-mail.xml.h:110
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "行事曆設定(_C)..."
-
-# mail/mail-config.glade.h:61
-#: ui/evolution-calendar.xml.h:42
-msgid "_Publish Free/Busy Information"
-msgstr "發佈 空閒/忙碌 資訊(_P)"
-
-# ui/evolution-tasks.xml.h:9
-#: ui/evolution-calendar.xml.h:43
-msgid "_Task..."
-msgstr "工作(_T)..."
-
 # calendar/gui/dialogs/alarm-notify.glade.h:1
 # ui/evolution-contact-editor.xml.h:1
 # ui/evolution-event-editor.xml.h:10
@@ -15379,8 +30993,8 @@ msgid "Delete this item"
 msgstr "刪除這個項目"
 
 # ui/evolution.xml.h:22
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "主工具列"
 
@@ -15397,28 +31011,27 @@ msgstr "預覽須要列印的項目"
 msgid "Print this item"
 msgstr "列印這個項目"
 
-# ui/evolution-contact-editor.xml.h:7
-# ui/evolution-event-editor.xml.h:38
-# ui/evolution-task-editor-dialog.xml.h:41
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "列印..."
-
 # ui/evolution-event-editor.xml.h:40
 # ui/evolution-message-composer.xml.h:17
 # ui/evolution-task-editor-dialog.xml.h:50
 # widgets/misc/e-filter-bar.c:241
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:239
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
 msgid "Save"
 msgstr "儲存"
 
+# widgets/misc/e-filter-bar.h:94
+# widgets/misc/e-filter-bar.h:101
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "另存新檔..."
+
 # ui/evolution-contact-editor.xml.h:9
 # ui/evolution-event-editor.xml.h:42
 # ui/evolution-task-editor-dialog.xml.h:52
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "儲存後關閉"
 
@@ -15441,8 +31054,8 @@ msgstr "儲存這個項目到磁碟"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:36
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:42
 msgid "_File"
 msgstr "檔案(_F)"
 
@@ -15456,7 +31069,7 @@ msgstr "列印信封(_V)..."
 # ui/evolution-message-composer.xml.h:19
 # ui/evolution-task-editor-dialog.xml.h:51
 #: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "另存新檔(_A)..."
@@ -15466,6 +31079,11 @@ msgstr "另存新檔(_A)..."
 msgid "Save the contact and close the dialog box"
 msgstr "儲存連絡人並關閉對話盒"
 
+# ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Send _Message to Contact..."
+msgstr "傳送郵件給連絡人(_M)..."
+
 # ui/evolution-contact-editor.xml.h:16
 # ui/evolution-event-editor.xml.h:71
 # ui/evolution-message-composer.xml.h:53
@@ -15473,7 +31091,7 @@ msgstr "儲存連絡人並關閉對話盒"
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Save"
 msgstr "儲存(_S)"
 
@@ -15523,24 +31141,24 @@ msgstr "以 i_Calendar 轉寄"
 msgid "Forward this item via email"
 msgstr "經由電子郵件轉寄這個項目"
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr "取得最新的會議資訊"
 
 # calendar/gui/e-meeting-dialog.glade.h:17
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr "重新整理會議(_F)"
 
 # ui/evolution-event-editor.xml.h:46
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr "會議排程(_M)"
 
 # calendar/gui/e-day-view.c:3166
 # calendar/gui/e-week-view.c:3296
 # ui/evolution-event-editor.xml.h:45
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr "為這個項目安排一個會議"
 
@@ -15560,103 +31178,68 @@ msgstr "取消目前郵件所作的行動"
 msgid "Compose _New Message"
 msgstr "撰寫新郵件(_N)"
 
-# ui/evolution-mail.xml.h:19
-#: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr "建立或編輯郵件帳號及其它設定"
-
 # ui/evolution-mail.xml.h:20
-#: ui/evolution-mail-global.xml.h:5
+#: ui/evolution-mail-global.xml.h:4
 msgid "Create or edit rules for filtering new mail"
 msgstr "為新郵件建立或編輯過濾規則"
 
 # ui/evolution-mail.xml.h:21
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr "建立或編輯虛擬資料夾的定義"
 
 # ui/evolution-mail.xml.h:25
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "清空垃圾桶(_T)"
 
 # ui/evolution-mail.xml.h:31
-#: ui/evolution-mail-global.xml.h:8
+#: ui/evolution-mail-global.xml.h:7
 msgid "Forget _Passwords"
 msgstr "重新輸入密碼 _P)"
 
 # ui/evolution-mail.xml.h:32
-#: ui/evolution-mail-global.xml.h:9
+#: ui/evolution-mail-global.xml.h:8
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "刪除已記錄的密碼以便可再重新輸入"
 
-# widgets/misc/e-messagebox.c:180
-#: ui/evolution-mail-global.xml.h:10
-msgid "New Message"
-msgstr "新郵件"
-
 # ui/evolution-mail.xml.h:58
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "開啟視窗以便撰寫郵件"
 
 # ui/evolution-mail.xml.h:61
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "永久移除在所有資料夾內的全部已刪除的郵件"
 
-# ui/evolution-mail.xml.h:81
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send / Receive"
-msgstr "傳送 / 接收"
-
-# ui/evolution-mail.xml.h:82
-#: ui/evolution-mail-global.xml.h:14
-msgid "Send queued mail and retrieve new mail"
-msgstr "傳送待送的郵件及接收新郵件"
-
 # ui/evolution-mail.xml.h:86
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:11
 msgid "Show message preview window"
 msgstr "顯示郵件預覽視窗"
 
 # ui/evolution-mail.xml.h:90
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:12
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "訂閱或取消訂閱在遠端伺服器的資料夾"
 
 # ui/evolution-mail.xml.h:99
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:13
 msgid "Virtual Folder _Editor..."
 msgstr "虛擬資料夾編輯器(_E)..."
 
 # ui/evolution-mail.xml.h:105
-#: ui/evolution-mail-global.xml.h:19
+#: ui/evolution-mail-global.xml.h:15
 msgid "_Filters..."
 msgstr "過濾器(_F)..."
 
-# ui/evolution-mail.xml.h:109
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Message"
-msgstr "郵件訊息(_M)"
-
-# ui/evolution-mail.xml.h:110
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Mail Settings..."
-msgstr "郵件設定(_M)..."
-
 # calendar/gui/event-editor-dialog.glade.h:15
-#: ui/evolution-mail-global.xml.h:22
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "預覽面版(_P)"
 
-# ui/evolution-mail.xml.h:119
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Send / Receive"
-msgstr "傳送 / 接收 (_S)"
-
 # mail/subscribe-dialog.c:271
-#: ui/evolution-mail-global.xml.h:24
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Subscribe to Folders..."
 msgstr "訂閱至資料夾(_S)..."
 
@@ -15775,13 +31358,13 @@ msgid "Threaded Message list"
 msgstr "相關郵件清單"
 
 # ui/evolution-mail.xml.h:104
-#: ui/evolution-mail-list.xml.h:26
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "刪除(_E)"
 
 # ui/evolution-mail.xml.h:106
 # ui/evolution.xml.h:50
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
 msgid "_Folder"
 msgstr "資料 (_F)"
 
@@ -15804,240 +31387,259 @@ msgstr "內容(_P)..."
 msgid "_Threaded Message List"
 msgstr "相關郵件清單(_T)"
 
-# ui/evolution-mail.xml.h:1
+# addressbook/gui/component/addressbook-config.c:662
 #: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Addressbook"
+msgstr "新增傳送者到目錄服務"
+
+# mail/folder-browser.c:727
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "套用過濾器"
+
+# addressbook/gui/component/addressbook-config.c:662
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Addressbook"
+msgstr "新增傳送者到目錄服務"
+
+# ui/evolution-mail.xml.h:1
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "套用過濾器規則於所選定的郵件"
 
 # ui/evolution-mail.xml.h:6
-#: ui/evolution-mail-message.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "撰寫回郵給所選定的郵件的全部收件者"
 
 # ui/evolution-mail.xml.h:7
-#: ui/evolution-mail-message.xml.h:3
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "撰寫回郵給所選定郵件的郵件清單"
 
 # ui/evolution-mail.xml.h:7
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的郵件的寄件者"
 
 # ui/evolution-mail.xml.h:9
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的郵件到另一個資料夾"
 
 # ui/evolution-mail.xml.h:10
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "從郵件建立虛擬資料夾(_V)"
 
 # ui/evolution-mail.xml.h:11
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "為這個寄件者建立過濾器規則"
 
 # ui/evolution-mail.xml.h:12
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "為這些收件者建立過濾器規則"
 
 # ui/evolution-mail.xml.h:13
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "為這個郵件清單建立過濾器規則"
 
 # ui/evolution-mail.xml.h:14
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
 # ui/evolution-mail.xml.h:15
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "為這些收件者建立一個虛擬資料夾"
 
 # ui/evolution-mail.xml.h:16
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "為這個郵件清單建立一個虛擬資料夾"
 
 # ui/evolution-mail.xml.h:17
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "為這個寄件者建立一個虛擬資料夾"
 
 # ui/evolution-mail.xml.h:18
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "為這個主旨建立一個虛擬資料夾"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr ""
 
 # ui/evolution-mail.xml.h:23
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "顯示下一封重要的郵件"
 
 # ui/evolution-mail.xml.h:23
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "顯示下一封郵件"
 
 # ui/evolution-mail.xml.h:23
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "顯示下一封未閱讀的郵件"
 
 # ui/evolution-mail.xml.h:23
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "顯示下一封未閱讀的相關郵件"
 
 # ui/evolution-mail.xml.h:24
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "顯示上一封重要的郵件"
 
 # ui/evolution-mail.xml.h:24
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "顯示上一封郵件"
 
 # ui/evolution-mail.xml.h:24
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "顯示上一封未閱讀的郵件"
 
+# mail/message-browser.c:194
+# ui/evolution-mail.xml.h:33
+#: ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "F_orward"
+msgstr "轉寄"
+
 # ui/evolution-mail.xml.h:26
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "郵件清單規則(_L)..."
 
 # ui/evolution-mail.xml.h:27
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "寄件者規則(_N)..."
 
 # ui/evolution-mail.xml.h:28
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "收件者規則(_R)..."
 
 # ui/evolution-mail.xml.h:29
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "主旨規則(_S)..."
 
-# ui/evolution-mail.xml.h:30
-#: ui/evolution-mail-message.xml.h:29
-msgid "Force images in HTML mail to be loaded"
-msgstr "閱讀 HTML 格式的郵件時強迫載入圖片"
-
-# mail/message-browser.c:194
-# ui/evolution-mail.xml.h:33
-#: ui/evolution-mail-message.xml.h:30
-msgid "Forward"
-msgstr "轉寄"
-
-# ui/evolution-mail.xml.h:34
-#: ui/evolution-mail-message.xml.h:31
-msgid "Forward As"
-msgstr "轉寄方式"
-
-# ui/evolution-mail.xml.h:35
-#: ui/evolution-mail-message.xml.h:32
-msgid "Forward _Attached"
-msgstr "轉寄附加檔案(_A)"
-
-# ui/evolution-mail.xml.h:36
+# ui/evolution-mail.xml.h:54
 #: ui/evolution-mail-message.xml.h:33
-msgid "Forward _Inline"
-msgstr "正常轉寄(_I)"
+#, fuzzy
+msgid "Flag selected message(s) for follow-up"
+msgstr "將選定的郵件標示成要刪除"
 
-# ui/evolution-mail.xml.h:37
 #: ui/evolution-mail-message.xml.h:34
-msgid "Forward _Quoted"
-msgstr "轉寄引文(_Q)"
+msgid "Follow _Up..."
+msgstr ""
 
-# ui/evolution-mail.xml.h:38
+# ui/evolution-mail.xml.h:30
 #: ui/evolution-mail-message.xml.h:35
+msgid "Force images in HTML mail to be loaded"
+msgstr "閱讀 HTML 格式的郵件時強迫載入圖片"
+
+# ui/evolution-mail.xml.h:38
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "將需要轉寄的郵件夾附於新郵件的內文中"
 
 # ui/evolution-mail.xml.h:39
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "將須要轉寄的郵件以回覆郵件方式寄出"
 
 # ui/evolution-mail.xml.h:40
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
 
 # ui/evolution-mail.xml.h:41
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "將選定的郵件以附加檔案形式轉寄給某人"
 
 # ui/evolution-message-composer.xml.h:10
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Increase the text size"
 msgstr "插入純文字檔案..."
 
 # ui/evolution-mail.xml.h:46
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "載入圖片(_I)"
 
 # ui/evolution-mail.xml.h:50
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "標示成重要(_M)"
 
 # mail/folder-browser.c:706
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "標示成未閱讀(_n)"
+
+# mail/folder-browser.c:706
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "標示成不重要(_O)"
 
 # ui/evolution-mail.xml.h:52
-#: ui/evolution-mail-message.xml.h:46
-msgid "Mark the selected messages as having been read"
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected message(s) as having been read"
 msgstr "將選定的郵件標示成已閱讀"
 
 # ui/evolution-mail.xml.h:54
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mark the selected messages as important"
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected message(s) as important"
 msgstr "將選定的郵件標示成重要"
 
 # ui/evolution-mail.xml.h:53
-#: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected messages as not having been read"
+#: ui/evolution-mail-message.xml.h:49
+#, fuzzy
+msgid "Mark the selected message(s) as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
 # ui/evolution-mail.xml.h:54
-#: ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected messages as unimportant"
+#: ui/evolution-mail-message.xml.h:50
+#, fuzzy
+msgid "Mark the selected message(s) as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
 # ui/evolution-mail.xml.h:54
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的郵件標示成要刪除"
 
 # ui/evolution-mail.xml.h:55
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "移動"
 
 # ui/evolution-mail.xml.h:56
-#: ui/evolution-mail-message.xml.h:52
-msgid "Move selected messages to another folder"
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Move selected message(s) to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
 
 # mail/message-browser.c:210
@@ -16045,27 +31647,25 @@ msgstr "將選定的郵件移至另一個資料夾"
 # ui/evolution-event-editor.xml.h:29
 # ui/evolution-mail.xml.h:57
 # ui/evolution-task-editor-dialog.xml.h:32
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "下一步"
 
 # ui/evolution-mail.xml.h:23
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "下一封重要郵件"
-
-# widgets/misc/e-messagebox.c:180
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
-msgstr "下一封郵件"
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "下一封重要郵件"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+#, fuzzy
+msgid "Next _Thread"
 msgstr "下一封相關郵件"
 
 # mail/mail-search.c:138
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
+#, fuzzy
+msgid "Next _Unread Message"
 msgstr "下一封未閱讀的郵件"
 
 # ui/evolution-mail.xml.h:59
@@ -16082,9 +31682,21 @@ msgstr "開啟選定的郵件然後重傳"
 msgid "Original Si_ze"
 msgstr ""
 
+# ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "上一封未閱讀的郵件"
+
+# ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Pr_evious Important Message"
+msgstr "上一封重要郵件"
+
 # ui/evolution-addressbook.xml.h:8
 # ui/evolution-mail.xml.h:63
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Preview the message to be printed"
 msgstr "預覽需要列印的郵件"
 
@@ -16092,186 +31704,205 @@ msgstr "預覽需要列印的郵件"
 # ui/evolution-event-editor.xml.h:33
 # ui/evolution-mail.xml.h:64
 # ui/evolution-task-editor-dialog.xml.h:36
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous"
 msgstr "上一步"
 
-# ui/evolution-mail.xml.h:24
-#: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "上一封重要郵件"
-
-# mail/mail-callbacks.c:1407
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "上一封郵件"
-
-# ui/evolution-mail.xml.h:24
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "上一封未閱讀的郵件"
-
 # mail/mail-callbacks.c:1407
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "列印郵件"
 
-# mail/message-browser.c:188
-# ui/evolution-mail.xml.h:70
-#: ui/evolution-mail-message.xml.h:69
-msgid "Reply"
-msgstr "回覆"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Re_direct"
+msgstr ""
 
-# mail/message-browser.c:191
-# ui/evolution-mail.xml.h:71
-#: ui/evolution-mail-message.xml.h:70
-msgid "Reply to All"
-msgstr "全部回覆"
+# ui/evolution-mail.xml.h:40
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "將選定的郵件轉寄給某人"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr ""
 
 # ui/evolution-mail.xml.h:73
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "尋找郵件(_E)..."
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr ""
 
 # ui/evolution-mail.xml.h:74
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "另存郵件成文字檔案"
 
 # ui/evolution-mail.xml.h:75
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:78
 msgid "Search for text in the body of the displayed message"
 msgstr "搜尋顯示的郵件本文中的文字"
 
 # ui/evolution-event-editor.xml.h:50
 # ui/evolution-task-editor-dialog.xml.h:59
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "設定目前印表機的版面設定"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "顯示郵件原始檔(_S)"
 
 # addressbook/printing/e-contact-print.glade.h:11
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "顯示全部檔頭(_H)"
 
 # ui/evolution-mail.xml.h:86
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "使用正常模式顯示郵件"
 
 # ui/evolution-mail.xml.h:87
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
 # ui/evolution-mail.xml.h:89
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr ""
 
 # ui/evolution-mail.xml.h:94
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "復原選定的郵件"
 
 # ui/evolution-mail.xml.h:95
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "郵件列表虛擬資料夾(_L)..."
 
 # ui/evolution-mail.xml.h:96
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "寄件者虛擬資料夾(_N)..."
 
 # ui/evolution-mail.xml.h:97
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "收件者虛擬資料夾(_R)..."
 
 # ui/evolution-mail.xml.h:98
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "主旨虛擬資料夾(_S)..."
 
-# ui/evolution-mail.xml.h:100
-#: ui/evolution-mail-message.xml.h:91
-msgid "_Apply Filters"
-msgstr "套用過濾器規則(_A)"
+# ui/evolution-message-composer.xml.h:1
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Attached"
+msgstr "附加"
 
 # ui/evolution-mail.xml.h:101
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "複製至資料夾(_C)"
 
 # ui/evolution-mail.xml.h:102
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "建立郵件規則(_C)"
 
 # ui/evolution-mail.xml.h:107
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "轉寄郵件(_F)"
 
+# ui/evolution-calendar.xml.h:8
+#: ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "_Go To"
+msgstr "移至"
+
+# mail/mail-config.glade.h:37
+#: ui/evolution-mail-message.xml.h:99
+#, fuzzy
+msgid "_Inline"
+msgstr "正常"
+
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Larger"
 msgstr "呼叫器"
 
 # views/mail/galview.xml.h:4
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "檢視郵件(_M)"
 
 # ui/evolution-mail.xml.h:112
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
+# widgets/misc/e-messagebox.c:180
+#: ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Next Message"
+msgstr "下一封郵件"
+
 # calendar/gui/calendar-model.c:499
 # calendar/gui/calendar-model.c:1068
 # calendar/gui/calendar-model.c:1574
 # calendar/gui/dialogs/task-editor-dialog.glade.h:13
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "標準顯示(_N)"
 
 # ui/evolution-mail.xml.h:114
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Open Message"
 msgstr "開啟郵件(_O)"
 
+# mail/mail-callbacks.c:1407
+#: ui/evolution-mail-message.xml.h:106
+#, fuzzy
+msgid "_Previous Message"
+msgstr "上一封郵件"
+
+# mail/mail-config.glade.h:56
+#: ui/evolution-mail-message.xml.h:108
+#, fuzzy
+msgid "_Quoted"
+msgstr "引用"
+
 # ui/evolution-addressbook.xml.h:20
 # ui/evolution-calendar.xml.h:44
 # ui/evolution-event-editor.xml.h:74
 # ui/evolution-task-editor-dialog.xml.h:88
 # ui/evolution.xml.h:64
-#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
 msgid "_Tools"
 msgstr "工具(_T)"
 
+# mail/folder-browser.c:717
+# ui/evolution-mail.xml.h:121
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "復原(_U)"
+
 # ui/evolution.xml.h:6
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
@@ -16283,8 +31914,8 @@ msgstr "關閉這個視窗"
 # ui/evolution.xml.h:43
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:33
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:38
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -16293,7 +31924,7 @@ msgstr "關閉(_C)"
 # ui/evolution-task-editor-dialog.xml.h:90
 # ui/evolution.xml.h:65
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
 msgid "_View"
 msgstr "檢視(_V)"
 
@@ -16324,13 +31955,13 @@ msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "使用您的 S/MIME 加密證書將這封郵件加密"
 
 # addressbook/printing/e-contact-print.glade.h:10
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 #, fuzzy
 msgid "For_mat"
 msgstr "格式"
 
 # ui/evolution-message-composer.xml.h:8
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
 #, fuzzy
 msgid "H_TML"
 msgstr "HTML"
@@ -16350,6 +31981,14 @@ msgstr "將檔案以純文字格式附加到郵件"
 msgid "Insert text file..."
 msgstr "插入純文字檔案..."
 
+# calendar/gui/e-day-view.c:3162
+# calendar/gui/e-week-view.c:3292
+# ui/evolution-calendar.xml.h:19
+# ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "開啟"
+
 # ui/evolution-message-composer.xml.h:12
 #: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
@@ -16395,7 +32034,7 @@ msgstr "儲存至資料夾..."
 # ui/evolution-message-composer.xml.h:23
 # ui/evolution-task-editor-dialog.xml.h:53
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "儲存目前檔案"
 
@@ -16426,6 +32065,7 @@ msgstr "稍後傳送(_L)"
 
 # ui/evolution-message-composer.xml.h:29
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "使用 HTML 格式傳送郵件"
 
@@ -16519,7 +32159,7 @@ msgstr "寄件者(_F)"
 
 # ui/evolution-message-composer.xml.h:49
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -16533,16 +32173,11 @@ msgstr "開啟(_O)..."
 msgid "_Reply-To Field"
 msgstr "回覆(_R)"
 
-# ui/evolution-message-composer.xml.h:54
-#: ui/evolution-message-composer.xml.h:54
-msgid "_Security"
-msgstr "安全(_S)"
-
 # ui/evolution-event-editor.xml.h:60
 # ui/evolution-message-composer.xml.h:48
 # ui/evolution-task-editor-dialog.xml.h:72
 # ui/evolution.xml.h:53
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "說明(_H)"
 
@@ -16609,41 +32244,50 @@ msgstr "取得最新的工作資訊"
 msgid "Re_fresh Task"
 msgstr "重整工作(_F)"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "組態工作檢視的設定值"
-
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "複製選定的工作"
 
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "剪下選定的工作"
 
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Delete completed tasks"
+msgstr "刪除選定的工作"
+
+# calendar/gui/e-calendar-table.c:714
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "刪除選定的工作"
 
+# calendar/gui/e-calendar-table.c:707
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "Mar_k as Complete"
+msgstr "標示完成(_M)"
+
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "貼上剪貼板上的工作"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#: ui/evolution-tasks.xml.h:13
-msgid "Tasks Settings..."
-msgstr "工作設定..."
+# ui/evolution-calendar.xml.h:22
+#: ui/evolution-tasks.xml.h:11
+#, fuzzy
+msgid "Previews the list of tasks to be printed"
+msgstr "預覽將要列印的連絡人"
 
-# ui/evolution-tasks.xml.h:9
-#: ui/evolution-tasks.xml.h:18
-msgid "_Task"
-msgstr "工作(_T)"
+# mail/mail-callbacks.c:1407
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Print the list of tasks"
+msgstr "列印郵件"
 
 # ui/evolution.xml.h:1
 #: ui/evolution.xml.h:1
@@ -16714,94 +32358,115 @@ msgstr ""
 msgid "Move this folder to another place"
 msgstr "將這個資料夾移至另一個地方"
 
-# ui/evolution.xml.h:24
+# ui/evolution.xml.h:8
 #: ui/evolution.xml.h:18
+#, fuzzy
+msgid "Open Other _User's Folder..."
+msgstr "新增資料夾(_N)..."
+
+#: ui/evolution.xml.h:19
+msgid "Open a folder that is made available by some other user on the server"
+msgstr ""
+
+# ui/evolution.xml.h:24
+#: ui/evolution.xml.h:20
 msgid "Open in New Window"
 msgstr "在新視窗開啟"
 
 # ui/evolution.xml.h:26
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Open this folder in an other window"
 msgstr "使用新視窗開啟這個資料夾"
 
+# ui/evolution-mail.xml.h:81
+#: ui/evolution.xml.h:23
+msgid "Send / Receive"
+msgstr "傳送 / 接收"
+
+# ui/evolution-mail.xml.h:82
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Send queued items and retrieve new items"
+msgstr "傳送待送的郵件及接收新郵件"
+
 # ui/evolution.xml.h:27
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:25
 msgid "Show information about Ximian Evolution"
 msgstr "顯示關於 Ximian Evolution 的資訊"
 
 # ui/evolution.xml.h:28
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "傳送錯誤報告"
 
 # ui/evolution.xml.h:29
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:27
 msgid "Submit _Bug Report"
 msgstr "傳送錯誤報告(_B)"
 
 # ui/evolution.xml.h:30
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy 送出錯誤報告。"
 
 # ui/evolution.xml.h:31
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
 msgid "Toggle"
 msgstr "切換"
 
 # ui/evolution.xml.h:32
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:30
 msgid "Toggle whether to show the folder bar"
 msgstr "切換資料夾清單的顯示狀態"
 
 # ui/evolution.xml.h:33
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the shortcut bar"
 msgstr "切換資料功能列的顯示狀態"
 
 # ui/evolution.xml.h:34
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:32
 msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
 
 # ui/evolution.xml.h:38
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:33
 msgid "View the selected folder"
 msgstr "檢視選定的資料夾"
 
 # ui/evolution.xml.h:16
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:35
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
 # ui/evolution.xml.h:40
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:36
 msgid "_About Ximian Evolution..."
 msgstr "關於 Ximian Evolution(_A)..."
 
 # ui/evolution.xml.h:45
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:40
 msgid "_Copy..."
 msgstr "複製(_C)..."
 
 # ui/evolution.xml.h:51
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:44
 msgid "_Folder Bar"
 msgstr "資料夾清單(_F)"
 
 # ui/evolution.xml.h:52
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:45
 msgid "_Go to Folder..."
 msgstr "移至資料夾(_G)..."
 
 # shell/e-shell-importer.c:363
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Import..."
 msgstr "匯入..."
 
 # ui/evolution.xml.h:57
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:48
 msgid "_Move..."
 msgstr "移動(_M)..."
 
@@ -16809,59 +32474,54 @@ msgstr "移動(_M)..."
 # ui/evolution-event-editor.xml.h:66
 # ui/evolution-task-editor-dialog.xml.h:79
 # ui/evolution.xml.h:58
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:49
 msgid "_New"
 msgstr "新增(_N)"
 
 # ui/evolution.xml.h:59
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:50
 msgid "_New Folder"
 msgstr "新增資料夾(_N)"
 
 # ui/evolution-mail.xml.h:110
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Pilot Settings..."
 msgstr "郵件設定(_M)..."
 
 # ui/evolution.xml.h:61
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:52
 msgid "_Rename..."
 msgstr "重新命名(_R)..."
 
+# ui/evolution-mail.xml.h:119
+#: ui/evolution.xml.h:53
+msgid "_Send / Receive"
+msgstr "傳送 / 接收 (_S)"
+
 # ui/evolution.xml.h:62
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:54
 msgid "_Shortcut"
 msgstr "功能(_S)"
 
 # ui/evolution.xml.h:62
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:55
 msgid "_Shortcut Bar"
 msgstr "功能列(_S)"
 
-# ui/evolution.xml.h:4
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "變更摘要的設定值"
-
 # calendar/gui/e-calendar-table.c:159
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "列印摘要"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "重新載入"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "重新載入檢視器"
 
-# ui/evolution-mail.xml.h:110
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "摘要設定值(_S)..."
-
 # data/evolution.keys.in.h:1
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
@@ -16877,23 +32537,33 @@ msgstr "依公司"
 msgid "Phone List"
 msgstr "電話清單"
 
-# views/mail/galview.xml.h:1
+# mail/mail-account-gui.c:682
 #: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As Sent Folder"
+msgstr "選擇資料夾"
+
+#: views/mail/galview.xml.h:2
+msgid "By Follow Up Flag"
+msgstr ""
+
+# views/mail/galview.xml.h:1
+#: views/mail/galview.xml.h:3
 msgid "By Sender"
 msgstr "依寄件者"
 
 # views/mail/galview.xml.h:2
-#: views/mail/galview.xml.h:2
+#: views/mail/galview.xml.h:4
 msgid "By Status"
 msgstr "依狀況"
 
 # views/mail/galview.xml.h:3
-#: views/mail/galview.xml.h:3
+#: views/mail/galview.xml.h:5
 msgid "By Subject"
 msgstr "依主旨"
 
 # views/mail/galview.xml.h:4
-#: views/mail/galview.xml.h:4
+#: views/mail/galview.xml.h:6
 msgid "Messages"
 msgstr "郵件"
 
@@ -16902,6 +32572,12 @@ msgstr "郵件"
 msgid "With Category"
 msgstr "依類別"
 
+#. Check for UTC.
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+msgid "UTC"
+msgstr ""
+
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
@@ -16928,12 +32604,23 @@ msgstr ""
 "  使用滑鼠右鍵縮小地圖。"
 
 # widgets/menus/gal-view-menus.c:176
-#: widgets/menus/gal-view-menus.c:195
+#: widgets/menus/gal-view-menus.c:295
 msgid "_Current View"
 msgstr "目前檢視(_C)"
 
+# widgets/menus/gal-view-menus.c:176
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:357
+#, fuzzy
+msgid "Custom View"
+msgstr "目前檢視(_C)"
+
+#: widgets/menus/gal-view-menus.c:366
+msgid "Save Custom View"
+msgstr ""
+
 # widgets/menus/gal-view-menus.c:202
-#: widgets/menus/gal-view-menus.c:222
+#: widgets/menus/gal-view-menus.c:379
 msgid "Define Views"
 msgstr "定義檢視"
 
@@ -16975,32 +32662,36 @@ msgstr "時間格式：%s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "數值必須是由 0 到 100 的數字"
 
-#: widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "波羅的海文"
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:60
 msgid "Central European"
 msgstr "中歐字母"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:61
 msgid "Chinese"
 msgstr "中文"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:62
 msgid "Cyrillic"
 msgstr "斯拉夫文"
 
 # ui/evolution-calendar.xml.h:36
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Greek"
 msgstr "希臘文"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
+msgid "Hebrew"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
 msgid "Japanese"
 msgstr "日文"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Korean"
 msgstr "韓文"
 
@@ -17009,57 +32700,55 @@ msgstr "韓文"
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "土耳其文"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "西歐字母"
 
 # camel/providers/smtp/camel-smtp-transport.c:206
-#: widgets/misc/e-charset-picker.c:84
+#: widgets/misc/e-charset-picker.c:86
 msgid "Traditional"
 msgstr "繁體"
 
-#: widgets/misc/e-charset-picker.c:85 widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
 msgid "Simplified"
 msgstr "簡體"
 
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:92
 msgid "Ukrainian"
 msgstr "烏克籣文"
 
-# ui/evolution-calendar.xml.h:40
-# ui/evolution-event-editor.xml.h:66
-# ui/evolution-task-editor-dialog.xml.h:79
-# ui/evolution.xml.h:58
-#: widgets/misc/e-charset-picker.c:101
-msgid "New"
-msgstr "新增"
+# mail/mail-accounts.c:197
+#: widgets/misc/e-charset-picker.c:95
+#, fuzzy
+msgid "Visual"
+msgstr "停用"
 
 # mail/mail-config.glade.h:22
-#: widgets/misc/e-charset-picker.c:159
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "不明的編碼：%s"
 
 # mail/mail-config.glade.h:22
-#: widgets/misc/e-charset-picker.c:201
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "輸入需要使用的編碼"
 
 # addressbook/contact-editor/e-contact-editor.c:1254
 # addressbook/contact-editor/e-contact-editor.c:1312
-#: widgets/misc/e-charset-picker.c:276
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "其它..."
 
-#: widgets/misc/e-charset-picker.c:395
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "編碼"
 
@@ -17069,31 +32758,33 @@ msgid "..."
 msgstr "..."
 
 # mail/mail-search.c:299
-#: widgets/misc/e-filter-bar.c:152
+#: widgets/misc/e-filter-bar.c:146
 msgid "Search Editor"
 msgstr "尋找編輯器"
 
 # widgets/misc/e-filter-bar.c:168
-#: widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.c:162
 msgid "Save Search"
 msgstr "儲存搜尋結果"
 
 # widgets/misc/e-filter-bar.c:168
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr "加入儲存的搜尋結果"
+#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
+#, fuzzy
+msgid "_Save Search..."
+msgstr "儲存搜尋結果"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "清除"
+# widgets/misc/e-filter-bar.c:168
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "加入儲存的搜尋結果"
 
-# widgets/misc/e-filter-bar.h:95
-# widgets/misc/e-filter-bar.h:102
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "全部顯示"
+# widgets/misc/e-filter-bar.h:97
+# widgets/misc/e-filter-bar.h:104
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Advanced..."
+msgstr "進階..."
 
 # widgets/misc/e-messagebox.c:152
 #: widgets/misc/e-messagebox.c:152
@@ -17124,13 +32815,27 @@ msgstr "訊息"
 msgid "Don't show this message again."
 msgstr "不要再顯示這個訊息。"
 
-# widgets/misc/e-search-bar.c:155
-#: widgets/misc/e-search-bar.c:334
-msgid "Sear_ch"
-msgstr "尋找(_C)"
+# addressbook/gui/component/addressbook-config.c:349
+#: widgets/misc/e-search-bar.c:512
+#, fuzzy
+msgid "_Find Now"
+msgstr "立即搜尋"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: widgets/misc/e-search-bar.c:513
+#, fuzzy
+msgid "_Clear"
+msgstr "清除"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: widgets/misc/e-search-bar.c:875
+msgid "Clear"
+msgstr "清除"
 
 # addressbook/gui/component/addressbook-config.c:349
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:877
 msgid "Find Now"
 msgstr "立即搜尋"
 
@@ -17161,14 +32866,902 @@ msgstr "init_corba()：不能初始化 GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo()：不能初始化 Bonobo"
 
+# addressbook/backend/ebook/e-card.c:3314
+#~ msgid "Card: "
+#~ msgstr "名片："
+
+# addressbook/backend/ebook/e-card.c:3316
+#~ msgid ""
+#~ "\n"
+#~ "Name: "
+#~ msgstr ""
+#~ "\n"
+#~ "名字："
+
+# addressbook/backend/ebook/e-card.c:3317
+#~ msgid ""
+#~ "\n"
+#~ "  Prefix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  前置：     "
+
+# addressbook/backend/ebook/e-card.c:3318
+#~ msgid ""
+#~ "\n"
+#~ "  Given:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  姓：       "
+
+# addressbook/backend/ebook/e-card.c:3319
+#~ msgid ""
+#~ "\n"
+#~ "  Additional: "
+#~ msgstr ""
+#~ "\n"
+#~ "  額外的： "
+
+# addressbook/backend/ebook/e-card.c:3320
+#~ msgid ""
+#~ "\n"
+#~ "  Family:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  姓氏：     "
+
+# addressbook/backend/ebook/e-card.c:3321
+#~ msgid ""
+#~ "\n"
+#~ "  Suffix:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  後置：     "
+
+# addressbook/backend/ebook/e-card.c:3335
+#~ msgid ""
+#~ "\n"
+#~ "Birth Date: "
+#~ msgstr ""
+#~ "\n"
+#~ "出生日期："
+
+# addressbook/backend/ebook/e-card.c:3346
+#~ msgid ""
+#~ "\n"
+#~ "Address:"
+#~ msgstr ""
+#~ "\n"
+#~ "地址："
+
+# addressbook/backend/ebook/e-card.c:3348
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Box:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  信箱：  "
+
+# addressbook/backend/ebook/e-card.c:3349
+#~ msgid ""
+#~ "\n"
+#~ "  Ext:         "
+#~ msgstr ""
+#~ "\n"
+#~ "  內線：         "
+
+# addressbook/backend/ebook/e-card.c:3350
+#~ msgid ""
+#~ "\n"
+#~ "  Street:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  街：      "
+
+# addressbook/backend/ebook/e-card.c:3351
+#~ msgid ""
+#~ "\n"
+#~ "  City:        "
+#~ msgstr ""
+#~ "\n"
+#~ "  縣/市：        "
+
+# addressbook/backend/ebook/e-card.c:3352
+#~ msgid ""
+#~ "\n"
+#~ "  Region:      "
+#~ msgstr ""
+#~ "\n"
+#~ "  地區：      "
+
+# addressbook/backend/ebook/e-card.c:3353
+#~ msgid ""
+#~ "\n"
+#~ "  Postal Code: "
+#~ msgstr ""
+#~ "\n"
+#~ "  郵遞區號： "
+
+# addressbook/backend/ebook/e-card.c:3354
+#~ msgid ""
+#~ "\n"
+#~ "  Country:     "
+#~ msgstr ""
+#~ "\n"
+#~ "  國家：     "
+
+# addressbook/backend/ebook/e-card.c:3367
+#~ msgid ""
+#~ "\n"
+#~ "Delivery Label: "
+#~ msgstr ""
+#~ "\n"
+#~ "送遞標籤： "
+
+# addressbook/backend/ebook/e-card.c:3379
+#~ msgid ""
+#~ "\n"
+#~ "Telephones:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "電話：\n"
+
+# addressbook/backend/ebook/e-card.c:3382
+#~ msgid ""
+#~ "\n"
+#~ "Telephone:"
+#~ msgstr ""
+#~ "\n"
+#~ "電話："
+
+# addressbook/backend/ebook/e-card.c:3406
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "電子郵件：\n"
+
+# addressbook/backend/ebook/e-card.c:3409
+#~ msgid ""
+#~ "\n"
+#~ "E-mail:"
+#~ msgstr ""
+#~ "\n"
+#~ "電子郵件："
+
+# addressbook/backend/ebook/e-card.c:3434
+#~ msgid ""
+#~ "\n"
+#~ "Time Zone: "
+#~ msgstr ""
+#~ "\n"
+#~ "時區： "
+
+# addressbook/backend/ebook/e-card.c:3446
+#~ msgid ""
+#~ "\n"
+#~ "Business Role: "
+#~ msgstr ""
+#~ "\n"
+#~ "業務職位： "
+
+# addressbook/backend/ebook/e-card.c:3458
+#~ msgid ""
+#~ "\n"
+#~ "Org: "
+#~ msgstr ""
+#~ "\n"
+#~ "團體： "
+
+# addressbook/backend/ebook/e-card.c:3459
+#~ msgid ""
+#~ "\n"
+#~ "  Name:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  名稱：  "
+
+# addressbook/backend/ebook/e-card.c:3460
+#~ msgid ""
+#~ "\n"
+#~ "  Unit:  "
+#~ msgstr ""
+#~ "\n"
+#~ "  單位：  "
+
+# addressbook/backend/ebook/e-card.c:3461
+#~ msgid ""
+#~ "\n"
+#~ "  Unit2: "
+#~ msgstr ""
+#~ "\n"
+#~ "  單位2： "
+
+# addressbook/backend/ebook/e-card.c:3462
+#~ msgid ""
+#~ "\n"
+#~ "  Unit3: "
+#~ msgstr ""
+#~ "\n"
+#~ "  單位3： "
+
+# addressbook/backend/ebook/e-card.c:3463
+#~ msgid ""
+#~ "\n"
+#~ "  Unit4: "
+#~ msgstr ""
+#~ "\n"
+#~ "  單位4： "
+
+# addressbook/backend/ebook/e-card.c:3467
+#~ msgid ""
+#~ "\n"
+#~ "Categories: "
+#~ msgstr ""
+#~ "\n"
+#~ "類別： "
+
+# addressbook/backend/ebook/e-card.c:3468
+#~ msgid ""
+#~ "\n"
+#~ "Comment: "
+#~ msgstr ""
+#~ "\n"
+#~ "備註： "
+
+# addressbook/backend/ebook/e-card.c:3481
+#~ msgid ""
+#~ "\n"
+#~ "Unique String: "
+#~ msgstr ""
+#~ "\n"
+#~ "唯一字串： "
+
+# addressbook/backend/ebook/e-card.c:3484
+#~ msgid ""
+#~ "\n"
+#~ "Public Key: "
+#~ msgstr ""
+#~ "\n"
+#~ "公鑰： "
+
+# mail/mail-config.c:1213
+# mail/mail-config.c:1216
+#, fuzzy
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "正在連線至伺服器..."
+
+# mail/mail-config.c:1213
+# mail/mail-config.c:1216
+#, fuzzy
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "正在連線至伺服器..."
+
+# ui/evolution-addressbook.xml.h:7
+#~ msgid "New _Contact"
+#~ msgstr "新增連絡人(_C)"
+
+# ui/evolution-addressbook.xml.h:17
+#~ msgid "New Contact _List"
+#~ msgstr "新增連絡人清單"
+
+# addressbook/gui/component/addressbook-config.c:660
+#~ msgid "Edit Addressbook"
+#~ msgstr "編輯目錄服務"
+
+# mail/mail-config.glade.h:3
+#~ msgid "Account Name"
+#~ msgstr "帳號"
+
+# addressbook/gui/component/addressbook-config.c:662
+#~ msgid "Add Addressbook"
+#~ msgstr "新增目錄服務"
+
+# addressbook/gui/component/select-names/select-names.glade.h:3
+#~ msgid "Server Name"
+#~ msgstr "伺服器名稱"
+
+#~ msgid "The information below is required in order to add an addressbook.  "
+#~ msgstr "下列資訊是新增目錄服務所需要的。"
+
+#~ msgid "This information is not required for most ldap servers. "
+#~ msgstr "此資訊大多數的 LDAP 伺服器都不需要。"
+
+#~ msgid ""
+#~ "This information is used by your ldap server to specify which nodes are "
+#~ "used in a search. Contact your server administrator for more information."
+#~ msgstr ""
+#~ "此資訊被您的 LDAP 伺服器用來指出那一個節點正被用於搜尋.連絡您的伺服器管理"
+#~ "者以得到更多資訊。"
+
+#~ msgid ""
+#~ "This is the base node for all your searches on the ldap server. Contact "
+#~ "your server administrator for more information."
+#~ msgstr ""
+#~ "這是您在 LDAP 伺服器上所有搜尋的基礎節點.連絡您的伺服器管理者以得到更多資"
+#~ "訊。"
+
+#~ msgid "This is the name of the server where your addressbook is located."
+#~ msgstr "這是您的目錄服務所在之伺服器的名稱。"
+
+#~ msgid "This is the port that your ldap server uses."
+#~ msgstr "這是您的 LDAP 伺服器使用的連接埠。"
+
+# mail/mail-config.glade.h:73
+#~ msgid "_My server requires authentication"
+#~ msgstr "伺服器要求驗證(_M)"
+
+# ui/evolution-addressbook.xml.h:17
+#~ msgid "Co_ntacts:"
+#~ msgstr "連絡人(_N)："
+
+#~ msgid "Show contacts matching the following criteria:"
+#~ msgstr "顯示符合下列條件的連絡人："
+
+# addressbook/gui/component/select-names/select-names.glade.h:2
+#~ msgid "_Message Recipients:"
+#~ msgstr "收件者(_M)："
+
+# addressbook/contact-editor/contact-editor.glade.h:3
+#~ msgid "B_usiness"
+#~ msgstr "商務 (_U)"
+
+# addressbook/contact-editor/contact-editor.glade.h:4
+#~ msgid "Business _Fax"
+#~ msgstr "商務傳真 (_F)"
+
+# addressbook/contact-editor/contact-editor.glade.h:21
+#~ msgid "_Business"
+#~ msgstr "商務 (_B)"
+
+# addressbook/contact-editor/contact-editor.glade.h:26
+#~ msgid "_Home"
+#~ msgstr "住家 (_H)"
+
+# addressbook/contact-editor/contact-editor.glade.h:29
+#~ msgid "_Mobile"
+#~ msgstr "行動電話(_M)"
+
+#~ msgid "Republic Of Moldova"
+#~ msgstr "摩爾多瓦"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#~ msgid "Evolution calendar executive summary component."
+#~ msgstr "Evolution 行事曆執行摘要元件."
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#~ msgid "Factory for the Calendar Summary component."
+#~ msgstr "行事曆摘要元件工廠."
+
+# ui/evolution-calendar.xml.h:5
+#~ msgid "Create a new appointment"
+#~ msgstr "建立一個新的約會"
+
+# ui/evolution-tasks.xml.h:2
+#~ msgid "Create a new task"
+#~ msgstr "建立一個新的工作"
+
+# ui/evolution-tasks.xml.h:3
+#~ msgid "New _Task"
+#~ msgstr "新增工作(_T)"
+
+# ui/evolution-calendar.xml.h:5
+#~ msgid "Create new appointments with a default _reminder"
+#~ msgstr "以預設提醒建立新的約會(_R)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#~ msgid "First day of wee_k:"
+#~ msgstr "每週的第一天(_K)："
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#~ msgid "Sta_rt of day:"
+#~ msgstr "工作開始時間(_R)："
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#~ msgid "_End of day:"
+#~ msgstr "工作結束時間(_E)："
+
+# addressbook/contact-editor/e-contact-editor.c:1254
+# addressbook/contact-editor/e-contact-editor.c:1312
+#~ msgid "_Other"
+#~ msgstr "其它(_O)"
+
+# calendar/gui/event-editor.c:1612
+#~ msgid "before the start of the appointment"
+#~ msgstr "約會開始前"
+
+# calendar/gui/e-itip-control.glade.h:9
+#~ msgid "_Other Organizer"
+#~ msgstr "其他會議召集人(_O)"
+
+#~ msgid "The journal entry has changed. Send an updated version?"
+#~ msgstr "日誌項目已變更。是否傳送更新後的資訊？"
+
+# calendar/gui/e-calendar-table.c:708
+# ui/evolution-task-editor-dialog.xml.h:19
+#~ msgid "_Delete this Task"
+#~ msgstr "刪除這個工作(_D)"
+
+# calendar/gui/e-itip-control.c:470
+#~ msgid "I couldn't remove the item from your calendar file!\n"
+#~ msgstr "無法將項目從您的行事曆檔案移除！\n"
+
+# camel/camel-cipher-context.c:211
+#~ msgid "Clearsigning is not supported by this cipher"
+#~ msgstr "此加密器不支援明確簽章"
+
+# camel/camel-folder-search.c:670
+# camel/camel-folder-search.c:714
+#~ msgid "Invalid type in body-contains, expecting string"
+#~ msgstr "錯誤的類型於 body-contains，需要字串"
+
+# camel/camel-pgp-context.c:190
+#~ msgid "Please enter your %s passphrase for %s"
+#~ msgstr "請輸入 %2$s 所須的 %1$s 密碼"
+
+# camel/camel-pgp-context.c:193
+#~ msgid "Please enter your %s passphrase"
+#~ msgstr "請輸入您的 %s 密碼"
+
+# camel/providers/smtp/camel-smtp-transport.c:582
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to sign"
+#~ msgstr "無法傳送郵件：沒有提供收件者。"
+
+# camel/providers/smtp/camel-smtp-transport.c:568
+#, fuzzy
+#~ msgid "Cannot sign this message: no password provided"
+#~ msgstr "無法傳送郵件：寄件者的地址無效。"
+
+# camel/camel-pgp-context.c:524
+# camel/camel-pgp-context.c:696
+# camel/camel-pgp-context.c:879
+# camel/camel-pgp-context.c:1064
+# camel/camel-pgp-context.c:1276
+#, fuzzy
+#~ msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "不能建立導管至 GPG/PGP：%s"
+
+# camel/providers/smtp/camel-smtp-transport.c:582
+#, fuzzy
+#~ msgid "Cannot sign this message: no plaintext to clearsign"
+#~ msgstr "無法傳送郵件：沒有提供收件者。"
+
+# camel/providers/smtp/camel-smtp-transport.c:582
+#, fuzzy
+#~ msgid "Cannot verify this message: no plaintext to verify"
+#~ msgstr "無法傳送郵件：沒有提供收件者。"
+
+# camel/camel-pgp-context.c:524
+# camel/camel-pgp-context.c:696
+# camel/camel-pgp-context.c:879
+# camel/camel-pgp-context.c:1064
+# camel/camel-pgp-context.c:1276
+#, fuzzy
+#~ msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "不能建立導管至 GPG/PGP：%s"
+
+# camel/providers/smtp/camel-smtp-transport.c:582
+#, fuzzy
+#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
+#~ msgstr "無法傳送郵件：沒有提供收件者。"
+
+# camel/providers/smtp/camel-smtp-transport.c:568
+#, fuzzy
+#~ msgid "Cannot encrypt this message: no password provided"
+#~ msgstr "無法傳送郵件：寄件者的地址無效。"
+
+# camel/camel-pgp-context.c:524
+# camel/camel-pgp-context.c:696
+# camel/camel-pgp-context.c:879
+# camel/camel-pgp-context.c:1064
+# camel/camel-pgp-context.c:1276
+#, fuzzy
+#~ msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "不能建立導管至 GPG/PGP：%s"
+
+# camel/providers/smtp/camel-smtp-transport.c:582
+#, fuzzy
+#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#~ msgstr "無法傳送郵件：沒有提供收件者。"
+
+# camel/camel-pgp-context.c:524
+# camel/camel-pgp-context.c:696
+# camel/camel-pgp-context.c:879
+# camel/camel-pgp-context.c:1064
+# camel/camel-pgp-context.c:1276
+#, fuzzy
+#~ msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+#~ msgstr "不能建立導管至 GPG/PGP：%s"
+
+# camel/camel-remote-store.c:191
+#~ msgid "%s server %s"
+#~ msgstr "%s 伺服器 %s"
+
+# camel/camel-remote-store.c:256
+#~ msgid "(unknown host)"
+#~ msgstr "(不明的主機)"
+
+# camel/camel-tcp-stream-ssl.c:348
+#~ msgid ""
+#~ "EMail: %s\n"
+#~ "Common Name: %s\n"
+#~ "Organization Unit: %s\n"
+#~ "Organization: %s\n"
+#~ "Locality: %s\n"
+#~ "State: %s\n"
+#~ "Country: %s"
+#~ msgstr ""
+#~ "電子郵件: %s\n"
+#~ "通用名稱: %s\n"
+#~ "組織單位: %s\n"
+#~ "組織: %s\n"
+#~ "地區: %s\n"
+#~ "州: %s\n"
+#~ "國家: %s"
+
+# camel/camel-vee-folder.c:546
+#~ msgid "No such message: %s"
+#~ msgstr "沒有這個郵件： %s"
+
+# camel/camel-vtrash-folder.c:109
+#~ msgid "You cannot copy messages from this trash folder."
+#~ msgstr "您不能從垃圾桶資料夾內複製郵件。"
+
+# camel/providers/local/camel-mbox-folder.c:259
+#~ msgid "Cannot append message to spool file: %s: %s"
+#~ msgstr "無法將郵件增加到 spool 檔案： %s： %s"
+
+# camel/camel-provider.c:140
+#, fuzzy
+#~ msgid "Could not file: %s: %s"
+#~ msgstr "不能載入 %s：%s"
+
+# camel/providers/nntp/camel-nntp-auth.c:45
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "請輸入 %s@%s 的 NNTP 密碼"
+
+# camel/providers/nntp/camel-nntp-auth.c:66
+#~ msgid "Server rejected username"
+#~ msgstr "伺服器拒絕的使用者名稱"
+
+# camel/providers/nntp/camel-nntp-auth.c:72
+#~ msgid "Failed to send username to server"
+#~ msgstr "傳送使用者名稱到伺服器失敗"
+
+# camel/providers/nntp/camel-nntp-auth.c:81
+#~ msgid "Server rejected username/password"
+#~ msgstr "伺服器拒絕的使用者名稱/密碼"
+
+# camel/providers/nntp/camel-nntp-folder.c:115
+#~ msgid "Message %s not found."
+#~ msgstr "找不到郵件 %s"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:45
+#~ msgid "Could not get group list from server."
+#~ msgstr "無法從伺服器取得群組清單"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:94
+# camel/providers/nntp/camel-nntp-grouplist.c:103
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "無法載入 %s： %s 的群組清單檔案"
+
+# camel/providers/nntp/camel-nntp-grouplist.c:153
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "無法儲存 %s： %s 的群組清單檔案"
+
+# camel/providers/nntp/camel-nntp-store.c:224
+#~ msgid "Could not open directory for news server: %s"
+#~ msgstr "無法開啟新聞伺服器：%s 的目錄"
+
+# camel/providers/nntp/camel-nntp-store.c:325
+# camel/providers/nntp/camel-nntp-store.c:488
+#~ msgid "Unable to open or create .newsrc file for %s: %s"
+#~ msgstr "不能夠開啟或建立給 %s： %s 的 .newsrc 檔案"
+
+# camel/providers/pop3/camel-pop3-folder.c:155
+#~ msgid "Could not check POP server for new messages: %s"
+#~ msgstr "無法檢查於 POP 伺服器的新郵件：%s "
+
+# camel/providers/pop3/camel-pop3-folder.c:199
+#~ msgid "Could not open folder: message listing was incomplete."
+#~ msgstr "無法開啟資料夾：不完整的郵件清單。"
+
+# camel/providers/pop3/camel-pop3-folder.c:303
+#~ msgid "Could not fetch message: %s"
+#~ msgstr "不能接收郵件：%s"
+
+# camel/providers/pop3/camel-pop3-folder.c:320
+#~ msgid "Could not retrieve message from POP server %s: %s"
+#~ msgstr "無法從 POP 伺服器接收郵件 %s： %s"
+
+# camel/providers/pop3/camel-pop3-provider.c:91
+#~ msgid ""
+#~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
+#~ "it."
+#~ msgstr "這將會使用 Kerberos 4 的驗證方法連線到 POP  伺服器。"
+
+# camel/providers/pop3/camel-pop3-store.c:199
+#~ msgid "Could not authenticate to KPOP server: %s"
+#~ msgstr "無法驗證登入 KPOP 伺服器：%s"
+
+# camel/providers/pop3/camel-pop3-store.c:215
+#~ msgid "Could not connect to server: %s"
+#~ msgstr "不能夠連線到伺服器：%s"
+
+# camel/providers/pop3/camel-pop3-store.c:382
+# camel/providers/pop3/camel-pop3-store.c:419
+#~ msgid "(Unknown)"
+#~ msgstr "(不明)"
+
+# camel/providers/sendmail/camel-sendmail-transport.c:194
+#~ msgid "Could not find 'From' address in message"
+#~ msgstr "在郵件內找不到寄件者的電郵地址"
+
+# camel/providers/smtp/camel-smtp-transport.c:561
+#~ msgid "Cannot send message: sender address not defined."
+#~ msgstr "無法傳送郵件：沒有提供寄件者。"
+
+# camel/providers/smtp/camel-smtp-transport.c:898
+#~ msgid "RCPT TO response error: %s: mail not sent"
+#~ msgstr "傳回 RCPT TO 的回應錯誤：%s： 郵件無法傳送"
+
+# camel/providers/smtp/camel-smtp-transport.c:948
+#~ msgid "DATA response error: %s: mail not sent"
+#~ msgstr "傳回 DATA 的回應錯誤：%s： 郵件無法傳送"
+
+# camel/providers/smtp/camel-smtp-transport.c:1000
+#~ msgid "DATA response error: message termination: %s: mail not sent"
+#~ msgstr "傳回 DATA 的回應錯誤：郵件傳送中止：%s： 郵件無法傳送"
+
+# camel/providers/smtp/camel-smtp-transport.c:1085
+#~ msgid "QUIT response error: %s: non-fatal"
+#~ msgstr "傳回 QUIT 的回應錯誤： %s：非嚴重的錯誤"
+
+#~ msgid "Enter folder URI"
+#~ msgstr "請輸入資料夾的 URI"
+
+#~ msgid "Message was received"
+#~ msgstr "已接收的郵件"
+
+#~ msgid "Message was sent"
+#~ msgstr "已傳送的郵件"
+
+#~ msgid "on or before"
+#~ msgstr "到期或之前"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "郵件儲存資料夾(內部的)"
+
+# camel/providers/pop3/camel-pop3-store.c:215
+#, fuzzy
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "不能夠連線到伺服器：%s"
+
+# ui/evolution-mail.xml.h:109
+#~ msgid "New _Mail Message"
+#~ msgstr "新增郵件(_M)"
+
+# ui/evolution-mail.xml.h:102
+#~ msgid "Create vFolder from Search"
+#~ msgstr "自搜尋建立虛擬資料夾"
+
+# mail/folder-browser.c:706
+#~ msgid "Mark as Unim_portant"
+#~ msgstr "標示成不重要(_I)"
+
+# mail/folder-browser.c:870
+#~ msgid "Filter on Mailing List"
+#~ msgstr "郵件清單的規則"
+
+# mail/local-config.glade.h:2
+#~ msgid "Mailbox Format"
+#~ msgstr "信箱格式"
+
+#, fuzzy
+#~ msgid "This message contains invalid recipients:"
+#~ msgstr "這個郵件只包含密件副本收件者。"
+
+# mail/local-config.glade.h:8
+#~ msgid "%s: Inbox"
+#~ msgstr "%s: Inbox"
+
+# mail/mail-config.glade.h:3
+#~ msgid "Account"
+#~ msgstr "帳號"
+
+#, fuzzy
+#~ msgid "Always _encrypt to myself when sending encrypted mail"
+#~ msgstr "當傳送加密郵件時永遠自我加密"
+
+# mail/mail-config.glade.h:14
+#~ msgid "Composer"
+#~ msgstr "編輯器"
+
+# mail/mail-config.glade.h:22
+#~ msgid "Default Forward style is: "
+#~ msgstr "預設的轉寄樣式為："
+
+# widgets/misc/e-filter-bar.h:96
+# widgets/misc/e-filter-bar.h:103
+#~ msgid "Edit..."
+#~ msgstr "編輯..."
+
+# shell/e-shell-importer.c:545
+# shell/importer/import.glade.h:5
+#~ msgid "Select Filter Log file..."
+#~ msgstr "選擇過濾器記錄檔..."
+
+# mail/mail-config.glade.h:29
+#~ msgid "_Email Address:"
+#~ msgstr "電子郵件地址(_E)："
+
+#~ msgid "_Log filter actions to:"
+#~ msgstr "記錄過濾器動作至(_L)："
+
+# addressbook/gui/widgets/e-addressbook-view.c:708
+#~ msgid "_Organization:"
+#~ msgstr "團體(_O)："
+
+# addressbook/gui/component/addressbook-config.c:352
+# mail/mail-config.glade.h:60
+#~ msgid "_Remember this password"
+#~ msgstr "記下這個密碼(_R)"
+
+# mail/mail-config.glade.h:64
+#~ msgid "_Send mail in HTML format by default."
+#~ msgstr "預設使用 HTML 格式傳送郵件(_S)"
+
+# mail/mail-config.glade.h:72
+#, fuzzy
+#~ msgid "_Server Type: "
+#~ msgstr "伺服器類別："
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+# mail/mail-config.glade.h:88
+#~ msgid "seconds."
+#~ msgstr "秒"
+
+# mail/mail-crypto.c:113
+#~ msgid "Could not create a PGP encryption context."
+#~ msgstr "不能建立 PGP 加密文本"
+
+# mail/mail-crypto.c:138
+#~ msgid "Could not create a PGP decryption context."
+#~ msgstr "不能建立 PGP 解密文本"
+
+# mail/mail-ops.c:914
+#~ msgid "Moving"
+#~ msgstr "移動"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#~ msgid "Evolution component for the executive summary."
+#~ msgstr "用作處理摘要的 Evolution 元件。"
+
+# mail/component-factory.c:337
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's Summary component."
+#~ msgstr "不能初始化 Evolution 的 mail 元件。"
+
+#~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
+#~ msgstr "<dd><b>無法連繫天氣伺服器</b></dd>"
+
+#~ msgid "蚌"
+#~ msgstr "蚌"
+
+#~ msgid "蚓"
+#~ msgstr "蚓"
+
+# shell/e-shell-importer.c:601
+#~ msgid "All _folders:"
+#~ msgstr "全部資料夾(_A)："
+
+# ui/evolution.xml.h:14
+#~ msgid "_Display folders:"
+#~ msgstr "顯示資料夾(_D)："
+
+# calendar/gui/calendar-summary.c:622
+# mail/mail-config.glade.h:24
+#~ msgid "_Displayed feeds:"
+#~ msgstr "顯示新聞發送伺服器(_D)："
+
+# shell/e-shell-view-menu.c:230
+#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+#~ msgstr "版權 1999, 2000, 2001 Ximian, Inc."
+
+# calendar/gui/dialogs/delete-comp.c:93
+#, fuzzy
+#~ msgid "Are you sure you want to remove the \"%s\" folder?"
+#~ msgstr "您確定要刪除這個資料夾 '%s'？"
+
+# shell/e-storage.c:178
+#~ msgid "(No name)"
+#~ msgstr "(沒有名稱)"
+
+# mail/mail-config.glade.h:45
+#~ msgid "New List"
+#~ msgstr "新增清單"
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "組態行事曆的設定值"
+
+# ui/evolution-calendar.xml.h:4
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "新增一個全天要事(_E)"
+
+# ui/evolution-tasks.xml.h:2
+#~ msgid "Create a New _Task"
+#~ msgstr "建立一個新的工作(_T)"
+
+# ui/evolution-calendar.xml.h:5
+#~ msgid "Create a _New Appointment"
+#~ msgstr "新增一個約會(_N)"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "建立一個整天的事件"
+
+# ui/evolution-calendar.xml.h:37
+#~ msgid "_Appointment..."
+#~ msgstr "約會(_A)..."
+
+# ui/evolution-mail.xml.h:110
+#~ msgid "_Calendar Settings..."
+#~ msgstr "行事曆設定(_C)..."
+
+# ui/evolution-tasks.xml.h:9
+#~ msgid "_Task..."
+#~ msgstr "工作(_T)..."
+
+# ui/evolution-mail.xml.h:19
+#~ msgid "Create or edit mail accounts and other preferences"
+#~ msgstr "建立或編輯郵件帳號及其它設定"
+
+# ui/evolution-mail.xml.h:110
+#~ msgid "_Mail Settings..."
+#~ msgstr "郵件設定(_M)..."
+
+# ui/evolution-mail.xml.h:35
+#~ msgid "Forward _Attached"
+#~ msgstr "轉寄附加檔案(_A)"
+
+# ui/evolution-mail.xml.h:37
+#~ msgid "Forward _Quoted"
+#~ msgstr "轉寄引文(_Q)"
+
+# ui/evolution-mail.xml.h:100
+#~ msgid "_Apply Filters"
+#~ msgstr "套用過濾器規則(_A)"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "組態工作檢視的設定值"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#~ msgid "Tasks Settings..."
+#~ msgstr "工作設定..."
+
+# ui/evolution.xml.h:4
+#~ msgid "Change the settings for the summary"
+#~ msgstr "變更摘要的設定值"
+
+# ui/evolution-mail.xml.h:110
+#~ msgid "_Summary Settings..."
+#~ msgstr "摘要設定值(_S)..."
+
+# widgets/misc/e-filter-bar.h:95
+# widgets/misc/e-filter-bar.h:102
+#~ msgid "Show All"
+#~ msgstr "全部顯示"
+
+# widgets/misc/e-search-bar.c:155
+#~ msgid "Sear_ch"
+#~ msgstr "尋找(_C)"
+
 # camel/camel-smime-context.c:194
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "請輸入您的的電子郵件地址與密碼以存取 %s"
 
-# mail/mail-config.glade.h:10
-#~ msgid "LDAP Authentication"
-#~ msgstr "LDAP 驗證"
-
 # addressbook/gui/component/addressbook-config.c:165
 # camel/camel-sasl-plain.c:32
 # camel/providers/imap/camel-imap-provider.c:80
@@ -17232,11 +33825,6 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ msgid "Snooze"
 #~ msgstr "延期"
 
-# calendar/gui/alarm-notify/alarm-queue.c:890
-# calendar/gui/alarm-notify/alarm-queue.c:945
-#~ msgid "Ok"
-#~ msgstr "確定"
-
 # calendar/gui/alarm-notify/notify-main.c:56
 #~ msgid ""
 #~ "It is %s.  The Unix time is %ld right now.  We just thought you may like "
@@ -17262,14 +33850,6 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ msgid "after start of appointment"
 #~ msgstr "約會開始後"
 
-# calendar/gui/event-editor.c:1622
-#~ msgid "before end of appointment"
-#~ msgstr "約會結束前"
-
-# mail/mail-config.glade.h:68
-#~ msgid "Sent By:"
-#~ msgstr "傳送者："
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:411
 #~ msgid "_Invite Others"
 #~ msgstr "邀請其他人(_I)"
@@ -17373,10 +33953,6 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ msgid "Elm mail"
 #~ msgstr "Elm 郵件"
 
-# importers/pine-importer.c:723
-#~ msgid "Pine mail"
-#~ msgstr "Pine 郵件"
-
 # mail/mail-callbacks.c:756
 #~ msgid "Forwarded message:\n"
 #~ msgstr "已轉寄的郵件：\n"
@@ -17422,16 +33998,6 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ msgid "Registering '%s'"
 #~ msgstr "註冊 '%s'"
 
-# camel/providers/local/camel-mbox-summary.c:502
-# camel/providers/local/camel-mbox-summary.c:703
-# mail/mail-ops.c:1397
-#~ msgid "Synchronizing '%s'"
-#~ msgstr "同步處理 '%s'"
-
-# mail/mail-tools.c:145
-#~ msgid "Couldn't create temporary mbox `%s': %s"
-#~ msgstr "無法建立暫存 mbox `%s'：%s"
-
 # mail/component-factory.c:337
 #~ msgid "Cannot initialize Evolution's Executive Summary component."
 #~ msgstr "不能初始化 Evolution 的執行摘要元件。"
@@ -17441,9 +34007,6 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ "RCFS:RCTP:RCKU:RCQS:RCBS:RCLM:RCNO:RCFN:RCKW:RCPO:RCYU:RCMS:RCAY:RCKH:"
 #~ "RCQC:RCFG:RCUK:RCSQ:RCDC:RCSS:RCLG:RCNN:RCGM:RCMQ:VHHH:WSSS"
 
-#~ msgid "There was an error downloading news feed"
-#~ msgstr "下載新聞發送伺服器時發生錯誤"
-
 #~ msgid "Smoke w/ thunders"
 #~ msgstr "帶雷的煙"
 
@@ -17454,20 +34017,9 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ msgid "Units: "
 #~ msgstr "單位：  "
 
-#~ msgid "_imperial"
-#~ msgstr "英制(_I)"
-
 #~ msgid "m_etric"
 #~ msgstr "公制(_E)"
 
-# ui/evolution.xml.h:47
-#~ msgid "Delete folder '%s'"
-#~ msgstr "刪除資料夾 '%s'"
-
-# ui/evolution.xml.h:61
-#~ msgid "Rename"
-#~ msgstr "重新命名"
-
 # camel/providers/imap/camel-imap-message-cache.c:150
 #~ msgid "Folder cannot contain the directory separator."
 #~ msgstr "資料夾不能包含目錄分隔。"
@@ -17476,12 +34028,6 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ msgid "Cannot initialize the Evolution Mailer Wizard interface"
 #~ msgstr "無法初始化 Evolution Mailer 精靈界面"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#~ msgid "Ximian Evolution"
-#~ msgstr "Ximian Evolution"
-
 # shell/e-shell-view-menu.c:232
 #~ msgid ""
 #~ "Ximian Evolution is a suite of groupware applications\n"
@@ -17533,51 +34079,10 @@ msgstr "init_bonobo()：不能初始化 Bonobo"
 #~ msgid "Your configuration is complete."
 #~ msgstr "您的設定完成了。"
 
-#~ msgid ""
-#~ "Hi.  Thanks for taking the time to download this preview release\n"
-#~ "of the Ximian Evolution groupware suite.\n"
-#~ "\n"
-#~ "Ximian Evolution is not yet complete. It's getting close, but there are\n"
-#~ "places where features are either missing or only half working. \n"
-#~ "\n"
-#~ "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
-#~ "This product comes with no warranty and is not intended for\n"
-#~ "individuals prone to violent fits of anger.\n"
-#~ "\n"
-#~ "We hope that you enjoy the results of our hard work, and we\n"
-#~ "eagerly await your contributions!\n"
-#~ msgstr ""
-#~ "嗨。感謝您花時間下載\n"
-#~ "Ximian Evolution 群體軟體套餐。\n"
-#~ "\n"
-#~ "Ximian Evolution 尚未完成。它已經很接近了，但有些地方\n"
-#~ "的功能失效或只有一半的功能可以運作。\n"
-#~ "\n"
-#~ "如果您找到 bug，請把它們回報到 bugzilla.ximian.com。\n"
-#~ "這個產品沒有任何保證，而其本意並不是要惹\n"
-#~ "任何人震怒。\n"
-#~ "\n"
-#~ "我們希望您享受我們努力工作的成果，也\n"
-#~ "熱切地期待您的貢獻！\n"
-
-# shell/main.c:107
-#~ msgid ""
-#~ "Thanks\n"
-#~ "The Ximian Evolution Team\n"
-#~ msgstr ""
-#~ "多謝\n"
-#~ "Ximian Evolution 小組\n"
-
 # ui/evolution-message-composer.xml.h:7
 #~ msgid "F_ormat"
 #~ msgstr "格式(_O)"
 
-# ui/evolution-event-editor.xml.h:56
-# ui/evolution-message-composer.xml.h:44
-# ui/evolution-task-editor-dialog.xml.h:68
-#~ msgid "_Debug"
-#~ msgstr "除錯(_D)"
-
 # ui/evolution.xml.h:54
 #~ msgid "_Import File..."
 #~ msgstr "匯入檔案(_I)..."